[jbossws-commits] JBossWS SVN: r1750 - in branches/tdiesler/trunk/build: . ant-import

[jbossws-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2006-12-22 09:57:57 -0500 (Fri, 22 Dec 2006)
New Revision: 1750

Modified:
   branches/tdiesler/trunk/build/ant-import/build-release.xml
   branches/tdiesler/trunk/build/ant-import/build-setup.xml
   branches/tdiesler/trunk/build/build.xml
Log:
partial commit

Modified: branches/tdiesler/trunk/build/ant-import/build-release.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-release.xml	2006-12-22 14:57:53 UTC (rev 1749)
+++ branches/tdiesler/trunk/build/ant-import/build-release.xml	2006-12-22 14:57:57 UTC (rev 1750)
@@ -38,9 +38,9 @@
   <target name="release-to-repository" depends="jars" description="Release to jboss.local.repository">
 
     <!-- jbossws -->
-    <property name="jbossws.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
-    <mkdir dir="${jbossws.dir}/lib"/>
-    <copy todir="${jbossws.dir}/lib" overwrite="true">
+    <property name="target.dir" value="${jboss.local.repository}/jboss/jbossws/${repository.id}"/>
+    <mkdir dir="${target.dir}/lib"/>
+    <copy todir="${target.dir}/lib" overwrite="true">
       <fileset dir="${build.lib.dir}">
         <include name="jbossws50.sar"/>
         <include name="jbossws50.deployer"/>
@@ -54,7 +54,7 @@
         <include name="jboss-saaj.jar"/>
       </fileset>
     </copy>
-    <copy tofile="${jbossws.dir}/component-info.xml" file="${build.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
+    <copy tofile="${target.dir}/component-info.xml" file="${build.etc.dir}/jbossws-component-info.xml" filtering="true" overwrite="true">
       <filterset>
         <filtersfile file="version.properties"/>
       </filterset>

Modified: branches/tdiesler/trunk/build/ant-import/build-setup.xml
===================================================================
--- branches/tdiesler/trunk/build/ant-import/build-setup.xml	2006-12-22 14:57:53 UTC (rev 1749)
+++ branches/tdiesler/trunk/build/ant-import/build-setup.xml	2006-12-22 14:57:57 UTC (rev 1750)
@@ -26,7 +26,8 @@
   <property name="integration.jboss42.dir" value="${basedir}/../integration-jboss42"/>
   <property name="integration.jboss50.dir" value="${basedir}/../integration-jboss50"/>
   <property name="integration.tomcat.dir" value="${basedir}/../integration-tomcat"/>
-  <property name="jbossws.dir" value="${basedir}/../jbossws"/>
+  <property name="core.dir" value="${basedir}/../jbossws-core"/>
+  <property name="tests.dir" value="${basedir}/../jbossws-tests"/>
   
   <property name="docs.userguide.dir" value="${docs.dir}/user-guide/project"/>
   <property name="output.etc.dir" value="${build.dir}/output/etc"/>

Modified: branches/tdiesler/trunk/build/build.xml
===================================================================
--- branches/tdiesler/trunk/build/build.xml	2006-12-22 14:57:53 UTC (rev 1749)
+++ branches/tdiesler/trunk/build/build.xml	2006-12-22 14:57:57 UTC (rev 1750)
@@ -13,13 +13,13 @@
 
 <project default="main" basedir="../build" name="JBossWS-Build">
   
-  <import file="${basedir}/import/build-thirdparty.xml"/>
-  <import file="${basedir}/import/build-setup.xml"/>
-  <import file="${basedir}/import/build-release.xml"/>
+  <import file="${basedir}/ant-import/build-thirdparty.xml"/>
+  <import file="${basedir}/ant-import/build-setup.xml"/>
+  <import file="${basedir}/ant-import/build-release.xml"/>
   <import file="${basedir}/../integration-jboss42/build.xml"/>
   <import file="${basedir}/../integration-jboss50/build.xml"/>
   <import file="${basedir}/../integration-tomcat/build.xml"/>
-  <import file="${basedir}/../jbossws/build.xml"/>
+  <import file="${basedir}/../jbossws-core/build.xml"/>
   
   <target name="init" depends="prepare, thirdparty">
   </target>
@@ -32,7 +32,7 @@
   | Build all jar files.
   -->
   <target name="jars" depends="init" description="Builds all jar files.">
-    <ant antfile="${jbossws.dir}/build.xml" target="jbossws-jars" dir="${jbossws.dir}" inheritall="false"/>
+    <ant antfile="${core.dir}/build.xml" target="jbossws-jars" inheritall="false"/>
     <ant antfile="${integration.jboss42.dir}/build.xml" target="jboss42-jars" inheritall="false"/>
     <ant antfile="${integration.jboss50.dir}/build.xml" target="jboss50-jars" inheritall="false"/>
     <ant antfile="${integration.tomcat.dir}/build.xml" target="tomcat-jars" inheritall="false"/>
@@ -44,7 +44,7 @@
   
   <target name="clean" depends="prepare" description="Cleans up most generated files.">
     <delete dir="${build.dir}/output"/>
-    <ant antfile="${jbossws.dir}/build.xml" target="clean" inheritall="false"/>
+    <ant antfile="${core.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${integration.jboss42.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${integration.jboss50.dir}/build.xml" target="clean" inheritall="false"/>
     <ant antfile="${integration.tomcat.dir}/build.xml" target="clean" inheritall="false"/>