August 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4107 - in trunk/build/hudson/hudson-home/jobs: Integration-Native-AS-4.2 and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 11:21:19 -0400 (Thu, 02 Aug 2007) New Revision: 4107 Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml Log: Add tests-main Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-02 15:05:43 UTC (rev 4106) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-02 15:21:19 UTC (rev 4107) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-main tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u #

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4106 - trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 11:05:43 -0400 (Thu, 02 Aug 2007) New Revision: 4106 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml Log: Add AS-Tests-AS-4.0 Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2007-08-02 15:05:15 UTC (rev 4105) +++ trunk/build/hudson/hudson-home/jobs/AS-Tests-ALL/config.xml 2007-08-02 15:05:43 UTC (rev 4106) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2</childProjects> + <childProjects>AS-Tests-AS-5.0, AS-Tests-AS-4.2, AS-Tests-AS-4.0</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4105 - in trunk: build/ant-import and 30 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 11:05:15 -0400 (Thu, 02 Aug 2007) New Revision: 4105 Added: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java trunk/jbossws-core/ant-import/build-bin-dist.xml trunk/jbossws-core/ant-import/build-testsuite.xml trunk/jbossws-core/ant-import/macros-deploy-native.xml trunk/jbossws-core/src/main/etc/bin-dist-build.xml trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml trunk/jbossws-core/src/main/etc/component-info40.xml trunk/jbossws-core/src/main/etc/component-info42.xml trunk/jbossws-core/src/main/etc/component-info50.xml trunk/jbossws-core/src/main/java/org/jboss/wsf/ trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/ trunk/jbossws-core/src/main/resources/jbossws-context.war/ trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/ trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css trunk/jbossws-core/src/main/resources/jbossws-native-config.xml trunk/jbossws-core/src/main/resources/jbossws-native.jar/ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt Removed: trunk/integration/jboss50/ trunk/integration/native/ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java trunk/jbossws-core/src/main/java/org/jboss/wsf/stack/ Modified: trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-testsuite.xml trunk/build/build.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java trunk/integration/sunri/.classpath trunk/integration/sunri/build.xml trunk/integration/xfire/.classpath trunk/integration/xfire/ant-import/build-testsuite.xml trunk/integration/xfire/build.xml trunk/jbossws-core/ant-import-tests/build-testsuite.xml trunk/jbossws-core/ant-import/build-deploy.xml trunk/jbossws-core/ant-import/build-thirdparty.xml trunk/jbossws-core/build.xml trunk/jbossws-core/version.properties Log: Externalize container/jboss50. REmove integration/native Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/ant-import/build-setup.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -21,10 +21,8 @@ <property name="framework.dir" value="${basedir}/integration/spi"/> <property name="core.dir" value="${basedir}/jbossws-core"/> <property name="testsuite.dir" value="${basedir}/testsuite"/> - <property name="int.jboss50.dir" value="${basedir}/integration/jboss50"/> <property name="int.jboss42.dir" value="${basedir}/integration/jboss42"/> <property name="int.jboss40.dir" value="${basedir}/integration/jboss40"/> - <property name="int.native.dir" value="${basedir}/integration/native"/> <property name="int.sunri.dir" value="${basedir}/integration/sunri"/> <property name="int.xfire.dir" value="${basedir}/integration/xfire"/> Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/ant-import/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -103,8 +103,6 @@ <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> - <pathelement location="${jboss.client}/jaxb-api.jar"/> - <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/build.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -125,11 +125,9 @@ <delete dir="${build.dir}/output"/> <ant antfile="${framework.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${int.jboss50.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.jboss40.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clean" inheritall="false"/> - <ant antfile="${int.native.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clean" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clean" inheritall="false"/> </target> @@ -139,10 +137,8 @@ <ant antfile="${framework.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${core.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${testsuite.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${int.jboss50.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss42.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.jboss40.dir}/build.xml" target="clobber" inheritall="false"/> - <ant antfile="${int.native.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="clobber" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="clobber" inheritall="false"/> </target> @@ -156,14 +152,12 @@ <target name="most" description="Builds almost everything." depends="prepare"> <ant antfile="${core.dir}/build.xml" target="most" inheritall="false"/> - <ant antfile="${int.native.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="most" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="most" inheritall="false"/> </target> <target name="all" description="Create a distribution zip file" depends="prepare"> <ant antfile="${core.dir}/build.xml" target="all" inheritall="false"/> - <ant antfile="${int.native.dir}/build.xml" target="all" inheritall="false"/> <ant antfile="${int.sunri.dir}/build.xml" target="all" inheritall="false"/> <ant antfile="${int.xfire.dir}/build.xml" target="all" inheritall="false"/> </target> Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -29,7 +29,7 @@ # # Build jbws-jboss40 # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ./build.sh $ENVIRONMENT deploy-jboss40 # @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -29,7 +29,7 @@ # # Build jbws-jboss42 # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ./build.sh $ENVIRONMENT deploy-jboss42 # @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -29,7 +29,7 @@ # # Build deploy-jboss50 # -cd $JBWSDIR/integration/native +cd $JBWSDIR/jbossws-core ./build.sh $ENVIRONMENT deploy-jboss50 # @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/build/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -48,7 +48,7 @@ # # execute tests # -./build.sh $ENVIRONMENT tests-clean tests 2>&1 | tee $WORKSPACE/tests.out +./build.sh $ENVIRONMENT tests-clean tests-smoke 2>&1 | tee $WORKSPACE/tests.out cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u # Modified: trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/jboss40/src/main/java/org/jboss/wsf/container/jboss40/WebServiceContextFactoryImpl.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -21,21 +21,25 @@ */ package org.jboss.wsf.container.jboss40; -import org.jboss.wsf.spi.invocation.*; - import javax.xml.ws.handler.MessageContext; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; +import org.jboss.wsf.spi.invocation.InvocationType; +import org.jboss.wsf.spi.invocation.WebServiceContextEJB; +import org.jboss.wsf.spi.invocation.WebServiceContextFactory; +import org.jboss.wsf.spi.invocation.WebServiceContextJSE; + /** * @author Heiko.Braun(a)jboss.com * Created: Jul 25, 2007 */ public class WebServiceContextFactoryImpl extends WebServiceContextFactory { - public ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) + public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) { - ExtendableWebServiceContext context = null; + ExtensibleWebServiceContext context = null; - if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) + if (type.toString().indexOf("EJB") != -1 || type.toString().indexOf("MDB") != -1) context = new WebServiceContextEJB(messageContext); else context = new WebServiceContextJSE(messageContext); Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/DeploymentAspectHttpServer.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -26,15 +26,14 @@ import javax.xml.ws.Endpoint; import javax.xml.ws.WebServiceException; -import org.jboss.wsf.framework.DefaultExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentAspectManager; import org.jboss.wsf.spi.deployment.DeploymentAspectManagerFactory; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; import org.jboss.wsf.spi.deployment.Service; -import org.jboss.wsf.spi.deployment.Deployment.DeploymentType; import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer; @@ -45,7 +44,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 07-Jul-2006 */ -public class DeploymentAspectHttpServer extends DefaultExtensible implements HttpServer +public class DeploymentAspectHttpServer extends AbstractExtensible implements HttpServer { /** Start an instance of this HTTP server */ public void start() Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/InvocationHandlerEJB3.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -42,9 +42,8 @@ import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import org.jboss.wsf.spi.invocation.Invocation; -import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.InvocationType; import org.jboss.wsf.spi.invocation.WebServiceContextFactory; @@ -132,7 +131,8 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + WebServiceContextFactory factory = spiProvider.getSPI(WebServiceContextFactory.class); + ExtensibleWebServiceContext wsContext = factory.newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebAppDeployingHttpServer.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -36,9 +36,9 @@ import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.framework.DefaultExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer; @@ -52,7 +52,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 07-Jul-2006 */ -public class WebAppDeployingHttpServer extends DefaultExtensible implements HttpServer +public class WebAppDeployingHttpServer extends AbstractExtensible implements HttpServer { private static final String MAIN_DEPLOYER = "jboss.system:service=MainDeployer"; Modified: trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/WebServiceContextFactoryImpl.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -31,9 +31,9 @@ */ public class WebServiceContextFactoryImpl extends WebServiceContextFactory { - public ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) + public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) { - ExtendableWebServiceContext context = null; + ExtensibleWebServiceContext context = null; if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) context = new WebServiceContextEJB(messageContext); Deleted: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/DefaultExtensible.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.framework; - -//$Id: BasicDeploymentContext.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $ - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import org.jboss.wsf.spi.Extensible; - -/** - * A general extendible artifact - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class DefaultExtensible implements Extensible -{ - private Map<Class, Object> attachments = new HashMap<Class, Object>(); - private Map<String, Object> properties = new HashMap<String, Object>(); - - public Collection<Object> getAttachments() - { - return attachments.values(); - } - - public <T> T getAttachment(Class<T> clazz) - { - return (T)attachments.get(clazz); - } - - public <T> T addAttachment(Class<T> clazz, Object obj) - { - return (T)attachments.put(clazz, obj); - } - - public <T> T removeAttachment(Class<T> key) - { - return (T)attachments.remove(key); - } - - public Set<String> getProperties() - { - return properties.keySet(); - } - - public Object getProperty(String key) - { - return properties.get(key); - } - - public void removeProperty(String key) - { - properties.remove(key); - } - - public void setProperty(String key, Object value) - { - properties.put(key, value); - } - - public void setProperties(Map<String, Object> props) - { - properties.putAll(props); - } -} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultDeployment.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.framework.deployment; -import org.jboss.wsf.framework.DefaultExtensible; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Service; @@ -35,7 +35,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class DefaultDeployment extends DefaultExtensible implements Deployment +public class DefaultDeployment extends AbstractExtensible implements Deployment { // The name for this deployment private String simpleName; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultEndpoint.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -26,8 +26,8 @@ import javax.management.ObjectName; -import org.jboss.wsf.framework.DefaultExtensible; import org.jboss.wsf.spi.binding.BindingCustomization; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.LifecycleHandler; import org.jboss.wsf.spi.deployment.Service; @@ -42,7 +42,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class DefaultEndpoint extends DefaultExtensible implements Endpoint +public class DefaultEndpoint extends AbstractExtensible implements Endpoint { private Service service; private ObjectName name; Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/deployment/DefaultService.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.wsf.framework.DefaultExtensible; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.deployment.Service; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; @@ -40,7 +40,7 @@ * @author Thomas.Diesler(a)jboss.com * @since 20-Apr-2007 */ -public class DefaultService extends DefaultExtensible implements Service +public class DefaultService extends AbstractExtensible implements Service { private Deployment dep; private List<Endpoint> endpoints = new LinkedList<Endpoint>(); Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/http/DefaultHttpContext.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -23,7 +23,7 @@ //$Id: HttpContext.java 1757 2006-12-22 15:40:24Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.framework.DefaultExtensible; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpServer; @@ -33,7 +33,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 07-Jul-2006 */ -public class DefaultHttpContext extends DefaultExtensible implements HttpContext +public class DefaultHttpContext extends AbstractExtensible implements HttpContext { private HttpServer server; private String contextRoot; Copied: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java (from rev 4087, spi/trunk/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java) =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java (rev 0) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/DefaultEndpointRegistry.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.framework.management; + +// $Id$ + +import org.jboss.logging.Logger; +import org.jboss.wsf.spi.deployment.Endpoint; +import org.jboss.wsf.spi.management.EndpointRegistry; +import org.jboss.wsf.spi.management.EndpointResolver; + +import javax.management.ObjectName; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * A general endpoint registry. + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public class DefaultEndpointRegistry implements EndpointRegistry +{ + // provide logging + private static final Logger log = Logger.getLogger(DefaultEndpointRegistry.class); + + private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>(); + + public Endpoint getEndpoint(ObjectName epName) + { + if (epName == null) + throw new IllegalArgumentException("Endpoint name cannot be null"); + + if (isRegistered(epName) == false) + throw new IllegalStateException("Endpoint not registered: " + epName); + + Endpoint endpoint = endpoints.get(epName); + return endpoint; + } + + public Endpoint resolve(EndpointResolver resolver) + { + return resolver.query(endpoints.values().iterator()); + } + + public boolean isRegistered(ObjectName epName) + { + if (epName == null) + throw new IllegalArgumentException("Endpoint name cannot be null"); + + return endpoints.get(epName) != null; + } + + public Set<ObjectName> getEndpoints() + { + return endpoints.keySet(); + } + + public void register(Endpoint endpoint) + { + if (endpoint == null) + throw new IllegalArgumentException("Endpoint cannot be null"); + + ObjectName epName = endpoint.getName(); + if (epName == null) + throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint); + + if (isRegistered(epName)) + throw new IllegalStateException("Endpoint already registered: " + epName); + + log.info("register: " + epName); + endpoints.put(epName, endpoint); + } + + public void unregister(Endpoint endpoint) + { + if (endpoint == null) + throw new IllegalArgumentException("Endpoint cannot be null"); + + ObjectName epName = endpoint.getName(); + if (isRegistered(epName) == false) + throw new IllegalStateException("Endpoint not registered: " + epName); + + log.info("remove: " + epName); + endpoints.remove(epName); + } +} Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java =================================================================== --- trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/spi/src/main/java/org/jboss/wsf/framework/management/ManagedEndpointRegistry.java 2007-08-02 15:05:15 UTC (rev 4105) @@ -28,7 +28,6 @@ import org.jboss.logging.Logger; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.DefaultEndpointRegistry; /** * A Service Endpoint Registry Modified: trunk/integration/sunri/.classpath =================================================================== --- trunk/integration/sunri/.classpath 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/sunri/.classpath 2007-08-02 15:05:15 UTC (rev 4105) @@ -20,7 +20,6 @@ <classpathentry kind="lib" path="thirdparty/stax-ex.jar"/> <classpathentry kind="lib" path="thirdparty/streambuffer.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/sunri/build.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -145,8 +145,6 @@ <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> -  <concat destfile="${sunri.output.lib.dir}/jbossws-sunri50/jbossws-beans.xml"> <header trimleading="yes"> Modified: trunk/integration/xfire/.classpath =================================================================== --- trunk/integration/xfire/.classpath 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/xfire/.classpath 2007-08-02 15:05:15 UTC (rev 4105) @@ -7,7 +7,6 @@ <classpathentry kind="lib" path="thirdparty/jaxb-xjc.jar"/> <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-jboss50"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry kind="lib" path="thirdparty/cxf-incubator.jar" sourcepath="/home/tdiesler/Download/java/apache/cxf/apache-cxf-2.0-incubator-src.zip"/> <classpathentry kind="lib" path="thirdparty/geronimo-ws-metadata.jar"/> Modified: trunk/integration/xfire/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/xfire/ant-import/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -33,6 +33,7 @@ <pathelement location="${int.xfire.dir}/thirdparty/cxf-incubator.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/geronimo-javamail.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/geronimo-ws-metadata.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jaxb-api.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jaxws-api.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/jdom.jar"/> <pathelement location="${int.xfire.dir}/thirdparty/neethi.jar"/> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/integration/xfire/build.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -131,8 +131,6 @@ <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> - <ant antfile="${int.jboss50.dir}/build.xml" target="jars" inheritall="false"/> -  <concat destfile="${xfire.output.lib.dir}/jbossws-xfire50/jbossws-beans.xml"> <header trimleading="yes"> Added: trunk/jbossws-core/ant-import/build-bin-dist.xml =================================================================== --- trunk/jbossws-core/ant-import/build-bin-dist.xml (rev 0) +++ trunk/jbossws-core/ant-import/build-bin-dist.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> + + <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> + <property name="bindist.build.dir" value="${bindist.dir}/build"/> + <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> + <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> + <property name="bindist.docs.dir" value="${bindist.dir}/docs"/> + <property name="bindist.tests.dir" value="${bindist.dir}/tests"/> + <property name="bindist.tools.dir" value="${bindist.dir}/tools"/> + + <delete dir="${bindist.dir}"/> + <mkdir dir="${bindist.build.dir}"/> + <mkdir dir="${bindist.bin.dir}"/> + <mkdir dir="${bindist.docs.dir}"/> + <mkdir dir="${bindist.tests.dir}"/> + <mkdir dir="${bindist.tools.dir}"/> + +  + <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"> + <filterset> + <filtersfile file="${build.dir}/ant.properties"/> + </filterset> + </copy> + <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${native.etc.dir}/bin-dist-deploy.xml"/> + +  + <copy todir="${bindist.build.dir}"> + <fileset dir="${build.dir}"> + <include name="version.properties"/> + </fileset> + <fileset dir="${build.dir}/ant-import"> + <include name="build-testsuite.xml"/> + </fileset> + <fileset dir="${int.native.dir}/ant-import"> + <include name="macros-deploy-native.xml"/> + </fileset> + <fileset dir="${int.sunri.dir}/ant-import"> + <include name="macros-deploy-sunri.xml"/> + </fileset> + <fileset dir="${framework.dir}/ant-import"> + <include name="macros-deploy-spi.xml"/> + </fileset> + <fileset dir="${int.xfire.dir}/ant-import"> + <include name="macros-deploy-xfire.xml"/> + </fileset> + <fileset dir="${testsuite.dir}/ant-import"> + <include name="build-jars-jaxws.xml"/> + </fileset> + </copy> + + <copy todir="${bindist.bin.dir}"> + <fileset dir="${framework.dir}/src/main/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + + <copy todir="${bindist.bin.dir}"> + <fileset dir="${core.dir}/src/main/etc"> + <include name="*.sh"/> + <include name="*.bat"/> + </fileset> + </copy> + + <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> + + +  + <copy todir="${bindist.docs.dir}" > + <fileset dir="${native.output.dir}"> + <include name="apidocs/**"/> + </fileset> + </copy> + <copy todir="${bindist.docs.dir}" filtering="yes"> + <fileset dir="${build.dir}/dist"> + <include name="Install.txt"/> + <include name="ReleaseNotes.txt"/> + </fileset> + <filterset> + <filtersfile file="${build.dir}/version.properties"/> + </filterset> + </copy> + + <copy todir="${bindist.docs.dir}"> + <fileset dir="${build.dir}/etc"> + <include name="JBossORG-EULA.txt"/> + </fileset> + </copy> + +  + <copy todir="${bindist.lib.dir}" overwrite="true"> + <fileset dir="${framework.dir}/output/lib"> + <include name="jbossws-framework.jar"/> + <include name="jbossws-framework-scripts.zip"/> + </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + <include name="jbossws-jboss50-deployer.zip"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${int.jboss40.dir}/output/lib"> + <include name="jbossws-jboss40.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-core.jar"/> + <include name="jbossws-core-scripts.zip"/> + </fileset> + <fileset dir="${int.native.dir}/output/lib"> + <include name="jbossws-context.war"/> + <include name="jbossws-native40.sar"/> + <include name="jbossws-native42.sar"/> + <include name="jbossws-native50.sar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="juddi-service.sar"/> + <include name="policy.jar"/> + <include name="getopt.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="stax-api.jar"/> + <include name="wsdl4j.jar"/> + <include name="streambuffer.jar"/> + <include name="stax-ex.jar"/> + </fileset> + </copy> + +  + <copy todir="${bindist.tests.dir}" overwrite="true"> + <fileset dir="${testsuite.dir}/src"/> + <fileset dir="${int.native.dir}/src/test"/> + </copy> + +  + <copy todir="${bindist.tools.dir}" overwrite="true"> + <fileset dir="${build.dir}/tools/ant"/> + </copy> + <copy todir="${bindist.dir}" overwrite="true"> + <fileset dir="${build.dir}"> + <include name="build.bat"/> + <include name="build.sh"/> + </fileset> + </copy> + <chmod file="${bindist.dir}/build.sh" perm="+x"/> + + <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> + <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> + </zip> + </target> + +</project> Modified: trunk/jbossws-core/ant-import/build-deploy.xml =================================================================== --- trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/jbossws-core/ant-import/build-deploy.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -13,34 +13,116 @@ <project> -  - <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss50" inheritall="false"/> - </target> + <import file="${core.dir}/ant-import/macros-deploy-native.xml"/> + <import file="${framework.dir}/ant-import/macros-deploy-wsf.xml"/> -  - <target name="undeploy-jboss50" depends="prepare" description="Undeploy jbossws"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> +  +  +  + +  + <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50"> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss50" inheritall="false"/> + <macro-deploy-native50 + wsflibs="${framework.dir}/output/lib" + stacklibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-wsf + wsflibs="${framework.dir}/output/lib" + thirdpartylibs="${framework.dir}/thirdparty" + jbosshome="${jboss50.home}"/> + +  </target> -  - <target name="deploy-jboss42" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss42" inheritall="false"/> - </target> + <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss50.home}" + corelibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-wsf jbosshome="${jboss50.home}"/> + </target> -  - <target name="undeploy-jboss42" depends="prepare" description="Undeploy jbossws"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <target name="undeploy-jboss50-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss50.home}"/> + </target> + +  + <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42"> + <ant antfile="${int.sunri.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <ant antfile="${int.xfire.dir}/build.xml" target="undeploy-jboss42" inheritall="false"/> + <macro-deploy-native42 + wsflibs="${framework.dir}/output/lib" + jbosslibs="${int.jboss42.dir}/output/lib" + corelibs="${core.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-wsf + wsflibs="${framework.dir}/output/lib" + thirdpartylibs="${framework.dir}/thirdparty" + jbosshome="${jboss42.home}"/> + +  + </target> -  - <target name="deploy-jboss40" depends="prepare" description="Deploy jbossws"> - <ant antfile="${int.native.dir}/build.xml" target="deploy-jboss40" inheritall="false"/> - </target> + <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss42.home}" + corelibs="${core.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-wsf jbosshome="${jboss42.home}"/> + </target> + <target name="undeploy-jboss42-endorsed" depends="prepare"> + <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + </target> -  - <target name="undeploy-jboss40" depends="prepare" description="Undeploy jbossws"> - <ant antfile="${int.native.dir}/build.xml" target="undeploy-jboss40" inheritall="false"/> - </target> +  + <target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/> + <target name="deploy-jboss40-ejb3"> + <macro-deploy-native40 + wsflibs="${framework.dir}/output/lib" + jbosslibs="${int.jboss40.dir}/output/lib" + corelibs="${core.dir}/output/lib" + stacklibs="${int.native.dir}/output/lib" + thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-wsf + wsflibs="${framework.dir}/output/lib" + thirdpartylibs="${framework.dir}/thirdparty" + jbosshome="${jboss40.home}"/> + </target> + + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <macro-setup-native40-no-ejb3/> + <echo> + *********************************** + * JBossWS EJB3 support disabled * + * All EJB3 tests will fail. * + *********************************** + </echo> + </target> + +  + <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws from jboss40"> + <macro-undeploy-native40/> + <macro-undeploy-wsf jbosshome="${jboss40.home}"/> + </target> </project> Added: trunk/jbossws-core/ant-import/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import/build-testsuite.xml (rev 0) +++ trunk/jbossws-core/ant-import/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + +<project> + + <property name="tests.output.dir" value="${int.native.dir}/output/tests"/> + <import file="${testsuite.dir}/ant-import/build-testsuite.xml"/> + + <property name="tests.dir" value="${testsuite.dir}/src"/> + <property name="tests.java.dir" value="${tests.dir}/java"/> + <property name="tests.resources.dir" value="${tests.dir}/resources"/> + +  + <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + +  +  +  + + <target name="tests-init" depends="tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-common.jar"/> + <pathelement location="${core.dir}/thirdparty/jbossws-spi.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> + <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> + <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${jboss.client}/policy.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.java.dir}" excludesfile="${excludesfile}"/> + </target> + +</project> Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -69,6 +69,8 @@ <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50.jar" dest="${thirdparty.dir}/jbossws-jboss50.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-jboss50/${jbossws-jboss50}/lib/jbossws-jboss50-deployer.zip" dest="${thirdparty.dir}/jbossws-jboss50-deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> Added: trunk/jbossws-core/ant-import/macros-deploy-native.xml =================================================================== --- trunk/jbossws-core/ant-import/macros-deploy-native.xml (rev 0) +++ trunk/jbossws-core/ant-import/macros-deploy-native.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,402 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <macrodef name="macro-deploy-native50"> + <attribute name="wsflibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + +  + <unzip dest="${jboss50.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jbossws-jboss50.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src="@{thirdpartylibs}/jbossws-jboss50-deployer.zip"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native50.sar"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native50"> + <sequential> + <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> + + <delete> +  + <fileset dir="${jboss50.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + +  + <fileset dir="${jboss50.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-jboss50.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + +  + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> +  + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-native42"> + <attribute name="wsflibs"/> + <attribute name="jbosslibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + +  + <unzip dest="${jboss42.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/> + +  + <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> + </copy> + + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native42.sar"/> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native42"> + <sequential> + <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <delete> + +  + <fileset dir="${jboss42.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + +  + <fileset dir="${jboss42.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-jboss42.jar"/> + <include name="policy.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + +  + <fileset dir="${jboss42.home}/lib/endorsed"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> +  + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-jboss42.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> +  + <include name="jbossws-integration.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-deploy-native40"> + <attribute name="wsflibs"/> + <attribute name="jbosslibs"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + +  + <unzip dest="${jboss40.home}/bin" src="@{stacklibs}/jbossws-core-scripts.zip"/> + <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> + + <copy todir="${jboss40.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss40.home}/client" overwrite="true"> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss40.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="policy.jar"/> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> + <include name="wstx.jar"/> + </fileset> + </copy> + +  + <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss40.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + <fileset dir="@{thirdpartylibs}"> + <include name="wsdl4j.jar"/> + </fileset> + + </copy> + + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <unjar dest="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/jbossws-native40.sar"/> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/> + </sequential> + </macrodef> + + <macrodef name="macro-setup-native40-no-ejb3"> + <sequential> + + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-ejb3.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml"/> + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-ejb3.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml"/> + <move tofile="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans.xml" + file="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.beans/META-INF/jboss-beans-no-ejb3.xml"/> + + </sequential> + </macrodef> + + <macrodef name="macro-undeploy-native40"> + <sequential> + <fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/> + <delete> + +  + <fileset dir="${jboss40.home}/bin"> + <include name="wsconsume.*"/> + <include name="wsprovide.*"/> + <include name="wsrunclient.*"/> + <include name="wstools.*"/> + </fileset> + +  + <fileset dir="${jboss40.home}/client"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + <include name="jaxws-tools.jar"/> + <include name="jaxws-rt.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-jboss40.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> +  + <include name="jbossws-wsconsume-impl.jar"/> + <include name="jbossws14-client.jar"/> + </fileset> + +  + <fileset dir="${jboss40.home}/lib"> +  + <include name="jbossws-integration.jar"/> + </fileset> + <fileset dir="${jboss40.home}/server/${jboss.server.instance}/lib"> + <include name="jbossws-jboss40.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> +  + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> + </sequential> + </macrodef> + +  + <macrodef name="macro-deploy-endorsed"> + <attribute name="jbosshome"/> + <attribute name="stacklibs"/> + <attribute name="thirdpartylibs"/> + <sequential> + <copy todir="@{jbosshome}/lib/endorsed" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + </fileset> + <fileset dir="@{stacklibs}"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </copy> + </sequential> + </macrodef> + +  + <macrodef name="macro-undeploy-endorsed"> + <attribute name="jbosshome"/> + <sequential> + <delete> + <fileset dir="@{jbosshome}/lib/endorsed"> + <include name="jaxb-api.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + </sequential> + </macrodef> + +</project> Modified: trunk/jbossws-core/ant-import-tests/build-testsuite.xml =================================================================== --- trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/jbossws-core/ant-import-tests/build-testsuite.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -20,7 +20,7 @@  <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/> - <property name="excludesfile" value="${int.native.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/> + <property name="excludesfile" value="${core.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>  - <target name="jars" depends="compile,module-jars" description="Builds all jar files."> + <target name="jars" depends="compile,jars-jboss40,jars-jboss42,jars-jboss50" description="Builds all jar files."> </target>  - <target name="module-jars"> + <target name="jars-common" depends="compile">  <mkdir dir="${core.output.lib.dir}"/> @@ -169,6 +170,23 @@ <metainf dir="${core.resources.dir}/standard-config"/> </jar> +  + <jar jarfile="${core.output.lib.dir}/jbossws-native.jar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.classes.dir}"> + <include name="org/jboss/wsf/stack/jbws/**"/> + </fileset> + <metainf dir="${core.resources.dir}/jbossws-native.jar/META-INF"/> + </jar> + +  + <copy todir="${core.output.lib.dir}/jbossws-context.war"> + <fileset dir="${core.resources.dir}/jbossws-context.war"> + <include name="index.html"/> + <include name="styles.css"/> + <include name="WEB-INF/**"/> + </fileset> + </copy> +  <zip zipfile="${core.output.lib.dir}/jbossws-core-scripts.zip" > <fileset dir="${core.output.etc.dir}"> @@ -188,6 +206,141 @@ </target> + <target name="jars-jboss50" depends="jars-common" if="jboss50.home"> + +  + <concat destfile="${core.output.lib.dir}/jbossws-native50/jbossws-beans.xml"> + <header trimleading="yes"> + <deployment xmlns="urn:jboss:bean-deployer:2.0"> + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <footer trimleading="yes"> + </deployment> + </footer> + </concat> + +  + <jar jarfile="${core.output.lib.dir}/jbossws-native50.sar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-context.war/**"/> + <include name="jbossws-native.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="policy.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + <include name="wstx.jar"/> + </fileset> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + <metainf dir="${core.output.lib.dir}/jbossws-native50"> + <include name="jbossws-beans.xml"/> + </metainf> + </jar> + + </target> + + <target name="jars-jboss42" depends="jars-common" if="jboss42.home"> + + <ant antfile="${int.jboss42.dir}/build.xml" target="jars" inheritall="false"/> + +  + <concat destfile="${core.output.lib.dir}/jbossws-native42/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${int.jboss42.dir}/src/main/resources/jbossws-jboss42-config.xml"/> + <footer trimleading="yes"> + </deployment> + </footer> + </concat> + +  + <jar jarfile="${core.output.lib.dir}/jbossws-native42.sar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-context.war/**"/> + <include name="jbossws-native.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxws.jar"/> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + <include name="wstx.jar"/> + </fileset> + <fileset dir="${core.output.lib.dir}/jbossws-native42"> + <include name="jbossws.beans/**"/> + </fileset> + <metainf dir="${int.jboss42.dir}/src/main/resources/jbossws-jboss42.sar/META-INF"> + <include name="jboss-service.xml"/> + </metainf> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + </jar> + </target> + + <target name="jars-jboss40" depends="jars-common" if="jboss40.home"> + + <ant antfile="${int.jboss40.dir}/build.xml" target="jars" inheritall="false"/> + +  + <concat destfile="${core.output.lib.dir}/jbossws-native40/jbossws.beans/META-INF/jboss-beans.xml"> + <header trimleading="yes"> + <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + </header> + <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> + <fileset file="${int.jboss40.dir}/src/main/resources/jbossws-jboss40-config.xml"/> + <footer trimleading="yes"> + </deployment> + </footer> + </concat> + +  + <jar jarfile="${core.output.lib.dir}/jbossws-native40.sar" manifest="${core.output.etc.dir}/default.mf"> + <fileset dir="${core.output.lib.dir}"> + <include name="jbossws-context.war/**"/> + <include name="jbossws-native.jar"/> + </fileset> + <fileset dir="${core.dir}/output/lib"> + <include name="jboss-jaxws.jar"/> + <include name="jbossws-core.jar"/> + </fileset> + <fileset dir="${core.dir}/thirdparty"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="policy.jar"/> + <include name="stax-api.jar"/> + <include name="wsdl4j.jar"/> + <include name="xmlsec.jar"/> + <include name="wstx.jar"/> + </fileset> + <fileset dir="${core.output.lib.dir}/jbossws-native40"> + <include name="jbossws.beans/**"/> + </fileset> + <metainf dir="${int.jboss40.dir}/src/main/resources/jbossws-jboss40.sar/META-INF"/> + <metainf dir="${core.dir}/src/main/resources/standard-config"> + <include name="standard-*-config.xml"/> + </metainf> + </jar> + </target> +    Added: trunk/jbossws-core/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/jbossws-core/src/main/etc/bin-dist-build.xml (rev 0) +++ trunk/jbossws-core/src/main/etc/bin-dist-build.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS-Native"> + +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="bin.dir" value="${basedir}/bin"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${tests.dir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + <property file="${build.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jboss40.lib" value="${jboss40.home}/lib"/> + <property name="jboss40.client" value="${jboss40.home}/client"/> + <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> + <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> + <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> + <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + <available property="jboss40.available" file="${jboss40.available.file}"/> + + <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-spi.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <import file="${basedir}/build/macros-deploy-xfire.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jbossws-framework.jar"/> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${lib.dir}/jboss-saaj.jar"/> + <pathelement location="${lib.dir}/jbossws-core.jar"/> + <pathelement location="${lib.dir}/jbossws-client.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/policy.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  + <target name="jars-jboss50" depends="prepare"/> + <target name="jars-jboss42" depends="prepare"/> + <target name="jars-jboss40" depends="prepare"/> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> Added: trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml =================================================================== --- trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml (rev 0) +++ trunk/jbossws-core/src/main/etc/bin-dist-deploy.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50"> + <macro-undeploy-sunri50/> + <macro-undeploy-xfire50/> + <macro-deploy-native50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + <macro-deploy-spi + spilibs="${lib.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss50.home}"/> + </target> + <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss50.home}" + corelibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-spi jbosshome="${jboss50.home}"/> + </target> + +  + <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42"> + <macro-undeploy-sunri42/> + <macro-undeploy-xfire42/> + <macro-deploy-native42 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + <macro-deploy-spi + spilibs="${lib.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss42.home}"/> + </target> + <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss42.home}" + corelibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-spi jbosshome="${jboss42.home}"/> + </target> + <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + </target> + +  + <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/> + + <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40"> + <macro-deploy-native40 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + corelibs="${lib.dir}" + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-spi + spilibs="${lib.dir}" + thirdpartylibs="${lib.dir}" + jbosshome="${jboss40.home}"/> + </target> + + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <macro-setup-native40-no-ejb3/> + <echo> + *********************************** + * JBossWS EJB3 support disabled * + * All EJB3 tests will fail. * + *********************************** + </echo> + </target> + +  + <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> + <macro-undeploy-native40/> + <macro-undeploy-spi jbosshome="${jboss40.home}"/> + </target> + +</project> Added: trunk/jbossws-core/src/main/etc/component-info40.xml =================================================================== --- trunk/jbossws-core/src/main/etc/component-info40.xml (rev 0) +++ trunk/jbossws-core/src/main/etc/component-info40.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,28 @@ +<project name="jboss/jbossws-native40"> + + <component id="jboss/jbossws-native40" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-native40.sar"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting-jboss40@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Added: trunk/jbossws-core/src/main/etc/component-info42.xml =================================================================== --- trunk/jbossws-core/src/main/etc/component-info42.xml (rev 0) +++ trunk/jbossws-core/src/main/etc/component-info42.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,30 @@ +<project name="jboss/jbossws-native42"> + + <component id="jboss/jbossws-native42" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-native42.sar"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb-jboss42@"/> + <compatible version="@jboss-jbossxb-jboss42@-brew"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting-jboss42@"/> + <compatible version="@jboss-remoting-jboss42@-brew"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Added: trunk/jbossws-core/src/main/etc/component-info50.xml =================================================================== --- trunk/jbossws-core/src/main/etc/component-info50.xml (rev 0) +++ trunk/jbossws-core/src/main/etc/component-info50.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,28 @@ +<project name="jboss/jbossws-native50"> + + <component id="jboss/jbossws-native50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-native50.sar"/> + + <import componentref="jboss/jbossxb"> + <compatible version="@jboss-jbossxb-jboss50@"/> + </import> + <import componentref="jboss/remoting"> + <compatible version="@jboss-remoting-jboss50@"/> + </import> + <import componentref="jboss/jbossws"> + <compatible version="@repository.id@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@repository.id@"/> + </import> + + <export> + </export> + + </component> + +</project> Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf (from rev 4091, trunk/integration/native/src/main/java/org/jboss/wsf) Copied: trunk/jbossws-core/src/main/java/org/jboss/wsf/stack (from rev 4104, trunk/integration/native/src/main/java/org/jboss/wsf/stack) Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/jboss-web.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<!DOCTYPE jboss-web + PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> + +<jboss-web> + +  + + <context-root>jbossws</context-root> + +</jboss-web> Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-context.war/WEB-INF/web.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + + + +<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + + <display-name>JBossWS</display-name> + + <servlet> + <servlet-name>ContextServlet</servlet-name> + <servlet-class>org.jboss.wsf.framework.management.ContextServlet</servlet-class> + </servlet> + + <servlet> + <servlet-name>PortComponentLinkServlet</servlet-name> + <servlet-class>org.jboss.ws.core.server.PortComponentLinkServlet</servlet-class> + </servlet> + +  + + <servlet-mapping> + <servlet-name>ContextServlet</servlet-name> + <url-pattern>/services/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>PortComponentLinkServlet</servlet-name> + <url-pattern>/pclink</url-pattern> + </servlet-mapping> + +  + + <login-config> + <auth-method>BASIC</auth-method> + <realm-name>JBossWS Management Console</realm-name> + </login-config> + + <security-role> + <role-name>friend</role-name> + </security-role> + +  + <mime-mapping> + <extension>wsdl</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <mime-mapping> + <extension>xsd</extension> + <mime-type>text/xml</mime-type> + </mime-mapping> + + <welcome-file-list id="WelcomeFileList"> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-context.war/index.html 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,63 @@ +<html><head> +<meta http-equiv='Content-Type content='text/html; charset=iso-8859-1'> +<title>JBossWS</title> +<link rel='stylesheet' href='./styles.css'> +</head> +<body> + +<div class='pageHeader'>Welcome to JBoss Web Services</div> + +<div class="pageSection"> +<h2>J2EE compatible web services</h2> +JBossWS is a JAX-WS compliant web service stack developed to be part of JBoss' JavaEE5 offering. +</div> + +<div class="pageSection"> +<h3>Administration</h3> + +<fieldset> + <legend><b>Runtime information</b></legend> +<ul> + <li><a href="services">View a list of deployed services</a></li> +  + <li><a href="/jmx-console/">Access JMX console</a></li> +</ul> +</fieldset> +</div> + +<div class="pageSection"> +<h3>Project information</h3> + +<fieldset> + <legend><b>Documentation</b></legend> + +<ul> + <li><a href="http://labs.jboss.com/portal/jbossws/downloads">Latest download and samples</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JBossWS_FAQs">FAQ</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/JAX-WS_User_Guide">User guide</a></li> + <li><a href="http://jbws.dyndns.org/mediawiki/index.php/Main_Page">JBossWS WIKI</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Community</b></legend> +<ul> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=200">User forum</a></li> + <li><a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=174">Design forum</a></li> + <li><a href="https://lists.jboss.org/mailman/listinfo/jbossws-users">Mailing list</a></li> +</ul> +</fieldset> + +</br> +<fieldset> + <legend><b>Source repository</b></legend> +<ul> + <li><a href="http://wiki.jboss.org/wiki/Wiki.jsp?page=JBWSFAQSourceRepository">Subversion repository</a></li> + <li><a href="http://fisheye.jboss.com/viewrep/JBossWS">Browse sources online</a></li> +</ul> +</fieldset> +</div> + +</body> +</html> Added: trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-context.war/styles.css 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,186 @@ + +/* table for list views */ +.table_list { +} + +/* table for detail views */ +.table_form { +} + +.pageHeader { + font-size: 14pt; + font-weight: BOLD; + color: #ffffff; + border-bottom-width:1px; + border-bottom-style:solid; + border-color:#000066; + margin-bottom:15px; + padding-left:15px; + padding-top:5px; + padding-bottom:5px; + background-color: #aaaadd; + max-width: 900px; +} + +.pageSection { + padding-left:15px; + margin-bottom: 5px; + max-width: 900px; +} + +.metrics +{ + font-size: 6pt; + background-color: #dddddd; + width: 100%; +} + +/* table row header */ +.list_tr_head { + font-family: Verdana, sans-serif; + font-size: 8pt; + font-weight: 600; + text-align: center; + background-color: #aaaadd; +} + +/* table row list view */ +.list_tr { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view odd lines */ +.list_tr_even { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #ffffff; +} + +/* table row list view even lines */ +.list_tr_odd { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; +} + +/* form label */ +.form_label { + font-family: Verdana, sans-serif; + font-weight: 500; + font-size: 8pt; + color: #000066; + vertical-align: top; + background-color: #dddddd; + padding-top: 2px; + padding-bottom: 2px; +} + +/* form value */ +.form_value { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; + vertical-align: baseline; +} + +/* tiny writing */ +.tiny { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #666666; +} + +/* required input fields */ +.inputmust { + background-color: #dddddd; +} + +/* error message */ +.error { + font-family: Courier New; + color: #990000; +} + +/* error message */ +.error_trace { + font-family: Courier New; +} + +/* active tree node */ +.tree_active_label { + font-weight: bold; +} + +body { + font-family: Verdana,, sans-serif; + font-size: 8pt; + color: #000066; + background-color: #ffffff; +} + +/* title style */ +h1 { + font-family: Verdana, sans-serif; + font-size: 14pt; + font-weight: 600; + color: #000066; +} + +h2 { + font-family: Verdana, sans-serif; + font-size: 12pt; + font-weight: 600; + color: #000066; +} + +h3 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 600; + color: #000066; +} + +h4 { + font-family: Verdana, sans-serif; + font-size: 10pt; + font-weight: 500; + color: #000066; +} + +/* table desk */ +td { + font-family: Verdana, sans-serif; + font-size: 8pt; + padding-left: 5px; + padding-right: 5px; +} + +input, textarea, select, option { + font-family: Verdana, sans-serif; + font-size: 8pt; + color: #000066; +} + +a { + font-family: Verdana, sans-serif; + color: #0000dd; + text-decoration: none; +} + +a:hover{ + font-family: Verdana, sans-serif; + color: #cc0000; + text-decoration: none; +} + +pre { + background:#dddddd +} \ No newline at end of file Added: trunk/jbossws-core/src/main/resources/jbossws-native-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-native-config.xml (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-native-config.xml 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,125 @@ + +  + <bean name="WSServerConfig" class="org.jboss.wsf.stack.jbws.NativeServerConfig"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + +  + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="modifySOAPAddress">true</property> + +  + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> + +  + <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> + <property name="bindAddress">${jboss.bind.address}</property> + </bean> + +  + <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> + <property name="provides">ContextProperties</property> + <property name="contextProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.jboss.ws.webapp.ServletClass</key><value>org.jboss.wsf.stack.jbws.EndpointServlet</value></entry> + </map> + </property> + </bean> + + <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">InitializedMetaDataModel</property> + </bean> + + <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerEndpointHandler, ContainerMetaData</property> + <property name="provides">StackEndpointHandler</property> + </bean> + + <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + <property name="provides">PublishedContract</property> + </bean> + + <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> + <property name="requires">UnifiedMetaDataModel</property> + </bean> + + <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> + <property name="requires">ContainerMetaData, URLPattern, VFSRoot</property> + <property name="provides">UnifiedMetaDataModel, StackDescriptor</property> + </bean> + +  + <bean name="WSNativeDeploymentAspectInstallerJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerJSE"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerJSE</depends> + </bean> + <bean name="WSNativeDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerEJB</depends> + </bean> + <bean name="WSNativeDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">true</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSNativeContextPropertiesDeploymentAspect"/> + <inject bean="WSNativeEagerInitializeDeploymentAspect"/> + <inject bean="WSNativeEndpointHandlerDeploymentAspect"/> + <inject bean="WSNativeEventingDeploymentAspect"/> + <inject bean="WSNativePublishContractDeploymentAspect"/> + <inject bean="WSNativeServiceEndpointInvokerDeploymentAspect"/> + <inject bean="WSNativeUnifiedMetaDataDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerEndpointAPI</depends> + </bean> + \ No newline at end of file Added: trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl \ No newline at end of file Added: trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.EndpointRegistryFactoryImpl \ No newline at end of file Added: trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0) +++ trunk/jbossws-core/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1 @@ +org.jboss.ws.core.client.ServiceRefBinderFactoryImpl \ No newline at end of file Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,14 @@ +# JBossAS-4.0 excludes +org/jboss/test/ws/jaxrpc/jbws723/** + +# benchmark tests +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase* +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/serviceref/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/webserviceref/** Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss40.txt ___________________________________________________________________ Name: svn:executable + * Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,11 @@ +# benchmark tests +org/jboss/test/ws/benchmark/** + +# EJB3/Injection excludes +org/jboss/test/ws/jaxws/jbws1581/** +org/jboss/test/ws/jaxws/samples/handlerchain/HandlerChainClientTestCase* +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/serviceref/** +org/jboss/test/ws/jaxws/samples/webserviceref/** + +org/jboss/test/ws/jaxws/webserviceref/** Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss42.txt ___________________________________________________________________ Name: svn:executable + * Added: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt =================================================================== --- trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt (rev 0) +++ trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt 2007-08-02 15:05:15 UTC (rev 4105) @@ -0,0 +1,19 @@ +# benchmark tests +#org/jboss/test/ws/benchmark/** + +# Fix before JBoss50 goes final +org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* +org/jboss/test/ws/jaxrpc/jbws124/JBWS124TestCase.* +org/jboss/test/ws/jaxrpc/jbws128/JBWS128TestCase.* +org/jboss/test/ws/jaxrpc/jbws153/JBWS153TestCase.* +org/jboss/test/ws/jaxrpc/jbws165/JBWS165TestCase.* +org/jboss/test/ws/jaxrpc/jbws331/JBWS331TestCase.* +org/jboss/test/ws/jaxrpc/jbws358/JBWS358TestCase.* +org/jboss/test/ws/jaxrpc/jbws626/JBWS626TestCase.* +org/jboss/test/ws/jaxrpc/jbws772/JBWS772TestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxrpc/wsdlpublish/** + Property changes on: trunk/jbossws-core/src/test/resources/test-excludes-jboss50.txt ___________________________________________________________________ Name: svn:executable + * Modified: trunk/jbossws-core/version.properties =================================================================== --- trunk/jbossws-core/version.properties 2007-08-02 14:39:29 UTC (rev 4104) +++ trunk/jbossws-core/version.properties 2007-08-02 15:05:15 UTC (rev 4105) @@ -6,6 +6,9 @@ ibm-wsdl4j=1.6.2 javassist=3.5.0.CR1 jbpm-bpel=1.1.0.Beta5 +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +jbossws-jboss50=2.0.1.CR1 # Thirdparty library versions apache-collections=3.1

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4104 - in trunk: testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-02 10:39:29 -0400 (Thu, 02 Aug 2007) New Revision: 4104 Modified: trunk/JBossWS-Trunk.iws trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java Log: Example usage of the CmdTracker added Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-02 14:35:28 UTC (rev 4103) +++ trunk/JBossWS-Trunk.iws 2007-08-02 14:39:29 UTC (rev 4104) @@ -20,21 +20,10 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/int-native.iml" afterPath="$PROJECT_DIR$/integration/native/int-native.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" afterPath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> - <change type="DELETED" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" afterPath="" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -385,7 +374,7 @@ <file leaf-file-name="CmdConsumeTestCase.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="62" selection-start="4043" selection-end="4043" vertical-scroll-proportion="0.55410224"> + <state line="119" column="68" selection-start="3912" selection-end="3912" vertical-scroll-proportion="0.46373364"> <folding> <element signature="imports" expanded="true" /> <element signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0" expanded="false" /> @@ -397,7 +386,7 @@ <file leaf-file-name="WSConsume.java" pinned="false" current="false" current-in-tab="false"> <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="123" column="0" selection-start="4912" selection-end="4912" vertical-scroll-proportion="0.19262782"> + <state line="208" column="33" selection-start="7086" selection-end="7101" vertical-scroll-proportion="0.6896552"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -426,7 +415,7 @@ <file leaf-file-name="CmdConsumeTracker.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.07372176"> + <state line="85" column="29" selection-start="0" selection-end="2457" vertical-scroll-proportion="0.68370986"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -1246,7 +1235,7 @@ </entry> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="34" column="13" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.07372176"> + <state line="85" column="29" selection-start="0" selection-end="2457" vertical-scroll-proportion="0.68370986"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -1255,7 +1244,7 @@ </entry> <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="123" column="0" selection-start="4912" selection-end="4912" vertical-scroll-proportion="0.19262782"> + <state line="208" column="33" selection-start="7086" selection-end="7101" vertical-scroll-proportion="0.6896552"> <folding> <element signature="imports" expanded="true" /> </folding> @@ -1264,7 +1253,7 @@ </entry> <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="126" column="62" selection-start="4043" selection-end="4043" vertical-scroll-proportion="0.55410224"> + <state line="119" column="68" selection-start="3912" selection-end="3912" vertical-scroll-proportion="0.46373364"> <folding> <element signature="imports" expanded="true" /> <element signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0" expanded="false" /> Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 14:35:28 UTC (rev 4103) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 14:39:29 UTC (rev 4104) @@ -111,12 +111,13 @@ public void testInvalidBindingOption() throws Exception { - executeCmd("-b", true); + executeCmd("-b", true); } public void testValidBindingOption() throws Exception { executeCmd("-b binding-file.xml Service.wsdl", false); + assertEquals(CmdConsumeTracker.LAST_EVENT, "setBindingFiles"); } public void testMissingOptions() throws Exception Modified: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 14:35:28 UTC (rev 4103) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 14:39:29 UTC (rev 4104) @@ -35,7 +35,7 @@ public class CmdConsumeTracker extends WSContractConsumer { public static String LAST_EVENT = ""; - + public void setBindingFiles(List<File> bindingFiles) { LAST_EVENT = "setBindingFiles"; @@ -43,51 +43,51 @@ public void setCatalog(File catalog) { - + LAST_EVENT = "setCatalog"; } public void setOutputDirectory(File directory) { - + LAST_EVENT = "setOutputDirectory"; } public void setSourceDirectory(File directory) { - + LAST_EVENT = "setSourceDirectory"; } public void setGenerateSource(boolean generateSource) { - + LAST_EVENT = "setGenerateSource"; } public void setTargetPackage(String targetPackage) { - + LAST_EVENT = "setTargetPackage"; } public void setWsdlLocation(String wsdlLocation) { - + LAST_EVENT = "setWsdlLocation"; } public void setMessageStream(PrintStream messageStream) { - + LAST_EVENT = "setMessageStream"; } public void setAdditionalCompilerClassPath(List<String> classPath) { - + LAST_EVENT = "setAdditionalCompilerClassPath"; } public void setTarget(String target) { - + LAST_EVENT = "setTarget"; } public void consume(URL wsdl) { - + } }

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4103 - in trunk: integration/jboss40 and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2007-08-02 10:35:28 -0400 (Thu, 02 Aug 2007) New Revision: 4103 Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java Removed: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java Modified: trunk/JBossWS-Trunk.ipr trunk/JBossWS-Trunk.iws trunk/integration/jboss40/int-40.iml trunk/integration/jboss42/int-42.iml trunk/integration/jboss50/int-50.iml trunk/integration/native/int-native.iml trunk/integration/sunri/int-sunri.iml trunk/integration/xfire/int-xfire.iml trunk/jbossws-core/jbossws-core.iml trunk/testsuite/testsuite.iml Log: Added test case for WSConsume command line interface Modified: trunk/JBossWS-Trunk.ipr =================================================================== --- trunk/JBossWS-Trunk.ipr 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/JBossWS-Trunk.ipr 2007-08-02 14:35:28 UTC (rev 4103) @@ -268,6 +268,7 @@ <module fileurl="file://$PROJECT_DIR$/integration/xfire/int-xfire.iml" filepath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> <module fileurl="file://$PROJECT_DIR$/jbossws-core/jbossws-core.iml" filepath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> <module fileurl="file://$PROJECT_DIR$/integration/spi/spi.iml" filepath="$PROJECT_DIR$/integration/spi/spi.iml" /> + <module fileurl="file:///home/hbraun/dev/prj/jbossws/spi/trunk/spi-trunk.iml" filepath="/home/hbraun/dev/prj/jbossws/spi/trunk/spi-trunk.iml" /> <module fileurl="file:///home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" filepath="/home/hbraun/dev/prj/jaxws-2.1.1/sunri-sources.iml" /> <module fileurl="file://$PROJECT_DIR$/testsuite/testsuite.iml" filepath="$PROJECT_DIR$/testsuite/testsuite.iml" /> </modules> Modified: trunk/JBossWS-Trunk.iws =================================================================== --- trunk/JBossWS-Trunk.iws 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/JBossWS-Trunk.iws 2007-08-02 14:35:28 UTC (rev 4103) @@ -20,22 +20,21 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" afterPath="$PROJECT_DIR$/build/ant-import/build-testsuite.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestService.wsdl" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/async-binding.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/jax-ws-catalog.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/TestServiceCatalog.wsdl" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CalculatorBean.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss50/int-50.iml" afterPath="$PROJECT_DIR$/integration/jboss50/int-50.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" afterPath="$PROJECT_DIR$/integration/sunri/int-sunri.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss42/int-42.iml" afterPath="$PROJECT_DIR$/integration/jboss42/int-42.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/native/int-native.iml" afterPath="$PROJECT_DIR$/integration/native/int-native.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" afterPath="$PROJECT_DIR$/integration/xfire/int-xfire.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/testsuite.iml" afterPath="$PROJECT_DIR$/testsuite/testsuite.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/integration/jboss40/int-40.iml" afterPath="$PROJECT_DIR$/integration/jboss40/int-40.iml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_0.dtd" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/testsuite/src/resources/jaxws/smoke/tools/wsdl/ws-addr-wsdl.xsd" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" afterPath="" /> <change type="MODIFICATION" beforePath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" afterPath="/home/hbraun/dev/prj/jbossas/trunk/server/src/resources/dtd/jboss-web_4_2.dtd" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" afterPath="$PROJECT_DIR$/jbossws-core/jbossws-core.iml" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -224,7 +223,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" line="193" class="org.jboss.test.ws.jaxws.smoke.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.smoke.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -237,7 +236,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java" line="257" class="org.jboss.test.ws.jaxws.smoke.tools.WSConsumerTestCase" package="org.jboss.test.ws.jaxws.smoke.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -263,7 +262,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="112" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java" line="112" class="org.jboss.test.ws.jaxws.smoke.tools.WSProviderTestCase" package="org.jboss.test.ws.jaxws.smoke.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -276,7 +275,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="77" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java" line="91" class="com.sun.tools.ws.wscompile.WsgenTool" package="com.sun.tools.ws.wscompile"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -289,7 +288,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java" line="80" class="org.jboss.test.ws.jaxws.tools.WSProvideTestCase" package="org.jboss.test.ws.jaxws.tools"> + <breakpoint url="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java" line="54" class="org.jboss.test.ws.jaxws.smoke.tools.CmdConsumeTestCase.InterceptedSecurity" package="org.jboss.test.ws.jaxws.smoke.tools"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -302,7 +301,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file:///home/hbraun/dev/prj/jaxws-2.1.1/src/com/sun/tools/ws/wscompile/WsgenTool.java" line="91" class="com.sun.tools.ws.wscompile.WsgenTool" package="com.sun.tools.ws.wscompile"> + <breakpoint url="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java" line="122" class="org.jboss.wsf.spi.tools.cmd.WSConsume" package="org.jboss.wsf.spi.tools.cmd"> <option name="ENABLED" value="true" /> <option name="SUSPEND_POLICY" value="SuspendAll" /> <option name="LOG_ENABLED" value="false" /> @@ -383,50 +382,53 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> + <file leaf-file-name="CmdConsumeTestCase.java" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="398" column="14" selection-start="19181" selection-end="19181" vertical-scroll-proportion="0.748184"> - <folding /> + <state line="126" column="62" selection-start="4043" selection-end="4043" vertical-scroll-proportion="0.55410224"> + <folding> + <element signature="imports" expanded="true" /> + <element signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0" expanded="false" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="ant.properties" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/build/ant.properties"> + <file leaf-file-name="WSConsume.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="26" selection-start="1533" selection-end="1558" vertical-scroll-proportion="0.50297266"> - <folding /> + <state line="123" column="0" selection-start="4912" selection-end="4912" vertical-scroll-proportion="0.19262782"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="WSConsumerTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"> + <file leaf-file-name="WSProvide.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="281" column="46" selection-start="10059" selection-end="10059" vertical-scroll-proportion="0.7699758"> + <state line="227" column="28" selection-start="7508" selection-end="7508" vertical-scroll-proportion="4.428062"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="WSProvideTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"> + <file leaf-file-name="WSConsumerTestCase.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="42" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.4233056"> + <state line="44" column="13" selection-start="1668" selection-end="1668" vertical-scroll-proportion="0.13801453"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build-testsuite.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> + <file leaf-file-name="CmdConsumeTracker.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="20" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.59806293"> + <state line="34" column="13" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.07372176"> <folding> - <marker date="1186047277000" expanded="true" signature="1397:2394" placeholder="..." /> - <marker date="1186047277000" expanded="true" signature="1397:1960" placeholder="..." /> - <marker date="1186047277000" expanded="true" signature="1397:1774" placeholder="..." /> + <element signature="imports" expanded="true" /> </folding> </state> </provider> @@ -514,6 +516,10 @@ <option name="myItemId" value="JBossWS-Trunk.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -521,9 +527,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -531,13 +541,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -545,17 +559,49 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="int-native" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/native/ant-import" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -563,21 +609,69 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="JBossWS-Trunk.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="build" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> + </PATH> + <PATH> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -587,18 +681,66 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> + <option name="myItemId" value="int-xfire" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/build/ant-import" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/test/resources" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src/test" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="JBossWS-Trunk.ipr" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="int-xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/integration/xfire/src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </component> <component name="ProjectReloadState"> @@ -665,13 +807,13 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.client"> - <tempConfiguration default="false" name="WSProvideTestCase.testOutputDirectory" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <tempConfiguration default="false" name="WSProviderTestCase.testOutputDirectory" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <pattern value="org.jboss.test.ws.jaxws.tools.*" /> <module name="testsuite" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.smoke.tools" /> - <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSProvideTestCase" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSProviderTestCase" /> <option name="METHOD_NAME" value="testOutputDirectory" /> <option name="TEST_OBJECT" value="method" /> <option name="VM_PARAMETERS" /> @@ -689,9 +831,6 @@ <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> - <method> - <option name="Make" value="true" /> - </method> </tempConfiguration> <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <module name="" /> @@ -744,6 +883,31 @@ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> </configuration> + <configuration default="false" name="WSProviderTestCase.testOutputDirectory" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <pattern value="org.jboss.test.ws.jaxws.tools.*" /> + <module name="testsuite" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" value="org.jboss.test.ws.jaxws.smoke.tools" /> + <option name="MAIN_CLASS_NAME" value="org.jboss.test.ws.jaxws.smoke.tools.WSProviderTestCase" /> + <option name="METHOD_NAME" value="testOutputDirectory" /> + <option name="TEST_OBJECT" value="method" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="60976" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + </configuration> <configuration default="false" name="WSConsumerTestCase.testWsdlLocation" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> <pattern value="org.jboss.test.ws.jaxws.tools.*" /> <module name="testsuite" /> @@ -893,7 +1057,7 @@ <window_info id="simpleUML" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26419753" order="0" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25555557" order="0" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.51376146" order="2" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25617284" order="2" /> <window_info id="soapUI Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -901,7 +1065,7 @@ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.38417432" order="1" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39793578" order="4" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32912844" order="8" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25555557" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23024692" order="1" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298397" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> @@ -930,7 +1094,7 @@ <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="really exclude jaxws/tools tests for xfire" /> + <option name="LAST_COMMIT_MESSAGE" value="update exclude files" /> <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> @@ -946,6 +1110,8 @@ <MESSAGE value="Display information about output and source directories being used" /> <MESSAGE value="Implement SPIView marker" /> <MESSAGE value="really exclude jaxws/tools tests for xfire" /> + <MESSAGE value="fix deploy macros" /> + <MESSAGE value="update exclude files" /> </component> <component name="VssConfiguration"> <option name="CLIENT_PATH" value="" /> @@ -993,118 +1159,116 @@ </component> <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.322179,0.5" version="1"> <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="int-sunri" /> + <option name="myLastEditedConfigurable" value="testsuite" /> </component> <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="0.16666667" version="1"> <option name="myLastEditedConfigurable" value="IDE Profiles" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandlerFactory.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/build-deploy.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="33" selection-start="1550" selection-end="1550" vertical-scroll-proportion="0.39246657"> + <state line="30" column="0" selection-start="1635" selection-end="1635" vertical-scroll-proportion="0.33293697"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/jboss42/src/main/java/org/jboss/wsf/container/jboss42/serviceref/ServiceRefHandlerImpl.java"> + <entry file="file://$PROJECT_DIR$/integration/sunri/ant-import/macros-deploy-sunri.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="88" selection-start="2423" selection-end="2423" vertical-scroll-proportion="-0.42326733"> + <state line="119" column="28" selection-start="4682" selection-end="4682" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/spi/src/main/java/org/jboss/wsf/framework/serviceref/DefaultServiceRefHandler.java"> + <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="13" selection-start="2274" selection-end="2274" vertical-scroll-proportion="0.37623763"> + <state line="388" column="28" selection-start="18729" selection-end="18729" vertical-scroll-proportion="0.4503632"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/macros-deploy-native.xml"> + <entry file="file://$PROJECT_DIR$/integration/xfire/ant-import/macros-deploy-xfire.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="160" column="55" selection-start="7335" selection-end="7370" vertical-scroll-proportion="3.3922517"> + <state line="113" column="31" selection-start="4642" selection-end="4642" vertical-scroll-proportion="0.3329298"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.06900726"> + <state line="54" column="32" selection-start="1829" selection-end="1829" vertical-scroll-proportion="-0.97146255"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-3.0714285"> - <folding /> + <state line="30" column="38" selection-start="1249" selection-end="1274" vertical-scroll-proportion="0.23086269"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-deploy.xml"> + <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/WSContractConsumer.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.34503633"> + <state line="71" column="21" selection-start="2786" selection-end="2786" vertical-scroll-proportion="1.0581683"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="57" column="32" selection-start="1975" selection-end="1975" vertical-scroll-proportion="0.82066506"> + <state line="44" column="13" selection-start="1668" selection-end="1668" vertical-scroll-proportion="0.13801453"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss50.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.4655582"> + <state line="57" column="38" selection-start="1981" selection-end="1981" vertical-scroll-proportion="0.8192628"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/integration/native/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/integration/xfire/src/test/resources/test-excludes-jboss42.txt"> <provider selected="true" editor-type-id="text-editor"> - <state line="26" column="20" selection-start="1252" selection-end="1252" vertical-scroll-proportion="0.59806293"> - <folding> - <marker date="1186047277000" expanded="true" signature="1397:2394" placeholder="..." /> - <marker date="1186047277000" expanded="true" signature="1397:1960" placeholder="..." /> - <marker date="1186047277000" expanded="true" signature="1397:1774" placeholder="..." /> - </folding> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="100" column="42" selection-start="2978" selection-end="2978" vertical-scroll-proportion="0.4233056"> + <state line="57" column="0" selection-start="1943" selection-end="1981" vertical-scroll-proportion="0.8192628"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSConsumerTestCase.java"> + <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSProvide.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="281" column="46" selection-start="10059" selection-end="10059" vertical-scroll-proportion="0.7699758"> + <state line="227" column="28" selection-start="7508" selection-end="7508" vertical-scroll-proportion="4.428062"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/ant-import/build-testsuite.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="398" column="14" selection-start="19181" selection-end="19181" vertical-scroll-proportion="0.748184"> - <folding /> + <state line="34" column="13" selection-start="1285" selection-end="1285" vertical-scroll-proportion="0.07372176"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/version.properties"> + <entry file="file:///home/hbraun/dev/prj/jbossws/spi/trunk/src/main/java/org/jboss/wsf/spi/tools/cmd/WSConsume.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> - <folding /> + <state line="123" column="0" selection-start="4912" selection-end="4912" vertical-scroll-proportion="0.19262782"> + <folding> + <element signature="imports" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build/ant.properties"> + <entry file="file://$PROJECT_DIR$/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="47" column="26" selection-start="1533" selection-end="1558" vertical-scroll-proportion="0.50297266"> - <folding /> + <state line="126" column="62" selection-start="4043" selection-end="4043" vertical-scroll-proportion="0.55410224"> + <folding> + <element signature="imports" expanded="true" /> + <element signature="class#InterceptedExit#0;class#CmdConsumeTestCase#0" expanded="false" /> + </folding> </state> </provider> </entry> Modified: trunk/integration/jboss40/int-40.iml =================================================================== --- trunk/integration/jboss40/int-40.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/integration/jboss40/int-40.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -8,7 +8,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> <orderEntry type="module-library"> <library> <CLASSES> Modified: trunk/integration/jboss42/int-42.iml =================================================================== --- trunk/integration/jboss42/int-42.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/integration/jboss42/int-42.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -8,7 +8,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> <orderEntry type="module" module-name="42-ejb3" /> <orderEntry type="module" module-name="42-server" /> <orderEntry type="library" name="jaxws-api" level="application" /> Modified: trunk/integration/jboss50/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/integration/jboss50/int-50.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -9,7 +9,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> <orderEntry type="module" module-name="as-server" /> <orderEntry type="module" module-name="as-system" /> <orderEntry type="module" module-name="as-tomcat" /> Modified: trunk/integration/native/int-native.iml =================================================================== --- trunk/integration/native/int-native.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/integration/native/int-native.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -10,7 +10,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="jbossws-core" /> - <orderEntry type="module" module-name="spi" /> <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntry type="module-library"> <library> Modified: trunk/integration/sunri/int-sunri.iml =================================================================== --- trunk/integration/sunri/int-sunri.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/integration/sunri/int-sunri.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -8,7 +8,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> <orderEntry type="module" module-name="sunri-sources" /> <orderEntry type="module-library"> <library> Modified: trunk/integration/xfire/int-xfire.iml =================================================================== --- trunk/integration/xfire/int-xfire.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/integration/xfire/int-xfire.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -8,7 +8,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> <orderEntry type="library" name="jboss-logging-spi" level="project" /> <orderEntry type="module-library"> <library> Modified: trunk/jbossws-core/jbossws-core.iml =================================================================== --- trunk/jbossws-core/jbossws-core.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/jbossws-core/jbossws-core.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -514,7 +514,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="spi" /> <orderEntry type="module" module-name="sunri-sources" /> <orderEntryProperties /> </component> Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java 2007-08-02 14:35:28 UTC (rev 4103) @@ -0,0 +1,165 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.smoke.tools; + +import junit.framework.TestCase; +import org.jboss.wsf.spi.tools.cmd.WSConsume; + +import java.security.Permission; + +/** + * Test the command line interface to WSConsume. + * + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdConsumeTestCase extends TestCase +{ + + SecurityManager systemDefault = System.getSecurityManager(); + SecurityManager interceptor = new InterceptedSecurity(); + + class InterceptedSecurity extends SecurityManager + { + private final SecurityManager parent = systemDefault; + + public void checkPermission(Permission perm) + { + if (parent != null) + { + parent.checkPermission(perm); + } + } + + public void checkExit(int status) + { + String msg = (status == 0) ? "WSConsume did exit without errors" : "WSConsume did exit with an error"; + throw new InterceptedExit(msg, status); + } + } + + class InterceptedExit extends SecurityException + { + private int exitCode; + + public InterceptedExit(String s, int code) + { + super(s); + this.exitCode = code; + } + + + public int getExitCode() + { + return exitCode; + } + } + + private void swapSecurityManager() + { + if(System.getSecurityManager() instanceof InterceptedSecurity) + System.setSecurityManager(systemDefault); + else + System.setSecurityManager(interceptor); + } + + protected void setUp() throws Exception + { + super.setUp(); + + // enforce loading of the tracker implemenation + System.setProperty( + "org.jboss.wsf.spi.tools.ConsumerFactoryImpl", + "org.jboss.test.ws.jaxws.smoke.tools.CmdConsumeTrackerFactory" + ); + } + + /* + new LongOpt("binding", LongOpt.REQUIRED_ARGUMENT, null, 'b'), + new LongOpt("catalog", LongOpt.REQUIRED_ARGUMENT, null, 'c'), + new LongOpt("package", LongOpt.REQUIRED_ARGUMENT, null, 'p'), + new LongOpt("wsdlLocation", LongOpt.REQUIRED_ARGUMENT, null, 'w'), + new LongOpt("output", LongOpt.REQUIRED_ARGUMENT, null, 'o'), + new LongOpt("source", LongOpt.REQUIRED_ARGUMENT, null, 's'), + new LongOpt("target", LongOpt.REQUIRED_ARGUMENT, null, 't'), + new LongOpt("keep", LongOpt.NO_ARGUMENT, null, 'k'), + new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'h'), + new LongOpt("quiet", LongOpt.NO_ARGUMENT, null, 'q'), + new LongOpt("verbose", LongOpt.NO_ARGUMENT, null, 'v'), + new LongOpt("load-consumer", LongOpt.NO_ARGUMENT, null, 'l'), + + */ + + public void testInvalidBindingOption() throws Exception + { + executeCmd("-b", true); + } + + public void testValidBindingOption() throws Exception + { + executeCmd("-b binding-file.xml Service.wsdl", false); + } + + public void testMissingOptions() throws Exception + { + executeCmd("", false); // strange, shouldn't this exit(1) ? + } + + // TODO: add arbitrary combinations on a case by case basis + + /** + * Pass a number of arguments to WSConsume and specify if + * you expect this to cause an exception. + * + * @param arguments + * @param expectedException + * @throws Exception + */ + private void executeCmd(String arguments, boolean expectedException) throws Exception + { + swapSecurityManager(); + + String[] args = arguments.split("\\s"); + try + { + WSConsume.main(args); + if(expectedException) + fail("Did expect exception on args: " +args); + } + catch (InterceptedExit e) + { + boolean positivStatus = (e.getExitCode() == 0); + if( (expectedException && positivStatus) + || (!expectedException && !positivStatus) ) + { + String s = expectedException ? "Did expect an exception, but " : "Did not expect an exception, but "; + String s2 = positivStatus ? "status was positiv" : "status was negativ"; + throw new Exception(s+s2); + } + + } + finally + { + swapSecurityManager(); + } + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java 2007-08-02 14:35:28 UTC (rev 4103) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.smoke.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumer; + +import java.io.File; +import java.io.PrintStream; +import java.util.List; +import java.net.URL; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdConsumeTracker extends WSContractConsumer +{ + public static String LAST_EVENT = ""; + + public void setBindingFiles(List<File> bindingFiles) + { + LAST_EVENT = "setBindingFiles"; + } + + public void setCatalog(File catalog) + { + + } + + public void setOutputDirectory(File directory) + { + + } + + public void setSourceDirectory(File directory) + { + + } + + public void setGenerateSource(boolean generateSource) + { + + } + + public void setTargetPackage(String targetPackage) + { + + } + + public void setWsdlLocation(String wsdlLocation) + { + + } + + public void setMessageStream(PrintStream messageStream) + { + + } + + public void setAdditionalCompilerClassPath(List<String> classPath) + { + + } + + public void setTarget(String target) + { + + } + + public void consume(URL wsdl) + { + + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTracker.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java 2007-08-02 14:35:28 UTC (rev 4103) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.smoke.tools; + +import org.jboss.wsf.spi.tools.WSContractConsumerFactory; +import org.jboss.wsf.spi.tools.WSContractConsumer; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class CmdConsumeTrackerFactory implements WSContractConsumerFactory +{ + + public WSContractConsumer createConsumer() + { + return new CmdConsumeTracker(); + } +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/CmdConsumeTrackerFactory.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java 2007-08-02 14:35:28 UTC (rev 4103) @@ -1,212 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.smoke.tools; - -import org.jboss.wsf.common.DOMUtils; -import org.jboss.wsf.spi.tools.WSContractProvider; -import org.jboss.wsf.test.JBossWSTest; -import org.w3c.dom.Element; - -import javax.xml.bind.annotation.XmlRootElement; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.PrintStream; -import java.net.URL; -import java.net.URLClassLoader; - -/** - * @author Heiko.Braun(a)jboss.com - * @version $Revision$ - */ -public class WSProvideTestCase extends JBossWSTest -{ - // tools delegate - WSContractProvider provider; - - // redirect tools message to System.out ? - boolean toogleMessageOut = false; - - // relative to test execution - File outputDirectory; - - protected void setUp() throws Exception - { - super.setUp(); - - // create a new consumer for every test case - provider = WSContractProvider.newInstance(); - if(toogleMessageOut) provider.setMessageStream(System.out); - - // shared output directory, relative to test execution - outputDirectory = new File("wsprovide/java"); - } - - private ClassLoader getArtefactClassLoader() throws Exception { - URLClassLoader loader = new URLClassLoader(new URL[] { - new URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/") } - ); - - return loader; - } - - /** - * Enables/Disables WSDL generation. - * - */ - public void testGenerateWsdl() throws Exception - { - provider.setGenerateWsdl(true); - provide(); - - verifyWSDL(outputDirectory); - } - - /** - * Enables/Disables Java source generation. - * - */ - public void testGenerateSource() throws Exception - { - provider.setGenerateSource(true); - provide(); - - verifyJavaSource(outputDirectory); - - } - - private void verifyJavaSource(File directory) - { - File javaSource = new File( - directory.getAbsolutePath()+ - "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java" - ); - - assertTrue("Source not generated", javaSource.exists()); - } - - /** - * Sets the main output directory. - * If the directory does not exist, it will be created. - */ - public void testOutputDirectory() throws Exception - { - provide(); - ClassLoader loader = getArtefactClassLoader(); - Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse"); - XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class); - assertNotNull("@XmlRootElement missing form response wrapper", rootElement); - assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator"); - } - - /** - * Sets the resource directory. This directory will contain any generated - * WSDL and XSD files. If the directory does not exist, it will be created. - * If not specified, the output directory will be used instead. - * - */ - public void testResourceDirectory() throws Exception - { - File directory = new File("wsprovide/resources"); - provider.setResourceDirectory(directory); - provide(); - - verifyWSDL(directory); - } - - private void verifyWSDL(File directory) throws Exception - { - File wsdl = new File( - outputDirectory.getAbsolutePath()+ - "/CalculatorBeanService.wsdl" - ); - - assertTrue("WSDL not generated", wsdl.exists()); - Element root = DOMUtils.parse( new FileInputStream(wsdl)); - Element serviceElement = DOMUtils.getFirstChildElement(root, "service"); - assertEquals(serviceElement.getAttribute("name"), "CalculatorBeanService"); - } - - /** - * Sets the source directory. This directory will contain any generated Java source. - * If the directory does not exist, it will be created. If not specified, - * the output directory will be used instead. - * - */ - public void testSourceDirectory() throws Exception - { - File sourceDir = new File("wsprovide/sources"); - provider.setSourceDirectory(sourceDir); - provider.setGenerateSource(true); - provide(); - - verifyJavaSource(sourceDir); - } - - /** - * Sets the ClassLoader used to discover types. - * This defaults to the one used in instantiation. - * - */ - public void testClassLoader() - { - System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with WSProvide"); - } - - /** - * Sets the PrintStream to use for status feedback. The simplest example - * would be to use System.out. - * - */ - public void testMessageStream() throws Exception - { - - if(isIntegrationSunRI()) - { - System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly redirected"); - return; - } - - ByteArrayOutputStream bout = new ByteArrayOutputStream(); - PrintStream pout = new PrintStream(bout); - - provider.setMessageStream(pout); - provide(); - - String messageOut = new String(bout.toByteArray()); - - System.out.println("-- Begin captured output --"); - System.out.println(messageOut); - System.out.println("-- End captured output --"); - - assertTrue("Provider messages not correctly redirected", - messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1 ); - } - - private void provide() throws Exception - { - //provider.setGenerateSource(true); - provider.setOutputDirectory(outputDirectory); - provider.provide(CalculatorBean.class); - } - -} Copied: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java (from rev 4083, trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProvideTestCase.java) =================================================================== --- trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java (rev 0) +++ trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java 2007-08-02 14:35:28 UTC (rev 4103) @@ -0,0 +1,212 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.smoke.tools; + +import org.jboss.wsf.common.DOMUtils; +import org.jboss.wsf.spi.tools.WSContractProvider; +import org.jboss.wsf.test.JBossWSTest; +import org.w3c.dom.Element; + +import javax.xml.bind.annotation.XmlRootElement; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.PrintStream; +import java.net.URL; +import java.net.URLClassLoader; + +/** + * @author Heiko.Braun(a)jboss.com + * @version $Revision$ + */ +public class WSProviderTestCase extends JBossWSTest +{ + // tools delegate + WSContractProvider provider; + + // redirect tools message to System.out ? + boolean toogleMessageOut = false; + + // relative to test execution + File outputDirectory; + + protected void setUp() throws Exception + { + super.setUp(); + + // create a new consumer for every test case + provider = WSContractProvider.newInstance(); + if(toogleMessageOut) provider.setMessageStream(System.out); + + // shared output directory, relative to test execution + outputDirectory = new File("wsprovide/java"); + } + + private ClassLoader getArtefactClassLoader() throws Exception { + URLClassLoader loader = new URLClassLoader(new URL[] { + new URL("file:"+System.getProperty("user.dir")+"/wsprovide/java/") } + ); + + return loader; + } + + /** + * Enables/Disables WSDL generation. + * + */ + public void testGenerateWsdl() throws Exception + { + provider.setGenerateWsdl(true); + provide(); + + verifyWSDL(outputDirectory); + } + + /** + * Enables/Disables Java source generation. + * + */ + public void testGenerateSource() throws Exception + { + provider.setGenerateSource(true); + provide(); + + verifyJavaSource(outputDirectory); + + } + + private void verifyJavaSource(File directory) + { + File javaSource = new File( + directory.getAbsolutePath()+ + "/org/jboss/test/ws/jaxws/smoke/tools/jaxws/AddResponse.java" + ); + + assertTrue("Source not generated", javaSource.exists()); + } + + /** + * Sets the main output directory. + * If the directory does not exist, it will be created. + */ + public void testOutputDirectory() throws Exception + { + provide(); + ClassLoader loader = getArtefactClassLoader(); + Class responseWrapper = loader.loadClass("org.jboss.test.ws.jaxws.smoke.tools.jaxws.AddResponse"); + XmlRootElement rootElement = (XmlRootElement) responseWrapper.getAnnotation(XmlRootElement.class); + assertNotNull("@XmlRootElement missing form response wrapper", rootElement); + assertEquals("Wrong namespace", rootElement.namespace(), "http://foo.bar.com/calculator"); + } + + /** + * Sets the resource directory. This directory will contain any generated + * WSDL and XSD files. If the directory does not exist, it will be created. + * If not specified, the output directory will be used instead. + * + */ + public void testResourceDirectory() throws Exception + { + File directory = new File("wsprovide/resources"); + provider.setResourceDirectory(directory); + provide(); + + verifyWSDL(directory); + } + + private void verifyWSDL(File directory) throws Exception + { + File wsdl = new File( + outputDirectory.getAbsolutePath()+ + "/CalculatorBeanService.wsdl" + ); + + assertTrue("WSDL not generated", wsdl.exists()); + Element root = DOMUtils.parse( new FileInputStream(wsdl)); + Element serviceElement = DOMUtils.getFirstChildElement(root, "service"); + assertEquals(serviceElement.getAttribute("name"), "CalculatorBeanService"); + } + + /** + * Sets the source directory. This directory will contain any generated Java source. + * If the directory does not exist, it will be created. If not specified, + * the output directory will be used instead. + * + */ + public void testSourceDirectory() throws Exception + { + File sourceDir = new File("wsprovide/sources"); + provider.setSourceDirectory(sourceDir); + provider.setGenerateSource(true); + provide(); + + verifyJavaSource(sourceDir); + } + + /** + * Sets the ClassLoader used to discover types. + * This defaults to the one used in instantiation. + * + */ + public void testClassLoader() + { + System.out.println("FIXME [JBWS-1776]: Verify isolated classloading with WSProvide"); + } + + /** + * Sets the PrintStream to use for status feedback. The simplest example + * would be to use System.out. + * + */ + public void testMessageStream() throws Exception + { + + if(isIntegrationSunRI()) + { + System.out.println("FIXME [JBWS-1777]: WSProvide output is not correctly redirected"); + return; + } + + ByteArrayOutputStream bout = new ByteArrayOutputStream(); + PrintStream pout = new PrintStream(bout); + + provider.setMessageStream(pout); + provide(); + + String messageOut = new String(bout.toByteArray()); + + System.out.println("-- Begin captured output --"); + System.out.println(messageOut); + System.out.println("-- End captured output --"); + + assertTrue("Provider messages not correctly redirected", + messageOut.indexOf("org/jboss/test/ws/jaxws/smoke/tools/jaxws/Add.class") != -1 ); + } + + private void provide() throws Exception + { + //provider.setGenerateSource(true); + provider.setOutputDirectory(outputDirectory); + provider.provide(CalculatorBean.class); + } + +} Property changes on: trunk/testsuite/src/java/org/jboss/test/ws/jaxws/smoke/tools/WSProviderTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: trunk/testsuite/testsuite.iml =================================================================== --- trunk/testsuite/testsuite.iml 2007-08-02 14:00:54 UTC (rev 4102) +++ trunk/testsuite/testsuite.iml 2007-08-02 14:35:28 UTC (rev 4103) @@ -73,7 +73,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="spi" /> <orderEntry type="module-library"> <library> <CLASSES> @@ -86,6 +85,8 @@ <orderEntry type="module" module-name="jbossws-core" /> <orderEntry type="library" name="tools" level="application" /> <orderEntry type="module" module-name="sunri-sources" /> + <orderEntry type="module" module-name="spi" /> + <orderEntry type="module" module-name="spi-trunk" /> <orderEntryProperties /> </component> </module>

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4102 - common/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 10:00:54 -0400 (Thu, 02 Aug 2007) New Revision: 4102 Modified: common/trunk/.classpath common/trunk/version.properties Log: Fix eclipse classpath Modified: common/trunk/.classpath =================================================================== --- common/trunk/.classpath 2007-08-02 13:43:15 UTC (rev 4101) +++ common/trunk/.classpath 2007-08-02 14:00:54 UTC (rev 4102) @@ -4,20 +4,14 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/> <classpathentry kind="lib" path="thirdparty/activation.jar"/> - <classpathentry kind="lib" path="thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="thirdparty/getopt.jar"/> <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/> <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-microcontainer.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-xml-binding-sources.jar"/> - <classpathentry kind="lib" path="thirdparty/servlet-api.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/> <classpathentry kind="lib" path="thirdparty/jboss-dependency.jar"/> - <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/> - <classpathentry kind="lib" path="thirdparty/ant.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> <classpathentry kind="output" path="output/eclipse"/> </classpath> Modified: common/trunk/version.properties =================================================================== --- common/trunk/version.properties 2007-08-02 13:43:15 UTC (rev 4101) +++ common/trunk/version.properties 2007-08-02 14:00:54 UTC (rev 4102) @@ -8,7 +8,7 @@ version.id=2.0.1.CR1 repository.id=2.0.1.CR1 -implementation.title=JBoss Web Services - SPI +implementation.title=JBoss Web Services - Common implementation.url=http://www.jboss.org/products/jbossws implementation.vendor=JBoss Inc. implementation.vendor.id=http://www.jboss.org @@ -18,6 +18,7 @@ jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-microcontainer=2.0.0.Beta3 +jbossws-common=2.0.1.CR1 jbossws-spi=2.0.1.CR1 sun-jaf=1.1 sun-jaxb=2.1.4

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4101 - container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 09:43:15 -0400 (Thu, 02 Aug 2007) New Revision: 4101 Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java Log: Use AbstractExtensible Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java =================================================================== --- container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java 2007-08-02 13:41:02 UTC (rev 4100) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java 2007-08-02 13:43:15 UTC (rev 4101) @@ -40,9 +40,9 @@ import org.jboss.virtual.VirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.spi.AbstractExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; +import org.jboss.wsf.spi.deployment.AbstractExtensible; import org.jboss.wsf.spi.http.HttpContext; import org.jboss.wsf.spi.http.HttpContextFactory; import org.jboss.wsf.spi.http.HttpServer;

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4100 - in spi/trunk/src/main/java/org/jboss/wsf/spi: deployment and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 09:41:02 -0400 (Thu, 02 Aug 2007) New Revision: 4100 Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Extensible.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/Extensible.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java spi/trunk/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpContext.java spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpServer.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java Log: Add AbstractExtensible Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/Extensible.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/Extensible.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/Extensible.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi; - -//$Id: Deployment.java 3999 2007-07-26 11:33:20Z thomas.diesler(a)jboss.com $ - -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -/** - * A general extendible artifact - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public interface Extensible -{ - /** Add arbitrary attachments */ - <T> T addAttachment(Class<T> key, Object value); - - /** Get arbitrary attachments */ - <T> Collection<T> getAttachments(); - - /** Get an arbitrary attachment */ - <T> T getAttachment(Class<T> key); - - /** Remove arbitrary attachments */ - <T> T removeAttachment(Class<T> key); - - /** Get an property */ - Object getProperty(String key); - - /** Set a property */ - void setProperty(String key, Object value); - - /** Remove a property */ - void removeProperty(String key); - - /** Get the set of property names */ - Set<String> getProperties(); - - /** Set a map of properties */ - void setProperties(Map<String, Object> props); -} \ No newline at end of file Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/AbstractExtensible.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.deployment; + +//$Id: BasicDeploymentContext.java 3959 2007-07-20 14:44:19Z heiko.braun(a)jboss.com $ + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + + + +/** + * A general extendible artifact + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public abstract class AbstractExtensible implements Extensible +{ + private Map<Class, Object> attachments = new HashMap<Class, Object>(); + private Map<String, Object> properties = new HashMap<String, Object>(); + + public Collection<Object> getAttachments() + { + return attachments.values(); + } + + public <T> T getAttachment(Class<T> clazz) + { + return (T)attachments.get(clazz); + } + + public <T> T addAttachment(Class<T> clazz, Object obj) + { + return (T)attachments.put(clazz, obj); + } + + public <T> T removeAttachment(Class<T> key) + { + return (T)attachments.remove(key); + } + + public Set<String> getProperties() + { + return properties.keySet(); + } + + public Object getProperty(String key) + { + return properties.get(key); + } + + public void removeProperty(String key) + { + properties.remove(key); + } + + public void setProperty(String key, Object value) + { + properties.put(key, value); + } + + public void setProperties(Map<String, Object> props) + { + properties.putAll(props); + } +} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -21,7 +21,6 @@ */ package org.jboss.wsf.spi.deployment; -import org.jboss.wsf.spi.Extensible; // $Id$ Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -25,7 +25,6 @@ import javax.management.ObjectName; -import org.jboss.wsf.spi.Extensible; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; import org.jboss.wsf.spi.management.EndpointMetrics; Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Extensible.java (from rev 4099, spi/trunk/src/main/java/org/jboss/wsf/spi/Extensible.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Extensible.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Extensible.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -0,0 +1,64 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.deployment; + +//$Id: Deployment.java 3999 2007-07-26 11:33:20Z thomas.diesler(a)jboss.com $ + +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +/** + * A general extendible artifact + * + * @author Thomas.Diesler(a)jboss.com + * @since 20-Apr-2007 + */ +public interface Extensible +{ + /** Add arbitrary attachments */ + <T> T addAttachment(Class<T> key, Object value); + + /** Get arbitrary attachments */ + <T> Collection<T> getAttachments(); + + /** Get an arbitrary attachment */ + <T> T getAttachment(Class<T> key); + + /** Remove arbitrary attachments */ + <T> T removeAttachment(Class<T> key); + + /** Get an property */ + Object getProperty(String key); + + /** Set a property */ + void setProperty(String key, Object value); + + /** Remove a property */ + void removeProperty(String key); + + /** Get the set of property names */ + Set<String> getProperties(); + + /** Set a map of properties */ + void setProperties(Map<String, Object> props); +} \ No newline at end of file Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Service.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -25,7 +25,6 @@ import java.util.List; -import org.jboss.wsf.spi.Extensible; /** * A general service deployment. Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpContext.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpContext.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpContext.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -21,7 +21,7 @@ */ package org.jboss.wsf.spi.http; -import org.jboss.wsf.spi.Extensible; +import org.jboss.wsf.spi.deployment.Extensible; // $Id: HttpContext.java 1757 2006-12-22 15:40:24Z thomas.diesler(a)jboss.com $ Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpServer.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpServer.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/http/HttpServer.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -25,7 +25,7 @@ import javax.xml.ws.Endpoint; -import org.jboss.wsf.spi.Extensible; +import org.jboss.wsf.spi.deployment.Extensible; /** * An abstract HTTP Server Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -1,88 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.invocation; - -import java.security.Principal; -import java.util.Map; -import java.util.HashMap; - -import javax.xml.ws.EndpointReference; -import javax.xml.ws.WebServiceContext; -import javax.xml.ws.handler.MessageContext; - -import org.jboss.util.NotImplementedException; -import org.w3c.dom.Element; - -/** - * A WebServiceContext makes it possible for a web service endpoint implementation - * class to access message context and security information relative to a request - * being served. Typically a WebServiceContext is injected into an endpoint implementation - * class using the Resource annotation. - * - * @author Thomas.Diesler(a)jboss.com - * @since 03-May-2006 - */ -public abstract class ExtendableWebServiceContext implements WebServiceContext -{ - private MessageContext messageContext; - - private Map<Class, Object> attachments = new HashMap<Class, Object>(); - - public ExtendableWebServiceContext(MessageContext messageContext) - { - this.messageContext = messageContext; - } - - public MessageContext getMessageContext() - { - return messageContext; - } - - public abstract Principal getUserPrincipal(); - - public abstract boolean isUserInRole(String role); - - public EndpointReference getEndpointReference(Element... referenceParameters) - { - throw new IllegalArgumentException("Not implemented"); - } - - public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters) - { - throw new IllegalArgumentException("Not implemented"); - } - - public <T> T addAttachment(Class<T> key, Object value) - { - return (T)attachments.put(key, value); - } - - public <T> T getAttachment(Class<T> key) - { - return (T)attachments.get(key); - } - - public <T> T removeAttachment(Class<T> key) - { - return (T)attachments.get(key); - } -} \ No newline at end of file Copied: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java (from rev 4087, spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtendableWebServiceContext.java) =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java (rev 0) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/ExtensibleWebServiceContext.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.wsf.spi.invocation; + +import java.security.Principal; + +import javax.xml.ws.EndpointReference; +import javax.xml.ws.WebServiceContext; +import javax.xml.ws.handler.MessageContext; + +import org.jboss.wsf.spi.deployment.AbstractExtensible; +import org.w3c.dom.Element; + +/** + * A WebServiceContext makes it possible for a web service endpoint implementation + * class to access message context and security information relative to a request + * being served. Typically a WebServiceContext is injected into an endpoint implementation + * class using the Resource annotation. + * + * @author Thomas.Diesler(a)jboss.com + * @since 03-May-2006 + */ +public abstract class ExtensibleWebServiceContext extends AbstractExtensible implements WebServiceContext +{ + private MessageContext messageContext; + + public ExtensibleWebServiceContext(MessageContext messageContext) + { + this.messageContext = messageContext; + } + + public MessageContext getMessageContext() + { + return messageContext; + } + + public abstract Principal getUserPrincipal(); + + public abstract boolean isUserInRole(String role); + + public EndpointReference getEndpointReference(Element... referenceParameters) + { + throw new IllegalArgumentException("Not implemented"); + } + + public <T extends EndpointReference> T getEndpointReference(Class<T> clazz, Element... referenceParameters) + { + throw new IllegalArgumentException("Not implemented"); + } +} \ No newline at end of file Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextEJB.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import java.security.Principal; @@ -36,7 +36,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 23-Jan-2007 */ -public class WebServiceContextEJB extends ExtendableWebServiceContext +public class WebServiceContextEJB extends ExtensibleWebServiceContext { public WebServiceContextEJB(MessageContext msgContext) { Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -31,5 +31,5 @@ */ public abstract class WebServiceContextFactory implements SPIView { - public abstract ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext); + public abstract ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextJSE.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import java.security.Principal; @@ -36,7 +36,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 23-Jan-2007 */ -public class WebServiceContextJSE extends ExtendableWebServiceContext +public class WebServiceContextJSE extends ExtensibleWebServiceContext { private HttpServletRequest httpRequest; Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-08-02 13:36:49 UTC (rev 4099) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/management/DefaultEndpointRegistry.java 2007-08-02 13:41:02 UTC (rev 4100) @@ -1,106 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.wsf.spi.management; - -// $Id$ - -import org.jboss.logging.Logger; -import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.management.EndpointRegistry; - -import javax.management.ObjectName; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * A general endpoint registry. - * - * @author Thomas.Diesler(a)jboss.com - * @since 20-Apr-2007 - */ -public class DefaultEndpointRegistry implements EndpointRegistry -{ - // provide logging - private static final Logger log = Logger.getLogger(DefaultEndpointRegistry.class); - - private Map<ObjectName, Endpoint> endpoints = new HashMap<ObjectName, Endpoint>(); - - public Endpoint getEndpoint(ObjectName epName) - { - if (epName == null) - throw new IllegalArgumentException("Endpoint name cannot be null"); - - if (isRegistered(epName) == false) - throw new IllegalStateException("Endpoint not registered: " + epName); - - Endpoint endpoint = endpoints.get(epName); - return endpoint; - } - - public Endpoint resolve(EndpointResolver resolver) - { - return resolver.query(endpoints.values().iterator()); - } - - public boolean isRegistered(ObjectName epName) - { - if (epName == null) - throw new IllegalArgumentException("Endpoint name cannot be null"); - - return endpoints.get(epName) != null; - } - - public Set<ObjectName> getEndpoints() - { - return endpoints.keySet(); - } - - public void register(Endpoint endpoint) - { - if (endpoint == null) - throw new IllegalArgumentException("Endpoint cannot be null"); - - ObjectName epName = endpoint.getName(); - if (epName == null) - throw new IllegalStateException("Endpoint name cannot be null for: " + endpoint); - - if (isRegistered(epName)) - throw new IllegalStateException("Endpoint already registered: " + epName); - - log.info("register: " + epName); - endpoints.put(epName, endpoint); - } - - public void unregister(Endpoint endpoint) - { - if (endpoint == null) - throw new IllegalArgumentException("Endpoint cannot be null"); - - ObjectName epName = endpoint.getName(); - if (isRegistered(epName) == false) - throw new IllegalStateException("Endpoint not registered: " + epName); - - log.info("remove: " + epName); - endpoints.remove(epName); - } -}

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4099 - in container/jboss50: trunk and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 09:36:49 -0400 (Thu, 02 Aug 2007) New Revision: 4099 Added: container/jboss50/trunk/ container/jboss50/trunk/.classpath container/jboss50/trunk/ant-import/build-setup.xml container/jboss50/trunk/ant-import/build-thirdparty.xml container/jboss50/trunk/ant.properties.example container/jboss50/trunk/src/main/etc/default.mf container/jboss50/trunk/version.properties Removed: container/jboss50/trunk/.classpath container/jboss50/trunk/ant-import/build-thirdparty.xml container/jboss50/trunk/int-50.iml Modified: container/jboss50/trunk/.project container/jboss50/trunk/ant-import/build-release.xml container/jboss50/trunk/build.xml container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java Log: Initial Copied: container/jboss50/trunk (from rev 4091, trunk/integration/jboss50) Property changes on: container/jboss50/trunk ___________________________________________________________________ Name: svn:ignore + ant.properties output* thirdparty version.properties.md5 Deleted: container/jboss50/trunk/.classpath =================================================================== --- trunk/integration/jboss50/.classpath 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/.classpath 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> - <classpathentry combineaccessrules="false" kind="src" path="/spi"/> - <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> - <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> - <classpathentry kind="output" path="output/eclipse"/> -</classpath> Copied: container/jboss50/trunk/.classpath (from rev 4094, trunk/integration/jboss50/.classpath) =================================================================== --- container/jboss50/trunk/.classpath (rev 0) +++ container/jboss50/trunk/.classpath 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> + <classpathentry combineaccessrules="false" kind="src" path="/spi"/> + <classpathentry combineaccessrules="false" kind="src" path="/integration-framework"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/dom4j.jar"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxws-api.jar"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/jsr181-api.jar"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/saaj-api.jar"/> + <classpathentry kind="lib" path="/integration-framework/thirdparty/jaxrpc-api.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/common"/> + <classpathentry kind="output" path="output/eclipse"/> +</classpath> Modified: container/jboss50/trunk/.project =================================================================== --- trunk/integration/jboss50/.project 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/.project 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>integration-jboss50</name> + <name>container-jboss50</name> <comment></comment> <projects> </projects> Modified: container/jboss50/trunk/ant-import/build-release.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-release.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/ant-import/build-release.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -21,7 +21,7 @@ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> <mkdir dir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib"/> <copy todir="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/lib" overwrite="true"> - <fileset dir="${int.jboss50.dir}/output/lib"> + <fileset dir="${jbws50.dir}/output/lib"> <include name="jbossws-jboss50.jar"/> <include name="jbossws-jboss50-deployer.zip"/> <include name="jbossws-jboss50-src.zip"/> @@ -29,7 +29,7 @@ </copy> <copy tofile="${jboss.repository.dir}/jbossws-jboss50/${repository.id}/component-info.xml" file="${jbws50.etc.dir}/component-info.xml" filtering="true" overwrite="true"> <filterset> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${jbws50.dir}/version.properties"/> </filterset> </copy> Added: container/jboss50/trunk/ant-import/build-setup.xml =================================================================== --- container/jboss50/trunk/ant-import/build-setup.xml (rev 0) +++ container/jboss50/trunk/ant-import/build-setup.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <property name="jbws50.dir" value="${basedir}"/> + +  + <available property="ant.properties.available" file="${jbws50.dir}/ant.properties"/> + <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/> + + <property file="${jbws50.dir}/ant.properties"/> + <property file="${jbws50.dir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> + <available property="jboss50.available" file="${jboss50.available.file}"/> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + +  +  +  + + <target name="prepare"> + <tstamp> + <format property="build.id" pattern="yyyyMMddHHmm"/> + </tstamp> + </target> + +</project> \ No newline at end of file Deleted: container/jboss50/trunk/ant-import/build-thirdparty.xml =================================================================== --- trunk/integration/jboss50/ant-import/build-thirdparty.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/ant-import/build-thirdparty.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - - <target name="thirdparty" depends="thirdparty-get,thirdparty-classpath"> - </target> - - <target name="thirdparty-init" depends="prepare"/> - -  - <target name="thirdparty-get" depends="thirdparty-init" - description="Gets the thirdparty libraries"/> - - <target name="thirdparty-classpath" depends="thirdparty-get"> - -  - <path id="jbws50.integration.classpath"> - <pathelement location="${framework.dir}/output/lib/jbossws-framework.jar"/> - <pathelement location="${framework.dir}/thirdparty/jbossws-spi.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jaxrpc-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${framework.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${jboss50.lib}/dom4j.jar"/> - <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> - <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> - <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> - <pathelement location="${jboss50.lib}/jboss-system.jar"/> - <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> - <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> - <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> - <pathelement location="${jboss50.server.lib}/jboss.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> - <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> - <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> - - </path> - - </target> - -</project> Copied: container/jboss50/trunk/ant-import/build-thirdparty.xml (from rev 4092, trunk/integration/jboss50/ant-import/build-thirdparty.xml) =================================================================== --- container/jboss50/trunk/ant-import/build-thirdparty.xml (rev 0) +++ container/jboss50/trunk/ant-import/build-thirdparty.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + + <target name="thirdparty-init" depends="prepare"> + + <property name="thirdparty.dir" value="${jbws50.dir}/thirdparty"/> + <checksum file="${jbws50.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/> + <condition property="force.thirdparty"> + <or> + <not> + <available file="${thirdparty.dir}" type="dir"/> + </not> + <isfalse value="${checksum.ok}"/> + <isset property="force.thirdparty.get"/> + </or> + </condition> + <echo message="checksum.ok = ${checksum.ok}"/> + </target> + + <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries"> + + <mkdir dir="${thirdparty.dir}"/> + <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> + <checksum file="${jbws50.dir}/version.properties" fileext=".md5"/> + </target> + + <target name="thirdparty-classpath" depends="thirdparty-get"> + +  + <path id="jbws50.integration.classpath"> + <pathelement location="${thirdparty.dir}/jbossws-common.jar"/> + <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${jboss50.lib}/dom4j.jar"/> + <pathelement location="${jboss50.lib}/jboss-aop-jdk50.jar"/> + <pathelement location="${jboss50.lib}/jboss-common-core.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-client-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-core-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-structure-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-deployers-vfs-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-logging-spi.jar"/> + <pathelement location="${jboss50.lib}/jboss-j2se.jar"/> + <pathelement location="${jboss50.lib}/jboss-system.jar"/> + <pathelement location="${jboss50.lib}/jboss-system-jmx.jar"/> + <pathelement location="${jboss50.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss50.lib}/jboss-xml-binding.jar"/> + <pathelement location="${jboss50.server.lib}/jboss.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-javaee.jar"/> + <pathelement location="${jboss50.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss50.server.lib}/jboss-security-spi.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-ejb3.jar"/> + <pathelement location="${jboss50.server.deployers}/ejb3.deployer/jboss-annotations-ejb3.jar"/> + + </path> + + </target> + +</project> Added: container/jboss50/trunk/ant.properties.example =================================================================== --- container/jboss50/trunk/ant.properties.example (rev 0) +++ container/jboss50/trunk/ant.properties.example 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,26 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ + +# JBoss Home +#jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 + +# The JBoss settings +jboss.server.instance=default + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBossWS Release +jboss.local.repository=/home/tdiesler/svn/jboss.local.repository + +# Force thirdparty HTTP get +#force.thirdparty.get=true + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Modified: container/jboss50/trunk/build.xml =================================================================== --- trunk/integration/jboss50/build.xml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/build.xml 2007-08-02 13:36:49 UTC (rev 4099) @@ -11,18 +11,16 @@  -<project default="main" basedir="../.." name="Integration-JBoss50"> +<project default="main" basedir="." name="Integration-JBoss50"> - <import file="${basedir}/build/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-release.xml"/> + <import file="${basedir}/ant-import/build-thirdparty.xml"/> - <import file="${int.jboss50.dir}/ant-import/build-release.xml"/> - <import file="${int.jboss50.dir}/ant-import/build-thirdparty.xml"/> -    - <property name="jbws50.dir" value="${int.jboss50.dir}"/> <property name="jbws50.src.dir" value="${jbws50.dir}/src/main"/> <property name="jbws50.etc.dir" value="${jbws50.src.dir}/etc"/> <property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/> @@ -37,9 +35,8 @@   - <target name="init" depends="prepare,thirdparty"> + <target name="init" depends="prepare,thirdparty-get"> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <ant antfile="${framework.dir}/build.xml" target="jars" inheritall="false"/> </target>  @@ -70,7 +67,7 @@ <target name="compile-etc" depends="init"> <mkdir dir="${jbws50.output.etc.dir}"/> <copy todir="${jbws50.output.etc.dir}" filtering="yes"> - <fileset dir="${build.dir}/etc"> + <fileset dir="${jbws50.etc.dir}"> <include name="default.mf"/> </fileset> <filterset> @@ -78,7 +75,7 @@ <filter token="java.vm.vendor" value="${java.vm.vendor}"/> <filter token="build.id" value="${build.id}"/> <filter token="implementation.version" value="jbossws-${version.id}"/> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${jbws50.dir}/version.properties"/> </filterset> </copy> </target> @@ -147,7 +144,7 @@ </target> <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.jboss50.dir}/output/tests"/> + <delete dir="${jbws50.dir}/thirdparty"/> </target> <target name="main" description="Executes the default target (most)." depends="most"/> Deleted: container/jboss50/trunk/int-50.iml =================================================================== --- trunk/integration/jboss50/int-50.iml 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/int-50.iml 2007-08-02 13:36:49 UTC (rev 4099) @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/output/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="spi" /> - <orderEntry type="module" module-name="as-server" /> - <orderEntry type="module" module-name="as-system" /> - <orderEntry type="module" module-name="as-tomcat" /> - <orderEntry type="module" module-name="as-ejb3" /> - <orderEntry type="library" name="jaxws-api" level="application" /> - <orderEntry type="library" name="jboss-javaee" level="application" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-aop-jdk50.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="library" name="jboss-aop-jdk50" level="application" /> - <orderEntry type="library" name="jboss-jaxrpc" level="application" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-vfs.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-logging-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../jbossws-core/thirdparty/jboss-deployers.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-client-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/jboss-deployers-vfs-spi.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../jbossas/trunk/build/output/jboss-5.0.0.Beta3/lib/dom4j.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntryProperties /> - </component> -</module> - Added: container/jboss50/trunk/src/main/etc/default.mf =================================================================== --- container/jboss50/trunk/src/main/etc/default.mf (rev 0) +++ container/jboss50/trunk/src/main/etc/default.mf 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,10 @@ +Manifest-Version: 1.2 +Created-By: @java.vm.version@ (@java.vm.vendor@) +Specification-Title: @specification.title@ +Specification-Version: @specification.version@ +Specification-Vendor: @specification.vendor@ +Implementation-Title: @implementation.title@ +Implementation-URL: @implementation.url@ +Implementation-Version: @implementation.version@ (build=(a)build.id@) +Implementation-Vendor: @implementation.vendor@ +Implementation-Vendor-Id: @implementation.vendor.id@ Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/InvocationHandlerEJB3.java 2007-08-02 13:36:49 UTC (rev 4099) @@ -42,7 +42,7 @@ import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Endpoint; -import org.jboss.wsf.spi.invocation.ExtendableWebServiceContext; +import org.jboss.wsf.spi.invocation.ExtensibleWebServiceContext; import org.jboss.wsf.spi.invocation.Invocation; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.InvocationType; @@ -132,7 +132,7 @@ { EJBContext ejbCtx = beanCtx.getEJBContext(); SPIProvider spiProvider = SPIProviderResolver.getInstance().getProvider(); - ExtendableWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); + ExtensibleWebServiceContext wsContext = spiProvider.getSPI(WebServiceContextFactory.class).newWebServiceContext(InvocationType.JAXWS_EJB3, jaxwsMessageContext); wsContext.addAttachment(EJBContext.class, ejbCtx); beanProp.set(beanCtx.getInstance(), wsContext); } Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebAppDeployingHttpServer.java 2007-08-02 13:36:49 UTC (rev 4099) @@ -40,7 +40,7 @@ import org.jboss.virtual.VirtualFile; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.common.DOMWriter; -import org.jboss.wsf.framework.DefaultExtensible; +import org.jboss.wsf.spi.AbstractExtensible; import org.jboss.wsf.spi.SPIProvider; import org.jboss.wsf.spi.SPIProviderResolver; import org.jboss.wsf.spi.http.HttpContext; @@ -56,7 +56,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 07-Jul-2006 */ -public class WebAppDeployingHttpServer extends DefaultExtensible implements HttpServer +public class WebAppDeployingHttpServer extends AbstractExtensible implements HttpServer { private DeployerClient mainDeployer; private Map<String, Deployment> deploymentMap = new HashMap<String, Deployment>(); Modified: container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java =================================================================== --- trunk/integration/jboss50/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java 2007-08-02 11:05:57 UTC (rev 4091) +++ container/jboss50/trunk/src/main/java/org/jboss/wsf/container/jboss50/WebServiceContextFactoryImpl.java 2007-08-02 13:36:49 UTC (rev 4099) @@ -31,9 +31,9 @@ */ public class WebServiceContextFactoryImpl extends WebServiceContextFactory { - public ExtendableWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) + public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) { - ExtendableWebServiceContext context = null; + ExtensibleWebServiceContext context = null; if(type.toString().indexOf("EJB")!=-1 || type.toString().indexOf("MDB")!=-1) context = new WebServiceContextEJB(messageContext); Added: container/jboss50/trunk/version.properties =================================================================== --- container/jboss50/trunk/version.properties (rev 0) +++ container/jboss50/trunk/version.properties 2007-08-02 13:36:49 UTC (rev 4099) @@ -0,0 +1,20 @@ + +# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $ + +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 + +version.id=2.0.1.CR1 +repository.id=2.0.1.CR1 + +implementation.title=JBoss Web Services - Integration JBoss50 +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + +# Thirdparty library versions +jbossws-common=2.0.1.CR1 +jbossws-spi=2.0.1.CR1 +sun-jaxrpc=1.1 +sun-jaxws=2.1.1 \ No newline at end of file

16 years, 10 months

1
0
0 / 0

JBossWS SVN: r4098 - container.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-02 08:41:08 -0400 (Thu, 02 Aug 2007) New Revision: 4098 Added: container/jboss40/ Log: create container integration projects

16 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007