You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/03/13 23:52:56 UTC
svn commit: r385688 - in /geronimo/devtools/eclipse-plugin/trunk:
geronimo-emf-common/ geronimo-emf-common/templates/
maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/
plugins/org.apache.geronimo.deployment.model/
Author: sppatel
Date: Mon Mar 13 14:52:54 2006
New Revision: 385688
URL: http://svn.apache.org/viewcvs?rev=385688&view=rev
Log:
m2 fixes
Added:
geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/templates/
geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/templates/Header.javajetinc
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/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=385688&r1=385687&r2=385688&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/pom.xml Mon Mar 13 14:52:54 2006
@@ -15,14 +15,14 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
<configuration>
- <target>${project.build.directory}/schemas</target>
+ <target>${project.build.outputDirectory}/schemas</target>
<includes>
<include>**/*.xsd</include>
</includes>
</configuration>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <phase>process-resources</phase>
<goals>
<goal>importresources</goal>
</goals>
@@ -30,6 +30,41 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>2.0.8</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-apache-oro</artifactId>
+ <version>1.6.4</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-optional</artifactId>
+ <version>1.5.3-1</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <phase>process-classes</phase>
+ <configuration>
+ <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"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
@@ -50,6 +85,8 @@
<org.apache.geronimo.xml.ns.j2ee.application.client>http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0</org.apache.geronimo.xml.ns.j2ee.application.client>
</packagemap>
<attributes>
+ <modelDirectory>/org.apache.geronimo.deployment.model/src</modelDirectory>
+ <editDirectory>/org.apache.geronimo.deployment.model.edit/src</editDirectory>
<modelPluginClass>org.apache.geronimo.deployment.model.GeronimoEMFModelPlugin</modelPluginClass>
<editPluginClass>org.apache.geronimo.deployment.model.edit.GeronimoEMFEditPlugin</editPluginClass>
<updateClasspath>false</updateClasspath>
@@ -58,14 +95,14 @@
<executions>
<execution>
<id>execution-web</id>
- <phase>generate-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>xsd2genmodel</goal>
<goal>setattributes</goal>
</goals>
<configuration>
<schemas>
- <schema>${project.build.directory}/schemas/geronimo-web-1.0.xsd</schema>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-web-1.0.xsd</schema>
</schemas>
<genmodel>${project.build.outputDirectory}/emf/geronimo-web.genmodel</genmodel>
<packages>
@@ -78,14 +115,14 @@
</execution>
<execution>
<id>execution-application</id>
- <phase>generate-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>xsd2genmodel</goal>
<goal>setattributes</goal>
</goals>
<configuration>
<schemas>
- <schema>${project.build.directory}/schemas/geronimo-application-1.0.xsd</schema>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-application-1.0.xsd</schema>
</schemas>
<genmodel>${project.build.outputDirectory}/emf/geronimo-application.genmodel</genmodel>
<packages>
@@ -95,14 +132,14 @@
</execution>
<execution>
<id>execution-openejb</id>
- <phase>generate-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>xsd2genmodel</goal>
<goal>setattributes</goal>
</goals>
<configuration>
<schemas>
- <schema>${project.build.directory}/schemas/openejb-jar-2.0.xsd</schema>
+ <schema>${project.build.outputDirectory}/schemas/openejb-jar-2.0.xsd</schema>
</schemas>
<genmodel>${project.build.outputDirectory}/emf/openejb-jar.genmodel</genmodel>
<packages>
@@ -113,14 +150,14 @@
</execution>
<execution>
<id>execution-connector</id>
- <phase>generate-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>xsd2genmodel</goal>
<goal>setattributes</goal>
</goals>
<configuration>
<schemas>
- <schema>${project.build.directory}/schemas/geronimo-connector-1.0.xsd</schema>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-connector-1.0.xsd</schema>
</schemas>
<genmodel>${project.build.outputDirectory}/emf/geronimo-connector.genmodel</genmodel>
<packages>
@@ -130,14 +167,14 @@
</execution>
<execution>
<id>execution-appclient</id>
- <phase>generate-resources</phase>
+ <phase>process-classes</phase>
<goals>
<goal>xsd2genmodel</goal>
<goal>setattributes</goal>
</goals>
<configuration>
<schemas>
- <schema>${project.build.directory}/schemas/geronimo-application-client-1.0.xsd</schema>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-application-client-1.0.xsd</schema>
</schemas>
<genmodel>${project.build.outputDirectory}/emf/geronimo-application-client.genmodel</genmodel>
<packages>
Added: geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/templates/Header.javajetinc
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/templates/Header.javajetinc?rev=385688&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/templates/Header.javajetinc (added)
+++ geronimo/devtools/eclipse-plugin/trunk/geronimo-emf-common/templates/Header.javajetinc Mon Mar 13 14:52:54 2006
@@ -0,0 +1,15 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
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=385688&r1=385687&r2=385688&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 Mon Mar 13 14:52:54 2006
@@ -35,7 +35,7 @@
* @parameter
* @required
*/
- private File genModel;
+ private File genmodel;
/**
* @parameter
@@ -67,18 +67,19 @@
buffer.append("-projects").append(projectRootDirectory.getAbsolutePath()).append(SPACE);
}
- buffer.append("-").append("type").append(SPACE);
- buffer.append(genModel.getAbsolutePath());
+ buffer.append("-").append(type).append(SPACE);
+ buffer.append(genmodel.getAbsolutePath());
return buffer;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.emf.plugin.LaunchOSGIMojo#validate()
*/
protected void validate() throws MojoFailureException {
- if (!"model".equalsIgnoreCase(type) || !"edit".equalsIgnoreCase(type)
- || !"editor".equalsIgnoreCase(type)) {
+ if (!("model".equalsIgnoreCase(type) || "edit".equalsIgnoreCase(type) || "editor".equalsIgnoreCase(type))) {
throw new MojoFailureException("<type> must be set to either 'model', 'edit', or 'editor'");
}
}
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=385688&r1=385687&r2=385688&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 Mon Mar 13 14:52:54 2006
@@ -51,6 +51,26 @@
<outputDirectory>${imported-resources}</outputDirectory>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-emf-plugin</artifactId>
+ <configuration>
+ <projectRootDirectory>${project.base.directory}/..</projectRootDirectory>
+ <type>model</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>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>