svn commit: r290447 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model: build.xml maven.xml

[sp...@apache.org]

Author: sppatel
Date: Tue Sep 20 06:29:01 2005
New Revision: 290447

URL: http://svn.apache.org/viewcvs?rev=290447&view=rev
Log:
generate everything into ./target

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml?rev=290447&r1=290446&r2=290447&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml Tue Sep 20 06:29:01 2005
@@ -3,10 +3,12 @@
     <dirname property="antfile.dir" file="${ant.file}"/>
     
     <!-- Global properties -->
-	<property name="main.directory" location="${basedir}"/>
+    <property name="project.directory" location="${basedir}"/>
 	<property name="source.directory" value="src"/>
+    <property name="target.directory" location="${basedir}/target"/>
 	
 	<target name="codegen">
+	   <echo>${source.directory}</echo>
 
 	    <!-- A macrodef makes it easier to generate code for multiple models in one script. -->
 		<macrodef name="multipleXSDs2Java">
@@ -14,8 +16,8 @@
 			<element name="settings"/>
 			<sequential>
 				<emf.XSD2Java
-					genModel="${main.directory}/emf/@{genModelName}.genmodel"
-					modelProject="${main.directory}"
+					genModel="${target.directory}/emf/@{genModelName}.genmodel"
+					modelProject="${project.directory}"
 					modelProjectFragmentPath="${source.directory}"
 					modelPluginID="org.apache.geronimo.deployment.model"
 					copyright="">
@@ -26,31 +28,31 @@
 
 		<multipleXSDs2Java genModelName="geronimo-web">
 			<settings>
-				<model file="${main.directory}/schema/geronimo-web.xsd"/>
+				<model file="${target.directory}/schema/geronimo-web.xsd"/>
 			</settings>
 		</multipleXSDs2Java>
 		
 		<multipleXSDs2Java genModelName="geronimo-application">
 			<settings>
-				<model file="${main.directory}/schema/geronimo-application.xsd"/>
+				<model file="${target.directory}/schema/geronimo-application.xsd"/>
 			</settings>
 		</multipleXSDs2Java>
 		
 	    <multipleXSDs2Java genModelName="openejb-jar">
 			<settings>
-				<model file="${main.directory}/schema/openejb-jar.xsd"/>
+				<model file="${target.directory}/schema/openejb-jar.xsd"/>
 			</settings>
 		</multipleXSDs2Java>
 		
 	    <multipleXSDs2Java genModelName="geronimo-connector">
 			<settings>
-				<model file="${main.directory}/schema/geronimo-connector.xsd"/>
+				<model file="${target.directory}/schema/geronimo-connector.xsd"/>
 			</settings>
 		</multipleXSDs2Java>
 		
 	    <multipleXSDs2Java genModelName="geronimo-application-client">
 			<settings>
-				<model file="${main.directory}/schema/geronimo-application-client.xsd"/>
+				<model file="${target.directory}/schema/geronimo-application-client.xsd"/>
 			</settings>
 		</multipleXSDs2Java>
 					

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml?rev=290447&r1=290446&r2=290447&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml Tue Sep 20 06:29:01 2005
@@ -18,16 +18,11 @@
     <attainGoal name="build"/>
   </goal>
   
-  <preGoal name="clean:clean">
-    <ant:delete dir="${basedir}/lib"/>
-    <ant:delete dir="${basedir}/emf"/>
-  </preGoal> 
-  
   <goal name="importschemas">
     <j:forEach var="artifact" items="${pom.artifacts}"> 
     <j:set var="group" value="${artifact.dependency.groupId}"/>
       <j:if test="${group.equals('geronimo') || group.equals('openejb')}">
-          <ant:unzip src="${artifact.path}" dest="${basedir}/temp">
+          <ant:unzip src="${artifact.path}" dest="${maven.build.dir}/temp">
             <ant:patternset>
              <ant:include name="META-INF/schema/*.xsd"/>
              <ant:include name="**/xml.xsd"/>
@@ -36,17 +31,17 @@
       </j:if>      
     </j:forEach> 
     
-    <ant:move todir="${basedir}/schema" flatten="true">
-      <ant:fileset dir="${basedir}/temp/">
+    <ant:move todir="${maven.build.dir}/schema" flatten="true">
+      <ant:fileset dir="${maven.build.dir}/temp/">
         <ant:include name="**/*.xsd"/>
       </ant:fileset>
     </ant:move>
     
-    <ant:delete dir="${basedir}/temp"/>
+    <ant:delete dir="${maven.build.dir}/temp"/>
     
     <!-- update include paths in all schemas -->
     <ant:fileScanner var="schemaScanner">
-      <ant:fileset dir="${basedir}/schema">
+      <ant:fileset dir="${maven.build.dir}/schema">
         <ant:include name="*.xsd"/>
       </ant:fileset>
     </ant:fileScanner>