[jbossws-commits] JBossWS SVN: r3520 - in branches/jbossws-2.0: integration/native/ant-import and 3 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Sat Jun 9 10:11:15 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-06-09 10:11:15 -0400 (Sat, 09 Jun 2007)
New Revision: 3520
Modified:
branches/jbossws-2.0/build/ant-import/build-setup.xml
branches/jbossws-2.0/build/ant-import/build-testsuite.xml
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java
Log:
Add deployment to lib/endorsed for jdk1.6
Modified: branches/jbossws-2.0/build/ant-import/build-setup.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/build/ant-import/build-setup.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -66,6 +66,12 @@
<available property="jbossws.portal.content.available" file="${jbossws.portal.content}" type="dir"/>
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
+
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
Modified: branches/jbossws-2.0/build/ant-import/build-testsuite.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/build/ant-import/build-testsuite.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -136,8 +136,8 @@
<path id="tests.javac.classpath">
<path refid="ws.stack.classpath"/>
<path refid="tests.extra.classpath"/>
- <pathelement location="${jboss.lib}/endorsed/jaxb-api.jar"/>
<pathelement location="${jboss.client}/activation.jar"/>
+ <pathelement location="${jboss.client}/jaxb-api.jar"/>
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-common-client.jar"/>
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -21,28 +21,41 @@
<!-- ================================================================== -->
<!-- Deploy jbossws to jboss50 -->
- <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to jboss50">
+ <target name="deploy-jboss50" depends="jars-jboss50,undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws to jboss50">
+
<macro-deploy-native50
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
thirdpartylibs="${core.dir}/thirdparty"/>
-
+
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss50.home}"/>
</target>
+
+ <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss50.home}"
+ corelibs="${core.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
<!-- Remove jbossws from jboss50 -->
- <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws from jboss50">
+ <target name="undeploy-jboss50" depends="prepare,undeploy-jboss50-endorsed" description="Remove jbossws from jboss50">
<macro-undeploy-native50/>
<macro-undeploy-spi jbosshome="${jboss50.home}"/>
</target>
+
+ <target name="undeploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss50.home}"/>
+ </target>
<!-- Deploy jbossws to jboss42 -->
- <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to jboss42">
+ <target name="deploy-jboss42" depends="jars-jboss42,undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws to jboss42">
+
<macro-deploy-native42
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss42.dir}/output/lib"
@@ -55,17 +68,28 @@
thirdpartylibs="${spi.dir}/thirdparty"
jbosshome="${jboss42.home}"/>
</target>
+
+ <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss42.home}"
+ corelibs="${core.dir}/output/lib"
+ thirdpartylibs="${core.dir}/thirdparty"/>
+ </target>
<!-- Remove jbossws from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws from jboss42">
+ <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws from jboss42">
<macro-undeploy-native42/>
<macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
+ <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
+ </target>
<!-- Deploy jbossws to jboss40 -->
<target name="deploy-jboss40" depends="jars-jboss40,undeploy-jboss40,deploy-jboss40-no-ejb3" description="Deploy jbossws to jboss40"/>
<target name="deploy-jboss40-ejb3">
+
<macro-deploy-native40
spilibs="${spi.dir}/output/lib"
jbosslibs="${int.jboss40.dir}/output/lib"
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -135,18 +135,6 @@
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- <!-- ENDORSED -->
- <copy todir="${jboss42.home}/lib/endorsed" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <include name="jaxb-api.jar"/>
- </fileset>
- <fileset dir="@{corelibs}">
- <include name="jboss-jaxrpc.jar"/>
- <include name="jboss-jaxws.jar"/>
- <include name="jboss-saaj.jar"/>
- </fileset>
- </copy>
-
<!-- BIN SCRIPTS -->
<unzip dest="${jboss42.home}/bin" src="@{corelibs}/jbossws-core-scripts.zip"/>
<chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
@@ -157,9 +145,13 @@
<include name="jbossws-jboss42.jar"/>
</fileset>
<fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
<include name="jbossws-client.jar"/>
</fileset>
<fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
<include name="jaxb-xjc.jar"/>
<include name="wsdl4j.jar"/>
@@ -189,11 +181,6 @@
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
<delete>
- <!-- ENDORSED -->
- <fileset dir="${jboss42.home}/lib/endorsed">
- <include name="jaxb-api.jar"/>
- </fileset>
-
<!-- BIN SCRIPTS -->
<fileset dir="${jboss42.home}/bin">
<include name="wsconsume.*"/>
@@ -363,5 +350,39 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
</sequential>
</macrodef>
+
+ <!-- Deploy API jars to lib/endorsed for usage with jdk1.6 -->
+ <macrodef name="macro-deploy-endorsed">
+ <attribute name="jbosshome"/>
+ <attribute name="corelibs"/>
+ <attribute name="thirdpartylibs"/>
+ <sequential>
+ <copy todir="@{jbosshome}/lib/endorsed" overwrite="true">
+ <fileset dir="@{thirdpartylibs}">
+ <include name="jaxb-api.jar"/>
+ </fileset>
+ <fileset dir="@{corelibs}">
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+ <!-- Undeploy API jars from lib/endorsed -->
+ <macrodef name="macro-undeploy-endorsed">
+ <attribute name="jbosshome"/>
+ <sequential>
+ <delete>
+ <fileset dir="@{jbosshome}/lib/endorsed">
+ <include name="jaxb-api.jar"/>
+ <include name="jboss-jaxrpc.jar"/>
+ <include name="jboss-jaxws.jar"/>
+ <include name="jboss-saaj.jar"/>
+ </fileset>
+ </delete>
+ </sequential>
+ </macrodef>
+
</project>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-build.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -59,6 +59,12 @@
<available property="jboss40.available" file="${jboss40.available.file}"/>
<available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/>
+
+ <!-- JDK Detection -->
+ <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
<import file="${basedir}/build/build-deploy.xml"/>
<import file="${basedir}/build/build-testsuite.xml"/>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -18,21 +18,25 @@
<!-- ================================================================== -->
<!-- Deploy jbossws/native to jboss50 -->
- <target name="deploy-jboss50" depends="undeploy-jboss50" description="Deploy jbossws/native to jboss50">
+ <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50">
<macro-deploy-native50
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"
- corescripts="${bin.dir}"/>
-
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"
jbosshome="${jboss50.home}"/>
</target>
+ <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss50.home}"
+ corelibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ </target>
<!-- Remove jbossws/native from jboss50 -->
<target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50">
@@ -41,27 +45,34 @@
</target>
<!-- Deploy jbossws/native to jboss42 -->
- <target name="deploy-jboss42" depends="undeploy-jboss42" description="Deploy jbossws/native to jboss42">
+ <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42">
<macro-deploy-native42
spilibs="${lib.dir}"
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"
- corescripts="${bin.dir}"/>
-
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
spiscripts="${bin.dir}"
thirdpartylibs="${lib.dir}"
jbosshome="${jboss42.home}"/>
</target>
+ <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-deploy-endorsed
+ jbosshome="${jboss42.home}"
+ corelibs="${lib.dir}"
+ thirdpartylibs="${lib.dir}"/>
+ </target>
<!-- Remove jbossws/native from jboss42 -->
- <target name="undeploy-jboss42" depends="prepare" description="Remove jbossws/native from jboss42">
+ <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42">
<macro-undeploy-native42/>
<macro-undeploy-spi jbosshome="${jboss42.home}"/>
</target>
+ <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6">
+ <macro-undeploy-endorsed jbosshome="${jboss42.home}"/>
+ </target>
<!-- Deploy jbossws/native to jboss40 -->
<target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/>
@@ -72,8 +83,7 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"
- corescripts="${bin.dir}"/>
+ thirdpartylibs="${lib.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
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-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/integration/native/src/main/resources/jbossws-native50.sar/META-INF/jbossws-beans.xml 2007-06-09 14:11:15 UTC (rev 3520)
@@ -135,7 +135,7 @@
Each handles a single aspect of web service deployment
-->
<bean name="WSClassLoaderInjectionDeployer" class="org.jboss.wsf.container.jboss50.ClassLoaderInjectionDeployer"/>
- <bean name="WSContextRootDeployer" class="org.jboss.ws.core.server.LegacyContextRootDeployer"/>
+ <bean name="WSContextRootDeployer" class="org.jboss.wsf.spi.deployment.ContextRootDeployer"/>
<bean name="WSEagerInitializeDeployer" class="org.jboss.wsf.stack.jbws.EagerInitializeDeployer"/>
<bean name="WSEndpointHandlerDeployer" class="org.jboss.wsf.spi.deployment.EndpointHandlerDeployer">
<property name="requestHandler">org.jboss.wsf.stack.jbws.RequestHandlerImpl</property>
@@ -161,7 +161,7 @@
<bean name="WSUnifiedDeploymentInfoDeployer" class="org.jboss.wsf.container.jboss50.UnifiedDeploymentInfoDeployer"/>
<bean name="WSUnifiedMetaDataAssociationDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataAssociationDeployer"/>
<bean name="WSUnifiedMetaDataDeployer" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeployer"/>
- <bean name="WSURLPatternDeployer" class="org.jboss.ws.core.server.LegacyURLPatternDeployer"/>
+ <bean name="WSURLPatternDeployer" class="org.jboss.wsf.spi.deployment.URLPatternDeployer"/>
<bean name="WSWebAppGeneratorDeployer" class="org.jboss.wsf.spi.deployment.WebAppGeneratorDeployer">
<property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property>
<property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property>
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-09 09:30:54 UTC (rev 3519)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/core/server/LegacyContextRootDeployer.java 2007-06-09 14:11:15 UTC (rev 3520)
@@ -55,6 +55,9 @@
String[] tokens = urlPattern.split("/");
if (tokens.length > 1)
{
+ if (contextRoot != null && contextRoot.equals(tokens[0]) == false)
+ throw new IllegalStateException("All endpoints must share the same <context-root>: " + contextRoot + "!=" + tokens[0]);
+
contextRoot = tokens[0];
}
}
More information about the jbossws-commits
mailing list