JBossWS SVN: r5964 - stack/native/trunk/src/main/java/org/jboss/ws/tools/schema.
by jbossws-commits＠lists.jboss.org
Author: mageshbk(a)jboss.com
Date: 2008-03-13 10:48:37 -0400 (Thu, 13 Mar 2008)
New Revision: 5964
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
Log:
[JBWS-2018] Fixed regression due to array types package lookup
Modified: stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-13 13:43:44 UTC (rev 5963)
+++ stack/native/trunk/src/main/java/org/jboss/ws/tools/schema/SchemaTypeCreator.java 2008-03-13 14:48:37 UTC (rev 5964)
@@ -703,41 +703,40 @@
private String getNamespace(Class javaType, String defaultNS)
{
- if (javaType.isPrimitive())
- return Constants.NS_JBOSSWS_URI + "/primitives";
-
- while (javaType.isArray())
+ String retNS = defaultNS;
+ if (javaType.isPrimitive() && retNS == null)
{
- javaType = javaType.getComponentType();
+ retNS = Constants.NS_JBOSSWS_URI + "/primitives";
}
-
- Package javaPackage = javaType.getPackage();
- if (javaPackage == null)
+ else
{
- if (defaultNS != null)
+ while (javaType.isArray())
{
- return defaultNS;
+ javaType = javaType.getComponentType();
}
- else
+
+ Package javaPackage = javaType.getPackage();
+ if (javaPackage != null)
{
+ String packageName = javaPackage.getName();
+ String ns = packageNamespaceMap.get(packageName);
+ if (ns != null)
+ {
+ retNS = ns;
+ }
+ else if (retNS == null)
+ {
+ retNS = utils.getTypeNamespace(packageName);
+ }
+
+ allocatePrefix(retNS);
+ }
+ else if (retNS == null)
+ {
throw new WSException("Cannot determine namespace, Class had no package");
}
}
- String packageName = javaPackage.getName();
-
- String ns = packageNamespaceMap.get(packageName);
- if (ns == null && defaultNS == null)
- {
- ns = utils.getTypeNamespace(packageName);
- }
- else if (ns == null)
- {
- ns = defaultNS;
- }
-
- allocatePrefix(ns);
-
- return ns;
+ return retNS;
}
private JBossXSComplexTypeDefinition getComplexTypeForJavaException(QName xmlType, Class javaType)
18 years, 1 month
- 1
- 0
JBossWS SVN: r5963 - stack/cxf/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-13 09:43:44 -0400 (Thu, 13 Mar 2008)
New Revision: 5963
Modified:
stack/cxf/trunk/ant-import/build-bin-dist.xml
Log:
format xml
Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-03-13 13:43:06 UTC (rev 5962)
+++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-03-13 13:43:44 UTC (rev 5963)
@@ -17,90 +17,90 @@
<!-- Binary distribution -->
<!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
-
+ <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
+
<property name="bindist.dir" value="${cxf.output.dir}/jbossws-cxf-dist"/>
- <property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.deploy.dir" value="${bindist.dir}/deploy"/>
- <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
- <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
- <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
-
- <delete dir="${bindist.dir}"/>
- <mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.deploy.dir}"/>
- <mkdir dir="${bindist.docs.dir}"/>
- <mkdir dir="${bindist.tests.dir}"/>
- <mkdir dir="${bindist.tools.dir}"/>
-
- <!-- root -->
- <copy tofile="${bindist.dir}/ant.properties.example" file="${cxf.distro.dir}/ant.properties.example">
+ <property name="bindist.build.dir" value="${bindist.dir}/build"/>
+ <property name="bindist.deploy.dir" value="${bindist.dir}/deploy"/>
+ <property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
+ <property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
+ <property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
+
+ <delete dir="${bindist.dir}"/>
+ <mkdir dir="${bindist.build.dir}"/>
+ <mkdir dir="${bindist.deploy.dir}"/>
+ <mkdir dir="${bindist.docs.dir}"/>
+ <mkdir dir="${bindist.tests.dir}"/>
+ <mkdir dir="${bindist.tools.dir}"/>
+
+ <!-- root -->
+ <copy tofile="${bindist.dir}/ant.properties.example" file="${cxf.distro.dir}/ant.properties.example">
<filterset>
<filtersfile file="${cxf.dir}/ant.properties"/>
</filterset>
</copy>
- <copy tofile="${bindist.dir}/version.properties" file="${cxf.dir}/version.properties"/>
- <copy tofile="${bindist.dir}/build.xml" file="${cxf.distro.dir}/bin-dist-build.xml"/>
-
- <!-- build -->
- <copy todir="${bindist.build.dir}">
- <fileset dir="${cxf.dir}/ant-import">
+ <copy tofile="${bindist.dir}/version.properties" file="${cxf.dir}/version.properties"/>
+ <copy tofile="${bindist.dir}/build.xml" file="${cxf.distro.dir}/bin-dist-build.xml"/>
+
+ <!-- build -->
+ <copy todir="${bindist.build.dir}">
+ <fileset dir="${cxf.dir}/ant-import">
<include name="build-deploy.xml"/>
<include name="jbossws-deploy-macros.xml"/>
<include name="jbossws-default-deploy.conf"/>
- </fileset>
- </copy>
-
+ </fileset>
+ </copy>
+
<!-- deploy -->
<copy todir="${bindist.deploy.dir}">
<fileset dir="${deploy.artifacts.dir}"/>
</copy>
-
- <!-- docs -->
- <copy todir="${bindist.docs.dir}" >
- <fileset dir="${cxf.output.dir}">
+
+ <!-- docs -->
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${cxf.output.dir}">
<include name="apidocs/**"/>
</fileset>
- </copy>
- <copy todir="${bindist.docs.dir}" filtering="yes">
- <fileset dir="${cxf.distro.dir}">
+ </copy>
+ <copy todir="${bindist.docs.dir}" filtering="yes">
+ <fileset dir="${cxf.distro.dir}">
<include name="Install.txt"/>
<include name="ReleaseNotes.txt"/>
</fileset>
<filterset>
<filtersfile file="${cxf.dir}/version.properties"/>
</filterset>
- </copy>
+ </copy>
+
+ <copy todir="${bindist.docs.dir}">
+ <fileset dir="${cxf.etc.dir}">
+ <include name="JBossORG-EULA.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- tests -->
+ <copy todir="${bindist.tests.dir}" overwrite="true">
+ <fileset dir="${cxf.dir}/src/test-framework"/>
+ <fileset dir="${cxf.dir}/src/test">
+ <include name="resources/test-excludes-*.txt"/>
+ </fileset>
+ </copy>
+
+ <!-- build tools -->
+ <copy todir="${bindist.tools.dir}" overwrite="true">
+ <fileset dir="${cxf.dir}/tools/ant"/>
+ </copy>
+ <copy todir="${bindist.dir}" overwrite="true">
+ <fileset dir="${cxf.dir}">
+ <include name="build.bat"/>
+ <include name="build.sh"/>
+ </fileset>
+ </copy>
+ <chmod file="${bindist.dir}/build.sh" perm="+x"/>
+
+ <zip destfile="${cxf.output.dir}/jbossws-${version.id}.zip">
+ <fileset dir="${cxf.output.dir}" includes="jbossws-cxf-dist/**"/>
+ </zip>
+ </target>
- <copy todir="${bindist.docs.dir}">
- <fileset dir="${cxf.etc.dir}">
- <include name="JBossORG-EULA.txt"/>
- </fileset>
- </copy>
-
- <!-- tests -->
- <copy todir="${bindist.tests.dir}" overwrite="true">
- <fileset dir="${cxf.dir}/src/test-framework"/>
- <fileset dir="${cxf.dir}/src/test">
- <include name="resources/test-excludes-*.txt"/>
- </fileset>
- </copy>
-
- <!-- build tools -->
- <copy todir="${bindist.tools.dir}" overwrite="true">
- <fileset dir="${cxf.dir}/tools/ant"/>
- </copy>
- <copy todir="${bindist.dir}" overwrite="true">
- <fileset dir="${cxf.dir}">
- <include name="build.bat"/>
- <include name="build.sh"/>
- </fileset>
- </copy>
- <chmod file="${bindist.dir}/build.sh" perm="+x"/>
-
- <zip destfile="${cxf.output.dir}/jbossws-${version.id}.zip">
- <fileset dir="${cxf.output.dir}" includes="jbossws-cxf-dist/**"/>
- </zip>
- </target>
-
</project>
18 years, 1 month
- 1
- 0
JBossWS SVN: r5962 - in stack/metro/trunk: ant-import and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-13 09:43:06 -0400 (Thu, 13 Mar 2008)
New Revision: 5962
Added:
stack/metro/trunk/ant-import/build-prepare-deploy.xml
stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
Removed:
stack/metro/trunk/ant-import/build-testsuite.xml
stack/metro/trunk/ant-import/macros-deploy-metro.xml
stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
Modified:
stack/metro/trunk/ant-import-tests/build-testsuite.xml
stack/metro/trunk/ant-import/build-deploy.xml
stack/metro/trunk/build.xml
stack/metro/trunk/src/main/distro/ant.properties.example
stack/metro/trunk/src/main/distro/bin-dist-build.xml
Log:
Align deploy steps with native
Modified: stack/metro/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-deploy.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/ant-import/build-deploy.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -12,58 +12,123 @@
<!-- $Id$ -->
<project>
-
- <import file="${int.metro.dir}/ant-import/macros-deploy-metro.xml"/>
- <property name="deploy.dir" value="${int.metro.dir}/output/deploy"/>
- <property name="jbossws.default.undeploy.files" value="${int.metro.dir}/ant-import/jbossws-default-deploy.conf"/>
-
<!-- ================================================================== -->
- <!-- Deployment JBoss422 -->
+ <!-- Prepare Deployment Structure JBoss-4.2.x -->
<!-- ================================================================== -->
-
- <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/metro to jboss42">
- <macro-deploy-metro422 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/>
+
+ <target name="deploy-structure-jboss42" depends="prepare-deploy">
+ <delete dir="${deploy.structure.jboss42}"/>
+ <antcall target="deploy-jbossws-metro42" inheritall="false">
+ <param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
+ <param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure.jboss42}"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss422 -->
+ <!-- ================================================================== -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/metro from jboss42">
- <macro-undeploy-metro422/>
+ <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-structure-jboss42" description="Deploy jbossws to jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <copy todir="${jboss422.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <unzip dest="${jboss422.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
+ <chmod dir="${jboss422.home}/bin" perm="+x" includes="*.sh"/>
</target>
+
+ <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws from jboss422">
+ <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss422.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss422.server.deploy}/juddi-service.sar"/>
+ </target>
<!-- ================================================================== -->
- <!-- Deployment JBoss423 -->
+ <!-- Deployment JBoss423 -->
<!-- ================================================================== -->
- <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/metro to jboss42">
- <macro-deploy-metro423 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/>
+ <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-structure-jboss42" description="Deploy jbossws to jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <copy todir="${jboss423.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss42}"/>
+ </copy>
+ <unzip dest="${jboss423.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
+ <chmod dir="${jboss423.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/metro from jboss42">
- <macro-undeploy-metro423/>
+
+ <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws from jboss423">
+ <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss423.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss423.server.deploy}/juddi-service.sar"/>
</target>
-
+
<!-- ================================================================== -->
- <!-- Deployment JBoss500 -->
+ <!-- Prepare Deployment Structure JBoss-5.0.x -->
<!-- ================================================================== -->
-
- <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/metro to jboss50">
- <macro-deploy-metro500 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/>
+
+ <target name="deploy-structure-jboss50" depends="prepare-deploy">
+ <delete dir="${deploy.structure.jboss50}"/>
+ <antcall target="deploy-jbossws-metro50" inheritall="false">
+ <param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
+ <param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
+ </antcall>
+ <macro-create-deploy-conf deploystructure="${deploy.structure.jboss50}"/>
</target>
+
+ <!-- ================================================================== -->
+ <!-- Deployment JBoss500 -->
+ <!-- ================================================================== -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss50">
- <macro-undeploy-metro500/>
+ <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-structure-jboss50" description="Deploy jbossws to jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <copy todir="${jboss500.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss50}"/>
+ </copy>
+ <unzip dest="${jboss500.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
+ <chmod dir="${jboss500.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
+
+ <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws from jboss500">
+ <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss500.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss500.server.deploy}/juddi-service.sar"/>
+ </target>
+
<!-- ================================================================== -->
- <!-- Deployment JBoss501 -->
+ <!-- Deployment JBoss501 -->
<!-- ================================================================== -->
- <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/metro to jboss50">
- <macro-deploy-metro501 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/>
+ <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <copy todir="${jboss501.home}" overwrite="true">
+ <fileset dir="${deploy.structure.jboss50}"/>
+ </copy>
+ <unzip dest="${jboss501.server.deploy}/juddi-service.sar" src="${deploy.artifacts.dir}/lib/juddi-service.sar"/>
+ <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/>
</target>
-
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss50">
- <macro-undeploy-metro501/>
+
+ <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">
+ <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
+ <macro-undeploy-jbossws targetdir="${jboss501.server.deploy}/jbossws.sar" defaultconf="${jbossws.default.deploy.conf}"/>
+ <delete dir="${jboss501.server.deploy}/juddi-service.sar"/>
</target>
-
+
+ <!-- ================================================================== -->
+ <!-- Create jbossws-deploy.conf -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-create-deploy-conf">
+ <attribute name="deploystructure"/>
+ <sequential>
+ <fileset id="jbossws.deploy.fileset" dir="@{deploystructure}" excludes="**/jbossws.sar/**"/>
+ <property name="jbossws.deploy.fileset" refid="jbossws.deploy.fileset"/>
+ <property name="jbossws.sar.dir" value="@{deploystructure}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
+ <echo file="${jbossws.sar.dir}/jbossws-deploy.conf" message="${jbossws.deploy.fileset}"/>
+ <replace file="${jbossws.sar.dir}/jbossws-deploy.conf" token=";" value=" "/>
+ </sequential>
+ </macrodef>
+
</project>
Added: stack/metro/trunk/ant-import/build-prepare-deploy.xml
===================================================================
--- stack/metro/trunk/ant-import/build-prepare-deploy.xml (rev 0)
+++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!-- ================================================================== -->
+ <!-- Prepare Deployment Source -->
+ <!-- ================================================================== -->
+
+ <target name="prepare-deploy" depends="jars">
+
+ <delete dir="${deploy.artifacts.dir}"/>
+
+ <unzip dest="${deploy.artifacts.dir}/bin" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
+ <copy todir="${deploy.artifacts.dir}/lib">
+ <fileset dir="${thirdparty.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="juddi-service.sar"/>
+ </fileset>
+ <fileset dir="${metro.output.lib.dir}">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ <fileset dir="glassfish-metro/output">
+ <patternset refid="jbossws.client.patternset"/>
+ <patternset refid="jbossws.lib.patternset"/>
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ <patternset refid="jbossws.server.lib.patternset"/>
+ <patternset refid="jbossws.service.lib.patternset"/>
+ </fileset>
+ </copy>
+ <copy todir="${deploy.artifacts.dir}/resources">
+ <fileset dir="${metro.output.resources.dir}">
+ <include name="jbossws-metro42-beans.xml"/>
+ <include name="jbossws-metro50-beans.xml"/>
+ <include name="jbossws-jboss42.sar/**"/>
+ <include name="jbossws-metro.sar/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+</project>
Property changes on: stack/metro/trunk/ant-import/build-prepare-deploy.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/metro/trunk/ant-import/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import/build-testsuite.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/ant-import/build-testsuite.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ============================================================ -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- ============================================================ -->
-
-<!-- $Id$ -->
-
-<project>
-
- <property name="tests.output.dir" value="${int.metro.dir}/output/tests"/>
-
- <import file="${int.metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
-
- <!-- Define excludesfile -->
- <property name="excludesfile" value="${int.metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="tests-init" depends="tests-classpath">
-
- <path id="ws.stack.classpath">
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/http.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxrpc-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jsr173_api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jsr250-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/resolver.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
- </path>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiling -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="tests-init" description="Compile sources">
- <macro-compile-classes srcdir="${int.metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${int.metro.dir}/src/test/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${int.metro.dir}/src/test-framework"/>
- <macro-copy-resources srcdir="${int.metro.dir}/src/test"/>
- </target>
-
- <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">
- <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
-
-</project>
Added: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml (rev 0)
+++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- -->
+<!-- JBoss, the OpenSource J2EE webOS -->
+<!-- -->
+<!-- Distributable under LGPL license. -->
+<!-- See terms of license at http://www.gnu.org. -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<!-- $Id$ -->
+
+<project>
+
+ <!--
+ These patterns should be common for all supported containers.
+ All jars must also be declared in component-info.xml to ensure
+ that the AS build uses the same version.
+ -->
+ <patternset id="jbossws.bin.patternset">
+ <include name="**/wsconsume.bat"/>
+ <include name="**/wsconsume.sh"/>
+ <include name="**/wsprovide.bat"/>
+ <include name="**/wsprovide.sh"/>
+ </patternset>
+
+ <patternset id="jbossws.client.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-metro-client.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxb-xjc.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jboss-wsit-rt.jar"/>
+ <include name="**/jboss-wsit-tools.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.patternset">
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.lib.endorsed.patternset">
+ <include name="**/jboss-jaxrpc.jar"/>
+ <include name="**/jboss-jaxws.jar"/>
+ <include name="**/jboss-jaxws-ext.jar"/>
+ <include name="**/jboss-saaj.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.server.lib.patternset">
+ <include name="**/jbossws-common.jar"/>
+ <include name="**/jbossws-framework.jar"/>
+ <include name="**/jbossws-spi.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/saaj-api.jar"/>
+ </patternset>
+
+ <patternset id="jbossws.service.lib.patternset">
+ <include name="**/FastInfoset.jar"/>
+ <include name="**/http.jar"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ <include name="**/jaxrpc-api.jar"/>
+ <include name="**/jaxws-api.jar"/>
+ <include name="**/jaxws-local-transport.jar"/>
+ <include name="**/jaxws-rt.jar"/>
+ <include name="**/jaxws-tools.jar"/>
+ <include name="**/jboss-wsit-rt.jar"/>
+ <include name="**/jboss-wsit-tools.jar"/>
+ <include name="**/jbossws-metro.jar"/>
+ <include name="**/jsr181-api.jar"/>
+ <include name="**/jsr173_api.jar"/>
+ <include name="**/jsr250-api.jar"/>
+ <include name="**/mimepull.jar"/>
+ <include name="**/resolver.jar"/>
+ <include name="**/saaj-api.jar"/>
+ <include name="**/saaj-impl.jar"/>
+ <include name="**/sjsxp.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/stax-ex.jar"/>
+ <include name="**/stax-utils.jar"/>
+ <include name="**/streambuffer.jar"/>
+ <include name="**/txnannprocessor.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx-asl-3.2.1.jar"/>
+ <include name="**/xmldsig.jar"/>
+ <include name="**/xws-security.jar"/>
+ </patternset>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Bin -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-bin">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.bin.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-lib">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Lib Endorsed -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-endorsed">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.lib.endorsed.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy Client -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-client">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <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 -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-server-lib">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.server.lib.patternset"/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS Service -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-deploy-jbossws-metro42-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="resourcesdir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
+ <include name="**/jaxb-api.jar"/>
+ <include name="**/jaxb-impl.jar"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-metro42-beans.xml"/>
+ </fileset>
+ </copy>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-metro42-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ <copy todir="@{targetdir}/META-INF">
+ <fileset dir="@{resourcesdir}/META-INF"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="macro-deploy-jbossws-metro50-sar">
+ <attribute name="thirdpartydir"/>
+ <attribute name="targetdir"/>
+ <sequential>
+ <mkdir dir="@{targetdir}"/>
+ <copy todir="@{targetdir}" flatten="true" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <patternset refid="jbossws.service.lib.patternset"/>
+ <include name="**/jbossws-deploy.conf"/>
+ </fileset>
+ </copy>
+ <unzip dest="@{targetdir}/jbossws-context.war" overwrite="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-context.war"/>
+ </fileset>
+ </unzip>
+ <copy todir="@{targetdir}/jbossws.beans/META-INF" flatten="true">
+ <fileset dir="@{thirdpartydir}">
+ <include name="**/jbossws-metro50-beans.xml"/>
+ </fileset>
+ </copy>
+ <move file="@{targetdir}/jbossws.beans/META-INF/jbossws-metro50-beans.xml" tofile="@{targetdir}/jbossws.beans/META-INF/jboss-beans.xml"/>
+ </sequential>
+ </macrodef>
+
+ <!-- ================================================================== -->
+ <!-- Deploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <!-- JDK Detection -->
+ <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
+
+ <target name="deploy-jbossws-metro42" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-metro42-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}" resourcesdir="${resourcesdir}"/>
+ </target>
+
+ <target name="deploy-jbossws-metro50" depends="deploy-jbossws-endorsed">
+ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-lib targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-client targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-server-lib targetdir="${installserver}/lib" thirdpartydir="${thirdpartydir}"/>
+ <macro-deploy-jbossws-metro50-sar targetdir="${installserver}/deploy/jbossws.sar" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
+ <target name="deploy-jbossws-endorsed" if="HAVE_JDK_1.6">
+ <macro-deploy-jbossws-endorsed targetdir="${installserver}/../../lib/endorsed" thirdpartydir="${thirdpartydir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Undeploy JBossWS -->
+ <!-- ================================================================== -->
+
+ <macrodef name="macro-undeploy-jbossws">
+ <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.undeploy.home" value="@{targetdir}/../../../.."/>
+ <available property="jboss.undeploy.client" file="${jboss.undeploy.home}/client"/>
+ <fail message="Cannot find ${jboss.undeploy.home}/client" unless="jboss.undeploy.client"/>
+
+ <delete>
+ <fileset dir="${jboss.undeploy.home}" includes="${jbossws.deploy.conf}"/>
+ </delete>
+ <delete dir="@{targetdir}"/>
+ </sequential>
+ </macrodef>
+
+</project>
\ No newline at end of file
Property changes on: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: stack/metro/trunk/ant-import/macros-deploy-metro.xml
===================================================================
--- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <!--
- These patterns should be common for all supported containers
- Exceptions must be defined in the individual deploy macros.
- -->
- <patternset id="client.patternset">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-metro-client.jar"/>
- <include name="jbossws-spi.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="streambuffer.jar"/>
- <include name="stax-ex.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- </patternset>
-
- <patternset id="lib.patternset">
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- </patternset>
-
- <patternset id="server.lib.patternset">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-spi.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="saaj-api.jar"/>
- </patternset>
-
- <!-- ================================================================== -->
- <!-- Deploy Framework -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-framework">
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- BIN SCRIPTS -->
- <unzip dest="${deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>
-
- <!-- CLIENT JARS-->
- <copy todir="${deploy.dir}/client">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- SERVER LIB JARS-->
- <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="server.lib.patternset"/>
- </fileset>
- </copy>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-jbossws">
- <attribute name="jbosshome"/>
- <attribute name="sarname"/>
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- Deploy the sars -->
- <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <unjar dest="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" src="@{stacklibs}/@{sarname}"/>
- <mkdir dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
-
- <!-- Deploy the jars -->
- <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws-deploy.conf"/>
- <copy todir="@{jbosshome}" overwrite="true">
- <fileset refid="jbossws.deploy.files"/>
- </copy>
- <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>
-
- <!-- Write jbossws-deploy.conf -->
- <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/>
- <echo file="${deploy.dir}/jbossws-deploy.conf" message="${jbossws.deploy.files}"/>
- <replace file="${deploy.dir}/jbossws-deploy.conf" token=";" value=" "/>
- <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws-deploy.conf" overwrite="true"/>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Undeploy JBossWS -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-undeploy-jbossws">
- <attribute name="jbosshome"/>
- <sequential>
-
- <delete dir="${deploy.dir}"/>
-
- <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws-deploy.conf" failonerror="false"/>
- <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/>
- <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/>
- <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
- <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
- <delete>
- <fileset dir="@{jbosshome}" includes="${jbossws.undeploy.files}"/>
- </delete>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.x -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-metro42x">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- CLIENT JARS -->
- <mkdir dir="${deploy.dir}/client"/>
- <copy todir="${deploy.dir}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- LIB JARS -->
- <mkdir dir="${deploy.dir}/lib"/>
- <copy todir="${deploy.dir}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.2 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-metro422">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-metro42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-metro42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/metro from jboss422 -->
- <macrodef name="macro-undeploy-metro422">
- <sequential>
- <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss422.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.3 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-metro423">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-metro42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-metro42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/metro from jboss423 -->
- <macrodef name="macro-undeploy-metro423">
- <sequential>
- <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss423.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.x -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-metro50x">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
-
- <!-- CLIENT JARS -->
- <mkdir dir="${deploy.dir}/client"/>
- <copy todir="${deploy.dir}/client" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="client.patternset"/>
- </fileset>
- </copy>
-
- <!-- LIB JARS -->
- <mkdir dir="${deploy.dir}/lib"/>
- <copy todir="${deploy.dir}/lib" overwrite="true">
- <fileset dir="@{thirdpartylibs}">
- <patternset refid="lib.patternset"/>
- </fileset>
- </copy>
-
- <!-- SERVER JARS -->
- <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true">
- <fileset dir="@{stacklibs}">
- <patternset refid="server.lib.patternset"/>
- </fileset>
- </copy>
-
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.0 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-metro500">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-metro50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-metro50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/metro from jboss500 -->
- <macrodef name="macro-undeploy-metro500">
- <sequential>
- <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss500.home}"/>
- </sequential>
- </macrodef>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.1 -->
- <!-- ================================================================== -->
-
- <macrodef name="macro-deploy-metro501">
- <attribute name="stacklibs"/>
- <attribute name="thirdpartylibs"/>
- <sequential>
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-metro50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-metro50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/>
- </sequential>
- </macrodef>
-
- <!-- Remove jbossws/metro from jboss501 -->
- <macrodef name="macro-undeploy-metro501">
- <sequential>
- <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/>
- <macro-undeploy-jbossws jbosshome="${jboss501.home}"/>
- </sequential>
- </macrodef>
-
-</project>
\ No newline at end of file
Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml
===================================================================
--- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -9,120 +9,114 @@
<!-- $Id$ -->
<project>
-
- <property name="tests.output.dir" value="${metro.dir}/output/tests"/>
-
- <import file="${metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
-
- <!-- Define excluded tests -->
- <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
- <property name="excludesfile" value="${metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
-
- <property name="tests.dir" value="${metro.dir}/src/test"/>
- <property name="tests.java.dir" value="${tests.dir}/java"/>
- <property name="tests.resources.dir" value="${tests.dir}/resources"/>
-
- <!--
- Init the various classpaths
- -->
- <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
+
+ <property name="tests.output.dir" value="${metro.dir}/output/tests"/>
+
+ <import file="${metro.dir}/src/test-framework/ant-import/build-testsuite.xml"/>
+
+ <!-- Define excluded tests -->
+ <property name="excludes-short-name" value="test-excludes-${jbossws.integration.target}.txt"/>
+ <property name="excludesfile" value="${metro.dir}/src/test/resources/test-excludes-${jbossws.integration.target}.txt"/>
+
+ <property name="tests.dir" value="${metro.dir}/src/test"/>
+ <property name="tests.java.dir" value="${tests.dir}/java"/>
+ <property name="tests.resources.dir" value="${tests.dir}/resources"/>
+
+ <!--
+ Init the various classpaths
+ -->
+ <target name="tests-init" depends="thirdparty-classpath,tests-classpath">
+
+ <path id="ws.stack.classpath">
+ <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/http.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/>
- <path id="ws.stack.classpath">
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-common.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-spi.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/FastInfoset.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/http.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/>
-
- <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/>
- <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-tools.jar"/>
- <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-rt.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/>
-
- <!--pathelement location="${int.metro.dir}/thirdparty/jsr173_api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jsr181-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jsr250-api.jar"/-->
- <pathelement location="${int.metro.dir}/thirdparty/resolver.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/>
-
- <pathelement location="${int.metro.dir}/glassfish-metro/output/xws-security.jar"/>
- </path>
-
- <path id="tests.extra.classpath">
- <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/>
- <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
- </path>
-
- <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
- <classpath refid="ws.stack.classpath"/>
- </taskdef>
+ <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/>
+ <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-tools.jar"/>
+ <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-rt.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Generating sources -->
- <!-- ================================================================== -->
-
- <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts">
-
- <mkdir dir="${tests.output.dir}/wsimport"/>
-
- <wsimport
- wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl"
- destdir="${tests.output.dir}/wsimport"
- sourcedestdir="${tests.output.dir}/wsimport"
- keep="true"
- verbose="false"
- package="org.jboss.test.ws.wsit.rm"
- target="2.0"/>
-
- </target>
-
- <!--
- Generate JAX-WS sources
- -->
- <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts.">
-
- <!-- placeholder for jaxws tools extension points -->
-
- </target>
-
- <target name="tests-compile-generated-resources" depends="wsgen">
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Compiling -->
- <!-- ================================================================== -->
-
- <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources">
- <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
- <macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Building -->
- <!-- ================================================================== -->
-
- <!-- Copy resources -->
- <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
- <macro-copy-resources srcdir="${metro.dir}/src/test-framework"/>
- <macro-copy-resources srcdir="${metro.dir}/src/test"/>
- </target>
-
- <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
- <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
- </target>
-
- <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
-
-</project>
+ <!--pathelement location="${int.metro.dir}/thirdparty/jsr173_api.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/jsr181-api.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/jsr250-api.jar"/-->
+ <pathelement location="${int.metro.dir}/thirdparty/resolver.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/saaj-api.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/saaj-impl.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/sjsxp.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/stax-ex.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/streambuffer.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/>
+
+ <pathelement location="${int.metro.dir}/glassfish-metro/output/xws-security.jar"/>
+ </path>
+
+ <path id="tests.extra.classpath">
+ <pathelement location="${int.metro.dir}/output/lib/jbossws-metro-client.jar"/>
+ <pathelement location="${int.metro.dir}/thirdparty/jbossws-framework.jar"/>
+ </path>
+
+ <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport">
+ <classpath refid="ws.stack.classpath"/>
+ </taskdef>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Generating sources -->
+ <!-- ================================================================== -->
+
+ <target name="wsimport" depends="tests-init" description="Consume JAX-WS contracts">
+
+ <mkdir dir="${tests.output.dir}/wsimport"/>
+
+ <wsimport wsdl="${tests.resources.dir}/wsit/rm/WEB-INF/wsdl/Calc.wsdl" destdir="${tests.output.dir}/wsimport" sourcedestdir="${tests.output.dir}/wsimport" keep="true"
+ verbose="false" package="org.jboss.test.ws.wsit.rm" target="2.0"/>
+
+ </target>
+
+ <!--
+ Generate JAX-WS sources
+ -->
+ <target name="wsgen" depends="tests-compile" description="Provide the JAX-WS contracts.">
+
+ <!-- placeholder for jaxws tools extension points -->
+
+ </target>
+
+ <target name="tests-compile-generated-resources" depends="wsgen">
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compiling -->
+ <!-- ================================================================== -->
+
+ <target name="tests-compile" depends="wsimport,tests-classpath" description="Compile sources">
+ <macro-compile-classes srcdir="${tests.output.dir}/wsimport" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${metro.dir}/src/test-framework/java" excludesfile="${excludesfile}"/>
+ <macro-compile-classes srcdir="${metro.dir}/src/test/java" excludesfile="${excludesfile}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Building -->
+ <!-- ================================================================== -->
+
+ <!-- Copy resources -->
+ <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources.">
+ <macro-copy-resources srcdir="${metro.dir}/src/test-framework"/>
+ <macro-copy-resources srcdir="${metro.dir}/src/test"/>
+ </target>
+
+ <target name="tests-jars" depends="wsimport,tests-compile,tests-copy-resources,tests-compile-generated-resources" description="Build the deployments.">
+ <ant antfile="${metro.dir}/ant-import-tests/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ <ant antfile="${int.metro.dir}/src/test-framework/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws"/>
+ </target>
+
+ <target name="tests-main" depends="tests-jars" description="Build the deployments."/>
+
+</project>
\ No newline at end of file
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/build.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -12,304 +12,230 @@
<!-- $Id$ -->
<project default="main" basedir="." name="JBossWS-Metro">
-
- <property name="int.metro.dir" value="${basedir}"/>
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-bin-dist.xml"/>
- <import file="${basedir}/ant-import/build-deploy.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="metro.dir" value="${int.metro.dir}"/>
- <property name="metro.src.dir" value="${metro.dir}/src/main"/>
- <property name="metro.distro.dir" value="${metro.src.dir}/distro"/>
- <property name="metro.etc.dir" value="${metro.src.dir}/etc"/>
- <property name="metro.java.dir" value="${metro.src.dir}/java"/>
- <property name="metro.resources.dir" value="${metro.src.dir}/resources"/>
- <property name="metro.output.dir" value="${metro.dir}/output"/>
- <property name="metro.output.apidocs.dir" value="${metro.output.dir}/apidocs"/>
- <property name="metro.output.classes.dir" value="${metro.output.dir}/classes"/>
- <property name="metro.output.deploy.dir" value="${metro.output.dir}/deploy"/>
- <property name="metro.output.etc.dir" value="${metro.output.dir}/etc"/>
- <property name="metro.output.lib.dir" value="${metro.output.dir}/lib"/>
-
-
- <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
- <import file="${basedir}/ant-import/build-metro.xml"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty">
- <mkdir dir="${metro.output.apidocs.dir}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="compile-classes-metro"/>
- <target name="compile-classes-metro" depends="init">
- <mkdir dir="${metro.output.classes.dir}"/>
- <javac srcdir="${metro.java.dir}" sourcepath="" destdir="${metro.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/wsf/stack/metro/**"/>
- <classpath refid="metro.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${metro.output.etc.dir}"/>
- <copy todir="${metro.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${metro.etc.dir}">
- <include name="component-info.xml"/>
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${int.metro.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="build.metro,compile,jars-jboss42,jars-jboss50" description="Builds all jar files.">
- </target>
-
- <target name="jars-common" depends="build.metro,compile">
-
- <!-- Build jbossws-metro.jar -->
- <mkdir dir="${metro.output.lib.dir}"/>
- <jar jarfile="${metro.output.lib.dir}/jbossws-metro.jar" manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${metro.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/injection/**"/>
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/metadata/**"/>
- <include name="org/jboss/wsf/stack/metro/log/**"/>
- <include name="org/jboss/wsf/stack/metro/*"/>
- </fileset>
- <metainf dir="${metro.resources.dir}/jbossws-metro.jar/META-INF"/>
- </jar>
-
- <!-- jbossws-metro-client.jar -->
- <jar jarfile="${metro.output.lib.dir}/jbossws-metro-client.jar" manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${metro.output.classes.dir}">
- <include name="org/jboss/wsf/stack/metro/client/**"/>
- <include name="org/jboss/wsf/stack/metro/tools/**"/>
- </fileset>
- <metainf dir="${metro.resources.dir}/jbossws-metro-client.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-context.war -->
- <copy todir="${metro.output.lib.dir}/jbossws-context.war" filtering="true">
- <fileset dir="${metro.resources.dir}/jbossws-context.war">
- <include name="index.html"/>
- <include name="styles.css"/>
- <include name="WEB-INF/**"/>
- </fileset>
- <filterset>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${metro.dir}/version.properties"/>
- </filterset>
- </copy>
+
+ <property name="int.metro.dir" value="${basedir}"/>
+
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-bin-dist.xml"/>
+ <import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-deploy.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="metro.dir" value="${int.metro.dir}"/>
+ <property name="metro.src.dir" value="${metro.dir}/src/main"/>
+ <property name="metro.distro.dir" value="${metro.src.dir}/distro"/>
+ <property name="metro.etc.dir" value="${metro.src.dir}/etc"/>
+ <property name="metro.java.dir" value="${metro.src.dir}/java"/>
+ <property name="metro.resources.dir" value="${metro.src.dir}/resources"/>
+ <property name="metro.output.dir" value="${metro.dir}/output"/>
+ <property name="metro.output.apidocs.dir" value="${metro.output.dir}/apidocs"/>
+ <property name="metro.output.classes.dir" value="${metro.output.dir}/classes"/>
+ <property name="metro.output.deploy.dir" value="${metro.output.dir}/deploy"/>
+ <property name="metro.output.etc.dir" value="${metro.output.dir}/etc"/>
+ <property name="metro.output.lib.dir" value="${metro.output.dir}/lib"/>
+ <property name="metro.output.resources.dir" value="${metro.output.dir}/resources"/>
+
+ <property name="deploy.artifacts.dir" value="${metro.output.deploy.dir}-artifacts"/>
+ <property name="deploy.structure.jboss42" value="${metro.output.deploy.dir}-jboss42"/>
+ <property name="deploy.structure.jboss50" value="${metro.output.deploy.dir}-jboss50"/>
+ <property name="jbossws.default.deploy.conf" value="${metro.dir}/ant-import/jbossws-default-deploy.conf"/>
+
+ <import file="${basedir}/ant-import-tests/build-testsuite.xml"/>
+ <import file="${basedir}/ant-import/build-metro.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare,thirdparty">
+ <mkdir dir="${metro.output.apidocs.dir}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="init,compile-classes,compile-etc,compile-resources" description="Compile all source files."/>
+
+ <!-- Compile java sources -->
+ <target name="compile-classes" depends="compile-classes-metro"/>
+ <target name="compile-classes-metro" depends="init">
+ <mkdir dir="${metro.output.classes.dir}"/>
+ <javac srcdir="${metro.java.dir}" sourcepath="" destdir="${metro.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+ <include name="org/jboss/wsf/stack/metro/**"/>
+ <classpath refid="metro.integration.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${metro.output.etc.dir}"/>
+ <copy todir="${metro.output.etc.dir}" filtering="yes" overwrite="true">
+ <fileset dir="${metro.etc.dir}">
+ <include name="component-info.xml"/>
+ <include name="default.mf"/>
+ </fileset>
+ <filterset>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filtersfile file="${int.metro.dir}/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- Compile resource files -->
+ <target name="compile-resources" depends="init">
+
+ <!-- Concat jbossws-metro50-beans.xml -->
+ <mkdir dir="${metro.output.resources.dir}"/>
+ <concat destfile="${metro.output.resources.dir}/jbossws-metro50-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns="urn:jboss:bean-deployer:2.0">
+ </header>
+ <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <!-- Concat jboss-beans.xml -->
+ <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
+ <concat destfile="${metro.output.resources.dir}/jbossws-metro42-beans.xml">
+ <header trimleading="yes">
+ <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
+ </header>
+ <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
+ <fileset file="${metro.output.resources.dir}/jbossws-jboss42-config.xml"/>
+ <footer trimleading="yes">
+ </deployment>
+ </footer>
+ </concat>
+
+ <copy todir="${metro.output.resources.dir}">
+ <fileset dir="${metro.resources.dir}">
+ <include name="jbossws-metro.jar/**"/>
+ <include name="jbossws-metro.sar/**"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars" depends="build.metro,compile" description="Builds all jar files.">
+
+ <!-- Build jbossws-metro.jar -->
+ <mkdir dir="${metro.output.lib.dir}"/>
+ <jar jarfile="${metro.output.lib.dir}/jbossws-metro.jar" manifest="${metro.output.etc.dir}/default.mf">
+ <fileset dir="${metro.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/metro/injection/**"/>
+ <include name="org/jboss/wsf/stack/metro/client/**"/>
+ <include name="org/jboss/wsf/stack/metro/metadata/**"/>
+ <include name="org/jboss/wsf/stack/metro/log/**"/>
+ <include name="org/jboss/wsf/stack/metro/*"/>
+ </fileset>
+ <metainf dir="${metro.resources.dir}/jbossws-metro.jar/META-INF"/>
+ </jar>
+
+ <!-- jbossws-metro-client.jar -->
+ <jar jarfile="${metro.output.lib.dir}/jbossws-metro-client.jar" manifest="${metro.output.etc.dir}/default.mf">
+ <fileset dir="${metro.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/metro/client/**"/>
+ <include name="org/jboss/wsf/stack/metro/tools/**"/>
+ </fileset>
+ <metainf dir="${metro.resources.dir}/jbossws-metro-client.jar/META-INF"/>
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <copy todir="${metro.output.lib.dir}/jbossws-context.war" filtering="true">
+ <fileset dir="${metro.resources.dir}/jbossws-context.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ <include name="WEB-INF/**"/>
+ </fileset>
+ <filterset>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filtersfile file="${metro.dir}/version.properties"/>
+ </filterset>
+ </copy>
+
+ <!-- Build jbossws-metro-src.zip -->
+ <zip zipfile="${metro.output.lib.dir}/jbossws-metro-src.zip">
+ <fileset dir="${metro.java.dir}"/>
+ </zip>
+ </target>
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
+
+ <!-- expand the metro sources -->
+ <mkdir dir="${metro.output.dir}/thirdparty-sources"/>
+ <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${metro.output.dir}/thirdparty-sources"/>
+
+ <javadoc destdir="${metro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath>
+ <pathelement path="${metro50.integration.classpath}"/>
+ <pathelement path="${metro.integration.classpath}"/>
+ </classpath>
- <!-- Build jbossws-metro-src.zip -->
- <zip zipfile="${metro.output.lib.dir}/jbossws-metro-src.zip" >
- <fileset dir="${metro.java.dir}"/>
- </zip>
- </target>
-
- <target name="jars-jboss50" depends="jars-common">
-
- <!-- Concat jbossws-beans.xml -->
- <concat destfile="${metro.output.lib.dir}/jbossws-metro50/jbossws-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-metro50.sar -->
- <jar jarfile="${metro.output.lib.dir}/jbossws-metro50.sar" manifest="${metro.output.etc.dir}/default.mf">
-
- <fileset dir="${metro.output.lib.dir}">
- <include name="jbossws-context.war/**"/>
- <include name="jbossws-context.war"/>
- </fileset>
-
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="mimepull.jar"/>
-
- <include name="jsr173_api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr250-api.jar"/>
-
- </fileset>
-
- <!-- Any extra metro jar, including metro-rt.jar -->
- <fileset dir="glassfish-metro/output">
- <include name="*.jar"/>
- </fileset>
-
- <fileset dir="${metro.output.lib.dir}">
- <include name="jbossws-metro.jar"/>
- </fileset>
- <metainf dir="${metro.output.lib.dir}/jbossws-metro50">
- <include name="jbossws-beans.xml"/>
- </metainf>
- </jar>
- </target>
-
- <target name="jars-jboss42" depends="jars-common">
-
- <unzip dest="${metro.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
-
- <!-- Concat jboss-beans.xml -->
- <concat destfile="${metro.output.lib.dir}/jbossws-metro42/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${metro.resources.dir}/jbossws-metro-config.xml"/>
- <fileset file="${metro.output.dir}/resources/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-metro42.sar -->
- <jar jarfile="${metro.output.lib.dir}/jbossws-metro42.sar" manifest="${metro.output.etc.dir}/default.mf">
- <fileset dir="${metro.output.lib.dir}">
- <include name="jbossws-context.war/**"/>
- <include name="jbossws-context.war"/>
- </fileset>
- <fileset dir="${metro.output.lib.dir}">
- <include name="jbossws-metro.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jboss-wsit-tools.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr250-api.jar"/>
- <include name="mimepull.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="mimepull.jar"/>
- </fileset>
-
- <!-- Any extra metro jar, including metro-rt.jar -->
- <fileset dir="glassfish-metro/output">
- <include name="*.jar"/>
- </fileset>
-
-
- <fileset dir="${metro.output.lib.dir}/jbossws-metro42">
- <include name="jbossws.beans/**"/>
- </fileset>
- <metainf dir="${metro.output.dir}/resources/jbossws-jboss42.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- </jar>
- </target>
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
-
- <!-- expand the metro sources -->
- <mkdir dir="${metro.output.dir}/thirdparty-sources"/>
- <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${metro.output.dir}/thirdparty-sources"/>
-
- <javadoc destdir="${metro.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <pathelement path="${metro50.integration.classpath}"/>
- <pathelement path="${metro.integration.classpath}"/>
- </classpath>
-
- <packageset dir="${metro.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <packageset dir="${metro.output.dir}/thirdparty-sources" defaultexcludes="yes">
- <include name="com/sun/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
- <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
- <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
- <group title="Container integration" packages="org.jboss.wsf.container*"/>
-
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="glassfish-metro"/>
- <delete dir="output"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${int.metro.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
-
- <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
-
+ <packageset dir="${metro.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/wsf/**"/>
+ </packageset>
+ <packageset dir="${metro.output.dir}/thirdparty-sources" defaultexcludes="yes">
+ <include name="com/sun/**"/>
+ </packageset>
+
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework ${version.id} - Stack integration Sun-RI</h1>]]>
+ </doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+
+ <!--group title="Native SOAP stack" packages="org.jboss.ws,org.jboss.ws.core*, org.jboss.ws.metadata*, org.jboss.ws.extensions*, org.jboss.ws.tools*, org.jboss.ws.annotation*, org.jboss.ws.jaxrpc*, org.jboss.ws.soap*"/-->
+ <group title="Stack integration" packages="org.jboss.wsf.stack*"/>
+ <group title="SPI" packages="org.jboss.wsf.spi*, org.jboss.ws.integration*"/>
+ <group title="Container integration" packages="org.jboss.wsf.container*"/>
+
+ </javadoc>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="glassfish-metro"/>
+ <delete dir="output"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ <delete dir="${int.metro.dir}/thirdparty"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jars,tests-main"/>
+
+ <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
+
</project>
Modified: stack/metro/trunk/src/main/distro/ant.properties.example
===================================================================
--- stack/metro/trunk/src/main/distro/ant.properties.example 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/src/main/distro/ant.properties.example 2008-03-13 13:43:06 UTC (rev 5962)
@@ -4,11 +4,12 @@
# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $
# Optional JBoss Home
-jboss500.home=(a)jboss500.home@
jboss422.home=(a)jboss422.home@
jboss423.home=(a)jboss423.home@
+jboss500.home=(a)jboss500.home@
+jboss501.home=(a)jboss501.home@
-# The JBoss server under test. This can be [jboss422|jboss423|jboss500]
+# The JBoss server under test. This can be [jboss422|jboss423|jboss500|jboss501]
jbossws.integration.target=jboss422
# The JBoss settings
Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -18,14 +18,15 @@
<!-- ================================================================== -->
<property name="build.dir" value="${basedir}/build"/>
- <property name="bin.dir" value="${basedir}/bin"/>
- <property name="deploy.dir" value="${basedir}/output/deploy"/>
<property name="docs.dir" value="${basedir}/docs"/>
- <property name="lib.dir" value="${basedir}/lib"/>
+ <property name="thirdparty.dir" value="${basedir}/deploy/lib"/>
<property name="tests.dir" value="${basedir}/tests"/>
<property name="tests.output.dir" value="${basedir}/output"/>
- <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/>
+ <property name="deploy.artifacts.dir" value="${basedir}/deploy"/>
+ <property name="deploy.structure.jboss42" value="${basedir}/output/deploy-jboss42"/>
+ <property name="deploy.structure.jboss50" value="${basedir}/output/deploy-jboss50"/>
+ <property name="jbossws.default.deploy.conf" value="${build.dir}/jbossws-default-deploy.conf"/>
<property file="${basedir}/ant.properties"/>
<property file="${basedir}/version.properties"/>
@@ -89,7 +90,7 @@
<fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
<import file="${basedir}/build/build-deploy.xml"/>
- <import file="${basedir}/build/macros-deploy-metro.xml"/>
+ <import file="${basedir}/build/jbossws-deploy-macros.xml"/>
<import file="${basedir}/tests/ant-import/build-testsuite.xml"/>
<!-- ================================================================== -->
@@ -117,32 +118,32 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${lib.dir}/jbossws-common.jar"/>
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- <pathelement location="${lib.dir}/FastInfoset.jar"/>
- <pathelement location="${lib.dir}/http.jar"/>
- <pathelement location="${lib.dir}/jaxrpc-api.jar"/>
- <pathelement location="${lib.dir}/jaxws-api.jar"/>
- <pathelement location="${lib.dir}/jaxws-rt.jar"/>
- <pathelement location="${lib.dir}/jaxws-tools.jar"/>
- <pathelement location="${lib.dir}/jsr173_api.jar"/>
- <pathelement location="${lib.dir}/jsr181-api.jar"/>
- <pathelement location="${lib.dir}/jsr250-api.jar"/>
- <pathelement location="${lib.dir}/mimepull.jar"/>
- <pathelement location="${lib.dir}/resolver.jar"/>
- <pathelement location="${lib.dir}/saaj-api.jar"/>
- <pathelement location="${lib.dir}/saaj-impl.jar"/>
- <pathelement location="${lib.dir}/sjsxp.jar"/>
- <pathelement location="${lib.dir}/stax-ex.jar"/>
- <pathelement location="${lib.dir}/streambuffer.jar"/>
- <pathelement location="${lib.dir}/wstx.jar"/>
- <pathelement location="${lib.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/FastInfoset.jar"/>
+ <pathelement location="${thirdparty.dir}/http.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr173_api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
+ <pathelement location="${thirdparty.dir}/jsr250-api.jar"/>
+ <pathelement location="${thirdparty.dir}/mimepull.jar"/>
+ <pathelement location="${thirdparty.dir}/resolver.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl.jar"/>
+ <pathelement location="${thirdparty.dir}/sjsxp.jar"/>
+ <pathelement location="${thirdparty.dir}/stax-ex.jar"/>
+ <pathelement location="${thirdparty.dir}/streambuffer.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
</path>
<path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-metro-client.jar"/>
- <pathelement location="${lib.dir}/jbossws-framework.jar"/>
- <pathelement location="${lib.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-metro-client.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
<pathelement location="${basedir}/tools/lib/junit.jar"/>
</path>
@@ -171,9 +172,8 @@
<target name="tests-main" depends="tests-jars" description="Build the test deployments."/>
- <!-- dummy jar targets -->
- <target name="jars-jboss50" depends="prepare"/>
- <target name="jars-jboss42" depends="prepare"/>
+ <!-- dummy targets -->
+ <target name="prepare-deploy" depends="prepare"/>
<!-- ================================================================== -->
<!-- Miscellaneous -->
Deleted: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml
===================================================================
--- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-13 13:35:12 UTC (rev 5961)
+++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-03-13 13:43:06 UTC (rev 5962)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id: bin-dist-deploy.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.2 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/metro to jboss422 -->
- <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/metro to jboss422">
- <macro-deploy-metro422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/metro from jboss422 -->
- <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/metro from jboss422">
- <macro-undeploy-metro422/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-4.2.3 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/metro to jboss423 -->
- <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/metro to jboss423">
- <macro-deploy-metro423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/metro from jboss423 -->
- <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/metro from jboss423">
- <macro-undeploy-metro423/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.0 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/metro to jboss500 -->
- <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/metro to jboss500">
- <macro-deploy-metro500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/metro from jboss500 -->
- <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss500">
- <macro-undeploy-metro500/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Deployment JBoss-5.0.1 -->
- <!-- ================================================================== -->
-
- <!-- Deploy jbossws/metro to jboss501 -->
- <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/metro to jboss501">
- <macro-deploy-metro501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/>
- </target>
- <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6">
- <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/>
- </target>
-
- <!-- Remove jbossws/metro from jboss501 -->
- <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss501">
- <macro-undeploy-metro501/>
- </target>
-
-</project>
\ No newline at end of file
18 years, 1 month
- 1
- 0
JBossWS SVN: r5961 - stack/metro/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-13 09:35:12 -0400 (Thu, 13 Mar 2008)
New Revision: 5961
Modified:
stack/metro/trunk/ant-import/build-bin-dist.xml
Log:
format xml
Modified: stack/metro/trunk/ant-import/build-bin-dist.xml
===================================================================
--- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-03-13 13:17:12 UTC (rev 5960)
+++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-03-13 13:35:12 UTC (rev 5961)
@@ -17,19 +17,18 @@
<!-- Binary distribution -->
<!-- ================================================================== -->
- <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution">
-
+ <target name="build-bin-dist" depends="jars,javadoc,prepare-deploy" description="Build the binary distribution">
+
<property name="bindist.dir" value="${metro.output.dir}/jbossws-metro-dist"/>
<property name="bindist.build.dir" value="${bindist.dir}/build"/>
- <property name="bindist.bin.dir" value="${bindist.dir}/bin"/>
- <property name="bindist.lib.dir" value="${bindist.dir}/lib"/>
+ <property name="bindist.deploy.dir" value="${bindist.dir}/deploy"/>
<property name="bindist.docs.dir" value="${bindist.dir}/docs"/>
<property name="bindist.tests.dir" value="${bindist.dir}/tests"/>
<property name="bindist.tools.dir" value="${bindist.dir}/tools"/>
<delete dir="${bindist.dir}"/>
<mkdir dir="${bindist.build.dir}"/>
- <mkdir dir="${bindist.bin.dir}"/>
+ <mkdir dir="${bindist.deploy.dir}"/>
<mkdir dir="${bindist.docs.dir}"/>
<mkdir dir="${bindist.tests.dir}"/>
<mkdir dir="${bindist.tools.dir}"/>
@@ -42,27 +41,21 @@
</copy>
<copy tofile="${bindist.dir}/version.properties" file="${metro.dir}/version.properties"/>
<copy tofile="${bindist.dir}/build.xml" file="${metro.distro.dir}/bin-dist-build.xml"/>
- <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${metro.distro.dir}/bin-dist-deploy.xml"/>
<!-- build -->
<copy todir="${bindist.build.dir}">
<fileset dir="${metro.dir}/ant-import">
- <include name="jbossws.default.undeploy.files"/>
- <include name="macros-deploy-metro.xml"/>
+ <include name="build-deploy.xml"/>
+ <include name="jbossws-deploy-macros.xml"/>
+ <include name="jbossws-default-deploy.conf"/>
</fileset>
</copy>
- <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/>
-
- <copy todir="${bindist.bin.dir}">
- <fileset dir="${metro.dir}/src/main/etc">
- <include name="*.sh"/>
- <include name="*.bat"/>
- </fileset>
+ <!-- deploy -->
+ <copy todir="${bindist.deploy.dir}">
+ <fileset dir="${deploy.artifacts.dir}"/>
</copy>
- <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
-
<!-- docs -->
<copy todir="${bindist.docs.dir}">
<fileset dir="${metro.output.dir}">
@@ -85,47 +78,6 @@
</fileset>
</copy>
- <!-- lib -->
- <copy todir="${bindist.lib.dir}" overwrite="true">
- <fileset dir="${thirdparty.dir}">
- <include name="jbossws-common.jar"/>
- <include name="jbossws-framework.jar"/>
- <include name="jbossws-framework-scripts.zip"/>
- <include name="jbossws-spi.jar"/>
- </fileset>
- <fileset dir="${metro.dir}/output/lib">
- <include name="jbossws-context.war"/>
- <include name="jbossws-metro.jar"/>
- <include name="jbossws-metro-client.jar"/>
- <include name="jbossws-metro42.sar"/>
- <include name="jbossws-metro50.sar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="FastInfoset.jar"/>
- <include name="http.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxb-xjc.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxws-rt.jar"/>
- <include name="jaxws-tools.jar"/>
- <include name="jsr173_api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="jsr250-api.jar"/>
- <include name="mimepull.jar"/>
- <include name="juddi-service.sar"/>
- <include name="resolver.jar"/>
- <include name="saaj-api.jar"/>
- <include name="saaj-impl.jar"/>
- <include name="sjsxp.jar"/>
- <include name="stax-ex.jar"/>
- <include name="streambuffer.jar"/>
- <include name="wstx.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- </copy>
-
<!-- tests -->
<copy todir="${bindist.tests.dir}" overwrite="true">
<fileset dir="${metro.dir}/src/test-framework"/>
18 years, 1 month
- 1
- 0
JBossWS SVN: r5960 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-03-13 09:17:12 -0400 (Thu, 13 Mar 2008)
New Revision: 5960
Modified:
stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java
Log:
[JBWS-1991] Test improvement
Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java
===================================================================
--- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2008-03-13 12:47:16 UTC (rev 5959)
+++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1991/UsernameAuthTestCase.java 2008-03-13 13:17:12 UTC (rev 5960)
@@ -65,6 +65,23 @@
fail();
}
}
+
+ public void testWrongPasswordAuth() throws Exception
+ {
+ Hello port = getPort();
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.USERNAME_PROPERTY, "username");
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.PASSWORD_PROPERTY, "password");
+ String msg = "Hi!";
+ try
+ {
+ String result = port.echo(msg);
+ fail();
+ }
+ catch (Exception e)
+ {
+ //OK
+ }
+ }
private Hello getPort() throws Exception
{
18 years, 1 month
- 1
- 0
JBossWS SVN: r5959 - in spi/trunk/src/main/java/org/jboss/wsf/spi: deployment/integration and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-13 08:47:16 -0400 (Thu, 13 Mar 2008)
New Revision: 5959
Added:
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeployment.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/InvocationContextCallback.java
spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java
spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java
Log:
Add EJB integration interfaces
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2008-03-13 12:47:16 UTC (rev 5959)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.deployment.integration;
+
+/**
+ * A minimum web service meta data representation that offers a generic
+ * way to access more fine grained meta data through {@link #getAnnotation(Class)}
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WebServiceDeclaration
+{
+ /**
+ * Web service endpoint impl. name
+ * @return a name, that can be used to susequently address the service impl.
+ */
+ String getComponentName();
+
+ /**
+ * Web sevice endpoint impl. class
+ * @return
+ */
+ String getComponentClassName();
+
+ /**
+ * Get a unified meta data view represented by an annotation.
+ *
+ * @param t
+ * @return
+ */
+ <T extends java.lang.annotation.Annotation> T getAnnotation(Class<T> t);
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeployment.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeployment.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeployment.java 2008-03-13 12:47:16 UTC (rev 5959)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.deployment.integration;
+
+import java.util.List;
+
+/**
+ * A web service deployment contains {@link WebServiceDeclaration} declarations.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface WebServiceDeployment
+{
+ List<WebServiceDeclaration> getServiceEndpoints();
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeployment.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/InvocationContextCallback.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/InvocationContextCallback.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/InvocationContextCallback.java 2008-03-13 12:47:16 UTC (rev 5959)
@@ -0,0 +1,33 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.invocation.integration;
+
+/**
+ * Callback for invocation context properties that may be injected
+ * in the service endpoint prior to actual method invocation.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface InvocationContextCallback
+{
+ <T> T get(Class<T> propertyType);
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/InvocationContextCallback.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java 2008-03-13 12:47:16 UTC (rev 5959)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.invocation.integration;
+
+import java.lang.reflect.Method;
+
+/**
+ * Host's web service implementation and allows invocations on them.
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface ServiceEndpointContainer
+{
+ /**
+ * The actualk web service implementation hosted by this container.
+ * @return
+ */
+ Class getServiceImplementationClass();
+
+ /**
+ * Invokes a particular endpoint opertation.
+ *
+ * @param method business method
+ * @param args parameters
+ * @param callback gives access to invocation context properties. I.e. for injecting the WebServiceContext
+ * @return null for operations without return parameter
+ * @throws Exception
+ */
+ Object invokeEndpoint(Method method, Object[] args, InvocationContextCallback callback) throws Throwable;
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/integration/ServiceEndpointContainer.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java 2008-03-13 12:47:16 UTC (rev 5959)
@@ -0,0 +1,106 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata.j2ee;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class PortComponentMD implements PortComponentSpec
+{
+ private static final long serialVersionUID = 1;
+
+ private String portComponentName;
+ private String portComponentURI;
+ private String authMethod;
+ private String transportGuarantee;
+ private boolean secureWSDLAccess;
+
+ public PortComponentMD()
+ {
+ }
+
+ public String portComponentName()
+ {
+ return portComponentName;
+ }
+
+ public void setPortComponentName(String portComponentName)
+ {
+ this.portComponentName = portComponentName;
+ }
+
+ public String portComponentURI()
+ {
+ return portComponentURI;
+ }
+
+ public void setPortComponentURI(String portComponentURI)
+ {
+ this.portComponentURI = portComponentURI;
+ }
+
+ public String urlPattern()
+ {
+ String pattern = "/*";
+ if (portComponentURI != null)
+ pattern = portComponentURI;
+
+ return pattern;
+ }
+
+ public String authMethod()
+ {
+ return authMethod;
+ }
+
+ public void setAuthMethod(String authMethod)
+ {
+ this.authMethod = authMethod;
+ }
+
+ public String transportGuarantee()
+ {
+ return transportGuarantee;
+ }
+
+ public void setTransportGuarantee(String transportGuarantee)
+ {
+ this.transportGuarantee = transportGuarantee;
+ }
+
+ public boolean secureWSDLAccess()
+ {
+ return secureWSDLAccess;
+ }
+
+ public void setSecureWSDLAccess(boolean secureWSDLAccess)
+ {
+ this.secureWSDLAccess = secureWSDLAccess;
+ }
+
+ public Class<? extends Annotation> annotationType()
+ {
+ return PortComponentSpec.class;
+ }
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java
===================================================================
--- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java (rev 0)
+++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java 2008-03-13 12:47:16 UTC (rev 5959)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.wsf.spi.metadata.j2ee;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public @interface PortComponentSpec
+{
+ String portComponentName();
+
+ String portComponentURI();
+
+ String urlPattern();
+
+ String authMethod();
+
+ String transportGuarantee();
+
+ boolean secureWSDLAccess();
+}
Property changes on: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
18 years, 1 month
- 1
- 0
JBossWS SVN: r5958 - in spi/trunk: ant-import and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-03-13 08:45:49 -0400 (Thu, 13 Mar 2008)
New Revision: 5958
Added:
spi/trunk/src/main/etc/pom.xml
spi/trunk/tools/
spi/trunk/tools/mvn/
spi/trunk/tools/mvn/maven-ant-tasks-2.0.8.jar
Modified:
spi/trunk/ant-import/build-release.xml
spi/trunk/ant.properties.example
spi/trunk/build.xml
Log:
Enable maven publishing
Modified: spi/trunk/ant-import/build-release.xml
===================================================================
--- spi/trunk/ant-import/build-release.xml 2008-03-13 12:41:00 UTC (rev 5957)
+++ spi/trunk/ant-import/build-release.xml 2008-03-13 12:45:49 UTC (rev 5958)
@@ -31,7 +31,8 @@
<filtersfile file="${spi.dir}/version.properties"/>
</filterset>
</copy>
-
+
+ <antcall target="mvn.publish.remote"/>
</target>
</project>
Modified: spi/trunk/ant.properties.example
===================================================================
--- spi/trunk/ant.properties.example 2008-03-13 12:41:00 UTC (rev 5957)
+++ spi/trunk/ant.properties.example 2008-03-13 12:45:49 UTC (rev 5958)
@@ -10,6 +10,9 @@
# JBossWS Release
jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+# See http://wiki.jboss.org/wiki/Wiki.jsp?page=MavenReleaseRepository
+jboss.local.maven.repository=/home/hbraun/dev/prj/repository.jboss.org/maven2
+
# Force thirdparty HTTP get
#force.thirdparty.get=true
Modified: spi/trunk/build.xml
===================================================================
--- spi/trunk/build.xml 2008-03-13 12:41:00 UTC (rev 5957)
+++ spi/trunk/build.xml 2008-03-13 12:45:49 UTC (rev 5958)
@@ -11,119 +11,127 @@
<!-- $Id$ -->
-<project name="JBossWS-SPI" default="main" basedir=".">
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
- <import file="${basedir}/ant-import/build-testsuite.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="spi.src.dir" value="${spi.dir}/src/main"/>
- <property name="spi.etc.dir" value="${spi.src.dir}/etc"/>
- <property name="spi.java.dir" value="${spi.src.dir}/java"/>
- <property name="spi.resources.dir" value="${spi.src.dir}/resources"/>
- <property name="spi.java.dir" value="${spi.src.dir}/java"/>
- <property name="spi.output.dir" value="${spi.dir}/output"/>
+<project name="JBossWS-SPI" default="main" basedir="." xmlns:artifact="urn:maven-artifact-ant">
- <property name="spi.test.dir" value="${spi.dir}/src/test"/>
- <property name="spi.test.java.dir" value="${spi.test.dir}/java"/>
- <property name="spi.test.resources.dir" value="${spi.test.dir}/resources"/>
- <property name="spi.test.output.dir" value="${spi.output.dir}/test"/>
+ <import file="${basedir}/ant-import/build-setup.xml"/>
+ <import file="${basedir}/ant-import/build-release.xml"/>
+ <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+ <import file="${basedir}/ant-import/build-testsuite.xml"/>
- <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/>
- <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/>
- <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/>
- <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty-classpath">
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc"
- description="Compile all source files."/>
-
- <!-- Compile java sources -->
- <target name="compile-classes" depends="init">
-
- <!-- Compile spi classes with jdk1.5 -->
- <mkdir dir="${spi.output.classes.dir}"/>
- <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
- <include name="org/jboss/wsf/**"/>
- <classpath refid="spi.thirdparty.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${spi.output.etc.dir}"/>
- <copy todir="${spi.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${spi.etc.dir}">
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${spi.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars">
-
- <!-- Build jbossws-spi.jar -->
- <mkdir dir="${spi.output.lib.dir}"/>
- <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
- <fileset dir="${spi.output.classes.dir}">
- <include name="org/jboss/wsf/**"/>
- </fileset>
- </jar>
-
- <!-- Build jbossws-spi-src.zip -->
- <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
- <fileset dir="${spi.java.dir}"/>
- </zip>
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
- </target>
+ <path id="maven-ant-tasks.classpath" path="tools/mvn/maven-ant-tasks-2.0.8.jar" />
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="urn:maven-artifact-ant"
+ classpathref="maven-ant-tasks.classpath" />
- <!-- ================================================================== -->
- <!-- Documentation -->
- <!-- ================================================================== -->
+ <property name="spi.src.dir" value="${spi.dir}/src/main"/>
+ <property name="spi.etc.dir" value="${spi.src.dir}/etc"/>
+ <property name="spi.java.dir" value="${spi.src.dir}/java"/>
+ <property name="spi.resources.dir" value="${spi.src.dir}/resources"/>
+ <property name="spi.java.dir" value="${spi.src.dir}/java"/>
+ <property name="spi.output.dir" value="${spi.dir}/output"/>
+ <property name="spi.test.dir" value="${spi.dir}/src/test"/>
+ <property name="spi.test.java.dir" value="${spi.test.dir}/java"/>
+ <property name="spi.test.resources.dir" value="${spi.test.dir}/resources"/>
+ <property name="spi.test.output.dir" value="${spi.output.dir}/test"/>
+
+ <property name="spi.output.apidocs.dir" value="${spi.output.dir}/apidocs"/>
+ <property name="spi.output.etc.dir" value="${spi.output.dir}/etc"/>
+ <property name="spi.output.classes.dir" value="${spi.output.dir}/classes"/>
+ <property name="spi.output.lib.dir" value="${spi.output.dir}/lib"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init" depends="prepare,thirdparty-classpath">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Compile -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Compile everything.
+ |
+ | This target should depend on other compile-* targets for each
+ | different type of compile that needs to be performed, short of
+ | documentation compiles.
+ -->
+
+ <target name="compile" depends="init,compile-classes,compile-etc"
+ description="Compile all source files."/>
+
+ <!-- Compile java sources -->
+ <target name="compile-classes" depends="init">
+
+ <!-- Compile spi classes with jdk1.5 -->
+ <mkdir dir="${spi.output.classes.dir}"/>
+ <javac srcdir="${spi.java.dir}" sourcepath="" destdir="${spi.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
+ <include name="org/jboss/wsf/**"/>
+ <include name="org/jboss/integration/**"/>
+ <classpath refid="spi.thirdparty.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Compile etc files (manifests and such) -->
+ <target name="compile-etc" depends="init">
+ <mkdir dir="${spi.output.etc.dir}"/>
+ <copy todir="${spi.output.etc.dir}" filtering="yes" overwrite="true">
+ <fileset dir="${spi.etc.dir}">
+ <include name="default.mf"/>
+ <include name="pom.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="java.vm.version" value="${java.vm.version}"/>
+ <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
+ <filter token="build.id" value="${build.id}"/>
+ <filter token="implementation.version" value="jbossws-${version.id}"/>
+ <filtersfile file="${spi.dir}/version.properties"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Archives -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
+ </target>
+
+ <!--
+ | Build all jar files.
+ -->
+ <target name="module-jars">
+
+ <!-- Build jbossws-spi.jar -->
+ <mkdir dir="${spi.output.lib.dir}"/>
+ <jar jarfile="${spi.output.lib.dir}/jbossws-spi.jar" manifest="${spi.output.etc.dir}/default.mf">
+ <fileset dir="${spi.output.classes.dir}">
+ <include name="org/jboss/wsf/**"/>
+ <include name="org/jboss/integration/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws-spi-src.zip -->
+ <zip zipfile="${spi.output.lib.dir}/jbossws-spi-src.zip" >
+ <fileset dir="${spi.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Documentation -->
+ <!-- ================================================================== -->
+
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc">
@@ -135,23 +143,42 @@
<include name="org/jboss/wsf/**"/>
</packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
+ <tag name="todo" scope="all" description="To do:"/>
</javadoc>
</target>
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${spi.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${spi.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars"/>
-
- <target name="all" description="Create a distribution zip file" depends="main">
- </target>
-
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+ <delete dir="${spi.output.dir}"/>
+ </target>
+
+ <target name="clobber" depends="clean" description="Cleans up all generated files.">
+ <delete dir="${spi.dir}/thirdparty"/>
+ </target>
+
+ <target name="main" description="Executes the default target (most)." depends="most"/>
+
+ <target name="most" description="Builds almost everything." depends="jars"/>
+
+ <target name="all" description="Create a distribution zip file" depends="main">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Publish maven artifacts -->
+ <!-- ================================================================== -->
+
+ <target name="mvn.install.local" depends="compile-etc" description="Publish jbossws-spi.jar to ~/m2/ (local maven repo)">
+ <artifact:pom id="maven.project" file="${spi.output.etc.dir}/pom.xml" />
+ <artifact:install file="${spi.output.lib.dir}/jbossws-spi.jar">
+ <pom refid="maven.project"/>
+ </artifact:install>
+ </target>
+
+ <target name="mvn.install.remote" depends="compile-etc" description="Publish jbossws-spi.jar to a svn checkout of repository.jboss.org/maven2">
+ <artifact:pom id="maven.project" file="${spi.output.etc.dir}/pom.xml" />
+ <artifact:deploy file="${spi.output.lib.dir}/jbossws-spi.jar">
+ <remoteRepository url="file://${jboss.local.maven.repository}"/>
+ <pom refid="maven.project"/>
+ </artifact:deploy>
+ </target>
+
</project>
Added: spi/trunk/src/main/etc/pom.xml
===================================================================
--- spi/trunk/src/main/etc/pom.xml (rev 0)
+++ spi/trunk/src/main/etc/pom.xml 2008-03-13 12:45:49 UTC (rev 5958)
@@ -0,0 +1,6 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>@repository.id@</version>
+</project>
Added: spi/trunk/tools/mvn/maven-ant-tasks-2.0.8.jar
===================================================================
(Binary files differ)
Property changes on: spi/trunk/tools/mvn/maven-ant-tasks-2.0.8.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 1 month
- 1
- 0
JBossWS SVN: r5957 - stack/cxf/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-13 08:41:00 -0400 (Thu, 13 Mar 2008)
New Revision: 5957
Modified:
stack/cxf/trunk/build.xml
Log:
Remove targets jars-jboss42, jars-jboss50
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-03-13 12:29:07 UTC (rev 5956)
+++ stack/cxf/trunk/build.xml 2008-03-13 12:41:00 UTC (rev 5957)
@@ -186,107 +186,6 @@
</zip>
</target>
- <target name="jars-jboss50" depends="jars">
-
- <!-- Concat jbossws-beans.xml -->
- <concat destfile="${cxf.output.lib.dir}/jbossws-cxf50/jbossws-beans.xml">
- <header trimleading="yes">
- <deployment xmlns="urn:jboss:bean-deployer:2.0">
- </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-cxf50.sar -->
- <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf50.sar" manifest="${cxf.output.etc.dir}/default.mf">
- <fileset dir="${cxf.output.lib.dir}">
- <include name="cxf-${cxf.version}.jar"/>
- <include name="jbossws-context.war/**"/>
- <include name="jbossws-cxf.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
- <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="jdom-${cxf.jdom}.jar"/>
- <include name="neethi-${cxf.neethi}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- <include name="saaj-impl-${cxf.saaj}.jar"/>
- <include name="spring-beans-${cxf.spring}.jar"/>
- <include name="spring-context-${cxf.spring}.jar"/>
- <include name="spring-core-${cxf.spring}.jar"/>
- <include name="xbean-${cxf.xbean}.jar"/>
- <include name="xml-resolver-${cxf.xml.resolver}.jar"/>
- <include name="XmlSchema-${cxf.xmlschema}.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="wsdl4j.jar"/>
- </fileset>
- <metainf dir="${cxf.output.lib.dir}/jbossws-cxf50">
- <include name="jbossws-beans.xml"/>
- </metainf>
- <metainf dir="${cxf.resources.dir}/jbossws-cxf.sar/META-INF"/>
- </jar>
-
- </target>
-
- <target name="jars-jboss42" depends="jars">
-
- <unzip dest="${cxf.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/>
-
- <!-- Concat jboss-beans.xml -->
- <concat destfile="${cxf.output.lib.dir}/jbossws-cxf42/jbossws.beans/META-INF/jboss-beans.xml">
- <header trimleading="yes">
- <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer">
- </header>
- <fileset file="${cxf.resources.dir}/jbossws-cxf-config.xml"/>
- <fileset file="${cxf.output.dir}/resources/jbossws-jboss42-config.xml"/>
- <footer trimleading="yes">
- </deployment>
- </footer>
- </concat>
-
- <!-- Build jbossws-cxf42.sar -->
- <jar jarfile="${cxf.output.lib.dir}/jbossws-cxf42.sar" manifest="${cxf.output.etc.dir}/default.mf">
- <fileset dir="${cxf.output.lib.dir}">
- <include name="cxf-${cxf.version}.jar"/>
- <include name="jbossws-context.war/**"/>
- <include name="jbossws-cxf.jar"/>
- </fileset>
- <fileset dir="${thirdparty.dir}">
- <include name="geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
- <include name="geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <include name="jaxws-api-${cxf.jaxws.api}.jar"/>
- <include name="jdom-${cxf.jdom}.jar"/>
- <include name="neethi-${cxf.neethi}.jar"/>
- <include name="saaj-api-${cxf.saaj}.jar"/>
- <include name="saaj-impl-${cxf.saaj}.jar"/>
- <include name="spring-beans-${cxf.spring}.jar"/>
- <include name="spring-context-${cxf.spring}.jar"/>
- <include name="spring-core-${cxf.spring}.jar"/>
- <include name="xbean-${cxf.xbean}.jar"/>
- <include name="xml-resolver-${cxf.xml.resolver}.jar"/>
- <include name="XmlSchema-${cxf.xmlschema}.jar"/>
- <include name="jaxb-api.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="stax-api.jar"/>
- <include name="wsdl4j.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- <fileset dir="${cxf.output.lib.dir}/jbossws-cxf42">
- <include name="jbossws.beans/**"/>
- </fileset>
- <metainf dir="${cxf.output.dir}/resources/jbossws-jboss42.sar/META-INF">
- <include name="jboss-service.xml"/>
- </metainf>
- <metainf dir="${cxf.resources.dir}/jbossws-cxf.sar/META-INF"/>
- </jar>
- </target>
-
<!-- Generate the JavaDoc -->
<target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc">
18 years, 1 month
- 1
- 0
JBossWS SVN: r5956 - stack/native/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-13 08:29:07 -0400 (Thu, 13 Mar 2008)
New Revision: 5956
Modified:
stack/native/trunk/ant-import/build-deploy.xml
Log:
Cleanup deploy-artifact from previous build
Modified: stack/native/trunk/ant-import/build-deploy.xml
===================================================================
--- stack/native/trunk/ant-import/build-deploy.xml 2008-03-13 12:23:07 UTC (rev 5955)
+++ stack/native/trunk/ant-import/build-deploy.xml 2008-03-13 12:29:07 UTC (rev 5956)
@@ -18,6 +18,7 @@
<!-- ================================================================== -->
<target name="deploy-structure-jboss42" depends="prepare-deploy">
+ <delete dir="${deploy.structure.jboss42}"/>
<antcall target="deploy-jbossws-native42" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss42}/server/${jboss.server.instance}"/>
<param name="resourcesdir" value="${deploy.artifacts.dir}/resources/jbossws-jboss42.sar"/>
@@ -107,6 +108,7 @@
<!-- ================================================================== -->
<target name="deploy-structure-jboss50" depends="prepare-deploy">
+ <delete dir="${deploy.structure.jboss50}"/>
<antcall target="deploy-jbossws-native50" inheritall="false">
<param name="installserver" value="${deploy.structure.jboss50}/server/${jboss.server.instance}"/>
<param name="thirdpartydir" value="${deploy.artifacts.dir}"/>
18 years, 1 month
- 1
- 0
JBossWS SVN: r5955 - in stack/cxf/trunk: src/main/distro and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-03-13 08:23:07 -0400 (Thu, 13 Mar 2008)
New Revision: 5955
Modified:
stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
stack/cxf/trunk/src/main/distro/bin-dist-build.xml
Log:
Add missing stax-api
Modified: stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml
===================================================================
--- stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-13 11:24:53 UTC (rev 5954)
+++ stack/cxf/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-13 12:23:07 UTC (rev 5955)
@@ -34,6 +34,9 @@
<include name="**/jaxb-xjc.jar"/>
<include name="**/jaxws-api-${cxf.jaxws.api}.jar"/>
<include name="**/saaj-api-${cxf.saaj}.jar"/>
+ <include name="**/stax-api.jar"/>
+ <include name="**/wsdl4j.jar"/>
+ <include name="**/wstx.jar"/>
</patternset>
<patternset id="jbossws.lib.patternset">
Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml
===================================================================
--- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-03-13 11:24:53 UTC (rev 5954)
+++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-03-13 12:23:07 UTC (rev 5955)
@@ -117,27 +117,27 @@
<target name="tests-init" depends="prepare,tests-classpath">
<path id="ws.stack.classpath">
- <pathelement location="${lib.dir}/jbossws-common.jar"/>
- <pathelement location="${lib.dir}/jbossws-spi.jar"/>
- <pathelement location="${lib.dir}/cxf-${cxf.version}.jar"/>
- <pathelement location="${lib.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
- <pathelement location="${lib.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <pathelement location="${lib.dir}/jaxws-api-${cxf.jaxws.api}.jar"/>
- <pathelement location="${lib.dir}/jdom-${cxf.jdom}.jar"/>
- <pathelement location="${lib.dir}/neethi-${cxf.neethi}.jar"/>
- <pathelement location="${lib.dir}/saaj-api-${cxf.saaj}.jar"/>
- <pathelement location="${lib.dir}/saaj-impl-${cxf.saaj}.jar"/>
- <pathelement location="${lib.dir}/xml-resolver-${cxf.xml.resolver}.jar"/>
- <pathelement location="${lib.dir}/XmlSchema-${cxf.xmlschema}.jar"/>
- <pathelement location="${lib.dir}/jaxb-api.jar"/>
- <pathelement location="${lib.dir}/wsdl4j.jar"/>
- <pathelement location="${lib.dir}/wstx.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
+ <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/>
+ <pathelement location="${thirdparty.dir}/geronimo-javamail_${cxf.geronimo.javamail}.jar"/>
+ <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/>
+ <pathelement location="${thirdparty.dir}/jdom-${cxf.jdom}.jar"/>
+ <pathelement location="${thirdparty.dir}/neethi-${cxf.neethi}.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-api-${cxf.saaj}.jar"/>
+ <pathelement location="${thirdparty.dir}/saaj-impl-${cxf.saaj}.jar"/>
+ <pathelement location="${thirdparty.dir}/xml-resolver-${cxf.xml.resolver}.jar"/>
+ <pathelement location="${thirdparty.dir}/XmlSchema-${cxf.xmlschema}.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
+ <pathelement location="${thirdparty.dir}/wsdl4j.jar"/>
+ <pathelement location="${thirdparty.dir}/wstx.jar"/>
</path>
<path id="tests.extra.classpath">
- <pathelement location="${lib.dir}/jbossws-cxf-client.jar"/>
- <pathelement location="${lib.dir}/jbossws-framework.jar"/>
- <pathelement location="${lib.dir}/jaxws-tools.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-cxf-client.jar"/>
+ <pathelement location="${thirdparty.dir}/jbossws-framework.jar"/>
+ <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/>
</path>
</target>
18 years, 1 month
- 1
- 0