Author: thomas.diesler(a)jboss.com Date: 2007-07-06 15:10:16 -0400 (Fri, 06 Jul 2007) New Revision: 3815 Modified: branches/jbossws-2.0/integration/native/ant-import/build-release.xml branches/jbossws-2.0/integration/native/build.xml branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml branches/jbossws-2.0/integration/native/version.properties branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml Log: Fix AS42 release Modified: branches/jbossws-2.0/integration/native/ant-import/build-release.xml =================================================================== --- branches/jbossws-2.0/integration/native/ant-import/build-release.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/ant-import/build-release.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -26,11 +26,7 @@ <include name="jbossws-native50-deployer.zip"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${native.output.etc.dir}/component-info50.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> + <copy tofile="${jboss.repository.dir}/jbossws-native50/${repository.id}/component-info.xml" file="${native.output.etc.dir}/component-info50.xml" overwrite="true"/> <!-- jboss/jbossws-native42 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> @@ -40,11 +36,7 @@ <include name="jbossws-native42.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${native.output.etc.dir}/component-info42.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> + <copy tofile="${jboss.repository.dir}/jbossws-native42/${repository.id}/component-info.xml" file="${native.output.etc.dir}/component-info42.xml" overwrite="true"/> <!-- jboss/jbossws-native40 --> <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/> @@ -54,11 +46,7 @@ <include name="jbossws-native40.sar"/> </fileset> </copy> - <copy tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml" file="${native.output.etc.dir}/component-info40.xml" filtering="true" overwrite="true"> - <filterset> - <filtersfile file="${build.dir}/version.properties"/> - </filterset> - </copy> + <copy tofile="${jboss.repository.dir}/jbossws-native40/${repository.id}/component-info.xml" file="${native.output.etc.dir}/component-info40.xml" overwrite="true"/> </target> Modified: branches/jbossws-2.0/integration/native/build.xml =================================================================== --- branches/jbossws-2.0/integration/native/build.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/build.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -71,7 +71,7 @@ <!-- Compile etc files (manifests and such) --> <target name="compile-etc" depends="init"> <mkdir dir="${native.output.etc.dir}"/> - <copy todir="${native.output.etc.dir}" filtering="yes"> + <copy todir="${native.output.etc.dir}" filtering="yes" overwrite="true"> <fileset dir="${native.etc.dir}"> <include name="component-info*.xml"/> </fileset> Modified: branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/src/main/etc/component-info42.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -7,11 +7,17 @@ <artifact id="jbossws-native42.sar"/> + <import componentref="javassist"> + <compatible version="@javassist-jboss42@"/> + <compatible version="@javassist-jboss42@-brew"/> + </import> <import componentref="jboss/jbossxb"> - <compatible version="@jboss-jbossxb-jboss542@"/> + <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=&quot;@repository.id(a)&quot;/&gt; Modified: branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/src/main/etc/component-info50.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -8,6 +8,9 @@ <artifact id="jbossws-native50.sar"/> <artifact id="jbossws-native50-deployer.zip"/> + <import componentref="javassist"> + <compatible version="@javassist-jboss50@"/> + </import> <import componentref="jboss/jbossxb"> <compatible version="@jboss-jbossxb-jboss50@"/> </import> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native42.sar/jbossws.beans/META-INF/jboss-beans.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -34,8 +34,7 @@ </bean> <!-- Bind Service objects in client environment context --> - <!-- The bean name is compiled into the server. Changeit with the next release. --> - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> <!-- Locate the single instance of the kernel --> <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> Modified: branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml =================================================================== --- branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -34,7 +34,7 @@ </bean> <!-- Bind Service objects in client environment context --> - <bean name="ServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> + <bean name="WSServiceRefHandler" class="org.jboss.ws.core.client.ServiceRefHandlerImpl"/> <!-- Locate the single instance of the kernel --> <bean name="WSKernelLocator" class="org.jboss.ws.integration.KernelLocator"> Modified: branches/jbossws-2.0/integration/native/version.properties =================================================================== --- branches/jbossws-2.0/integration/native/version.properties 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/native/version.properties 2007-07-06 19:10:16 UTC (rev 3815) @@ -4,12 +4,14 @@ native.implementation.title=JBoss Web Services - JBossWS/Native # JBossAS-5.0 +javassist-jboss50=3.5.0.CR1 jboss-jbossxb-jboss50=2.0.0.CR2 jboss-remoting-jboss50=2.2.0.GA # JBossAS-4.2 +javassist-jboss42=3.5.0.GA jboss-jbossxb-jboss42=1.0.0.GA -jboss-remoting-jboss42=2.2.0.SP4 +jboss-remoting-jboss42=2.2.1.GA # JBossAS-4.0 jboss-jbossxb-jboss40=1.0.0.GA Modified: branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/spi/src/main/etc/component-info.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -6,6 +6,7 @@ licenseType="lgpl"> <artifact id="jbossws-spi.jar"/> + <artifact id="jbossws-spi-src.zip"/> <artifact id="jbossws-spi-scripts.zip"/> <import componentref="sun-jaxws"> Modified: branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java =================================================================== --- branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/integration/spi/src/main/java/org/jboss/ws/integration/ServiceRefHandler.java 2007-07-06 19:10:16 UTC (rev 3815) @@ -37,6 +37,8 @@ */ public interface ServiceRefHandler { + final String BEAN_NAME = "WSServiceRefHandler"; + ServiceRefMetaData newServiceRefMetaData(); Object newChild(ServiceRefElement ref, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs); Modified: branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml =================================================================== --- branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml 2007-07-06 16:59:59 UTC (rev 3814) +++ branches/jbossws-2.0/jbossws-core/src/main/etc/component-info.xml 2007-07-06 19:10:16 UTC (rev 3815) @@ -21,10 +21,6 @@ <compatible version="@ibm-wsdl4j@"/> <compatible version="@ibm-wsdl4j@-brew"/> </import> - <import componentref="javassist"> - <compatible version="@javassist@"/> - <compatible version="@javassist@-brew"/> - </import> <import componentref="jbpm/bpel"> <compatible version="@jbpm-bpel@"/> </import>