Author: thomas.diesler(a)jboss.com
Date: 2007-05-26 08:36:34 -0400 (Sat, 26 May 2007)
New Revision: 3269
Added:
trunk/integration/native/src/main/java/org/
trunk/integration/native/src/main/java/org/jboss/
trunk/integration/native/src/main/java/org/jboss/wsf/
Removed:
trunk/jbossws-core/src/main/java/org/jboss/wsf/
Modified:
trunk/integration/native/ant-import/build-deploy.xml
trunk/integration/native/ant-import/build-thirdparty.xml
trunk/integration/native/build.xml
trunk/jbossws-core/build.xml
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
Log:
Move native integration to integration/native
Modified: trunk/integration/native/ant-import/build-deploy.xml
===================================================================
--- trunk/integration/native/ant-import/build-deploy.xml 2007-05-26 11:57:57 UTC (rev
3268)
+++ trunk/integration/native/ant-import/build-deploy.xml 2007-05-26 12:36:34 UTC (rev
3269)
@@ -20,7 +20,7 @@
<!-- ================================================================== -->
<!-- Deploy to jboss50 -->
- <target name="deploy-jboss50"
depends="jars-native50,undeploy-jboss50" description="Deploy jbossws to
jboss50">
+ <target name="deploy-jboss50"
depends="jars-jboss50,undeploy-jboss50" description="Deploy jbossws to
jboss50">
<ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss50" inheritall="false"/>
<macro-deploy-native50
@@ -37,7 +37,7 @@
</target>
<!-- Deploy to jboss42 -->
- <target name="deploy-jboss42"
depends="jars-native42,undeploy-jboss42" description="Deploy jbossws to
jboss42">
+ <target name="deploy-jboss42"
depends="jars-jboss42,undeploy-jboss42" description="Deploy jbossws to
jboss42">
<ant antfile="${int.sunri.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
<ant antfile="${int.xfire.dir}/build.xml"
target="undeploy-jboss42" inheritall="false"/>
<macro-deploy-native42
Modified: trunk/integration/native/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/native/ant-import/build-thirdparty.xml 2007-05-26 11:57:57 UTC (rev
3268)
+++ trunk/integration/native/ant-import/build-thirdparty.xml 2007-05-26 12:36:34 UTC (rev
3269)
@@ -30,8 +30,22 @@
<target name="thirdparty-classpath"
depends="thirdparty-init">
- <!-- The compile classpath for jboss50 integration -->
+ <path id="native.integration.classpath">
+ <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
+ <pathelement location="${spi.dir}/thirdparty/activation.jar"/>
+ <pathelement location="${spi.dir}/thirdparty/dom4j.jar"/>
+ <pathelement
location="${spi.dir}/thirdparty/jboss-common-core.jar"/>
+ <pathelement
location="${spi.dir}/thirdparty/jboss-logging-spi.jar"/>
+ <pathelement location="${spi.dir}/thirdparty/servlet-api.jar"/>
+ <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/>
+ <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/>
+ <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/>
+ </path>
+
<path id="native50.integration.classpath">
+ <path refid="native.integration.classpath"/>
</path>
</target>
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-05-26 11:57:57 UTC (rev 3268)
+++ trunk/integration/native/build.xml 2007-05-26 12:36:34 UTC (rev 3269)
@@ -59,6 +59,12 @@
<!-- Compile java sources -->
<target name="compile-classes" depends="init">
+ <mkdir dir="${native.output.classes.dir}"/>
+ <javac srcdir="${native.java.dir}" sourcepath=""
destdir="${native.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/jbws/**"/>
+ <classpath refid="native.integration.classpath"/>
+ </javac>
</target>
<!-- Compile etc files (manifests and such) -->
@@ -88,11 +94,40 @@
<!--
| Build all jar files.
-->
- <target name="jars"
depends="compile,jars-native42,jars-native50" description="Builds all jar
files.">
+ <target name="jars" depends="compile,jars-jboss42,jars-jboss50"
description="Builds all jar files.">
</target>
- <target name="jars-native50" depends="compile"
if="jboss50.home">
+ <target name="jars-common" depends="compile">
+ <!-- Build jbossws-native.jar -->
+ <mkdir dir="${native.output.lib.dir}"/>
+ <jar jarfile="${native.output.lib.dir}/jbossws-native.jar"
manifest="${native.output.etc.dir}/default.mf">
+ <fileset dir="${native.output.classes.dir}">
+ <include name="org/jboss/wsf/stack/jbws/**"/>
+ </fileset>
+ </jar>
+
+ <!-- Build jbossws-context.war -->
+ <mkdir dir="${native.output.lib.dir}"/>
+ <war warfile="${native.output.lib.dir}/jbossws-context.war"
webxml="${native.resources.dir}/jbossws-context.war/WEB-INF/web.xml">
+ <fileset dir="${native.resources.dir}/jbossws-context.war">
+ <include name="index.html"/>
+ <include name="styles.css"/>
+ </fileset>
+ <webinf dir="${native.resources.dir}/jbossws-context.war/WEB-INF">
+ <include name="jboss-web.xml"/>
+ </webinf>
+ </war>
+
+ <!-- Build jbossws-native-src.zip -->
+ <zip zipfile="${native.output.lib.dir}/jbossws-native-src.zip" >
+ <fileset dir="${native.java.dir}"/>
+ </zip>
+
+ </target>
+
+ <target name="jars-jboss50" depends="jars-common"
if="jboss50.home">
+
<ant antfile="${int.jboss50.dir}/build.xml" target="jars"
inheritall="false"/>
<!-- Build jbossws-context.war -->
@@ -133,14 +168,16 @@
<!-- Build jbossws-native50.deployer -->
<zip
zipfile="${native.output.lib.dir}/jbossws-native50-deployer.zip">
+ <fileset dir="${native.output.lib.dir}">
+ <include name="jbossws-native.jar"/>
+ </fileset>
<fileset dir="${native.resources.dir}/jbossws-native50.deployer">
<include name="META-INF/jbossws-deployer-beans.xml"/>
</fileset>
</zip>
-
- </target>
+ </target>
- <target name="jars-native42" depends="compile"
if="jboss42.home">
+ <target name="jars-jboss42" depends="jars-common"
if="jboss42.home">
<ant antfile="${int.jboss42.dir}/build.xml" target="jars"
inheritall="false"/>
@@ -149,6 +186,7 @@
<jar jarfile="${native.output.lib.dir}/jbossws-native42.sar"
manifest="${native.output.etc.dir}/default.mf">
<fileset dir="${native.output.lib.dir}">
<include name="jbossws-context.war"/>
+ <include name="jbossws-native.jar"/>
</fileset>
<fileset dir="${core.dir}/output/lib">
<include name="jboss-jaxws.jar"/>
Copied: trunk/integration/native/src/main/java/org/jboss/wsf (from rev 3266,
trunk/jbossws-core/src/main/java/org/jboss/wsf)
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-05-26 11:57:57 UTC (rev 3268)
+++ trunk/jbossws-core/build.xml 2007-05-26 12:36:34 UTC (rev 3269)
@@ -79,7 +79,6 @@
<include name="javax/xml/ws/**"/>
<include name="javax/jws/**"/>
<include name="org/jboss/annotation/**"/>
- <include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
<classpath path="${core.output.classes14.dir}"/>
<classpath refid="thirdparty.classpath"/>
@@ -153,7 +152,6 @@
<jar jarfile="${core.output.lib.dir}/jbossws-core.jar"
manifest="${core.output.etc.dir}/default.mf">
<fileset dir="${core.output.classes.dir}">
<include name="org/jboss/annotation/**"/>
- <include name="org/jboss/wsf/**"/>
<include name="org/jboss/ws/**"/>
</fileset>
<fileset dir="${core.resources.dir}">
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java
===================================================================
---
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-26
11:57:57 UTC (rev 3268)
+++
trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/umdm/UnifiedMetaData.java 2007-05-26
12:36:34 UTC (rev 3269)
@@ -30,10 +30,9 @@
import java.util.StringTokenizer;
import org.jboss.logging.Logger;
+import org.jboss.ws.integration.UnifiedVirtualFile;
import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping;
import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.integration.UnifiedVirtualFile;
-import org.jboss.wsf.stack.jbws.ManagedEndpointRegistry;
/**
* The top level meta data.
@@ -200,7 +199,7 @@
{
if (implementationVersion == null)
{
- implementationVersion =
ManagedEndpointRegistry.class.getPackage().getImplementationVersion();
+ implementationVersion =
UnifiedMetaData.class.getPackage().getImplementationVersion();
if (implementationVersion != null)
isFinalRelease = new
StringTokenizer(implementationVersion).nextToken().endsWith(".GA");
}
Show replies by date