[jbossws-commits] JBossWS SVN: r2365 - in branches/jbossws-1.2.0: integration-jboss42 and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-15 04:26:25 -0500 (Thu, 15 Feb 2007)
New Revision: 2365

Modified:
   branches/jbossws-1.2.0/integration-jboss40/build.xml
   branches/jbossws-1.2.0/integration-jboss42/build.xml
Log:
Conditionally compile ejb3 support in jboss42 integration

Modified: branches/jbossws-1.2.0/integration-jboss40/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss40/build.xml	2007-02-15 08:45:45 UTC (rev 2364)
+++ branches/jbossws-1.2.0/integration-jboss40/build.xml	2007-02-15 09:26:25 UTC (rev 2365)
@@ -52,7 +52,7 @@
   | documentation compiles.
   -->
   
-  <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-check-ejb3-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/>
+  <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/>
   
   <!-- Compile integration java sources -->
   <target name="jboss40-compile-classes" depends="jboss40-init,core-compile">
@@ -68,7 +68,7 @@
       <classpath path="${core.output.classes.dir}"/>
     </javac>
   </target>
-  <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile" if="jboss40.ejb3.available">
+  <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile,jboss40-check-ejb3-classes" if="jboss40.ejb3.available">
     <mkdir dir="${jboss40.output.classes.dir}"/>
     <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
       deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">

Modified: branches/jbossws-1.2.0/integration-jboss42/build.xml
===================================================================
--- branches/jbossws-1.2.0/integration-jboss42/build.xml	2007-02-15 08:45:45 UTC (rev 2364)
+++ branches/jbossws-1.2.0/integration-jboss42/build.xml	2007-02-15 09:26:25 UTC (rev 2365)
@@ -27,6 +27,7 @@
 
   <target name="jboss42-init" depends="prepare, thirdparty">
     <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
+    <available file="${jboss42.client}/jboss-ejb3-client.jar" property="jboss42.ejb3.available"/>
   </target>
   
   <!-- ================================================================== -->
@@ -41,7 +42,7 @@
   | documentation compiles.
   -->
   
-  <target name="jboss42-compile" depends="jboss42-compile-classes,jboss42-compile-etc" description="Compile all source files."/>
+  <target name="jboss42-compile" depends="jboss42-compile-classes,jboss42-compile-ejb3-classes,jboss42-compile-etc" description="Compile all source files."/>
   
   <!-- Compile integration java sources -->
   <target name="jboss42-compile-classes" depends="jboss42-init,core-compile">
@@ -49,11 +50,33 @@
     <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
       deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
       <include name="org/jboss/ws/integration/jboss42/**"/>
+      <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
+      <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
+      <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
       <classpath refid="jboss42.integration.classpath"/>
       <classpath path="${core.output.classes14.dir}"/>
       <classpath path="${core.output.classes.dir}"/>
     </javac>
   </target>
+  <target name="jboss42-compile-ejb3-classes" depends="jboss42-init,core-compile,jboss42-check-ejb3-classes" if="jboss42.ejb3.available">
+    <mkdir dir="${jboss42.output.classes.dir}"/>
+    <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
+      deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
+      <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/>
+      <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/>
+      <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/>
+      <classpath refid="jboss42.integration.classpath"/>
+      <classpath path="${core.output.classes14.dir}"/>
+      <classpath path="${core.output.classes.dir}"/>
+    </javac>
+  </target>
+  <target name="jboss42-check-ejb3-classes" depends="jboss42-init" unless="jboss42.ejb3.available">
+    <echo message="****************************************"/>
+    <echo message="* EJB3 not available                   *"/>
+    <echo message="* jboss42 integartion layer will be    *"/>
+    <echo message="* build without EJB3 support!          *"/>
+    <echo message="****************************************"/>
+  </target>
   
   <!-- Compile etc files (manifests and such) -->
   <target name="jboss42-compile-etc" depends="jboss42-init">