[jboss-cvs] JBossAS SVN: r100896 - in branches/jaxrpc-cxf: webservices and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Feb 11 17:17:37 EST 2010
Author: alessio.soldano at jboss.com
Date: 2010-02-11 17:17:36 -0500 (Thu, 11 Feb 2010)
New Revision: 100896
Added:
branches/jaxrpc-cxf/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml
branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/
branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/
branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Modified:
branches/jaxrpc-cxf/build/build.xml
branches/jaxrpc-cxf/webservices/build.xml
branches/jaxrpc-cxf/webservices/src/assembly/assembly-resources.xml
branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
branches/jaxrpc-cxf/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
Log:
[JBWS-2920] Producing jbossws-jaxrpc.deployer, installing jbossws-native.core and netty.jar to common/lib, skipping jaxrpc integration deployers processing for Native stack
Modified: branches/jaxrpc-cxf/build/build.xml
===================================================================
--- branches/jaxrpc-cxf/build/build.xml 2010-02-11 20:49:29 UTC (rev 100895)
+++ branches/jaxrpc-cxf/build/build.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -1808,6 +1808,7 @@
<antcall target="install-jbossws-to-endorsed" inheritRefs="true"/>
<antcall target="install-jbossws-to-deploy" inheritRefs="true"/>
<antcall target="install-jbossws-to-deployers" inheritRefs="true"/>
+ <antcall target="install-jbossws-jaxrpc-deployers" inheritRefs="true"/>
</target>
<target name="install-jbossws-to-endorsed">
@@ -1857,6 +1858,18 @@
</copy>
</target>
+ <target name="install-jbossws-jaxrpc-deployers">
+ <!-- Install JBossWS jaxrpc deployers -->
+ <mkdir dir="${install.all.deployers}/jbossws-jaxrpc.deployer"/>
+ <unzip dest="${install.all.deployers}/jbossws-jaxrpc.deployer"
+ src="${webservices.module.output}/jboss-as-webservices-jbossws-jboss60-jaxrpc-deployer.zip"/>
+ <copy todir="${install.all.deployers}/jbossws-jaxrpc.deployer" flatten="true" overwrite="true">
+ <fileset refid="org.jboss.ws.native:jbossws-native-factories:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-services:jar"/>
+ <mapper refid="remove-versions" />
+ </copy>
+ </target>
+
<target name="module-webservices-all">
<!-- Copy the generated javadocs -->
<mkdir dir="${install.api}/${webservices.module.name}"/>
@@ -1951,6 +1964,8 @@
<fileset refid="org.jboss.ws:jbossws-common:jar"/>
<fileset refid="org.jboss.ws:jbossws-framework:jar"/>
<fileset refid="org.jboss.ws:jbossws-spi:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.netty:netty:jar"/>
<fileset refid="commons-beanutils:commons-beanutils:jar"/>
<fileset refid="antlr:antlr:jar"/>
<fileset refid="commons-collections:commons-collections:jar"/>
Modified: branches/jaxrpc-cxf/webservices/build.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/build.xml 2010-02-11 20:49:29 UTC (rev 100895)
+++ branches/jaxrpc-cxf/webservices/build.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -162,6 +162,13 @@
<include name="META-INF/stack-agnostic-jboss-beans.xml"/>
</fileset>
</zip>
+
+ <zip zipfile="${build.lib}/jbossws-jboss60-jaxrpc-deployer.zip">
+ <fileset dir="${build.resources}/jbossws-jaxrpc-jboss.deployer">
+ <include name="META-INF/stack-agnostic-jboss-beans.xml"/>
+ <include name="META-INF/jboss-classloading.xml"/>
+ </fileset>
+ </zip>
</target>
@@ -177,6 +184,9 @@
<!-- Build jbossws.deployer -->
<property name="jbossws.deployer.dir" value="../build/output/jboss-${specification.version}/server/default/deployers/jbossws.deployer"/>
<unzip dest="${jbossws.deployer.dir}" src="${build.lib}/jbossws-jboss60-deployer.zip"/>
+
+ <property name="jbossws-jaxrpc.deployer.dir" value="../build/output/jboss-${specification.version}/server/default/deployers/jbossws-jaxrpc.deployer"/>
+ <unzip dest="${jbossws-jaxrpc.deployer.dir}" src="${build.lib}/jbossws-jboss60-jaxrpc-deployer.zip"/>
</target>
</project>
Modified: branches/jaxrpc-cxf/webservices/src/assembly/assembly-resources.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/assembly/assembly-resources.xml 2010-02-11 20:49:29 UTC (rev 100895)
+++ branches/jaxrpc-cxf/webservices/src/assembly/assembly-resources.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -11,6 +11,7 @@
<outputDirectory>/</outputDirectory>
<includes>
<include>jbossws-jboss.deployer/**</include>
+ <include>jbossws-jaxrpc-jboss.deployer/**</include>
<include>jbossws-jboss.jar/**</include>
</includes>
</fileSet>
Added: branches/jaxrpc-cxf/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml (rev 0)
+++ branches/jaxrpc-cxf/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -0,0 +1,17 @@
+<assembly>
+ <id>jbossws-jboss60-jaxrpc-deployer</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/resources/jbossws-jaxrpc-jboss.deployer</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>META-INF/stack-agnostic-jboss-beans.xml</include>
+ <include>META-INF/jboss-classloading.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Property changes on: branches/jaxrpc-cxf/webservices/src/assembly/jbossws-jboss60-jaxrpc-deployer.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java
===================================================================
--- branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2010-02-11 20:49:29 UTC (rev 100895)
+++ branches/jaxrpc-cxf/webservices/src/main/java/org/jboss/webservices/integration/deployers/JAXRPCIntegrationClassPathDeployer.java 2010-02-11 22:17:36 UTC (rev 100896)
@@ -30,6 +30,7 @@
import org.jboss.util.StringPropertyReplacer;
import org.jboss.virtual.VFS;
import org.jboss.virtual.VirtualFile;
+import org.jboss.wsf.spi.management.ServerConfig;
/**
* An abstract deployer that properly set the classpath for JAX-RPC deployments.
@@ -45,7 +46,10 @@
private Set<String> libs;
private boolean integrationLibsFound = false;
+ private ServerConfig wsServerConfig;
+ private boolean stackRequiresIntegration;
+
public JAXRPCIntegrationClassPathDeployer(Class<T> input)
{
super(input);
@@ -56,7 +60,7 @@
@Override
protected boolean isIntegrationDeployment(VFSDeploymentUnit unit)
{
- return integrationLibsFound && isClassPathChangeRequired(unit);
+ return stackRequiresIntegration && integrationLibsFound && isClassPathChangeRequired(unit);
}
@Override
@@ -115,4 +119,16 @@
setIntegrationURLs(getJBossWSIntegrationUrls());
}
+ public ServerConfig getWsServerConfig()
+ {
+ return wsServerConfig;
+ }
+
+ public void setWsServerConfig(ServerConfig wsServerConfig)
+ {
+ this.wsServerConfig = wsServerConfig;
+ //the Native stack does not requires the JAXRPC additional integration
+ stackRequiresIntegration = !wsServerConfig.getImplementationTitle().toLowerCase().contains("native");
+ }
+
}
Added: branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml (rev 0)
+++ branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<classloading xmlns="urn:jboss:classloading:1.0"
+ domain="JAXRPCDeployerDomain"
+ parent-domain="DefaultDomain"
+ export-all="NON_EMPTY"
+ import-all="true">
+</classloading>
Property changes on: branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/jboss-classloading.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml (rev 0)
+++ branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <bean name="JAXRPCAppClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCAppClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCEjbClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCEjbClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCServletClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServletClientClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+ <bean name="JAXRPCServerClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServerClassPathDeployer">
+ <property name="wsServerConfig"><inject bean="WSServerConfig"/></property>
+ <property name="libs">
+ <set class="java.util.HashSet" elementClass="java.lang.String">
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
+ <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
+ </set>
+ </property>
+ </bean>
+
+</deployment>
Property changes on: branches/jaxrpc-cxf/webservices/src/resources/jbossws-jaxrpc-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: branches/jaxrpc-cxf/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml
===================================================================
--- branches/jaxrpc-cxf/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-11 20:49:29 UTC (rev 100895)
+++ branches/jaxrpc-cxf/webservices/src/resources/jbossws-jboss.deployer/META-INF/stack-agnostic-jboss-beans.xml 2010-02-11 22:17:36 UTC (rev 100896)
@@ -139,40 +139,4 @@
<property name="provides">WebMetaData</property>
</bean>
- <bean name="JAXRPCAppClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCAppClientClassPathDeployer">
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
- <bean name="JAXRPCEjbClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCEjbClientClassPathDeployer">
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
- <bean name="JAXRPCServletClientClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServletClientClassPathDeployer">
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
- <bean name="JAXRPCServerClassPathDeployer" class="org.jboss.webservices.integration.deployers.JAXRPCServerClassPathDeployer">
- <property name="libs">
- <set class="java.util.HashSet" elementClass="java.lang.String">
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-factories.jar</value>
- <value>deployers/jbossws-jaxrpc.deployer/jbossws-native-services.jar</value>
- </set>
- </property>
- </bean>
-
</deployment>
More information about the jboss-cvs-commits
mailing list