geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r411499 - in /geronimo/devtools/eclipse-plugin/trunk: emf/common/pom.xml emf/geronimo-1.0/pom.xml emf/geronimo-1.1/pom.xml emf/pom.xml pom.xml
Date Sun, 04 Jun 2006 02:39:21 GMT
Author: sppatel
Date: Sat Jun  3 19:39:19 2006
New Revision: 411499

URL: http://svn.apache.org/viewvc?rev=411499&view=rev
Log:
push common pom  plugin elements to parent pluginManagement and format pom's to 4 spaces

Added:
    geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml   (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml?rev=411499&r1=411498&r2=411499&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml Sat Jun  3 19:39:19 2006
@@ -1,179 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2006 The Apache Software Foundation
+
+    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.
+-->
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-common-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.1</version>
-  </parent>
-  
-  <!--TODO remove following properties after 3.2 migration -->
-  <properties>
-    <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
-    <platformDriver>S-3.2RC5-200605191206/eclipse-SDK-3.2RC5</platformDriver>
-    <geronimoVersion>1.0</geronimoVersion>
-    <openejbVersion>2.0</openejbVersion>
-  </properties>
-  
-  <build>
-    <resources>
-      <resource>
-        <targetPath>templates</targetPath>
-        <directory>templates</directory>
-        <includes>
-          <include>*.javajetinc</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>geronimo-common-emf</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>${artifactId}</name>
+    <parent>
         <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.common.deployment.model</modelProject>
-          <editProject>${project.build.directory}/org.apache.geronimo.common.deployment.model.edit</editProject>
-          <src>src</src>
-          <reload>true</reload>
-          <packagemap>
-            <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.1</org.apache.geronimo.xml.ns.security>   
-            <org.openejb.xml.ns.pkgen>http://www.openejb.org/xml/ns/pkgen-2.0</org.openejb.xml.ns.pkgen>
-          </packagemap>
-          <attributes>
-            <modelDirectory>/org.apache.geronimo.common.deployment.model/src</modelDirectory>
-            <editDirectory>/org.apache.geronimo.common.deployment.model.edit/src</editDirectory>
-            <modelPluginClass>org.apache.geronimo.common.deployment.model.GeronimoEMFModelPlugin</modelPluginClass>
-            <editPluginClass>org.apache.geronimo.common.deployment.model.edit.GeronimoEMFEditPlugin</editPluginClass>
-            <updateClasspath>false</updateClasspath>
-          </attributes>
-        </configuration>
+        <artifactId>geronimo-emf-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <properties>
+        <geronimoVersion>1.0</geronimoVersion>
+        <openejbVersion>2.0</openejbVersion>
+    </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>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </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.common.deployment.model</modelProject>
+                    <editProject>${project.build.directory}/org.apache.geronimo.common.deployment.model.edit</editProject>
+                    <src>src</src>
+                    <reload>true</reload>
+                    <packagemap>
+                        <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.1</org.apache.geronimo.xml.ns.security>
+                        <org.openejb.xml.ns.pkgen>http://www.openejb.org/xml/ns/pkgen-2.0</org.openejb.xml.ns.pkgen>
+                    </packagemap>
+                    <attributes>
+                        <modelDirectory>/org.apache.geronimo.common.deployment.model/src</modelDirectory>
+                        <editDirectory>/org.apache.geronimo.common.deployment.model.edit/src</editDirectory>
+                        <modelPluginClass>org.apache.geronimo.common.deployment.model.GeronimoEMFModelPlugin</modelPluginClass>
+                        <editPluginClass>org.apache.geronimo.common.deployment.model.edit.GeronimoEMFEditPlugin</editPluginClass>
+                        <updateClasspath>false</updateClasspath>
+                    </attributes>
+                </configuration>
                 <executions>
-          <execution>
-            <id>execution-security</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>xsd2genmodel</goal>
-              <goal>setattributes</goal>
-            </goals>
-            <configuration>
-              <schemas>
-                <schema>${project.build.outputDirectory}/schemas/geronimo-security-1.1.xsd</schema>
-              </schemas>
-              <genmodel>${project.build.outputDirectory}/emf/geronimo-security-1.1.genmodel</genmodel>
-              <packages>
-                <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
-              </packages>
-            </configuration>
-          </execution>
-          <execution>
-            <id>execution-openejb-pkgen</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>xsd2genmodel</goal>
-              <goal>setattributes</goal>
-            </goals>
-            <configuration>
-              <schemas>
-                <schema>${project.build.outputDirectory}/schemas/openejb-pkgen-2.0.xsd</schema>
-              </schemas>
-              <genmodel>${project.build.outputDirectory}/emf/openejb-pkgen-2.0.genmodel</genmodel>
-              <packages>
-                <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
-              </packages>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>openejb</groupId>
-      <artifactId>openejb-pkgen-builder</artifactId>
-      <version>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>geronimo</groupId>
-      <artifactId>geronimo-security-builder</artifactId>
-      <version>${geronimoVersion}</version>
-    </dependency>
-  </dependencies>
+                    <execution>
+                        <id>execution-security</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>xsd2genmodel</goal>
+                            <goal>setattributes</goal>
+                        </goals>
+                        <configuration>
+                            <schemas>
+                                <schema>${project.build.outputDirectory}/schemas/geronimo-security-1.1.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/geronimo-security-1.1.genmodel</genmodel>
+                            <packages>
+                                <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
+                            </packages>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>execution-openejb-pkgen</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>xsd2genmodel</goal>
+                            <goal>setattributes</goal>
+                        </goals>
+                        <configuration>
+                            <schemas>
+                                <schema>${project.build.outputDirectory}/schemas/openejb-pkgen-2.0.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/openejb-pkgen-2.0.genmodel</genmodel>
+                            <packages>
+                                <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
+                            </packages>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-pkgen-builder</artifactId>
+            <version>${openejbVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+    </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml?rev=411499&r1=411498&r2=411499&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml Sat Jun  3 19:39:19 2006
@@ -1,281 +1,208 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-1.0-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.1</version>
-  </parent>
-  
-  <!--TODO remove following properties after 3.2 migration -->
-  <properties>
-    <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
-    <platformDriver>S-3.2RC5-200605191206/eclipse-SDK-3.2RC5</platformDriver>
-    <geronimoVersion>1.0</geronimoVersion>
-    <openejbVersion>2.0</openejbVersion>
-  </properties>
-  
-  <build>
-    <resources>
-      <resource>
-        <targetPath>templates</targetPath>
-        <directory>templates</directory>
-        <includes>
-          <include>*.javajetinc</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>geronimo-1.0-emf</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>${artifactId}</name>
+    <parent>
         <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>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>openejb</groupId>
-      <artifactId>openejb-builder</artifactId>
-      <version>${openejbVersion}</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>
+        <artifactId>geronimo-emf-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <properties>
+        <geronimoVersion>1.0</geronimoVersion>
+        <openejbVersion>2.0</openejbVersion>
+    </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>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </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/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>
+                            </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>${openejbVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-builder</artifactId>
+            <version>${openejbVersion}</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>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml?rev=411499&r1=411498&r2=411499&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml Sat Jun  3 19:39:19 2006
@@ -1,281 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2006 The Apache Software Foundation
+
+    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.
+-->
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-1.1-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.1</version>
-  </parent>
-  
-  <!--TODO remove following properties after 3.2 migration -->
-  <properties>
-    <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
-    <platformDriver>S-3.2RC5-200605191206/eclipse-SDK-3.2RC5</platformDriver>
-    <geronimoVersion>1.1-SNAPSHOT</geronimoVersion>
-    <openejbVersion>2.1-SNAPSHOT</openejbVersion>
-  </properties>
-  
-  <build>
-    <resources>
-      <resource>
-        <targetPath>templates</targetPath>
-        <directory>templates</directory>
-        <includes>
-          <include>*.javajetinc</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>geronimo-1.1-emf</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>${artifactId}</name>
+    <parent>
         <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.0</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.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.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>${openejbVersion}</version>
-    </dependency>
-    <dependency>
-      <groupId>openejb</groupId>
-      <artifactId>openejb-builder</artifactId>
-      <version>${openejbVersion}</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>
+        <artifactId>geronimo-emf-parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <properties>
+        <geronimoVersion>1.1-SNAPSHOT</geronimoVersion>
+        <openejbVersion>2.1-SNAPSHOT</openejbVersion>
+    </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>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </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.0</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/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>
+                            </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>${openejbVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>openejb</groupId>
+            <artifactId>openejb-builder</artifactId>
+            <version>${openejbVersion}</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>

Added: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml?rev=411499&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml Sat Jun  3 19:39:19 2006
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2006 The Apache Software Foundation
+
+    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.
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>geronimo-emf-parent</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0</version>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>geronimo-eclipse-plugin</artifactId>
+        <version>1.1</version>
+    </parent>
+    <!-- TODO remove following properties after 3.2 migration -->
+    <properties>
+        <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
+        <platformDriver>S-3.2RC5-200605191206/eclipse-SDK-3.2RC5</platformDriver>
+    </properties>
+    <build>
+        <pluginManagement>
+            <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=&quot;http://www.w3.org/2001/xml.xsd&quot;" replace="schemaLocation=&quot;http://www.w3.org/2001/03/xml.xsd&quot;" byline="true">
+                                        <fileset dir="${project.build.outputDirectory}/schemas/" includes="**/*.xsd"/>
+                                    </replaceregexp>
+                                </tasks>
+                            </configuration>
+                            <goals>
+                                <goal>run</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <modules>
+        <module>common</module>
+        <module>geronimo-1.0</module>
+        <module>geronimo-1.1</module>
+    </modules>
+</project>

Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=411499&r1=411498&r2=411499&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Sat Jun  3 19:39:19 2006
@@ -262,9 +262,7 @@
     <module>config-store-service</module>
     <module>maven-plugins/maven-emf-plugin</module>
     <module>maven-plugins/maven-geronimodevtools-plugin</module>
-    <module>emf/common</module>
-    <module>emf/geronimo-1.0</module>
-    <module>emf/geronimo-1.1</module>
+    <module>emf</module>
     <module>plugins</module>
     <module>features/org.apache.geronimo.feature</module>
     <module>features/org.apache.geronimo.installableruntime.jetty.feature</module>



Mime
View raw message