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/04/18 00:42:04 UTC
svn commit: r394799 - in /geronimo/devtools/eclipse-plugin/trunk: ./ emf/
emf/geronimo-1.0/ emf/geronimo-1.0/templates/ emf/geronimo-1.1/
emf/geronimo-1.1/templates/
plugins/org.apache.geronimo.deployment.model.edit/
plugins/org.apache.geronimo.deploym...
Author: sppatel
Date: Mon Apr 17 15:42:02 2006
New Revision: 394799
URL: http://svn.apache.org/viewcvs?rev=394799&view=rev
Log:
support for v1 and v11 models
Added:
geronimo/devtools/eclipse-plugin/trunk/emf/
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml (with props)
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/templates/
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/templates/Header.javajetinc
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (with props)
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/templates/
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/templates/Header.javajetinc
Modified:
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
geronimo/devtools/eclipse-plugin/trunk/pom.xml
Added: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml?rev=394799&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml Mon Apr 17 15:42:02 2006
@@ -0,0 +1,280 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>geronimo-emf</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <name>${artifactId}</name>
+ <parent>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>geronimo-eclipse-plugin</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <!--TODO remove following properties after 3.2 migration -->
+ <properties>
+ <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
+ <platformDriver>I20060329-0800/eclipse-SDK-I20060329-0800</platformDriver>
+ <geronimoVersion>1.0</geronimoVersion>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <targetPath>templates</targetPath>
+ <directory>templates</directory>
+ <includes>
+ <include>*.javajetinc</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-geronimodevtools-plugin</artifactId>
+ <configuration>
+ <target>${project.build.outputDirectory}/schemas</target>
+ <includes>
+ <include>**/*.xsd</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>import-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>importresources</goal>
+ </goals>
+ </execution>
+ <!-- TODO remove following execution after 3.2 migration
+ need for running osgi under 3.2 due to platform bugs -->
+ <execution>
+ <id>create-eclipse-image</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>download</goal>
+ </goals>
+ <configuration>
+ <platformUrl>${platformUrl}</platformUrl>
+ <urls>
+ <url>${emfUrl}</url>
+ </urls>
+ <installLocation>${installLocation}</installLocation>
+ <propsFile>${installLocation}/install.props</propsFile>
+ </configuration>
+ </execution>
+ </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 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>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-emf-plugin</artifactId>
+ <configuration>
+ <!-- TODO remove <eclipseHome> after 3.2 migration -->
+ <eclipseHome>${installLocation}/eclipse</eclipseHome>
+ <workspace>${project.build.directory}/workspace</workspace>
+ <modelProject>${project.build.directory}/org.apache.geronimo.deployment.model</modelProject>
+ <editProject>${project.build.directory}/org.apache.geronimo.deployment.model.edit</editProject>
+ <src>src</src>
+ <reload>true</reload>
+ <packagemap>
+ <org.apache.geronimo.xml.ns.naming>http://geronimo.apache.org/xml/ns/naming-1.0</org.apache.geronimo.xml.ns.naming>
+ <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.1</org.apache.geronimo.xml.ns.security>
+ <org.apache.geronimo.xml.ns.deployment>http://geronimo.apache.org/xml/ns/deployment-1.0</org.apache.geronimo.xml.ns.deployment>
+ <org.apache.geronimo.xml.ns.j2ee.application>http://geronimo.apache.org/xml/ns/j2ee/application-1.0</org.apache.geronimo.xml.ns.j2ee.application>
+ <org.apache.geronimo.xml.ns.j2ee.web>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</org.apache.geronimo.xml.ns.j2ee.web>
+ <org.apache.geronimo.xml.ns.j2ee.connector>http://geronimo.apache.org/xml/ns/j2ee/connector-1.0</org.apache.geronimo.xml.ns.j2ee.connector>
+ <org.openejb.xml.ns.openejb.jar>http://www.openejb.org/xml/ns/openejb-jar-2.0</org.openejb.xml.ns.openejb.jar>
+ <org.openejb.xml.ns.pkgen>http://www.openejb.org/xml/ns/pkgen-2.0</org.openejb.xml.ns.pkgen>
+ <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>
+ </attributes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>execution-web</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-web-1.0.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-web-1.0.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/naming-1.0</package>
+ <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
+ <package>http://geronimo.apache.org/xml/ns/deployment-1.0</package>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-application</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-application-1.0.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-application-1.0.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/application-1.0</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-openejb</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/openejb-jar-2.0.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.0.genmodel</genmodel>
+ <packages>
+ <package>http://www.openejb.org/xml/ns/openejb-jar-2.0</package>
+ <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-connector</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-connector-1.0.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-connector-1.0.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/connector-1.0</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-appclient</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-application-client-1.0.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-application-client-1.0.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0</package>
+ </packages>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <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>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-web-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-client-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/templates/Header.javajetinc
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/templates/Header.javajetinc?rev=394799&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/templates/Header.javajetinc (added)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/templates/Header.javajetinc Mon Apr 17 15:42:02 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.
+ */
Added: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml?rev=394799&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml Mon Apr 17 15:42:02 2006
@@ -0,0 +1,280 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>geronimo-emf</artifactId>
+ <packaging>jar</packaging>
+ <version>1.1</version>
+ <name>${artifactId}</name>
+ <parent>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>geronimo-eclipse-plugin</artifactId>
+ <version>1.0</version>
+ </parent>
+
+ <!--TODO remove following properties after 3.2 migration -->
+ <properties>
+ <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
+ <platformDriver>I20060329-0800/eclipse-SDK-I20060329-0800</platformDriver>
+ <geronimoVersion>1.1-SNAPSHOT</geronimoVersion>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <targetPath>templates</targetPath>
+ <directory>templates</directory>
+ <includes>
+ <include>*.javajetinc</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-geronimodevtools-plugin</artifactId>
+ <configuration>
+ <target>${project.build.outputDirectory}/schemas</target>
+ <includes>
+ <include>**/*.xsd</include>
+ </includes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>import-resources</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>importresources</goal>
+ </goals>
+ </execution>
+ <!-- TODO remove following execution after 3.2 migration
+ need for running osgi under 3.2 due to platform bugs -->
+ <execution>
+ <id>create-eclipse-image</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>download</goal>
+ </goals>
+ <configuration>
+ <platformUrl>${platformUrl}</platformUrl>
+ <urls>
+ <url>${emfUrl}</url>
+ </urls>
+ <installLocation>${installLocation}</installLocation>
+ <propsFile>${installLocation}/install.props</propsFile>
+ </configuration>
+ </execution>
+ </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 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>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-emf-plugin</artifactId>
+ <configuration>
+ <!-- TODO remove <eclipseHome> after 3.2 migration -->
+ <eclipseHome>${installLocation}/eclipse</eclipseHome>
+ <workspace>${project.build.directory}/workspace</workspace>
+ <modelProject>${project.build.directory}/org.apache.geronimo.v11.deployment.model</modelProject>
+ <editProject>${project.build.directory}/org.apache.geronimo.v11.deployment.model.edit</editProject>
+ <src>src</src>
+ <reload>true</reload>
+ <packagemap>
+ <org.apache.geronimo.xml.ns.naming>http://geronimo.apache.org/xml/ns/naming-1.1</org.apache.geronimo.xml.ns.naming>
+ <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.1</org.apache.geronimo.xml.ns.security>
+ <org.apache.geronimo.xml.ns.deployment>http://geronimo.apache.org/xml/ns/deployment-1.1</org.apache.geronimo.xml.ns.deployment>
+ <org.apache.geronimo.xml.ns.j2ee.application>http://geronimo.apache.org/xml/ns/j2ee/application-1.1</org.apache.geronimo.xml.ns.j2ee.application>
+ <org.apache.geronimo.xml.ns.j2ee.web>http://geronimo.apache.org/xml/ns/j2ee/web-1.1</org.apache.geronimo.xml.ns.j2ee.web>
+ <org.apache.geronimo.xml.ns.j2ee.connector>http://geronimo.apache.org/xml/ns/j2ee/connector-1.1</org.apache.geronimo.xml.ns.j2ee.connector>
+ <org.openejb.xml.ns.openejb.jar>http://www.openejb.org/xml/ns/openejb-jar-2.1</org.openejb.xml.ns.openejb.jar>
+ <org.openejb.xml.ns.pkgen>http://www.openejb.org/xml/ns/pkgen-2.1</org.openejb.xml.ns.pkgen>
+ <org.apache.geronimo.xml.ns.j2ee.application.client>http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1</org.apache.geronimo.xml.ns.j2ee.application.client>
+ </packagemap>
+ <attributes>
+ <modelDirectory>/org.apache.geronimo.v11.deployment.model/src</modelDirectory>
+ <editDirectory>/org.apache.geronimo.v11.deployment.model.edit/src</editDirectory>
+ <modelPluginClass>org.apache.geronimo.v11.deployment.model.GeronimoEMFModelPlugin</modelPluginClass>
+ <editPluginClass>org.apache.geronimo.v11.deployment.model.edit.GeronimoEMFEditPlugin</editPluginClass>
+ <updateClasspath>false</updateClasspath>
+ </attributes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>execution-web</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-web-1.1.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-web-1.1.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/naming-1.1</package>
+ <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
+ <package>http://geronimo.apache.org/xml/ns/deployment-1.1</package>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.1</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-application</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-application-1.1.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-application-1.1.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/application-1.1</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-openejb</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/openejb-jar-2.1.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.1.genmodel</genmodel>
+ <packages>
+ <package>http://www.openejb.org/xml/ns/openejb-jar-2.1</package>
+ <package>http://www.openejb.org/xml/ns/pkgen-2.1</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-connector</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-connector-1.1.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-connector-1.1.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/connector-1.1</package>
+ </packages>
+ </configuration>
+ </execution>
+ <execution>
+ <id>execution-appclient</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ <goal>setattributes</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.outputDirectory}/schemas/geronimo-application-client-1.1.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-application-client-1.1.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1</package>
+ </packages>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-pkgen-builder</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>openejb</groupId>
+ <artifactId>openejb-builder</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-security-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-web-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-client-builder</artifactId>
+ <version>${geronimoVersion}</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/templates/Header.javajetinc
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/templates/Header.javajetinc?rev=394799&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/templates/Header.javajetinc (added)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/templates/Header.javajetinc Mon Apr 17 15:42:02 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/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=394799&r1=394798&r2=394799&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 Mon Apr 17 15:42:02 2006
@@ -91,8 +91,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>geronimo-emf-common</artifactId>
- <version>${geronimo-emf-common_version}</version>
+ <artifactId>geronimo-emf</artifactId>
+ <version>1.0</version>
<type>jar</type>
</artifactItem>
</artifactItems>
@@ -119,7 +119,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-web.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-web-1.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -130,7 +130,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/openejb-jar.genmodel</genmodel>
+ ${imported-resources}/emf/openejb-jar-2.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -141,7 +141,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-connector.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-connector-1.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -152,7 +152,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-application.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-application-1.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -163,7 +163,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-application-client.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-application-client-1.0.genmodel</genmodel>
</configuration>
</execution>
</executions>
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=394799&r1=394798&r2=394799&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 Apr 17 15:42:02 2006
@@ -94,8 +94,8 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>geronimo-emf-common</artifactId>
- <version>${geronimo-emf-common_version}</version>
+ <artifactId>geronimo-emf</artifactId>
+ <version>1.0</version>
<type>jar</type>
</artifactItem>
</artifactItems>
@@ -121,7 +121,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-web.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-web-1.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -132,7 +132,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/openejb-jar.genmodel</genmodel>
+ ${imported-resources}/emf/openejb-jar-2.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -143,7 +143,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-connector.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-connector-1.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -154,7 +154,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-application.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-application-1.0.genmodel</genmodel>
</configuration>
</execution>
<execution>
@@ -165,7 +165,7 @@
</goals>
<configuration>
<genmodel>
- ${imported-resources}/emf/geronimo-application-client.genmodel</genmodel>
+ ${imported-resources}/emf/geronimo-application-client-1.0.genmodel</genmodel>
</configuration>
</execution>
</executions>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=394799&r1=394798&r2=394799&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Apr 17 15:42:02 2006
@@ -200,7 +200,8 @@
</pluginRepositories>
<modules>
- <module>geronimo-emf-common</module>
+ <module>emf/geronimo-1.0</module>
+ <module>emf/geronimo-1.1</module>
<module>plugins</module>
<module>features/org.apache.geronimo.feature</module>
<module>features/org.apache.geronimo.installableruntime.jetty.feature</module>