geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r598023 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-javaee5/src/main/resources/cluster-repository/ assemblies/geronimo-jetty6-javaee5/src/main/resources/master-repository/ assemblies/geronimo-jetty6-javaee5/src/main/resources/va...
Date Sun, 25 Nov 2007 18:08:19 GMT
Author: djencks
Date: Sun Nov 25 10:08:16 2007
New Revision: 598023

URL: http://svn.apache.org/viewvc?rev=598023&view=rev
Log:
GERONIMO-3630 cleanup.  Use copy-file to install base tomcat goo and cluster repo stuff

Added:
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/
      - copied from r597942, geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/
Removed:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/cluster-repository/
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/master-repository/
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/resources/META-INF/geronimo-tomcat6/var/catalina/
Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
    geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Sun Nov 25 10:08:16 2007
@@ -98,11 +98,6 @@
             <artifactId>juli-adapters</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.myfaces.core</groupId>-->
-            <!--<artifactId>myfaces-api</artifactId>-->
-        <!--</dependency>        -->
-
     </dependencies>
 
     <build>
@@ -113,29 +108,6 @@
                 <configuration>
                     <forkMode>pertest</forkMode>
                 </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy todir="target/var/catalina/conf" file="src/main/resources/META-INF/geronimo-tomcat6/var/catalina/conf/web.xml"
/>
-                                <copy todir="target/var/catalina/webapps">
-                                    <fileset dir="src/test/resources/deployables">
-                                        <include name="war1/**" />
-                                        <include name="war3/**" />
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/AbstractWebModuleTest.java
Sun Nov 25 10:08:16 2007
@@ -107,8 +107,8 @@
         ApplicationPolicyConfigurationManager jacc = new ApplicationPolicyConfigurationManager(contextIDToPermissionsMap,
null, roleDesignates, cl, credentialStore, roleMapper);
         jacc.doStart();
 
-        URL configurationBaseURL = new File(BASEDIR, "target/var/catalina/webapps/war3/WEB-INF/web.xml").toURL();
-        return setUpInsecureAppContext(new File(BASEDIR, "target/var/catalina/webapps/war3/").toURI(),
+        URL configurationBaseURL = new File(BASEDIR, "src/test/resources/deployables/war3/WEB-INF/web.xml").toURL();
+        return setUpInsecureAppContext(new File(BASEDIR, "src/test/resources/deployables/war3/").toURI(),
                 configurationBaseURL,
                 securityHolder,
                 jacc,

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/ApplicationTest.java
Sun Nov 25 10:08:16 2007
@@ -30,8 +30,8 @@
     private File basedir = new File(System.getProperty("basedir"));
     
     public void testApplication() throws Exception {
-        setUpInsecureAppContext(new File(basedir, "target/var/catalina/webapps/war1/").toURI(),
-                new File(basedir, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(),
+        setUpInsecureAppContext(new File(basedir, "src/test/resources/deployables/war1/").toURI(),
+                new File(basedir, "src/test/resources/deployables/war1/WEB-INF/web.xml").toURL(),
                 null,
                 null,
                 null,

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/java/org/apache/geronimo/tomcat/StatTest.java
Sun Nov 25 10:08:16 2007
@@ -35,8 +35,8 @@
 
     public void testStats() throws Exception {
         TomcatWebAppContext webModule;
-        webModule = setUpInsecureAppContext(new File(BASEDIR, "target/var/catalina/webapps/war1/").toURI(),
new File(
-                BASEDIR, "target/var/catalina/webapps/war1/WEB-INF/web.xml").toURL(), null,
null, null, null);
+        webModule = setUpInsecureAppContext(new File(BASEDIR, "src/test/resources/deployables/war1/").toURI(),
new File(
+                BASEDIR, "src/test/resources/deployables/war1/WEB-INF/web.xml").toURL(),
null, null, null, null);
             HttpURLConnection connection = (HttpURLConnection) new URL(connector.getConnectUrl()
+ "/test/hello.txt")
                     .openConnection();
             BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war1/WEB-INF/web.xml
Sun Nov 25 10:08:16 2007
@@ -21,6 +21,23 @@
 
 <web-app>
     <description>Test Web Deployment</description>
+    <servlet>
+        <servlet-name>default</servlet-name>
+        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>listings</param-name>
+            <param-value>false</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
     <resource-env-ref>
         <resource-env-ref-name>fake-resource-env-ref</resource-env-ref-name>
         <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/test/resources/deployables/war3/WEB-INF/web.xml
Sun Nov 25 10:08:16 2007
@@ -23,6 +23,23 @@
 
 <web-app>
     <description>Test Web Deployment</description>
+    <servlet>
+        <servlet-name>default</servlet-name>
+        <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+        <init-param>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
+        </init-param>
+        <init-param>
+            <param-name>listings</param-name>
+            <param-value>false</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>default</servlet-name>
+        <url-pattern>/</url-pattern>
+    </servlet-mapping>
     <resource-env-ref>
         <resource-env-ref-name>fake-resource-env-ref</resource-env-ref-name>
         <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/pom.xml Sun Nov 25 10:08:16 2007
@@ -130,6 +130,7 @@
                     <category>Tomcat</category>
                     <instance>
                         <plugin-artifact>
+                            <copy-file relative-to="server" dest-dir="var/catalina">tomcat-base/</copy-file>
                             <config-xml-content>
                                 <!-- To disable accesslogging uncomment the following
lines
                                 <gbean name="TomcatEngine">
@@ -137,7 +138,6 @@
                                 </gbean>
                                 <gbean name="AccessLogValve" load="false"></gbean>
                                 -->
-                                <gbean name="TomcatResources"/>
                                 <gbean name="TomcatWebConnector">
                                     <attribute name="host">${ServerHostname}</attribute>
                                     <attribute name="port">${HTTPPort + PortOffset}</attribute>

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml?rev=598023&r1=598022&r2=598023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/plan/plan.xml Sun Nov 25 10:08:16
2007
@@ -26,15 +26,6 @@
         </attribute>
     </gbean>
 
-    <gbean name="TomcatResources" class="org.apache.geronimo.system.util.DirectoryInitializationGBean">
-        <!-- copies tomcat initialization files into specified location -->
-        <attribute name="prefix">META-INF/geronimo-tomcat6</attribute>
-        <attribute name="path">var/catalina</attribute>
-        <reference name="ServerInfo">
-            <name>ServerInfo</name>
-        </reference>
-    </gbean>
-
     <!-- david jencks is not convinced that this gbean should be in this plan and thinks
it might
     belong in the console plan -->
     <gbean name="TomcatWebManager" class="org.apache.geronimo.tomcat.TomcatManagerImpl">
@@ -144,9 +135,6 @@
         <reference name="MBeanServerReference">
             <name>MBeanServerReference</name>
         </reference>
-        <dependency>
-            <name>TomcatResources</name>
-        </dependency>
         <!-- n.b. is you have more hosts, you want them to start before the engine gbean
-->
         <!-- ensure this by including dependencies like this -->
         <!--



Mime
View raw message