geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1059720 - in /geronimo/external/trunk/tomcat-archetype: catalina/pom.xml pom.xml run.sh
Date Mon, 17 Jan 2011 01:47:48 GMT
Author: xuhaihong
Date: Mon Jan 17 01:47:48 2011
New Revision: 1059720

URL: http://svn.apache.org/viewvc?rev=1059720&view=rev
Log:
merge some changes back to archetype project and prepare for the 7.0.6

Modified:
    geronimo/external/trunk/tomcat-archetype/catalina/pom.xml
    geronimo/external/trunk/tomcat-archetype/pom.xml
    geronimo/external/trunk/tomcat-archetype/run.sh

Modified: geronimo/external/trunk/tomcat-archetype/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/catalina/pom.xml?rev=1059720&r1=1059719&r2=1059720&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/catalina/pom.xml Mon Jan 17 01:47:48 2011
@@ -78,7 +78,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>                        
-                        <Import-Package>javax.servlet.resources,javax.servlet.jsp.resources,*</Import-Package>
+                        <Import-Package>javax.servlet.resources,javax.servlet.jsp.resources,!org.apache.juli,*</Import-Package>
                         <Include-Resource>
                             {maven-resources},
                             org/apache/catalina/util/ServerInfo.properties=target/classes/org/apache/catalina/util/ServerInfo.properties

Modified: geronimo/external/trunk/tomcat-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/pom.xml?rev=1059720&r1=1059719&r2=1059720&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/pom.xml (original)
+++ geronimo/external/trunk/tomcat-archetype/pom.xml Mon Jan 17 01:47:48 2011
@@ -34,7 +34,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Apache Geronimo Tomcat Fork 6.0.20</name>
+    <name>Apache Geronimo Tomcat Fork 7.0.6</name>
     <description>Mavenized tomcat build</description>
 
     <!-- instructions:
@@ -81,7 +81,7 @@ mvn archetype:generate -DarchetypeCatalo
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-el_2.2_spec</artifactId>
-                <version>1.0</version>
+                <version>1.0.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>

Modified: geronimo/external/trunk/tomcat-archetype/run.sh
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-archetype/run.sh?rev=1059720&r1=1059719&r2=1059720&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-archetype/run.sh (original)
+++ geronimo/external/trunk/tomcat-archetype/run.sh Mon Jan 17 01:47:48 2011
@@ -18,7 +18,7 @@
 
 # Included as an example of how to set up a project. Works in *nix environments
 # Update TVER and TTAGVER with the Tomcat version number in appropriate format
-TVER=7.0.0
+TVER=7.0.6
 #export TTAGVER=6_0_20
 
 GVER=${TVER}.1-SNAPSHOT



Mime
View raw message