Author: thomas.diesler(a)jboss.com Date: 2008-01-11 05:44:30 -0500 (Fri, 11 Jan 2008) New Revision: 5465 Added: stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory Removed: stack/native/trunk/src/main/resources/jbossws-native.jar/ Modified: stack/native/trunk/build.xml Log: Remove jbossws-native.jar and consolidate with jbossws-core.jar Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-01-11 10:35:19 UTC (rev 5464) +++ stack/native/trunk/build.xml 2008-01-11 10:44:30 UTC (rev 5465) @@ -180,6 +180,7 @@ <jar jarfile="${core.output.lib.dir}/jbossws-core.jar" manifest="${core.output.etc.dir}/default.mf"> <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/annotation/**"/> + <include name="org/jboss/wsf/stack/jbws/**"/> <include name="org/jboss/ws/**"/> </fileset> <fileset dir="${core.resources.dir}"> @@ -194,7 +195,6 @@ <fileset dir="${core.output.classes.dir}"> <include name="org/jboss/wsf/**"/> <include name="org/jboss/ws/**"/> - <!-- JAX-WS 2.1 extensions --> <include name="javax/xml/ws/**/*21.class"/> <include name="javax/xml/ws/Action.class"/> @@ -211,7 +211,6 @@ <include name="javax/xml/ws/soap/MTOM.class"/> <include name="javax/xml/ws/soap/MTOMFeature.class"/> <include name="javax/xml/ws/wsaddressing/**"/> - </fileset> <fileset dir="${core.resources.dir}"> <include name="schema/**"/> @@ -226,14 +225,6 @@ <metainf dir="${core.resources.dir}/standard-config"/> </jar> - <!-- Build jbossws-native.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> - <!-- Build jbossws-context.war --> <copy todir="${core.output.lib.dir}/jbossws-context.war" filtering="true"> <fileset dir="${core.resources.dir}/jbossws-context.war"> @@ -284,9 +275,6 @@ <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"> @@ -325,11 +313,8 @@ <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-jaxws-ext.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-core.jar"/> @@ -388,11 +373,8 @@ <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="jboss-jaxws-ext.jar"/> + <include name="jboss-jaxws-ext.jar"/> <include name="jbossws-core.jar"/> </fileset> <fileset dir="${core.dir}/thirdparty"> Copied: stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (from rev 5462, stack/native/trunk/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.invocation.RequestHandlerFactory 2008-01-11 10:44:30 UTC (rev 5465) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.RequestHandlerFactoryImpl \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (from rev 5462, stack/native/trunk/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.management.EndpointRegistryFactory 2008-01-11 10:44:30 UTC (rev 5465) @@ -0,0 +1 @@ +org.jboss.wsf.stack.jbws.EndpointRegistryFactoryImpl \ No newline at end of file Copied: stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (from rev 5462, stack/native/trunk/src/main/resources/jbossws-native.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory) =================================================================== --- stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-core.jar/META-INF/services/org.jboss.wsf.spi.serviceref.ServiceRefBinderFactory 2008-01-11 10:44:30 UTC (rev 5465) @@ -0,0 +1 @@ +org.jboss.ws.core.client.ServiceRefBinderFactoryImpl \ No newline at end of file