geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r355507 - in /geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf: geronimo-application-client.genmodel geronimo-application.genmodel geronimo-connector.genmodel geronimo-web.genmodel maven.xml openejb-jar.genmodel
Date Fri, 09 Dec 2005 14:49:50 GMT
Author: sppatel
Date: Fri Dec  9 06:49:47 2005
New Revision: 355507

URL: http://svn.apache.org/viewcvs?rev=355507&view=rev
Log:
hopefully this fixes continuum build

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application-client.genmodel
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application.genmodel
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-connector.genmodel
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-web.genmodel
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/openejb-jar.genmodel

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application-client.genmodel
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application-client.genmodel?rev=355507&r1=355506&r2=355507&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application-client.genmodel
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application-client.genmodel
Fri Dec  9 06:49:47 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
copyrightText=""
-    modelDirectory="../plugins/org.apache.geronimo.deployment.model/./src/."
-    editDirectory="../plugins/org.apache.geronimo.deployment.model.edit/./src/."
+    modelDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model/./src/."
+    editDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model.edit/./src/."
     modelPluginID="org.apache.geronimo.deployment.model" templateDirectory="/org.apache.geronimo.deployment.model/target/templates"
dynamicTemplates="true"
     modelName="Geronimo-application-client" modelPluginClass="org.apache.geronimo.deployment.model.GeronimoEMFModelPlugin"
     editPluginClass="org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin"

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application.genmodel
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application.genmodel?rev=355507&r1=355506&r2=355507&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application.genmodel
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-application.genmodel
Fri Dec  9 06:49:47 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
copyrightText=""
-    modelDirectory="../plugins/org.apache.geronimo.deployment.model/./src/."
-    editDirectory="../plugins/org.apache.geronimo.deployment.model.edit/./src/."
+    modelDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model/./src/."
+    editDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model.edit/./src/."
     modelPluginID="org.apache.geronimo.deployment.model" templateDirectory="/org.apache.geronimo.deployment.model/target/templates"
dynamicTemplates="true"
     redirection="" modelName="Geronimo-application" modelPluginClass="org.apache.geronimo.deployment.model.GeronimoEMFModelPlugin"
     editPluginClass="org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin"

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-connector.genmodel
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-connector.genmodel?rev=355507&r1=355506&r2=355507&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-connector.genmodel
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-connector.genmodel
Fri Dec  9 06:49:47 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
copyrightText=""
-    modelDirectory="../plugins/org.apache.geronimo.deployment.model/./src/."
-    editDirectory="../plugins/org.apache.geronimo.deployment.model.edit/./src/."
+    modelDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model/./src/."
+    editDirectory="PLUGINS_LOC//plugins/org.apache.geronimo.deployment.model.edit/./src/."
     modelPluginID="org.apache.geronimo.deployment.model" templateDirectory="/org.apache.geronimo.deployment.model/target/templates"
dynamicTemplates="true"
     modelName="Geronimo-connector" modelPluginClass="org.apache.geronimo.deployment.model.GeronimoEMFModelPlugin"
     editPluginClass="org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin"

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-web.genmodel
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-web.genmodel?rev=355507&r1=355506&r2=355507&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-web.genmodel (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/geronimo-web.genmodel Fri
Dec  9 06:49:47 2005
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
copyrightText=""
-    modelDirectory="../plugins/plugins/org.apache.geronimo.deployment.model/./src/."
-    editDirectory="../plugins/org.apache.geronimo.deployment.model.edit/./src/."
+    modelDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model/./src/."
+    editDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model.edit/./src/."
     modelPluginID="org.apache.geronimo.deployment.model" templateDirectory="/org.apache.geronimo.deployment.model/target/templates"
dynamicTemplates="true"
     modelName="Geronimo-web" modelPluginClass="org.apache.geronimo.deployment.model.GeronimoEMFModelPlugin"
     editPluginClass="org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin"
     updateClasspath="false" importerID="org.eclipse.xsd.ecore.importer">
   <foreignModel>../schema/geronimo-web-1.0.xsd</foreignModel>
 </genmodel:GenModel>
+<!-- /Users/sppatel/geronimo/devtools/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/./src/.
-->

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml?rev=355507&r1=355506&r2=355507&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/maven.xml Fri Dec  9 06:49:47
2005
@@ -78,17 +78,37 @@
   </goal>
   
   <goal name="codegen" prereqs="importschemas">
+    
     <ant:copy todir="${maven.build.dir}/emf" overwrite="true">
-        <ant:fileset dir="${base.dir}">
+        <ant:fileset dir="${basedir}">
             <include name="*.genmodel"/>
         </ant:fileset>
     </ant:copy>
+    
+    <ant:fileScanner var="genModelScanner">
+      <ant:fileset dir="${maven.build.dir}/emf">
+        <ant:include name="*.genmodel"/>
+      </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="genmodel" items="${genModelScanner.iterator()}">
+      <ant:replaceregexp file="${genmodel}" match="PLUGINS_LOC" replace="${basedir}/.."
byline="true"/> 
+    </j:forEach>    
+    
     <ant:mkdir dir="../plugins/org.apache.geronimo.deployment.model/target/templates"/>
+    
     <ant:copy todir="../plugins/org.apache.geronimo.deployment.model/target/templates">
         <ant:fileset dir="templates"/>
     </ant:copy>
+    
     <ant:copy file=".classpath" todir="../plugins/org.apache.geronimo.deployment.model/"
overwrite="true"/>
     <ant:copy file=".classpath" todir="../plugins/org.apache.geronimo.deployment.model.edit/"
overwrite="true"/> 
+    
     <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/"/>

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/openejb-jar.genmodel
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/openejb-jar.genmodel?rev=355507&r1=355506&r2=355507&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/openejb-jar.genmodel (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/geronimo-emf/openejb-jar.genmodel Fri Dec
 9 06:49:47 2005
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
copyrightText=""
-    modelDirectory="../plugins/org.apache.geronimo.deployment.model/./src/."
-    editDirectory="../plugins/org.apache.geronimo.deployment.model.edit/./src/."
+    modelDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model/./src/."
+    editDirectory="PLUGINS_LOC/plugins/org.apache.geronimo.deployment.model.edit/./src/."
     modelPluginID="org.apache.geronimo.deployment.model" templateDirectory="/org.apache.geronimo.deployment.model/target/templates"
     dynamicTemplates="true" modelName="Openejb-jar" modelPluginClass="org.apache.geronimo.deployment.model.GeronimoEMFModelPlugin"
     editPluginClass="org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin"



Mime
View raw message