geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r354677 - in /geronimo/devtools/trunk/modules/eclipse-plugin: ./ plugins/org.apache.geronimo.deployment.model/
Date Wed, 07 Dec 2005 02:53:28 GMT
Author: sppatel
Date: Tue Dec  6 18:53:23 2005
New Revision: 354677

URL: http://svn.apache.org/viewcvs?rev=354677&view=rev
Log:
build rework cont'

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

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml?rev=354677&r1=354676&r2=354677&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/maven.xml Tue Dec  6 18:53:23 2005
@@ -34,7 +34,6 @@
 	<goal name="clean" prereqs="init">
 		<j:set var="goal" value="clean" />
 		<attainGoal name="multiproject:goal" />
-		<ant:delete dir="./plugins/temp" />
 	</goal>
 	
 	<goal name="clean-all">>

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=354677&r1=354676&r2=354677&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 18:53:23 2005
@@ -25,10 +25,6 @@
     <attainGoal name="jar:install"/>
   </goal>
   
-  <preGoal name="java:compile">
-    <attainGoal name="codegen"/>
-  </preGoal>
-  
   <goal name="rebuild">
     <attainGoal name="clean"/>
     <attainGoal name="build"/>
@@ -37,245 +33,5 @@
   <goal name="eclipse:generate-classpath">
   <!-- do nothing -->
   </goal>
-  
-  <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="${maven.build.dir}/temp">
-            <ant:patternset>
-             <ant:include name="META-INF/schema/*.xsd"/>
-             <ant:include name="**/xml.xsd"/>
-           </ant:patternset>
-         </ant:unzip>  
-      </j:if>      
-    </j:forEach> 
-    
-    <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="${maven.build.dir}/temp"/>
-  	
-  	<!-- update include paths in all schemas -->
-    <ant:fileScanner var="schemaScanner">
-      <ant:fileset dir="${maven.build.dir}/schema">
-        <ant:include name="*.xsd"/>
-      </ant:fileset>
-    </ant:fileScanner>
-  	
-  	<ant:taskdef name="replaceregexp"
-  		classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
-  		classpathref="maven.dependency.classpath"/>
-  	<ant:property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.JakartaOroRegexp"/>

-  
-    <j:forEach var="schema" items="${schemaScanner.iterator()}">
-      <ant:replaceregexp file="${schema}" match='schemaLocation="http://www.w3.org/2001/xml.xsd"'
replace='schemaLocation="http://www.w3.org/2001/03/xml.xsd"' byline="true"/> 
-    </j:forEach>    
-    
-  </goal>
-  
-  <goal name="codegen" prereqs="importschemas">
-    <echo>Starting Workbench...</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.ant.core.antRunner"/>
-      <ant:arg value="-buildfile"/>
-      <ant:arg value="${basedir}/build.xml"/>
-   </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>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties?rev=354677&r1=354676&r2=354677&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.properties
Tue Dec  6 18:53:23 2005
@@ -1,3 +1 @@
 maven.jar.manifest=META-INF/MANIFEST.MF
-patch=<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
-patch2=<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml?rev=354677&r1=354676&r2=354677&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/project.xml
Tue Dec  6 18:53:23 2005
@@ -42,78 +42,12 @@
      </resource>
     </resources>
   </build>
-  <dependencies>
+  <dependencies>
     <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.5.0</version>      
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xmlParserAPIs</artifactId>
-      <version>2.6.2</version>      
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xerces</artifactId>
-      <version>2.4.0</version>      
-    </dependency>
-    <dependency>
-      <groupId>xml-resolver</groupId>
-      <artifactId>xml-resolver</artifactId>
-      <version>1.1</version>      
-    </dependency>
-    <!--  geronimo dependencies needed for schemas during build -->
-    <dependency>
-      <groupId>openejb</groupId>
-      <artifactId>openejb-pkgen-builder</artifactId>
-      <version>${openejb_version}</version>      
-    </dependency>
-    <dependency>
-      <groupId>openejb</groupId>
-      <artifactId>openejb-builder</artifactId>
-      <version>${openejb_version}</version>
-    </dependency>  
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-security-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-naming-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-web-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency> 
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-j2ee-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency> 
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-service-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-j2ee-schema</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency> 
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-connector-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency> 
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-client-builder</artifactId>
-      <version>${geronimo_runtime_version}</version>
-    </dependency>        
+      <groupId>geronimo-devtools</groupId>
+      <artifactId>geronimo-emf</artifactId>
+      <version>${devtools_currentversion}</version>      
+    </dependency>      
     <!--  eclipse dependencies -->
     <dependency>
       <groupId>eclipse</groupId>



Mime
View raw message