geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r889280 - in /geronimo/sandbox/ivan/geronimo_tomcat_7.0.0: catalina-ha/pom.xml catalina/pom.xml pom.xml
Date Thu, 10 Dec 2009 14:58:24 GMT
Author: xuhaihong
Date: Thu Dec 10 14:58:24 2009
New Revision: 889280

URL: http://svn.apache.org/viewvc?rev=889280&view=rev
Log:
As we did in Tomcat 6.0.20.0, merge the util into catalina to avoid the runtime resource issue

Modified:
    geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina-ha/pom.xml
    geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina/pom.xml
    geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/pom.xml

Modified: geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina-ha/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina-ha/pom.xml?rev=889280&r1=889279&r2=889280&view=diff
==============================================================================
--- geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina-ha/pom.xml (original)
+++ geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina-ha/pom.xml Thu Dec 10 14:58:24 2009
@@ -48,6 +48,15 @@
         </dependency>
     </dependencies>
     <build>
+        <resources>
+            <resource>
+                <directory>${tomcat.local.directory}/java</directory>
+                <includes>
+                    <include>org/apache/catalina/ha/**/*.properties</include>
+                    <include>org/apache/catalina/ha/**/*.xml</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

Modified: geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina/pom.xml?rev=889280&r1=889279&r2=889280&view=diff
==============================================================================
--- geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina/pom.xml (original)
+++ geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/catalina/pom.xml Thu Dec 10 14:58:24 2009
@@ -63,10 +63,10 @@
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>shared</artifactId>
         </dependency>
-        <dependency>
+        <!--dependency>
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>util</artifactId>
-        </dependency>
+        </dependency-->
     </dependencies>
     <build>
         <resources>
@@ -77,13 +77,13 @@
                 <include>org/apache/naming/**/*.properties</include>
                 <include>org/apache/coyote/**/*.properties</include>        
               
                 <include>org/apache/jk/**/*.properties</include>
-                <include>org/apache/tomcat/util/net/**/*.properties</include>
+                <include>org/apache/tomcat/util/**/*.properties</include>
                 <include>org/apache/tomcat/jni/**/*.properties</include>
                 <include>org/apache/catalina/**/*.xml</include>
                 <include>org/apache/naming/**/*.xml</include>
                 <include>org/apache/coyote/**/*.xml</include>               
        
                 <include>org/apache/jk/**/*.xml</include>
-                <include>org/apache/tomcat/util/net/**/*.xml</include>
+                <include>org/apache/tomcat/util/**/*.xml</include>
                 <include>org/apache/tomcat/jni/**/*.xml</include>           
            
             </includes>
             <excludes>
@@ -108,7 +108,7 @@
                         <include>org/apache/naming/**</include>
                         <include>org/apache/coyote/**</include>             
          
                         <include>org/apache/jk/**</include>
-                        <include>org/apache/tomcat/util/net/**</include>
+                        <include>org/apache/tomcat/util/**</include>
                         <include>org/apache/tomcat/jni/**</include>         
              
                     </includes>
                     <excludes>
@@ -149,7 +149,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.apache.catalina*,org.apache.naming*,org.apache.coyote.*,org.apache.jk*,org.apache.tomcat.util.net*,org.apache.tomcat.jni*</Export-Package>
+                        <Export-Package>org.apache.catalina*,org.apache.naming*,org.apache.coyote.*,org.apache.jk*,org.apache.tomcat.util*,org.apache.tomcat.jni*</Export-Package>
                         <Include-Resource>
                             {maven-resources},
                             org/apache/catalina/util/ServerInfo.properties=target/classes/org/apache/catalina/util/ServerInfo.properties

Modified: geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/pom.xml?rev=889280&r1=889279&r2=889280&view=diff
==============================================================================
--- geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/pom.xml (original)
+++ geronimo/sandbox/ivan/geronimo_tomcat_7.0.0/pom.xml Thu Dec 10 14:58:24 2009
@@ -171,11 +171,11 @@
                 <artifactId>shared</artifactId>
                 <version>${version}</version>
             </dependency>
-            <dependency>
+            <!--dependency>
                 <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>util</artifactId>
                 <version>${version}</version>
-            </dependency>
+            </dependency-->
             <dependency>
                 <groupId>org.apache.geronimo.ext.tomcat</groupId>
                 <artifactId>tribes</artifactId>
@@ -220,7 +220,7 @@
                 <module>juli</module>
                 <module>catalina</module>
                 <module>tribes</module>
-                <module>util</module>
+                <!--module>util</module-->
                 <module>catalina-ha</module>
                 <module>jasper</module>
                 <module>jasper-el</module>



Mime
View raw message