[jboss-cvs] JBossAS SVN: r75785 - in branches/JBPAPP_4_2_0_GA_CP: server and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: dbhole
Date: 2008-07-14 12:00:04 -0400 (Mon, 14 Jul 2008)
New Revision: 75785

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
   branches/JBPAPP_4_2_0_GA_CP/server/build.xml
Log:

Remove code that copied version specific files over. Instead, javac now picks up the sources from the right versioned directory.



Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml	2008-07-14 15:53:39 UTC (rev 75784)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build.xml	2008-07-14 16:00:04 UTC (rev 75785)
@@ -176,7 +176,6 @@
       <!-- Where source files live -->
       <property name="source.java" value="${module.source}/main"/>
       <property name="source.etc" value="${module.source}/etc"/>
-      <property name="source.version.specific" value="${module.output}/versionspecificcode"/>
       <property name="resources" value="${module.source}/resources"/>
 
       <!-- Where build generated files will go -->
@@ -231,10 +230,6 @@
         <isset property="build.soa.bits"/>
       </condition>
 
-      <copy todir="${source.version.specific}">
-        <fileset dir="${version.specific.dir}"/>
-      </copy> 
-
    </target>
 
    <!-- ================================================================== -->
@@ -280,7 +275,7 @@
          deprecation="${javac.deprecation}"
          failonerror="${javac.fail.onerror}">
          <src path="${source.java}"/>
-         <src path="${source.version.specific}"/>
+         <src path="${version.specific.dir}"/>
          <classpath refid="javac.classpath"/>
          <include name="${javac.includes}"/>
          <exclude name="${javac.excludes}"/>

Modified: branches/JBPAPP_4_2_0_GA_CP/server/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/server/build.xml	2008-07-14 15:53:39 UTC (rev 75784)
+++ branches/JBPAPP_4_2_0_GA_CP/server/build.xml	2008-07-14 16:00:04 UTC (rev 75785)
@@ -87,8 +87,6 @@
     <property name="javac.target" value="5"/>
     <property name="javac.source" value="5"/>
 
-    <property name="source.version.specific" value="${module.output}/versionspecificcode"/>
-
     <!-- ========= -->
     <!-- Libraries -->
     <!-- ========= -->
@@ -195,10 +193,6 @@
       <isset property="build.soa.bits"/>
     </condition>
 
-    <copy todir="${source.version.specific}">
-      <fileset dir="${version.specific.dir}"/>
-    </copy> 
-
   </target>
 
 
@@ -273,7 +267,7 @@
 
       <src path="${source.java}"/>
       <src path="${build.parsers}"/>
-      <src path="${source.version.specific}"/>
+      <src path="${version.specific.dir}"/>
 
       <exclude name="org/jboss/ejb/plugins/cmp/jdbc/jdbc3/*.java" unless="HAVE_JDK_1.4"/>
     </javac>