geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r493090 - in /geronimo/devtools/eclipse-plugin/branches/1.2.1: emf/ emf/geronimo-1.0/ emf/geronimo-1.1/ emf/geronimo-1.2/ emf/geronimo-1.2/templates/ plugins/ plugins/org.apache.geronimo.deployment.model.edit/ plugins/org.apache.geronimo.de...
Date Fri, 05 Jan 2007 17:11:35 GMT
Author: sppatel
Date: Fri Jan  5 09:11:34 2007
New Revision: 493090

URL: http://svn.apache.org/viewvc?view=rev&rev=493090
Log:
add initial support for G-1.2 emf code gen for 1.2 schemas

Added:
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/pom.xml   (with props)
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/templates/
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/templates/Header.javajetinc
Modified:
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.0/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.1/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.0/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.0/pom.xml Fri Jan  5 09:11:34
2007
@@ -14,40 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You 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.
-  -->
-
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You 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.
-  -->
         
 <!-- $Rev$ $Date$ -->
 
@@ -163,6 +129,7 @@
                             </schemas>
                             <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.0.genmodel</genmodel>
                             <packages>
+                                <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
                                 <package>http://www.openejb.org/xml/ns/openejb-jar-2.0</package>
                             </packages>
                         </configuration>
@@ -198,6 +165,23 @@
                             <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>
+                    <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>

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.1/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.1/pom.xml Fri Jan  5 09:11:34
2007
@@ -127,6 +127,7 @@
                             </schemas>
                             <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.1.genmodel</genmodel>
                             <packages>
+                                <package>http://www.openejb.org/xml/ns/pkgen-2.0</package>
                                 <package>http://www.openejb.org/xml/ns/openejb-jar-2.1</package>
                             </packages>
                         </configuration>
@@ -162,6 +163,23 @@
                             <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>
+                    <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>

Added: geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/pom.xml?view=auto&rev=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/pom.xml Fri Jan  5 09:11:34
2007
@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You 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.2-emf</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>geronimo-emf-parent</artifactId>
+        <version>1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <properties>
+        <geronimoVersion>1.2-SNAPSHOT</geronimoVersion>
+        <openejbVersion>2.2-incubating</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>
+                    <workspace>${project.build.directory}/workspace</workspace>
+                    <modelProject>${project.build.directory}/org.apache.geronimo.v12.deployment.model</modelProject>
+                    <editProject>${project.build.directory}/org.apache.geronimo.v12.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.2</org.apache.geronimo.xml.ns.naming>
+                        <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.2</org.apache.geronimo.xml.ns.security>
+                        <org.apache.geronimo.xml.ns.deployment>http://geronimo.apache.org/xml/ns/deployment-1.2</org.apache.geronimo.xml.ns.deployment>
+                        <org.apache.geronimo.xml.ns.j2ee.application>http://geronimo.apache.org/xml/ns/j2ee/application-1.2</org.apache.geronimo.xml.ns.j2ee.application>
+                        <org.apache.geronimo.xml.ns.j2ee.web>http://geronimo.apache.org/xml/ns/j2ee/web-1.2</org.apache.geronimo.xml.ns.j2ee.web>
+                        <org.apache.geronimo.xml.ns.j2ee.connector>http://geronimo.apache.org/xml/ns/j2ee/connector-1.2</org.apache.geronimo.xml.ns.j2ee.connector>
+                        <org.openejb.xml.ns.openejb.jar>http://www.openejb.org/xml/ns/openejb-jar-2.2</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.2</org.apache.geronimo.xml.ns.j2ee.application.client>
+                    </packagemap>
+                    <attributes>
+                        <modelDirectory>/org.apache.geronimo.v12.deployment.model/src</modelDirectory>
+                        <editDirectory>/org.apache.geronimo.v12.deployment.model.edit/src</editDirectory>
+                        <modelPluginClass>org.apache.geronimo.v12.deployment.model.GeronimoEMFModelPlugin</modelPluginClass>
+                        <editPluginClass>org.apache.geronimo.v12.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.2.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/geronimo-web-1.2.genmodel</genmodel>
+                            <packages>
+                                <package>http://geronimo.apache.org/xml/ns/naming-1.2</package>
+                                <package>http://geronimo.apache.org/xml/ns/deployment-1.2</package>
+                                <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.2</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.2.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/geronimo-application-1.2.genmodel</genmodel>
+                            <packages>
+                                <package>http://geronimo.apache.org/xml/ns/j2ee/application-1.2</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.2.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/openejb-jar-2.2.genmodel</genmodel>
+                            <packages>
+                                <package>http://www.openejb.org/xml/ns/pkgen-2.1</package>
+                                <package>http://www.openejb.org/xml/ns/openejb-jar-2.2</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.2.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/geronimo-connector-1.2.genmodel</genmodel>
+                            <packages>
+                                <package>http://geronimo.apache.org/xml/ns/j2ee/connector-1.2</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.2.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/geronimo-application-client-1.2.genmodel</genmodel>
+                            <packages>
+                                <package>http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2</package>
+                            </packages>
+                        </configuration>
+                    </execution>
+                    <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.2.xsd</schema>
+                            </schemas>
+                            <genmodel>${project.build.outputDirectory}/emf/geronimo-security-1.2.genmodel</genmodel>
+                            <packages>
+                                <package>http://geronimo.apache.org/xml/ns/security-1.2</package>
+                            </packages>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-pkgen-builder</artifactId>
+            <version>${openejbVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-builder</artifactId>
+            <version>${openejbVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-security-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-web-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-service-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-client-builder</artifactId>
+            <version>${geronimoVersion}</version>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

Added: geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/templates/Header.javajetinc
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/templates/Header.javajetinc?view=auto&rev=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/templates/Header.javajetinc
(added)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/geronimo-1.2/templates/Header.javajetinc
Fri Jan  5 09:11:34 2007
@@ -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/branches/1.2.1/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/emf/pom.xml Fri Jan  5 09:11:34 2007
@@ -93,8 +93,8 @@
         </pluginManagement>
     </build>
     <modules>
-        <module>common</module>
         <module>geronimo-1.0</module>
         <module>geronimo-1.1</module>
+        <module>geronimo-1.2</module>
     </modules>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
Fri Jan  5 09:11:34 2007
@@ -14,9 +14,10 @@
  org.apache.geronimo.xml.ns.j2ee.connector.provider,
  org.apache.geronimo.xml.ns.j2ee.web.provider,
  org.apache.geronimo.xml.ns.naming.provider,
- org.openejb.xml.ns.openejb.jar.provider
+ org.apache.geronimo.xml.ns.security.provider,
+ org.openejb.xml.ns.openejb.jar.provider,
+ org.openejb.xml.ns.pkgen.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.geronimo.deployment.model;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.apache.geronimo.common.deployment.model.edit;visibility:=reexport
+ org.eclipse.emf.edit;visibility:=reexport
 Eclipse-LazyStart: true

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
Fri Jan  5 09:11:34 2007
@@ -171,6 +171,17 @@
                                 ${imported-resources}/emf/geronimo-application-client-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>execution-security</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <genmodel>
+                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -180,16 +191,6 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.deployment.model</artifactId>
             <version>${org.apache.geronimo.deployment.model_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.common.deployment.model</artifactId>
-            <version>${org.apache.geronimo.common.deployment.model_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.common.deployment.model.edit</artifactId>
-            <version>${org.apache.geronimo.common.deployment.model.edit_version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
Fri Jan  5 09:11:34 2007
@@ -8,8 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi,
- org.apache.geronimo.common.deployment.model;visibility:=reexport
+ org.eclipse.emf.ecore.xmi
 Eclipse-LazyStart: true
 Export-Package: org.apache.geronimo.deployment.model,
  org.apache.geronimo.xml.ns.deployment,
@@ -30,6 +29,12 @@
  org.apache.geronimo.xml.ns.naming,
  org.apache.geronimo.xml.ns.naming.impl,
  org.apache.geronimo.xml.ns.naming.util,
+ org.apache.geronimo.xml.ns.security,
+ org.apache.geronimo.xml.ns.security.impl,
+ org.apache.geronimo.xml.ns.security.util,
  org.openejb.xml.ns.openejb.jar,
  org.openejb.xml.ns.openejb.jar.impl,
- org.openejb.xml.ns.openejb.jar.util
+ org.openejb.xml.ns.openejb.jar.util,
+ org.openejb.xml.ns.pkgen,
+ org.openejb.xml.ns.pkgen.impl,
+ org.openejb.xml.ns.pkgen.util

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.deployment.model/pom.xml
Fri Jan  5 09:11:34 2007
@@ -167,15 +167,19 @@
                                 ${imported-resources}/emf/geronimo-application-client-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>execution-security</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <genmodel>
+                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.common.deployment.model</artifactId>
-            <version>${org.apache.geronimo.common.deployment.model_version}</version>
-        </dependency>
-    </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
Fri Jan  5 09:11:34 2007
@@ -10,8 +10,7 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  com.ibm.etools.emf.event,
- org.apache.geronimo.v11.deployment.model,
- org.apache.geronimo.common.deployment.model.edit;visibility:=reexport
+ org.apache.geronimo.v11.deployment.model
 Eclipse-LazyStart: true
 Export-Package: org.apache.geronimo.v11.deployment.model.edit,
  org.apache.geronimo.xml.ns.deployment.provider,
@@ -20,4 +19,6 @@
  org.apache.geronimo.xml.ns.j2ee.connector.provider,
  org.apache.geronimo.xml.ns.j2ee.web.provider,
  org.apache.geronimo.xml.ns.naming.provider,
- org.openejb.xml.ns.openejb.jar.provider
+ org.apache.geronimo.xml.ns.security.provider,
+ org.openejb.xml.ns.openejb.jar.provider,
+ org.openejb.xml.ns.pkgen.provider

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
Fri Jan  5 09:11:34 2007
@@ -174,6 +174,17 @@
                                 ${imported-resources}/emf/geronimo-application-client-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>execution-security</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <genmodel>
+                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
@@ -183,16 +194,6 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
             <version>${org.apache.geronimo.v11.deployment.model_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.common.deployment.model</artifactId>
-            <version>${org.apache.geronimo.common.deployment.model_version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.common.deployment.model.edit</artifactId>
-            <version>${org.apache.geronimo.common.deployment.model.edit_version}</version>
         </dependency>
     </dependencies>   
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
Fri Jan  5 09:11:34 2007
@@ -8,8 +8,7 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi,
- org.apache.geronimo.common.deployment.model;visibility:=reexport
+ org.eclipse.emf.ecore.xmi
 Eclipse-LazyStart: true
 Export-Package: org.apache.geronimo.v11.deployment.model,
  org.apache.geronimo.xml.ns.deployment,
@@ -30,6 +29,12 @@
  org.apache.geronimo.xml.ns.naming,
  org.apache.geronimo.xml.ns.naming.impl,
  org.apache.geronimo.xml.ns.naming.util,
+ org.apache.geronimo.xml.ns.security,
+ org.apache.geronimo.xml.ns.security.impl,
+ org.apache.geronimo.xml.ns.security.util,
  org.openejb.xml.ns.openejb.jar,
  org.openejb.xml.ns.openejb.jar.impl,
- org.openejb.xml.ns.openejb.jar.util
+ org.openejb.xml.ns.openejb.jar.util,
+ org.openejb.xml.ns.pkgen,
+ org.openejb.xml.ns.pkgen.impl,
+ org.openejb.xml.ns.pkgen.util

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
Fri Jan  5 09:11:34 2007
@@ -167,15 +167,19 @@
                                 ${imported-resources}/emf/geronimo-application-client-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>execution-security</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                        <configuration>
+                            <genmodel>
+                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.devtools</groupId>
-            <artifactId>org.apache.geronimo.common.deployment.model</artifactId>
-            <version>${org.apache.geronimo.common.deployment.model_version}</version>
-        </dependency>
-    </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml?view=diff&rev=493090&r1=493089&r2=493090
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/pom.xml Fri Jan  5 09:11:34 2007
@@ -127,8 +127,6 @@
         <module>org.apache.geronimo.st.ui</module>
         <module>org.apache.geronimo.st.v1.ui</module>
         <module>org.apache.geronimo.st.v11.ui</module>
-        <module>org.apache.geronimo.common.deployment.model</module>
-        <module>org.apache.geronimo.common.deployment.model.edit</module>
         <module>org.apache.geronimo.deployment.model</module>
         <module>org.apache.geronimo.deployment.model.edit</module>
         <module>org.apache.geronimo.v11.deployment.model</module>



Mime
View raw message