Author: jason.greene(a)jboss.com Date: 2007-02-23 15:30:10 -0500 (Fri, 23 Feb 2007) New Revision: 2459 Modified: trunk/integration-jboss40/.classpath trunk/integration-jboss40/build.xml trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml Log: sync missing jboss40 changes Modified: trunk/integration-jboss40/.classpath =================================================================== --- trunk/integration-jboss40/.classpath 2007-02-23 20:27:37 UTC (rev 2458) +++ trunk/integration-jboss40/.classpath 2007-02-23 20:30:10 UTC (rev 2459) @@ -30,5 +30,6 @@ <classpathentry kind="lib" path="/build/thirdparty/xercesImpl.jar"/> <classpathentry kind="lib" path="/build/thirdparty/mail.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-common.jar" sourcepath="/build/thirdparty/jboss-common-sources.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-4.0.x"/> <classpathentry kind="output" path="output-eclipse"/> </classpath> Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-02-23 20:27:37 UTC (rev 2458) +++ trunk/integration-jboss40/build.xml 2007-02-23 20:30:10 UTC (rev 2459) @@ -57,12 +57,17 @@ <!-- Compile integration java sources --> <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src location="${jboss42.java.dir}"/> + <src location="${jboss40.java.dir}"/> + <include name="org/jboss/ws/integration/jboss40/**"/> <include name="org/jboss/ws/integration/jboss42/**"/> <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> + <exclude name="org/jboss/ws/integration/jboss42/ServiceRefHandlerMBean.java"/> + <exclude name="org/jboss/ws/integration/jboss42/ServiceRefHandler.java"/> <classpath refid="jboss40.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> @@ -70,8 +75,10 @@ </target> <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile,jboss40-check-ejb3-classes" if="jboss40.ejb3.available"> <mkdir dir="${jboss40.output.classes.dir}"/> - <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + <javac sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src location="${jboss42.java.dir}"/> + <src location="${jboss40.java.dir}"/> <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> @@ -146,6 +153,7 @@ <jar jarfile="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <include name="org/jboss/ws/integration/jboss40/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> </jar> @@ -188,7 +196,7 @@ <include name="standard-jaxws-client-config.xml"/> <include name="standard-jaxws-endpoint-config.xml"/> </metainf> - <metainf dir="${jboss42.resources.dir}/jbossws.sar/META-INF"> + <metainf dir="${jboss40.resources.dir}/jbossws.sar/META-INF"> <include name="jboss-service*.xml"/> </metainf> </jar> @@ -225,6 +233,7 @@ <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <include name="org/jboss/ws/integration/jboss40/**"/> </fileset> <metainf dir="${jboss42.resources.dir}/jbossws-jboss42-integration.jar/META-INF"/> </jar> @@ -258,7 +267,7 @@ <mkdir dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"/> <copy tofile="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF/jboss-service.xml" - file="${jboss42.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> + file="${jboss40.resources.dir}/jbossws.sar/META-INF/jboss-service-no-ejb3.xml"/> <!-- Build jbossws40-jdk14.sar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws40-jdk14.sar" manifest="${etc.dir}/default.mf"> @@ -295,6 +304,12 @@ <!-- Deploy jbossws to jboss40 --> <target name="deploy-jboss40" depends="jboss40-jars" description="Deploy jbossws"> + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <delete file="${jboss40.home}/client/jbossws14-client.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> @@ -303,9 +318,11 @@ <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> </fileset> + <!-- Only available on jdk1.5 --> <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> @@ -345,8 +362,13 @@ <!-- Deploy jbossws to jboss40 jdk1.4 --> <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> + <copy todir="${jboss40.home}/bin" overwrite="true"> + <fileset dir="${etc.dir}"> + <include name="*.bat"/> + <include name="*.sh"/> + </fileset> + </copy> <delete file="${jboss40.home}/client/jbossws-client.jar"/> - <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -355,11 +377,8 @@ <fileset dir="${jboss40.output.lib.dir}"> <include name="jbossws14-client.jar"/> </fileset> - <fileset dir="${thirdparty.dir}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> </copy> + <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> Modified: trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-23 20:27:37 UTC (rev 2458) +++ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-23 20:30:10 UTC (rev 2459) @@ -46,12 +46,6 @@ <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property> </bean> - <!-- - Bind JAXWS Service objects in client environment context - JAX-WS functionality is not available with jdk-1.4 - <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss42.WebServiceRefHandler"/> - --> - <!-- A subscription manager for WS-Eventing --> <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/>