Author: rlaidlaw
Date: Wed Aug 7 22:21:35 2013
New Revision: 1511518
URL: http://svn.apache.org/r1511518
Log:
OODT-650: Removed duplicate context container example.
Removed:
oodt/trunk/webapp/fmprod/src/main/resources/cas-product-tomcat-5.5.9.xml
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/webapp/fmprod/pom.xml
oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml
Modified: oodt/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1511518&r1=1511517&r2=1511518&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Aug 7 22:21:35 2013
@@ -4,6 +4,9 @@ Apache OODT Change Log
Release 0.7 - Current Development
---------------------------------
+* OODT-650 Remove duplicate context container example from CAS-Product web
+ application (rlaidlaw)
+
* OODT-649 Add PathUtils.replaceEnvVariables wrapper around calls to
context.getInitParameter to process environment variables (rlaidlaw)
Modified: oodt/trunk/webapp/fmprod/pom.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/fmprod/pom.xml?rev=1511518&r1=1511517&r2=1511518&view=diff
==============================================================================
--- oodt/trunk/webapp/fmprod/pom.xml (original)
+++ oodt/trunk/webapp/fmprod/pom.xml Wed Aug 7 22:21:35 2013
@@ -39,9 +39,13 @@
<build>
<testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>
<plugins>
+ <!--
+ For plugins by Maven we don't need a groupId specification because
+ the groupId org.apache.maven.plugins is assumed by default.
+ -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1.1</version>
+ <version>2.4</version>
<configuration>
<webResources>
<resource>
@@ -54,17 +58,9 @@
<targetPath>META-INF/</targetPath>
</resource>
</webResources>
- <warSourceDirectory>src/main/webapp</warSourceDirectory>
- <containerConfigXML>
- src/main/resources/cas-product-tomcat-5.5.9.xml
- </containerConfigXML>
</configuration>
</plugin>
<plugin>
- <!--
- NOTE: We don't need a groupId specification because the group is
- org.apache.maven.plugins ...which is assumed by default.
- -->
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
Modified: oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml
URL: http://svn.apache.org/viewvc/oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml?rev=1511518&r1=1511517&r2=1511518&view=diff
==============================================================================
--- oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/webapp/fmprod/src/main/webapp/META-INF/context.xml Wed Aug 7 22:21:35 2013
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor
license agreements. See the NOTICE.txt file distributed with this work for
@@ -19,11 +20,21 @@ the License.
reloadable="true" crossContext="true">
<Valve className="org.apache.catalina.valves.AccessLogValve"
- prefix="fmprod_access_log." suffix=".txt" pattern="common" />
+ prefix="fmprod_access_log." suffix=".txt" pattern="common"/>
- <Parameter name="filemgr.url" value="[FILEMGR_URL]" override="false" />
- <Parameter name="filemgr.rdfconf.file" value="[FMPROD_HOME]/rdfconf.xml" override="false"/>
- <Parameter name="filemgr.rssconf.file" value="[FMPROD_HOME]/rssconf.xml" override="false"/>
- <Parameter name="filemgr.working.dir" value="/tmp" override="false" />
+ <Parameter name="filemgr.url"
+ value="[FILEMGR_URL]" override="false"/>
+
+ <Parameter name="filemgr.working.dir"
+ value="[FILEMGR_WORKINGDIR]" override="false"/>
+
+ <Parameter name="filemgr.rdfconf.file"
+ value="[FMPROD_HOME]/rdfconf.xml" override="false"/>
+
+ <Parameter name="filemgr.rssconf.file"
+ value="[FMPROD_HOME]/rssconf.xml" override="false"/>
+
+ <Parameter name="filemgr.rss-transfer-conf.file"
+ value="[FMPROD_HOME]/rss-transfer-conf.xml" override="false"/>
</Context>
|