[jboss-cvs] JBossAS SVN: r79748 - in trunk: component-matrix and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 20 10:10:29 EDT 2008
Author: richard.opalka at jboss.com
Date: 2008-10-20 10:10:29 -0400 (Mon, 20 Oct 2008)
New Revision: 79748
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
trunk/webservices/src/scripts/jbossws-deploy-macros.xml
Log:
[JBAS-6004][JBWS-2360] svn merge -r 79731:79737 https://svn.jboss.org/repos/jbossas/branches/ropalka-jbossws304
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/build/build-distr.xml 2008-10-20 14:10:29 UTC (rev 79748)
@@ -1605,7 +1605,7 @@
<unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
<!-- Copy jbossws container beans to deploy directory -->
- <copy todir="${install.all}/deploy" file="${_module.output}/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml"/>
+ <copy todir="${install.all.deployers}/jbossws.deployer/META-INF" file="${_module.output}/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml"/>
<delete dir="${_module.output}/jbossws-native-resources"/>
<mkdir dir="${_module.output}/jbossws-native-resources"/>
@@ -1620,9 +1620,6 @@
<property name="jbossid" value="jboss501"/>
</ant>
- <!-- FIXME JBAS-5811 -->
- <delete file="${install.all.deployers}/jbossws.deployer/META-INF/jbossws-deployer-beans.xml"/>
-
</target>
<target name="_module-webservices-all" depends="_module-webservices-most">
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/component-matrix/pom.xml 2008-10-20 14:10:29 UTC (rev 79748)
@@ -33,10 +33,10 @@
<version.jboss.jbossts>4.4.0.GA</version.jboss.jbossts>
<version.jboss.jms-integration-tests>1.0.1.GA</version.jboss.jms-integration-tests>
<version.jboss.jaxr>1.2.0.SP2</version.jboss.jaxr>
- <version.jboss.jbossws>3.0.4.CR1</version.jboss.jbossws>
- <version.jboss.jbossws-common>1.0.7.CR1</version.jboss.jbossws-common>
- <version.jboss.jbossws-framework>3.0.4.CR1</version.jboss.jbossws-framework>
- <version.jboss.jbossws-spi>1.0.6.CR1</version.jboss.jbossws-spi>
+ <version.jboss.jbossws>3.0.4.GA</version.jboss.jbossws>
+ <version.jboss.jbossws-common>1.0.7.GA</version.jboss.jbossws-common>
+ <version.jboss.jbossws-framework>3.0.4.GA</version.jboss.jbossws-framework>
+ <version.jboss.jbossws-spi>1.0.6.GA</version.jboss.jbossws-spi>
<version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
<version.jboss.web>2.1.1.CR7</version.jboss.web>
<version.org.hibernate>3.3.1.GA</version.org.hibernate>
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/AbstractWebServiceDeployer.java 2008-10-20 14:10:29 UTC (rev 79748)
@@ -30,7 +30,7 @@
import java.util.List;
/**
- * This deployer that calls the registered DeployerHooks
+ * This is the deployer that calls the registered DeployerHooks
*
* @author Thomas.Diesler at jboss.org
* @since 24-Apr-2007
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerEJB.java 2008-10-20 14:10:29 UTC (rev 79748)
@@ -43,7 +43,7 @@
import org.jboss.wsf.spi.deployment.integration.WebServiceDeployment;
/**
- * This web service deployer for EJB. Adopts EJB deployments to
+ * This it the web service deployer for EJB. Adopts EJB deployments to
* {@link org.jboss.wsf.spi.deployment.integration.WebServiceDeclaration} an passes it to a chain of
* {@link org.jboss.wsf.container.jboss50.deployer.DeployerHook}'s.
*
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployer/WebServiceDeployerPreJSE.java 2008-10-20 14:10:29 UTC (rev 79748)
@@ -24,7 +24,7 @@
import org.jboss.metadata.web.jboss.JBossWebMetaData;
/**
- * This web service deployer for JSE
+ * This is the web service deployer for JSE
*
* @author Thomas.Diesler at jboss.org
* @since 24-Apr-2007
@@ -36,6 +36,7 @@
public WebServiceDeployerPreJSE()
{
addInput(JBossWebMetaData.class);
+ addOutput(JBossWebMetaData.class);
}
public void setRelOrderWar(int relOrderWar)
Modified: trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java
===================================================================
--- trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/webservices/src/main/org/jboss/wsf/container/jboss50/deployment/tomcat/WebMetaDataModifierImpl.java 2008-10-20 14:10:29 UTC (rev 79748)
@@ -117,6 +117,16 @@
initParams = new ArrayList<ParamValueMetaData>();
servlet.setInitParam(initParams);
}
+
+ if (servlet.getLoadOnStartup() <= 0)
+ {
+ // [JBWS-2246] hack. We need to start all webservice endpoint servlets because of
+ // wsdl-publish-location feature. This feature generates wsdl to specified file
+ // location on the FS. Without starting the servlets the WSDL will not be published
+ // because publish wsdl deployment aspect is now called in endpoint init servlet
+ // lifecycle method and not in the deployers chain as it was in AS 4.x series.
+ servlet.setLoadOnStartup(1);
+ }
String linkName = servlet.getServletName();
Modified: trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml
===================================================================
--- trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/webservices/src/resources/jbossws-jboss50-container.jar/META-INF/jbossws-container-jboss-beans.xml 2008-10-20 14:10:29 UTC (rev 79748)
@@ -156,7 +156,7 @@
<property name="provides">ContainerEndpointHandler</property>
</bean>
- <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect">
+ <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointDeployerLifecycleDeploymentAspect">
<property name="requires">LAST_DEPLOYMENT_ASPECT</property>
</bean>
Modified: trunk/webservices/src/scripts/jbossws-deploy-macros.xml
===================================================================
--- trunk/webservices/src/scripts/jbossws-deploy-macros.xml 2008-10-20 13:44:10 UTC (rev 79747)
+++ trunk/webservices/src/scripts/jbossws-deploy-macros.xml 2008-10-20 14:10:29 UTC (rev 79748)
@@ -126,7 +126,9 @@
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
<patternset refid="jbossws.lib.patternset"/>
+ <include name="**/jaxb-api.jar"/>
<include name="**/jaxb-impl.jar"/>
+ <include name="**/stax-api.jar"/>
<include name="**/wstx.jar"/>
</fileset>
</copy>
@@ -154,7 +156,7 @@
<!-- Deploy Client -->
<!-- ================================================================== -->
- <macrodef name="macro-deploy-jbossws-client">
+ <macrodef name="macro-deploy-jbossws-client42">
<attribute name="thirdpartydir"/>
<attribute name="targetdir"/>
<attribute name="jbossid"/>
@@ -168,6 +170,20 @@
</copy>
</sequential>
</macrodef>
+
+ <macrodef name="macro-deploy-jbossws-client50">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <attribute name="jbossid"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.client.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Deploy Server Lib -->
@@ -265,26 +281,11 @@
<attribute name="jbossid"/>
<sequential>
<mkdir dir="@{targetdir}"/>
- <copy todir="@{targetdir}" flatten="true" overwrite="true">
- <fileset dir="@{thirdpartydir}">
- <patternset refid="jbossws.service.lib.patternset"/>
- </fileset>
- </copy>
<unzip dest="@{targetdir}/jbossws-management.war">
<fileset dir="@{thirdpartydir}">
<include name="**/jbossws-native-management.war"/>
</fileset>
</unzip>
- <copy todir="@{targetdir}">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
- <include name="META-INF/**"/>
- </fileset>
- </copy>
- <copy todir="@{targetdir}/META-INF">
- <fileset dir="@{artifactsdir}/resources">
- <include name="standard-*-config.xml"/>
- </fileset>
- </copy>
</sequential>
</macrodef>
@@ -301,41 +302,25 @@
<mkdir dir="@{targetdir}"/>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-common.jar"/>
- <include name="**/jbossws-framework.jar"/>
- <include name="**/jbossws-@{jbossid}.jar"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
</fileset>
</copy>
- <copy todir="@{targetdir}/META-INF" flatten="true" overwrite="true">
- <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}">
- <include name="**/jbossws-deployer-beans.xml"/>
+ <copy todir="@{targetdir}">
+ <fileset dir="@{artifactsdir}/resources/jbossws-@{jbossid}/jbossws.beans">
+ <include name="META-INF/**"/>
</fileset>
</copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy Deploy -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws-deploy50">
- <attribute name="thirdpartydir"/>
- <attribute name="targetdir"/>
- <attribute name="jbossid"/>
- <sequential>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{artifactsdir}/resources">
+ <include name="standard-*-config.xml"/>
+ </fileset>
+ </copy>
<copy todir="@{targetdir}" flatten="true" overwrite="true">
<fileset dir="@{thirdpartydir}">
- <include name="**/jbossws-@{jbossid}-container.jar"/>
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
</fileset>
</copy>
- <unzip dest="@{targetdir}" src="@{targetdir}/jbossws-@{jbossid}-container.jar">
- <patternset>
- <include name="META-INF/jbossws-container-beans.xml"/>
- </patternset>
- </unzip>
- <move file="@{targetdir}/META-INF/jbossws-container-beans.xml" tofile="@{targetdir}/jbossws-container-beans.xml"/>
- <delete file="@{targetdir}/jbossws-@{jbossid}-container.jar"/>
- <delete dir="@{targetdir}/META-INF"/>
</sequential>
</macrodef>
@@ -348,7 +333,7 @@
<target name="deploy-jbossws-native42" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client42 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib42 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib42 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar42 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
@@ -357,12 +342,11 @@
<target name="deploy-jbossws-native50" depends="check-parameters,deploy-jbossws-endorsed">
<macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/>
- <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
+ <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
<macro-deploy-jbossws-server-lib50 targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
<macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>
- <!--macro-deploy-jbossws-deploy50 targetdir="${installserver}/deploy" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/-->
<macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/>
</target>
@@ -380,7 +364,7 @@
<!-- Undeploy JBossWS -->
<!-- ================================================================== -->
- <macrodef name="macro-undeploy-jbossws">
+ <macrodef name="macro-undeploy-jbossws42">
<attribute name="defaultconf"/>
<attribute name="targetdir"/>
<sequential>
@@ -415,5 +399,32 @@
</sequential>
</macrodef>
+
+ <macrodef name="macro-undeploy-jbossws50">
+ <attribute name="defaultconf"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{targetdir}/jbossws-deploy.conf" failonerror="false"/>
+ <loadfile property="jbossws.deploy.conf" srcfile="@{defaultconf}" failonerror="false"/>
+
+ <property name="jboss.server.home" value="@{targetdir}/../.."/>
+ <property name="jboss.home" value="${jboss.server.home}/../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.home}/client"/>
+ <fail message="Cannot find ${jboss.home}/client" unless="jboss.undeploy.client"/>
+
+ <!-- delete content of last deployment -->
+ <delete>
+ <fileset dir="${jboss.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+
+ <!-- delete jbossws.sar -->
+ <delete dir="@{targetdir}"/>
+
+ <!-- delete juddi-service.sar -->
+ <delete dir="@{targetdir}/../juddi-service.sar"/>
+
+ </sequential>
+ </macrodef>
+
</project>
More information about the jboss-cvs-commits
mailing list