You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@geronimo.apache.org by Jarek Gawor <jg...@gmail.com> on 2007/04/11 17:19:02 UTC
Re: svn commit: r527403 - in /geronimo/server/trunk: ./ configs/axis-deployer/src/plan/ configs/axis/ configs/axis/src/plan/ configs/client/ configs/client/src/plan/ configs/geronimo-gbean-deployer/ configs/j2ee-server/src/plan/ configs/uddi-jetty6/
This patch disabled SAAJGBean which breaks SAAJ tests. I'll try to re-enable it.
Jarek
On 4/11/07, djencks@apache.org <dj...@apache.org> wrote:
> Author: djencks
> Date: Wed Apr 11 00:37:44 2007
> New Revision: 527403
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=527403
> Log:
> GERONIMO-3039, upgrade scout and fix some xmlbeans dependency issues. This is joes patch with tiny modifications
>
> Modified:
> geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
> geronimo/server/trunk/configs/axis/pom.xml
> geronimo/server/trunk/configs/axis/src/plan/plan.xml
> geronimo/server/trunk/configs/client/pom.xml
> geronimo/server/trunk/configs/client/src/plan/plan.xml
> geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
> geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml
> geronimo/server/trunk/configs/uddi-jetty6/pom.xml
> geronimo/server/trunk/configs/uddi-jetty6/src/plan/plan.xml
> geronimo/server/trunk/configs/uddi-tomcat/pom.xml
> geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml
> geronimo/server/trunk/configs/webservices-common/pom.xml
> geronimo/server/trunk/configs/xmlbeans/pom.xml
> geronimo/server/trunk/pom.xml
>
> Modified: geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml Wed Apr 11 00:37:44 2007
> @@ -68,7 +68,7 @@
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>axis</artifactId>
> <type>car</type>
> - <import>classes</import>
> + <!--<import>classes</import>-->
> </dependency>
> </dependencies>
> </environment>
>
> Modified: geronimo/server/trunk/configs/axis/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/axis/pom.xml (original)
> +++ geronimo/server/trunk/configs/axis/pom.xml Wed Apr 11 00:37:44 2007
> @@ -54,12 +54,19 @@
> <artifactId>openejb</artifactId>
> <version>${version}</version>
> <type>car</type>
> + <scope>runtime</scope>
> </dependency>
>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-axis</artifactId>
> <version>${version}</version>
> + </dependency>
> +
> + <!-- JAXR implementation -->
> + <dependency>
> + <groupId>org.apache.ws.scout</groupId>
> + <artifactId>scout</artifactId>
> </dependency>
>
> </dependencies>
>
> Modified: geronimo/server/trunk/configs/axis/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/src/plan/plan.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/axis/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/axis/src/plan/plan.xml Wed Apr 11 00:37:44 2007
> @@ -22,4 +22,6 @@
>
> <gbean name="AxisCLWorkaround" class="org.apache.geronimo.axis.AxisDiscoveryCLWorkaroundGBean"/>
>
> + <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
> +
> </module>
>
> Modified: geronimo/server/trunk/configs/client/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/client/pom.xml (original)
> +++ geronimo/server/trunk/configs/client/pom.xml Wed Apr 11 00:37:44 2007
> @@ -62,15 +62,6 @@
> <version>${version}</version>
> </dependency>
>
> - <!--
> - for property editor support for some login modules/principals
> -
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-common</artifactId>
> - <version>${version}</version>
> - </dependency> -->
> -
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-interceptor</artifactId>
> @@ -114,11 +105,11 @@
> <version>${version}</version>
> </dependency>
>
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-webservices</artifactId>
> - <version>${version}</version>
> - </dependency>
> + <!--<dependency>-->
> + <!-- <groupId>org.apache.geronimo.modules</groupId>-->
> + <!-- <artifactId>geronimo-webservices</artifactId>-->
> + <!-- <version>${version}</version>-->
> + <!--</dependency>-->
>
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> @@ -126,17 +117,6 @@
> <version>${version}</version>
> </dependency>
>
> -<!--
> - Added geronimo-axis so that the client can gain access to Axis classes. It would
> - probably be good to move the JAXR gbean from client and the web containers into
> - the Axis config and then add Axis to the client config.
> - <dependency>
> - <groupId>org.apache.geronimo.modules</groupId>
> - <artifactId>geronimo-axis</artifactId>
> - <version>${version}</version>
> - </dependency>
> --->
> -
> <dependency>
> <groupId>org.apache.xbean</groupId>
> <artifactId>xbean-reflect</artifactId>
> @@ -145,35 +125,6 @@
> <!-- geronimo-spec-corba, geronimo-j2ee_1.4_spec -->
> <!-- openejb-core, tranql, asm, activemq,
> concurrent, jdom -->
> -
> - <!-- jaxr must be available from a client -->
> - <dependency>
> - <groupId>org.apache.ws.scout</groupId>
> - <artifactId>scout</artifactId>
> - </dependency>
> -
> - <dependency>
> - <groupId>juddi</groupId>
> - <artifactId>juddi</artifactId>
> - </dependency>
> -
> - <!-- StAX implementation -->
> - <dependency>
> - <groupId>woodstox</groupId>
> - <artifactId>wstx-asl</artifactId>
> - </dependency>
> -
> - <!-- JAXB implementation -->
> - <dependency>
> - <groupId>com.sun.xml.bind</groupId>
> - <artifactId>jaxb-impl</artifactId>
> - </dependency>
> -
> - <!-- default SAAJ 1.3 implementation -->
> - <dependency>
> - <groupId>com.sun.xml.messaging.saaj</groupId>
> - <artifactId>saaj-impl</artifactId>
> - </dependency>
>
> <!-- used by openejb -->
> <dependency>
>
> Modified: geronimo/server/trunk/configs/client/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/client/src/plan/plan.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/client/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/client/src/plan/plan.xml Wed Apr 11 00:37:44 2007
> @@ -45,7 +45,7 @@
> <attribute name="poolName">DefaultThreadPool</attribute>
> </gbean>
>
> - <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
> +<!-- <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/> -->
>
> <gbean name="geronimo.client" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
> <reference name="ServerInfo">
> @@ -96,8 +96,8 @@
> </reference>
> </gbean>
>
> - <gbean name="SAAJGBean"
> - class="org.apache.geronimo.webservices.saaj.SAAJGBean"/>
> +<!-- <gbean name="SAAJGBean"
> + class="org.apache.geronimo.webservices.saaj.SAAJGBean"/> -->
>
> <gbean name="ClientSystemProperties"
> class="org.apache.geronimo.system.properties.SystemProperties">
>
> Modified: geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml (original)
> +++ geronimo/server/trunk/configs/geronimo-gbean-deployer/pom.xml Wed Apr 11 00:37:44 2007
> @@ -36,6 +36,13 @@
> <dependencies>
>
> <dependency>
> + <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>xmlbeans</artifactId>
> + <version>${version}</version>
> + <type>car</type>
> + </dependency>
> +
> + <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-common</artifactId>
> <version>${version}</version>
> @@ -68,6 +75,7 @@
> </dependency>
>
> <!-- Thirdparty Dependencies -->
> +<!--
> <dependency>
> <groupId>xmlbeans</groupId>
> <artifactId>xbean</artifactId>
> @@ -77,6 +85,7 @@
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-stax-api_1.0_spec</artifactId>
> </dependency>
> +-->
>
> </dependencies>
>
>
> Modified: geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/j2ee-server/src/plan/plan.xml Wed Apr 11 00:37:44 2007
> @@ -24,6 +24,7 @@
> <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl">
> <reference name="Servers"/>
> </gbean>
> +
> <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
> <reference name="ServerInfo">
> <name>ServerInfo</name>
> @@ -84,8 +85,8 @@
> </reference>
> </gbean>
>
> - <gbean name="SAAJGBean"
> - class="org.apache.geronimo.webservices.saaj.SAAJGBean"/>
> +<!-- <gbean name="SAAJGBean"
> + class="org.apache.geronimo.webservices.saaj.SAAJGBean"/> -->
>
> <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
>
>
> Modified: geronimo/server/trunk/configs/uddi-jetty6/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty6/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/uddi-jetty6/pom.xml (original)
> +++ geronimo/server/trunk/configs/uddi-jetty6/pom.xml Wed Apr 11 00:37:44 2007
> @@ -66,10 +66,10 @@
> <artifactId>juddi</artifactId>
> </dependency>
>
> - <dependency>
> - <groupId>org.apache.ws.scout</groupId>
> - <artifactId>scout</artifactId>
> - </dependency>
> + <!--<dependency>-->
> + <!-- <groupId>org.apache.ws.scout</groupId>-->
> + <!-- <artifactId>scout</artifactId>-->
> + <!--</dependency>-->
>
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
>
> Modified: geronimo/server/trunk/configs/uddi-jetty6/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-jetty6/src/plan/plan.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/uddi-jetty6/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/uddi-jetty6/src/plan/plan.xml Wed Apr 11 00:37:44 2007
> @@ -67,6 +67,6 @@
> </connector>
> </ext-module>
>
> - <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
> + <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
>
> </application>
>
> Modified: geronimo/server/trunk/configs/uddi-tomcat/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-tomcat/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/uddi-tomcat/pom.xml (original)
> +++ geronimo/server/trunk/configs/uddi-tomcat/pom.xml Wed Apr 11 00:37:44 2007
> @@ -35,23 +35,6 @@
>
> <dependencies>
>
> -<!--
> - <dependency>
> - <groupId>org.apache.geronimo.configs</groupId>
> - <artifactId>tomcat6-deployer</artifactId>
> - <version>${version}</version>
> - <type>car</type>
> - <scope>test</scope>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.geronimo.configs</groupId>
> - <artifactId>connector-deployer</artifactId>
> - <version>${version}</version>
> - <type>car</type>
> - <scope>test</scope>
> - </dependency>
> --->
> -
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>system-database</artifactId>
> @@ -88,10 +71,10 @@
> <artifactId>juddi</artifactId>
> </dependency>
>
> - <dependency>
> - <groupId>org.apache.ws.scout</groupId>
> - <artifactId>scout</artifactId>
> - </dependency>
> + <!--<dependency>-->
> + <!-- <groupId>org.apache.ws.scout</groupId>-->
> + <!-- <artifactId>scout</artifactId>-->
> + <!--</dependency>-->
>
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> @@ -100,6 +83,7 @@
> <type>car</type>
> <scope>provided</scope>
> </dependency>
> +
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>connector-deployer</artifactId>
> @@ -107,6 +91,7 @@
> <type>car</type>
> <scope>provided</scope>
> </dependency>
> +
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>jasper-deployer</artifactId>
> @@ -114,6 +99,7 @@
> <type>car</type>
> <scope>provided</scope>
> </dependency>
> +
> <dependency>
> <groupId>org.apache.geronimo.configs</groupId>
> <artifactId>jasper</artifactId>
>
> Modified: geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml (original)
> +++ geronimo/server/trunk/configs/uddi-tomcat/src/plan/plan.xml Wed Apr 11 00:37:44 2007
> @@ -68,6 +68,6 @@
> </connector>
> </ext-module>
>
> - <gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>
> + <!--<gbean name="eis/JAXR" class="org.apache.geronimo.webservices.jaxr.JAXRGBean"/>-->
>
> </application>
>
> Modified: geronimo/server/trunk/configs/webservices-common/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/webservices-common/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/webservices-common/pom.xml (original)
> +++ geronimo/server/trunk/configs/webservices-common/pom.xml Wed Apr 11 00:37:44 2007
> @@ -49,12 +49,25 @@
> <type>car</type>
> </dependency>
>
> + <dependency>
> + <groupId>org.apache.geronimo.configs</groupId>
> + <artifactId>xmlbeans</artifactId>
> + <version>${version}</version>
> + <type>car</type>
> + </dependency>
> +
> <dependency>
> <groupId>org.apache.geronimo.modules</groupId>
> <artifactId>geronimo-jaxws</artifactId>
> <version>${version}</version>
> </dependency>
>
> + <dependency>
> + <groupId>org.apache.geronimo.modules</groupId>
> + <artifactId>geronimo-webservices</artifactId>
> + <version>${version}</version>
> + </dependency>
> +
> <dependency>
> <groupId>wsdl4j</groupId>
> <artifactId>wsdl4j</artifactId>
> @@ -64,12 +77,6 @@
> <dependency>
> <groupId>woodstox</groupId>
> <artifactId>wstx-asl</artifactId>
> - <exclusions>
> - <exclusion>
> - <groupId>stax</groupId>
> - <artifactId>stax-api</artifactId>
> - </exclusion>
> - </exclusions>
> </dependency>
>
> <!-- JAXB implementation -->
> @@ -79,10 +86,10 @@
> </dependency>
>
> <!-- JAXR implementation -->
> - <dependency>
> - <groupId>org.apache.ws.scout</groupId>
> - <artifactId>scout</artifactId>
> - </dependency>
> + <!-- <dependency> -->
> + <!-- <groupId>org.apache.ws.scout</groupId> -->
> + <!-- <artifactId>scout</artifactId> -->
> + <!-- </dependency> -->
>
> <!-- default SAAJ 1.3 implementation -->
> <dependency>
>
> Modified: geronimo/server/trunk/configs/xmlbeans/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/xmlbeans/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/configs/xmlbeans/pom.xml (original)
> +++ geronimo/server/trunk/configs/xmlbeans/pom.xml Wed Apr 11 00:37:44 2007
> @@ -44,4 +44,16 @@
> </dependency>
> </dependencies>
>
> + <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.geronimo.plugins</groupId>
> + <artifactId>car-maven-plugin</artifactId>
> + <configuration>
> + <bootstrap>true</bootstrap>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> +
> </project>
>
> Modified: geronimo/server/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?view=diff&rev=527403&r1=527402&r2=527403
> ==============================================================================
> --- geronimo/server/trunk/pom.xml (original)
> +++ geronimo/server/trunk/pom.xml Wed Apr 11 00:37:44 2007
> @@ -500,6 +500,10 @@
> <groupId>axis</groupId>
> <artifactId>axis-saaj</artifactId>
> </exclusion>
> + <exclusion>
> + <groupId>xmlbeans</groupId>
> + <artifactId>xbean</artifactId>
> + </exclusion>
> </exclusions>
> </dependency>
>
>
>
>