TRy and sync up the deps in the POMs with what Checkstyle validates

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044731 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index 1cbd9c3..f36a287 100644 (file)
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -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"/>

diff --git a/res/maven/tomcat-api.pom b/res/maven/tomcat-api.pom
index a82abec..21ed16f 100644 (file)
--- a/res/maven/tomcat-api.pom
+++ b/res/maven/tomcat-api.pom
@@ -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>

diff --git a/res/maven/tomcat-catalina-ant.pom b/res/maven/tomcat-catalina-ant.pom
index 5b7ff7c..12f7153 100644 (file)
--- a/res/maven/tomcat-catalina-ant.pom
+++ b/res/maven/tomcat-catalina-ant.pom
@@ -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>

diff --git a/res/maven/tomcat-catalina-jmx-remote.pom b/res/maven/tomcat-catalina-jmx-remote.pom
index 3d85704..6bc448d 100644 (file)
--- a/res/maven/tomcat-catalina-jmx-remote.pom
+++ b/res/maven/tomcat-catalina-jmx-remote.pom
@@ -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>

diff --git a/res/maven/tomcat-catalina-ws.pom b/res/maven/tomcat-catalina-ws.pom
index 0a5f458..475b72b 100644 (file)
--- a/res/maven/tomcat-catalina-ws.pom
+++ b/res/maven/tomcat-catalina-ws.pom
@@ -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>

diff --git a/res/maven/tomcat-coyote.pom b/res/maven/tomcat-coyote.pom
index 479b2fd..0121b8f 100644 (file)
--- a/res/maven/tomcat-coyote.pom
+++ b/res/maven/tomcat-coyote.pom
@@ -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>

diff --git a/res/maven/tomcat-jasper.pom b/res/maven/tomcat-jasper.pom
index 73a5782..9cd6c72 100644 (file)
--- a/res/maven/tomcat-jasper.pom
+++ b/res/maven/tomcat-jasper.pom
@@ -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>

diff --git a/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java b/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java
deleted file mode 100644 (file)
index 22f8431..0000000
--- a/test/org/apache/tomcat/util/threads/DedicatedThreadExecutorTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomcat.util.threads;
-
-import java.util.concurrent.Callable;
-
-import junit.framework.TestCase;
-
-public class DedicatedThreadExecutorTest extends TestCase {
-    private Thread dedicatedThread;
-
-    public void testExecute() {
-        final Thread testingThread = Thread.currentThread();
-        DedicatedThreadExecutor executor = new DedicatedThreadExecutor();
-        Long result = executor.execute(new Callable<Long>() {
-            @Override
-            public Long call() throws Exception {
-                dedicatedThread = Thread.currentThread();
-                DedicatedThreadExecutorTest.assertNotSame(testingThread,
-                    dedicatedThread);
-                return 123L;
-            }
-        });
-        assertEquals(123, result.longValue());
-
-        //check that the same thread is reused
-        executor.execute(new Callable<Void>() {
-            @Override
-            public Void call() throws Exception {
-                DedicatedThreadExecutorTest.assertSame(dedicatedThread,
-                    Thread.currentThread());
-                return null;
-            }
-        });
-
-        executor.shutdown();
-        assertFalse(dedicatedThread.isAlive());
-    }
-
-    public void testExecuteInOwnThread() {
-        final Thread testingThread = Thread.currentThread();
-        Long result =
-            DedicatedThreadExecutor.executeInOwnThread(new Callable<Long>() {
-                @Override
-                public Long call() throws Exception {
-                    dedicatedThread = Thread.currentThread();
-                    DedicatedThreadExecutorTest.assertNotSame(testingThread,
-                        dedicatedThread);
-                    return 456L;
-                }
-            });
-        assertEquals(456, result.longValue());
-        assertFalse(dedicatedThread.isAlive());
-    }
-
-}