svn commit: rev 54200 - in portals/pluto/branches/pluto-1.1/testsuite: . src/conf

[dd...@apache.org]

Author: ddewolf
Date: Sat Oct  9 19:08:33 2004
New Revision: 54200

Added:
   portals/pluto/branches/pluto-1.1/testsuite/src/conf/
   portals/pluto/branches/pluto-1.1/testsuite/src/conf/testsuite.xml
Modified:
   portals/pluto/branches/pluto-1.1/testsuite/maven.xml
   portals/pluto/branches/pluto-1.1/testsuite/project.properties
Log:
Fixing deployment error

Modified: portals/pluto/branches/pluto-1.1/testsuite/maven.xml
==============================================================================
--- portals/pluto/branches/pluto-1.1/testsuite/maven.xml	(original)
+++ portals/pluto/branches/pluto-1.1/testsuite/maven.xml	Sat Oct  9 19:08:33 2004
@@ -85,6 +85,7 @@
     </goal>
 
     <goal name="tomcat:deploy">
+        <attainGoal name="tomcat:init"/>
         <j:set var="depType" value="${maven.tomcat.deploy}"/>
         <j:if test="${depType=='exploded'}">
             <unwar src="target/${maven.war.final.name}" dest="${maven.tomcat.home}/webapps/testsuite"/>
@@ -93,7 +94,23 @@
             <copy file="target/${maven.war.final.name}"
                 todir="${maven.tomcat.home}/webapps"/>
         </j:if>
-    </goal>
 
 
+        <!-- ===================== -->
+        <!-- Deploy Context Config -->
+        <!-- ===================== -->
+        <j:set var="version" value="${maven.tomcat.version.major}"/>
+
+        <!-- If we are in Tomcat4.x-->
+        <j:if test="${version==4}">
+            <copy file="${maven.tomcat.context.config}"
+                todir="${maven.tomcat.home}/webapps"/>
+        </j:if>
+
+        <!-- If we are in Tomcat5.x-->
+        <j:if test="${version==5}">
+            <copy file="${maven.tomcat.context.config}"
+                todir="${maven.tomcat.home}/conf/Catalina/${maven.tomcat.host}"/>
+        </j:if>
+    </goal>
 </project>

Modified: portals/pluto/branches/pluto-1.1/testsuite/project.properties
==============================================================================
--- portals/pluto/branches/pluto-1.1/testsuite/project.properties	(original)
+++ portals/pluto/branches/pluto-1.1/testsuite/project.properties	Sat Oct  9 19:08:33 2004
@@ -32,7 +32,7 @@
 
 maven.checkstyle.format = turbine
 maven.tomcat.host=localhost
-maven.tomcat.context.config=pluto.xml
+maven.tomcat.context.config=src/conf/testsuite.xml
 maven.tomcat.deploy=exploded
 
 maven.war.src=${pluto.testsuite.dir}/src/webapp

Added: portals/pluto/branches/pluto-1.1/testsuite/src/conf/testsuite.xml
==============================================================================
--- (empty file)
+++ portals/pluto/branches/pluto-1.1/testsuite/src/conf/testsuite.xml	Sat Oct  9 19:08:33 2004
@@ -0,0 +1,18 @@
+<!-- 
+Copyright 2004 The Apache Software Foundation.
+Licensed  under the  Apache License,  Version 2.0  (the "License");
+you may not use  this file  except in  compliance with the License.
+You may obtain a copy of the License at 
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed  under the  License is distributed on an "AS IS" BASIS,
+WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+implied.
+
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<Context path="/testsuite" docBase="testsuite" crossContext="true">
+</Context>