geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r354545 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model: build.xml maven.xml
Date Tue, 06 Dec 2005 20:53:12 GMT
Author: sppatel
Date: Tue Dec  6 12:53:09 2005
New Revision: 354545

URL: http://svn.apache.org/viewcvs?rev=354545&view=rev
Log:
support for emf.edit generation

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=354545&r1=354544&r2=354545&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 Dec  6 12:53:09 2005
@@ -18,7 +18,7 @@
 					genModel="${target.directory}/emf/@{genModelName}.genmodel"
 					modelProject="${project.directory}"
 					modelProjectFragmentPath="${source.directory}"
-					modelPluginID="org.apache.geronimo.deployment.model"
+					modelPluginID="org.apache.geronimo.deployment.model"					
 					copyright="">
 					<settings/>
 				</emf.XSD2Java>
@@ -40,12 +40,15 @@
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.1 org.apache.geronimo.xml.ns.security"/>
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
-				<arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/web-1.0 org.apache.geronimo.xml.ns.web"/>

+				<arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/web-1.0 org.apache.geronimo.xml.ns.j2ee.web"/>

 							
 				<arg line="-packages http://geronimo.apache.org/xml/ns/naming-1.0"/>
 				<arg line="-packages http://geronimo.apache.org/xml/ns/security-1.1"/>
 				<arg line="-packages http://geronimo.apache.org/xml/ns/deployment-1.0"/>
 				<arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/web-1.0"/>
+				
+				<arg line="-editProject ${project.directory} src"/>
+			
 			</settings>
 		</multipleXSDs2Java>
 		
@@ -57,6 +60,8 @@
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
 							
 				<arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/application-1.0"/>
+				
+				<arg line="-editProject ${project.directory} src"/>
 			</settings>
 		</multipleXSDs2Java>
 		
@@ -71,6 +76,8 @@
 				
 				<arg line="-packages http://www.openejb.org/xml/ns/openejb-jar-2.0"/>
 				<arg line="-packages http://www.openejb.org/xml/ns/pkgen-2.0"/>
+				
+				<arg line="-editProject ${project.directory} src"/>
 			</settings>
 		</multipleXSDs2Java>
 		
@@ -82,6 +89,8 @@
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
 							
 				<arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"/>
+				
+				<arg line="-editProject ${project.directory} src"/>
 			</settings>
 		</multipleXSDs2Java>
 		
@@ -95,6 +104,8 @@
 				<arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>

 							
 				<arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"/>
+				
+				<arg line="-editProject ${project.directory} src"/>
 			</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=354545&r1=354544&r2=354545&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 Dec  6 12:53:09 2005
@@ -90,5 +90,192 @@
    </ant:java> 
    <ant:delete dir="bin"/>
   </goal>
+	
+	<goal name="genmodels" prereqs="importschemas">
+	    <echo>Generating geronimo-web.genmodel</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.xsd.ecore.importer.XSD2GenModel"/>
+	      <ant:arg value="${maven.build.dir}/schema/geronimo-web-1.0.xsd"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-web.genmodel"/>
+	      <ant:arg value="-modelProject"/>
+	      <ant:arg value="${basedir}"/>
+	      <ant:arg value="src"/>
+	      <ant:arg value="-packages"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/naming-1.0"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/security-1.1"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"/>
+	      <ant:arg value="-packageMap"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/naming-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.naming"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/security-1.1"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.security"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.deployment"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.web"/>
+	    </ant:java> 
+		
+		<echo>Generating geronimo-application.genmodel</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.xsd.ecore.importer.XSD2GenModel"/>
+	      <ant:arg value="${maven.build.dir}/schema/geronimo-application-1.0.xsd"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-application.genmodel"/>
+	      <ant:arg value="-modelProject"/>
+	      <ant:arg value="${basedir}"/>
+	      <ant:arg value="src"/>
+	      <ant:arg value="-packages"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"/>
+	      <ant:arg value="-packageMap"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/security-1.1"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.security"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.deployment"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.j2ee.application"/>
+		 </ant:java> 
+		
+		<echo>Generating openejb-jar.genmodel</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.xsd.ecore.importer.XSD2GenModel"/>
+	      <ant:arg value="${maven.build.dir}/schema/openejb-jar-2.0.xsd"/>
+	      <ant:arg value="${maven.build.dir}/openejb-jar.genmodel"/>
+	      <ant:arg value="-modelProject"/>
+	      <ant:arg value="${basedir}"/>
+	      <ant:arg value="src"/>
+	      <ant:arg value="-packages"/>
+	      <ant:arg value="http://www.openejb.org/xml/ns/openejb-jar-2.0"/>
+	      <ant:arg value="http://www.openejb.org/xml/ns/pkgen-2.0"/>
+	      <ant:arg value="-packageMap"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/naming-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.naming"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/security-1.1"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.security"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.deployment"/>
+	      <ant:arg value="http://www.openejb.org/xml/ns/openejb-jar-2.0"/>
+	      <ant:arg value="org.openejb.xml.ns.openejb.jar"/>
+	      <ant:arg value="http://www.openejb.org/xml/ns/pkgen-2.0"/>
+	      <ant:arg value="org.openejb.xml.ns.pkgen"/>	
+		</ant:java> 
+		
+		<echo>Generating geronimo-connector.genmodel</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.xsd.ecore.importer.XSD2GenModel"/>
+	      <ant:arg value="${maven.build.dir}/schema/geronimo-connector-1.0.xsd"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-connector.genmodel"/>
+	      <ant:arg value="-modelProject"/>
+	      <ant:arg value="${basedir}"/>
+	      <ant:arg value="src"/>
+	      <ant:arg value="-packages"/>
+	      <ant:arg value="http://www.openejb.org/xml/ns/openejb-jar-2.0"/>
+	      <ant:arg value="http://www.openejb.org/xml/ns/pkgen-2.0"/>
+	      <ant:arg value="-packageMap"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/naming-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.naming"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.deployment"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.j2ee.connector"/>	
+		</ant:java> 
+		
+		<echo>Generating geronimo-application-client.genmodel</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.xsd.ecore.importer.XSD2GenModel"/>
+	      <ant:arg value="${maven.build.dir}/schema/geronimo-application-client-1.0.xsd"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-appclient.genmodel"/>
+	      <ant:arg value="-modelProject"/>
+	      <ant:arg value="${basedir}"/>
+	      <ant:arg value="src"/>
+	      <ant:arg value="-packages"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"/>
+	      <ant:arg value="-packageMap"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/naming-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.naming"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.deployment"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.j2ee.connector"/>	
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/security-1.1"/>
+	      <ant:arg value="org.apache.geronimo.xml.ns.security"/>
+	      <ant:arg value="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"/>
+	   	  <ant:arg value="org.apache.geronimo.xml.ns.j2ee.application.client"/>
+		</ant:java> 
+		
+	</goal>
+	
+	<goal name="codegen2" prereqs="genmodels">
+	    <echo>Generating geronimo-web model and edit code</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.emf.codegen.ecore.Generator"/>
+	      <ant:arg value="-model"/>
+	      <ant:arg value="-edit"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-web.genmodel"/>
+	    </ant:java> 
+		<echo>Generating geronimo-application model and edit code</echo>
+		<ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.emf.codegen.ecore.Generator"/>
+	      <ant:arg value="-model"/>
+	      <ant:arg value="-edit"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-application.genmodel"/>
+	    </ant:java> 
+		<echo>Generating openejb-jar model and edit code</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.emf.codegen.ecore.Generator"/>
+	      <ant:arg value="-model"/>
+	      <ant:arg value="-edit"/>
+	      <ant:arg value="${maven.build.dir}/openejb-jar.genmodel"/>
+	    </ant:java> 
+		<echo>Generating geronimo-connector model and edit code</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.emf.codegen.ecore.Generator"/>
+	      <ant:arg value="-model"/>
+	      <ant:arg value="-edit"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-connector.genmodel"/>
+	    </ant:java> 
+		<echo>Generating geronimo-application-client model and edit code</echo>
+	    <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+	      <ant:arg value="-data"/>
+	      <ant:arg value="../temp"/>
+	      <ant:arg value="-application"/>
+	      <ant:arg value="org.eclipse.emf.codegen.ecore.Generator"/>
+	      <ant:arg value="-model"/>
+	      <ant:arg value="-edit"/>
+	      <ant:arg value="${maven.build.dir}/geronimo-appclient.genmodel"/>
+	    </ant:java> 
+	   <ant:delete dir="bin"/>
+	</goal>
   
 </project>



Mime
View raw message