geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r385818 - in /geronimo/devtools/eclipse-plugin/trunk: geronimo-emf-common/ maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/ plugins/org.apache.geronimo.deployment.model.edit/ plugins/org.apache.geronimo.deployment.model/
Date Tue, 14 Mar 2006 15:56:27 GMT
Author: sppatel
Date: Tue Mar 14 07:55:49 2006
New Revision: 385818

URL: http://svn.apache.org/viewcvs?rev=385818&view=rev
Log:
m2 updates

Modified:
    geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml?rev=385818&r1=385817&r2=385818&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml Tue Mar 14 07:55:49
2006
@@ -10,6 +10,15 @@
     <version>1.0</version>
   </parent>
   <build>
+    <resources>
+      <resource>
+        <targetPath>templates</targetPath>
+        <directory>templates</directory>
+        <includes>
+          <include>*.javajetinc</include>
+        </includes>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.apache.geronimo.devtools</groupId>
@@ -55,7 +64,9 @@
               <tasks>
                 <taskdef name="replaceregexp" classname="org.apache.tools.ant.taskdefs.optional.ReplaceRegExp"
classpathref="maven.plugin.classpath"/>
                 <property name="ant.regexp.regexpimpl" value="org.apache.tools.ant.util.regexp.JakartaOroRegexp"/>
-                <replaceregexp file="${project.build.outputDirectory}/schemas/geronimo-security-1.1.xsd"
match='schemaLocation="http://www.w3.org/2001/xml.xsd"' replace='schemaLocation="http://www.w3.org/2001/03/xml.xsd"'
byline="true"/>
+                <replaceregexp match='schemaLocation="http://www.w3.org/2001/xml.xsd"'
replace='schemaLocation="http://www.w3.org/2001/03/xml.xsd"' byline="true">
+                  <fileset dir="${project.build.outputDirectory}/schemas/" includes="**/*.xsd"/>
+                </replaceregexp>
               </tasks>
             </configuration>
             <goals>

Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java?rev=385818&r1=385817&r2=385818&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java
Tue Mar 14 07:55:49 2006
@@ -64,7 +64,7 @@
 	protected StringBuffer processParameters() {
 		StringBuffer buffer = new StringBuffer();
 		if (projectRootDirectory != null) {
-			buffer.append("-projects").append(projectRootDirectory.getAbsolutePath()).append(SPACE);
+			buffer.append("-projects").append(SPACE).append(projectRootDirectory.getAbsolutePath()).append(SPACE);
 		}
 
 		buffer.append("-").append(type).append(SPACE);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=385818&r1=385817&r2=385818&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
Tue Mar 14 07:55:49 2006
@@ -9,6 +9,9 @@
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <version>1.0</version>
   </parent>
+  <properties>
+    <imported-resources>${project.build.directory}/imported-resources</imported-resources>
+  </properties>
   <build>
     <resources>
       <resource>
@@ -24,6 +27,92 @@
         </includes>
       </resource>
     </resources>
+        <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>dependency-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+          </execution>
+        </executions>     
+        <configuration>
+          <artifactItems>
+            <artifactItem>
+              <groupId>org.apache.geronimo.devtools</groupId>
+              <artifactId>geronimo-emf-common</artifactId>
+              <version>${geronimo-emf-common_version}</version>
+              <type>jar</type>
+            </artifactItem>
+          </artifactItems>
+          <outputDirectory>${imported-resources}</outputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>maven-emf-plugin</artifactId>
+        <configuration>
+          <workspace>${project.basedir}/..</workspace>
+          <!--<projectRootDirectory>${project.basedir}/..</projectRootDirectory>-->
+          <type>edit</type>
+        </configuration>
+        <executions>
+          <execution>
+            <id>execution-web</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-web.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-openejb</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/openejb-jar.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-connector</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-connector.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-application</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-application.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-appclient</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-application-client.genmodel</genmodel>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
   <dependencies>
   	<!-- g plugin dependencies -->

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=385818&r1=385817&r2=385818&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
Tue Mar 14 07:55:49 2006
@@ -55,7 +55,8 @@
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>maven-emf-plugin</artifactId>
         <configuration>
-          <projectRootDirectory>${project.base.directory}/..</projectRootDirectory>
+          <workspace>${project.basedir}/..</workspace>
+          <!--<projectRootDirectory>${project.basedir}/..</projectRootDirectory>-->
           <type>model</type>
         </configuration>
         <executions>
@@ -67,6 +68,46 @@
             </goals>
             <configuration>
               <genmodel>${imported-resources}/emf/geronimo-web.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-openejb</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/openejb-jar.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-connector</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-connector.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-application</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-application.genmodel</genmodel>
+            </configuration>
+          </execution>
+          <execution>
+            <id>execution-appclient</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+            <configuration>
+              <genmodel>${imported-resources}/emf/geronimo-application-client.genmodel</genmodel>
             </configuration>
           </execution>
         </executions>



Mime
View raw message