Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 70538 invoked from network); 7 Oct 2008 20:52:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Oct 2008 20:52:35 -0000 Received: (qmail 88334 invoked by uid 500); 7 Oct 2008 20:52:34 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 88282 invoked by uid 500); 7 Oct 2008 20:52:34 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 88273 invoked by uid 99); 7 Oct 2008 20:52:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2008 13:52:34 -0700 X-ASF-Spam-Status: No, hits=-1999.9 required=10.0 tests=ALL_TRUSTED,DNS_FROM_SECURITYSAGE X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Oct 2008 20:51:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 99937238898E; Tue, 7 Oct 2008 13:52:03 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r702631 - in /geronimo/server/trunk: ./ plugins/axis2/axis2-ejb/ plugins/axis2/axis2/ plugins/axis2/axis2/src/main/history/ plugins/axis2/axis2/src/main/plan/ plugins/axis2/geronimo-axis2/ plugins/cxf/cxf-ejb/ plugins/cxf/cxf/ plugins/jaxws... Date: Tue, 07 Oct 2008 20:52:02 -0000 To: scm@geronimo.apache.org From: gawor@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081007205203.99937238898E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: gawor Date: Tue Oct 7 13:52:02 2008 New Revision: 702631 URL: http://svn.apache.org/viewvc?rev=702631&view=rev Log: use jaxws-tools 2.1 to generate the wsdl (that needs extra CDDL libs such as stax-ex and streambuffer) and drop unneeded jaxen and annogen dependencies (GERONIMO-4327) Removed: geronimo/server/trunk/repository/com/ Modified: geronimo/server/trunk/NOTICE.txt geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml geronimo/server/trunk/plugins/axis2/axis2/pom.xml geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml geronimo/server/trunk/plugins/cxf/cxf/pom.xml geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java geronimo/server/trunk/pom.xml geronimo/server/trunk/repository/pom.xml Modified: geronimo/server/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/geronimo/server/trunk/NOTICE.txt?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/NOTICE.txt (original) +++ geronimo/server/trunk/NOTICE.txt Tue Oct 7 13:52:02 2008 @@ -97,19 +97,6 @@ apply to these dependencies. ========================================================================= -== ANNOGEN Notice == -========================================================================= - -This product includes software developed by the Annogen project -(http://annogen.codehaus.org/) - -This software consists of voluntary contributions made by many -individuals on behalf of the Apache Software Foundation and was -originally based on software copyright (c) 2000-2004 BEA Systems -Inc., . For more information on the Apache -Software Foundation, please see . - -========================================================================= == Apache ActiveMQ Notice == ========================================================================= @@ -496,15 +483,6 @@ ========================================================================= -== jaxen Notice == -========================================================================= - -This product includes software developed by the jaxen project -(http://jaxen.org/). - - Copyright 2003-2006 The Werken Company. All Rights Reserved. - -========================================================================= == JDBM Notice == ========================================================================= @@ -610,6 +588,12 @@ This product includes software developed for Java API for XML Web Services project (JAX-WS) (https://jax-ws.dev.java.net/) +This product includes software developed for StAX-Ex Project +(https://stax-ex.dev.java.net/) + +This product includes software developed for XML Stream Buffer Project +(https://xmlstreambuffer.dev.java.net/) + This product includes software developed for the Java Server Pages Tag Library project (https://jstl.dev.java.net/) Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original) +++ geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml Tue Oct 7 13:52:02 2008 @@ -74,6 +74,11 @@ car-maven-plugin Web Services + + + + + Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original) +++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Tue Oct 7 13:52:02 2008 @@ -159,16 +159,6 @@ - jaxen - jaxen - - - - annogen - annogen - - - xml-resolver xml-resolver @@ -187,6 +177,16 @@ com.sun.xml.ws jaxws-rt + + + com.sun.xml.stream.buffer + streambuffer + + + + org.jvnet.staxex + stax-ex + com.sun.xml.bind @@ -206,6 +206,11 @@ car-maven-plugin Web Services + + + + + Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml Tue Oct 7 13:52:02 2008 @@ -32,11 +32,6 @@ jar - annogen - annogen - jar - - org.apache.geronimo.modules geronimo-axis2 jar @@ -127,11 +122,6 @@ jar - jaxen - jaxen - jar - - org.apache.geronimo.framework server-security-config car @@ -186,4 +176,14 @@ woden-impl-dom jar + + org.jvnet.staxex + stax-ex + jar + + + com.sun.xml.stream.buffer + streambuffer + jar + Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml Tue Oct 7 13:52:02 2008 @@ -20,4 +20,11 @@ + + + javax.xml.ws.spi.Provider=org.apache.axis2.jaxws.spi.Provider + + + Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original) +++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Tue Oct 7 13:52:02 2008 @@ -124,17 +124,7 @@ commons-codec commons-codec - - - jaxen - jaxen - - - - annogen - annogen - - + Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Tue Oct 7 13:52:02 2008 @@ -74,6 +74,11 @@ car-maven-plugin Web Services + + + + + Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original) +++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Tue Oct 7 13:52:02 2008 @@ -176,6 +176,11 @@ true Web Services + + + + + Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java (original) +++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java Tue Oct 7 13:52:02 2008 @@ -47,6 +47,8 @@ { "com.sun.xml.bind", "jaxb-xjc" }, { "com.sun.xml.ws", "jaxws-tools" }, { "com.sun.xml.ws", "jaxws-rt" }, + { "com.sun.xml.stream.buffer", "streambuffer" }, + { "org.jvnet.staxex", "stax-ex" }, { "org.apache.geronimo.javamail", "geronimo-javamail_1.4_mail"}, { "org.apache.geronimo.specs", "geronimo-activation_1.1_spec"}, { "org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"}, @@ -59,6 +61,7 @@ { "org.apache.geronimo.specs", "geronimo-jms_1.1_spec"}, { "org.apache.geronimo.specs", "geronimo-jta_1.1_spec"}, { "org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"}, + { "org.codehaus.woodstox", "wstx-asl" }, }; private final static Artifact SUN_SAAJ_IMPL_ARTIFACT = new Artifact("com.sun.xml.messaging.saaj","saaj-impl", (Version)null, "jar"); Modified: geronimo/server/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/pom.xml (original) +++ geronimo/server/trunk/pom.xml Tue Oct 7 13:52:02 2008 @@ -1732,6 +1732,10 @@ org.apache.axis2 axis2-transport-local + + jaxen + jaxen + @@ -1824,6 +1828,10 @@ commons-io commons-io + + jaxen + jaxen + @@ -1983,6 +1991,10 @@ org.apache.geronimo.specs geronimo-javamail_1.4_spec + + jaxen + jaxen + @@ -2061,53 +2073,61 @@ com.sun.xml.ws jaxws-tools - 2.0 + 2.1.4 com.sun.xml.ws jaxws-rt - 2.0 - - - - com.sun.xml.bind - jaxb-xjc - 2.1.7 - - - - jaxen - jaxen - 1.1-beta-11 + 2.1.4 - xml-apis - xml-apis + javax.xml.ws + jaxws-api - xerces - xercesImpl + com.sun.xml.stream + sjsxp - dom4j - dom4j + com.sun.org.apache.xml.internal + resolver - jdom - jdom + org.jvnet + mimepull + + + + + com.sun.xml.stream.buffer + streambuffer + 0.8 + - xom - xom + javax.activation + activation - annogen - annogen - 0.1.0 + org.jvnet.staxex + stax-ex + 1.0 + + + javax.activation + activation + + + + + + com.sun.xml.bind + jaxb-xjc + 2.1.7 Modified: geronimo/server/trunk/repository/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=702631&r1=702630&r2=702631&view=diff ============================================================================== --- geronimo/server/trunk/repository/pom.xml (original) +++ geronimo/server/trunk/repository/pom.xml Tue Oct 7 13:52:02 2008 @@ -117,18 +117,6 @@ jasper-el - - - com.sun.xml.ws - jaxws-tools - - - - com.sun.xml.ws - jaxws-rt - - - org.apache.xbean