I don't really understand why... but this does appear to fix this problem, and I do like it better. Only thing is that you left in the temporary fix I committed last night to add commons-logging to geronimo-jetty6-builder, which I will remove.

--jason


On Jan 13, 2007, at 4:56 AM, [EMAIL PROTECTED] wrote:

Author: akulshreshtha
Date: Sat Jan 13 04:56:49 2007
New Revision: 495896

URL: http://svn.apache.org/viewvc?view=rev&rev=495896
Log:
GERONIMO-2723 - Removed unused dependency on testsupport-common. It was preventing commons-logging from being included
                in jetty6-builder transitively
              - Fixed some typos

Modified:
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDTest.java geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDUnpackedTest.java geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5NakedUnpackedTest.java geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5UnpackedTest.java
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/ test/java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/ deployment/EARConfigBuilder5AltDDTest.java? view=diff&rev=495896&r1=495895&r2=495896 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDTest.java (original) +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDTest.java Sat Jan 13 04:56:49 2007
@@ -19,7 +19,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;

 /**
- * EAR config builder tests for J2EE 1.4 using alt-dd..
+ * EAR config builder tests for JAVAEE 5 using alt-dd..
  *
  * @version $Rev:386276 $ $Date$
  */

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/ test/java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDUnpackedTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/ deployment/EARConfigBuilder5AltDDUnpackedTest.java? view=diff&rev=495896&r1=495895&r2=495896 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDUnpackedTest.java (original) +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5AltDDUnpackedTest.java Sat Jan 13 04:56:49 2007
@@ -19,7 +19,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;

 /**
- * EAR config builder tests for J2EE 1.4 using alt-dd unpacked..
+ * EAR config builder tests for JAVAEE 5 using alt-dd unpacked..
  *
  * @version $Rev:386276 $ $Date$
  */

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/ test/java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5NakedUnpackedTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/ deployment/EARConfigBuilder5NakedUnpackedTest.java? view=diff&rev=495896&r1=495895&r2=495896 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5NakedUnpackedTest.java (original) +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5NakedUnpackedTest.java Sat Jan 13 04:56:49 2007
@@ -19,7 +19,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;

 /**
- * EAR config builder tests for naked J2EE 1.4 unpacked.
+ * EAR config builder tests for naked JAVAEE 5 unpacked.
  *
  * @version $Rev:386276 $ $Date$
  */

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/ test/java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5Test.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/ deployment/EARConfigBuilder5Test.java? view=diff&rev=495896&r1=495895&r2=495896 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java (original) +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder5Test.java Sat Jan 13 04:56:49 2007
@@ -19,7 +19,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;

 /**
- * EAR config builder tests for J2EE 1.4.
+ * EAR config builder tests for JAVAEE 5.
  *
  * @version $Rev:386276 $ $Date$
  */

Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/ test/java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5UnpackedTest.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-j2ee-builder/src/test/java/org/apache/geronimo/j2ee/ deployment/EARConfigBuilder5UnpackedTest.java? view=diff&rev=495896&r1=495895&r2=495896 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5UnpackedTest.java (original) +++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/test/ java/org/apache/geronimo/j2ee/deployment/ EARConfigBuilder5UnpackedTest.java Sat Jan 13 04:56:49 2007
@@ -19,7 +19,7 @@
 import org.apache.geronimo.deployment.util.DeploymentUtil;

 /**
- * EAR config builder tests for J2EE 1.4 unpacked.
+ * EAR config builder tests for JAVAEE 5 unpacked.
  *
  * @version $Rev:386276 $ $Date$
  */

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/ pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/ geronimo-web-2.5-builder/pom.xml? view=diff&rev=495896&r1=495895&r2=495896 ====================================================================== ======== --- geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml (original) +++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/pom.xml Sat Jan 13 04:56:49 2007
@@ -76,12 +76,6 @@
         </dependency>

         <dependency>
-            <groupId>org.apache.geronimo.testsupport</groupId>
-            <artifactId>testsupport-common</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
         </dependency>



Reply via email to