tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1044731 - in /tomcat/trunk: res/checkstyle/ res/maven/ test/org/apache/tomcat/util/threads/
Date Sat, 11 Dec 2010 22:21:02 GMT
Author: markt
Date: Sat Dec 11 22:21:02 2010
New Revision: 1044731

URL: http://svn.apache.org/viewvc?rev=1044731&view=rev
Log:
TRy and sync up the deps in the POMs with what Checkstyle validates

Removed:
    tomcat/trunk/test/org/apache/tomcat/util/threads/
Modified:
    tomcat/trunk/res/checkstyle/org-import-control.xml
    tomcat/trunk/res/maven/tomcat-api.pom
    tomcat/trunk/res/maven/tomcat-catalina-ant.pom
    tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
    tomcat/trunk/res/maven/tomcat-catalina-ws.pom
    tomcat/trunk/res/maven/tomcat-coyote.pom
    tomcat/trunk/res/maven/tomcat-jasper.pom

Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Sat Dec 11 22:21:02 2010
@@ -43,7 +43,36 @@
     <allow pkg="org.apache.juli"/>
     <allow pkg="org.apache.naming"/>
     <allow pkg="org.apache.tomcat"/>
-    <allow pkg="org.apache.tools.ant"/>
+    <subpackage name="ant">
+      <allow pkg="org.apache.tools.ant"/>
+      <allow class="org.apache.tomcat.util.Base64"/>
+      <disallow pkg="javax.annotation"/>
+      <disallow pkg="javax.ejb"/>
+      <disallow pkg="javax.persistence"/>
+      <disallow pkg="javax.servlet"/>
+      <disallow pkg="org.apache.coyote"/>
+      <disallow pkg="org.apache.juli"/>
+      <disallow pkg="org.apache.naming"/>
+    </subpackage>
+    <subpackage name="ha">
+      <disallow pkg="javax.annotation"/>
+      <disallow pkg="javax.ejb"/>
+      <disallow pkg="javax.persistence"/>
+      <disallow pkg="org.apache.coyote"/>
+      <disallow pkg="org.apache.naming"/>
+      <allow pkg="org.apache.catalina.ha"/>
+    </subpackage>
+    <subpackage name="tribes">
+      <disallow pkg="javax.annotation"/>
+      <disallow pkg="javax.ejb"/>
+      <disallow pkg="javax.persistence"/>
+      <disallow pkg="javax.servlet"/>
+      <disallow pkg="org.apache.catalina"/>
+      <disallow pkg="org.apache.coyote"/>
+      <disallow pkg="org.apache.naming"/>
+      <disallow pkg="org.apache.tomcat"/>
+      <allow pkg="org.apache.catalina.tribes"/>
+    </subpackage>
   </subpackage>
   <subpackage name="coyote">
     <allow pkg="org.apache.coyote"/>
@@ -74,6 +103,8 @@
     <allow pkg="org.apache.naming"/>
     <allow class="org.apache.catalina.util.RequestUtil"/>
     <allow class="org.apache.tomcat.util.http.FastHttpDateFormat"/>
+    <subpackage name="factory.webservices">
+    </subpackage>
   </subpackage>
   <subpackage name="tomcat">
     <allow pkg="javax.servlet"/>

Modified: tomcat/trunk/res/maven/tomcat-api.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-api.pom?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-api.pom (original)
+++ tomcat/trunk/res/maven/tomcat-api.pom Sat Dec 11 22:21:02 2010
@@ -21,4 +21,12 @@
   <artifactId>tomcat-api</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
   <description>Definition of interfaces shared by Catalina and Jasper</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-servlet-api</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
 </project>

Modified: tomcat/trunk/res/maven/tomcat-catalina-ant.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ant.pom?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ant.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ant.pom Sat Dec 11 22:21:02 2010
@@ -30,18 +30,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-juli</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>

Modified: tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-jmx-remote.pom Sat Dec 11 22:21:02 2010
@@ -24,9 +24,21 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-coyote</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-juli</artifactId>
+      <version>@MAVEN.DEPLOY.VERSION@</version>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>

Modified: tomcat/trunk/res/maven/tomcat-catalina-ws.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-catalina-ws.pom?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-catalina-ws.pom (original)
+++ tomcat/trunk/res/maven/tomcat-catalina-ws.pom Sat Dec 11 22:21:02 2010
@@ -20,7 +20,7 @@
   <groupId>org.apache.tomcat</groupId>
   <artifactId>tomcat-catalina-ws</artifactId>
   <version>@MAVEN.DEPLOY.VERSION@</version>
-  <description>Tomcat Remote JMX listener</description>
+  <description>Tomcat JNDI Factory for Web Services</description>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>

Modified: tomcat/trunk/res/maven/tomcat-coyote.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-coyote.pom?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-coyote.pom (original)
+++ tomcat/trunk/res/maven/tomcat-coyote.pom Sat Dec 11 22:21:02 2010
@@ -24,18 +24,6 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-catalina</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-servlet-api</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-juli</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>

Modified: tomcat/trunk/res/maven/tomcat-jasper.pom
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/maven/tomcat-jasper.pom?rev=1044731&r1=1044730&r2=1044731&view=diff
==============================================================================
--- tomcat/trunk/res/maven/tomcat-jasper.pom (original)
+++ tomcat/trunk/res/maven/tomcat-jasper.pom Sat Dec 11 22:21:02 2010
@@ -42,12 +42,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
-      <artifactId>tomcat-catalina</artifactId>
-      <version>@MAVEN.DEPLOY.VERSION@</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-el-api</artifactId>
       <version>@MAVEN.DEPLOY.VERSION@</version>
       <scope>compile</scope>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message