geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r885543 - in /geronimo/external/trunk/tomcat-parent-6.0.20: ./ catalina/ catalina/src/main/java/org/apache/tomcat/util/ catalina/src/main/java/org/apache/tomcat/util/buf/ catalina/src/main/java/org/apache/tomcat/util/collections/ catalina/s...
Date Mon, 30 Nov 2009 19:11:08 GMT
Author: gawor
Date: Mon Nov 30 19:11:07 2009
New Revision: 885543

URL: http://svn.apache.org/viewvc?rev=885543&view=rev
Log:
merge util module into catalina module and add DynamicImport-Package to catalina bundle since
it needs to load Geronimo-specific classes

Added:
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/DomUtil.java
  (props changed)
      - copied unchanged from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/DomUtil.java
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
  (props changed)
      - copied unchanged from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/MutableInteger.java
  (props changed)
      - copied unchanged from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/MutableInteger.java
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/buf/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/buf/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/collections/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/collections/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/digester/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/digester/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/http/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/http/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/log/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/log/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/modeler/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/modeler/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/res/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/res/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/threads/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/threads/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/buf/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/buf/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/http/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/http/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/modeler/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/modeler/
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/threads/
  (props changed)
      - copied from r885498, geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/
Removed:
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/DomUtil.java
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/MutableInteger.java
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/buf/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/collections/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/digester/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/http/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/log/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/modeler/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/res/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/java/org/apache/tomcat/util/threads/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/buf/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/http/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/modeler/
    geronimo/external/trunk/tomcat-parent-6.0.20/util/src/main/resources/org/apache/tomcat/util/threads/
Modified:
    geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml
    geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml

Modified: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml?rev=885543&r1=885542&r2=885543&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/catalina/pom.xml Mon Nov 30 19:11:07 2009
@@ -62,14 +62,6 @@
             <groupId>org.apache.geronimo.ext.tomcat</groupId>
             <artifactId>shared</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.ext.tomcat</groupId>
-            <artifactId>util</artifactId>
-        </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.ext.tomcat</groupId>-->
-            <!--<artifactId>coyote</artifactId>-->
-        <!--</dependency>-->
     </dependencies>
     <build>
         <plugins>
@@ -82,6 +74,17 @@
                             {maven-resources},
                             org/apache/catalina/util/ServerInfo.properties=target/classes/org/apache/catalina/util/ServerInfo.properties
                         </Include-Resource>
+                        <Import-Package>
+                          org.apache.jasper.compiler;resolution:=optional,
+                          javax.servlet.jsp.resources;resolution:=optional,
+                          *
+                        </Import-Package>
+                        <DynamicImport-Package>
+                          *
+                        </DynamicImport-Package>
+                        <Export-Package>
+                          *
+                        </Export-Package>                       
                     </instructions>
                 </configuration>
             </plugin>

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/DomUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/DomUtil.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/DomUtil.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/DomUtil.java:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/DomUtil.java:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/DomUtil.java:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/IntrospectionUtils.java:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/IntrospectionUtils.java:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/MutableInteger.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/MutableInteger.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/MutableInteger.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/MutableInteger.java:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/MutableInteger.java:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/MutableInteger.java:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/buf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/buf:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/buf:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/buf:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/collections/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/collections:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/collections:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/collections:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/digester/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/digester:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/digester:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/digester:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/http/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/http:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/http:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/http:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/log/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/log:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/log:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/log:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/modeler/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/modeler:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/modeler:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/modeler:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/res/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/res:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/res:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/res:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/java/org/apache/tomcat/util/threads/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,3 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/threads:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/java/org/apache/tomcat/util/threads:783483-783555
+/tomcat/trunk/java/org/apache/tomcat/util/threads:601180,606992,612607,630314,640888,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757774,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/buf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,2 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/buf:783483-783555

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/http/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,2 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/http:783483-783555

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/modeler/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,2 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/modeler:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/modeler:783483-783555

Propchange: geronimo/external/trunk/tomcat-parent-6.0.20/catalina/src/main/resources/org/apache/tomcat/util/threads/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 30 19:11:07 2009
@@ -0,0 +1,2 @@
+/geronimo/external/trunk/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads:784303-784304
+/geronimo/sandbox/djencks/tomcat/branches/tomcat-parent-6.0.18/util/src/main/resources/org/apache/tomcat/util/threads:783483-783555

Modified: geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml?rev=885543&r1=885542&r2=885543&view=diff
==============================================================================
--- geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml (original)
+++ geronimo/external/trunk/tomcat-parent-6.0.20/pom.xml Mon Nov 30 19:11:07 2009
@@ -186,9 +186,8 @@
     <module>juli</module>
     <module>catalina</module>
     <module>tribes</module>
-    <module>util</module>
     <module>catalina-ha</module>
     <module>jasper</module>
     <module>jasper-el</module>
   </modules>
-</project>
\ No newline at end of file
+</project>



Mime
View raw message