You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2007/01/19 15:36:07 UTC
svn commit: r497830 - in /geronimo/devtools/eclipse-plugin/trunk: ./
assembly/ assembly/src/main/assembly/ emf/ emf/geronimo-1.0/
emf/geronimo-1.1/ features/org.apache.geronimo.feature/
features/org.apache.geronimo.installableruntime.jetty.feature/ fea...
Author: sppatel
Date: Fri Jan 19 06:36:06 2007
New Revision: 497830
URL: http://svn.apache.org/viewvc?view=rev&rev=497830
Log:
r4247@dyn9027152175 (orig r493090): sppatel | 2007-01-05 12:11:34 -0500
add initial support for G-1.2 emf code gen for 1.2 schemas
r4248@dyn9027152175 (orig r493182): sppatel | 2007-01-05 15:33:48 -0500
simplify generated package names
r6113@dyn9027152175 (orig r497584): sppatel | 2007-01-18 16:30:58 -0500
revert 1.2 emf, no emf for 1.2
r6114@dyn9027152175 (orig r497610): sppatel | 2007-01-18 17:34:25 -0500
fix broken dependnecy urls
r6115@dyn9027152175 (orig r497805): sppatel | 2007-01-19 08:22:33 -0500
fix compilation issues due to removed dependencies
r6116@dyn9027152175 (orig r497818): sppatel | 2007-01-19 09:02:41 -0500
update assemblies to include 1.2 plugins
r6117@dyn9027152175 (orig r497822): sppatel | 2007-01-19 09:10:43 -0500
use relative for parent
r6118@dyn9027152175 (orig r497828): sppatel | 2007-01-19 09:31:32 -0500
fix version mismatch
r6119@dyn9027152175 (orig r497829): sppatel | 2007-01-19 09:32:41 -0500
remove hardcoded version for feature directory
Modified:
geronimo/devtools/eclipse-plugin/trunk/ (props changed)
geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.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/emf/pom.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
geronimo/devtools/eclipse-plugin/trunk/pom.xml
Propchange: geronimo/devtools/eclipse-plugin/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jan 19 06:36:06 2007
@@ -1,2 +1,2 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:492709
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:497829
47d51c14-9805-4038-8224-40f2b3020a56:/local/G1526-eclipse:3238
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Fri Jan 19 06:36:06 2007
@@ -29,6 +29,7 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>geronimo-eclipse-plugin</artifactId>
<version>1.1</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<build>
<plugins>
@@ -84,8 +85,8 @@
</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>
+ <artifactId>org.apache.geronimo.st.v12.core</artifactId>
+ <version>${org.apache.geronimo.st.v12.core_version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
@@ -94,11 +95,6 @@
</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>
- <dependency>
- <groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
<version>${org.apache.geronimo.deployment.model.edit_version}</version>
</dependency>
@@ -126,6 +122,11 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>org.apache.geronimo.runtime.v11</artifactId>
<version>${org.apache.geronimo.runtime.v11_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>org.apache.geronimo.runtime.v12</artifactId>
+ <version>${org.apache.geronimo.runtime.v12_version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Fri Jan 19 06:36:06 2007
@@ -43,44 +43,25 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v12.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.common.deployment.model</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.common.deployment.model.edit</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
- </includes>
- </dependencySet>
- <!-- TODO, this is a hack... need to open a defect against assembly plugin to support property names (artifactID,version),
- for <outputDirectory> or to treat <outputFileNameMapping> as a target folder -->
- <!-- Exploded Bundles -->
- <dependencySet>
- <outputDirectory>plugins/org.apache.geronimo.runtime.common_1.0.0</outputDirectory>
- <unpack>true</unpack>
- <includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>plugins/org.apache.geronimo.runtime.v1_1.0.0</outputDirectory>
- <unpack>true</unpack>
- <includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>plugins/org.apache.geronimo.runtime.v11_1.0.0</outputDirectory>
- <unpack>true</unpack>
- <includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v12</include>
</includes>
</dependencySet>
+ <!-- TODO, this is a hack... need to open a defect against assembly plugin to support property names (artifactID,version),
+ for <outputDirectory> or to treat <outputFileNameMapping> as a target folder -->
<!-- Features -->
<dependencySet>
- <outputDirectory>features/org.apache.geronimo.feature_1.1.0</outputDirectory>
+ <outputDirectory>features/org.apache.geronimo.feature_${version}</outputDirectory>
<unpack>true</unpack>
<includes>
<include>org.apache.geronimo.devtools:org.apache.geronimo.feature</include>
Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Fri Jan 19 06:36:06 2007
@@ -33,18 +33,18 @@
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.core</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v12.core</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v1.ui</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.st.v11.ui</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.common.deployment.model</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
- <include>org.apache.geronimo.devtools:org.apache.geronimo.common.deployment.model.edit</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.v11.deployment.model.edit</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v1</include>
<include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
+ <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v12</include>
</includes>
</dependencySet>
<!-- Features -->
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?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml Fri Jan 19 06:36:06 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/trunk/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml Fri Jan 19 06:36:06 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>
Modified: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml Fri Jan 19 06:36:06 2007
@@ -93,7 +93,6 @@
</pluginManagement>
</build>
<modules>
- <module>common</module>
<module>geronimo-1.0</module>
<module>geronimo-1.1</module>
</modules>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.xml Fri Jan 19 06:36:06 2007
@@ -140,6 +140,13 @@
unpack="false"/>
<plugin
+ id="org.apache.geronimo.st.v12.core"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.geronimo.st.v12.core_version}"
+ unpack="false"/>
+
+ <plugin
id="org.apache.geronimo.st.v1.ui"
download-size="0"
install-size="0"
@@ -172,6 +179,12 @@
download-size="0"
install-size="0"
version="${org.apache.geronimo.runtime.v11_version}"/>
+
+ <plugin
+ id="org.apache.geronimo.runtime.v12"
+ download-size="0"
+ install-size="0"
+ version="${org.apache.geronimo.runtime.v12_version}"/>
<plugin
id="org.apache.geronimo.runtime.common"
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/feature.xml Fri Jan 19 06:36:06 2007
@@ -37,7 +37,7 @@
</license>
<data
- id="geronimo-jetty-j2ee-1.1.1.zip"
+ id="geronimo-jetty-j2ee-1.2.zip"
download-size="0"
install-size="0"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/feature.xml Fri Jan 19 06:36:06 2007
@@ -37,7 +37,7 @@
</license>
<data
- id="geronimo-tomcat-j2ee-1.1.1.zip"
+ id="geronimo-tomcat-j2ee-1.2.zip"
download-size="0"
install-size="0"/>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/META-INF/MANIFEST.MF Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/pom.xml Fri Jan 19 06:36:06 2007
@@ -76,11 +76,6 @@
</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.runtime.v1</artifactId>
<version>${org.apache.geronimo.runtime.v1_version}</version>
</dependency>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.ui/pom.xml Fri Jan 19 06:36:06 2007
@@ -77,18 +77,8 @@
</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.deployment.model.edit</artifactId>
<version>${org.apache.geronimo.deployment.model.edit_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>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/pom.xml Fri Jan 19 06:36:06 2007
@@ -76,11 +76,6 @@
</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.runtime.v11</artifactId>
<version>${org.apache.geronimo.runtime.v11_version}</version>
</dependency>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml Fri Jan 19 06:36:06 2007
@@ -77,18 +77,8 @@
</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.v11.deployment.model.edit</artifactId>
<version>${org.apache.geronimo.deployment.model.edit_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>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v12.core/pom.xml Fri Jan 19 06:36:06 2007
@@ -76,11 +76,6 @@
</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.runtime.v12</artifactId>
<version>${org.apache.geronimo.runtime.v12_version}</version>
</dependency>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/META-INF/MANIFEST.MF Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/META-INF/MANIFEST.MF Fri Jan 19 06:36:06 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/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml Fri Jan 19 06:36:06 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/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Fri Jan 19 06:36:06 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>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?view=diff&rev=497830&r1=497829&r2=497830
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Fri Jan 19 06:36:06 2007
@@ -98,7 +98,7 @@
<!-- Eclipse Distribution URLs -->
<platformDriver>R-3.2.1-200609210945/eclipse-SDK-3.2.1</platformDriver>
<platformUrl>http://download.eclipse.org/eclipse/downloads/drops/${platformDriver}</platformUrl>
- <emfUrl>http://download.eclipse.org/tools/emf/downloads/drops/2.2.1/R200609210005/emf-sdo-xsd-SDK-2.2.1.zip</emfUrl>
+ <emfUrl>http://download.eclipse.org/modeling/emf/emf/downloads/drops/2.2.1/R200609210005/emf-sdo-xsd-SDK-2.2.1.zip</emfUrl>
<jemUrl>http://download.eclipse.org/tools/ve/downloads/drops/R-1.2.1-200609261748/JEM-SDK-1.2.1.zip</jemUrl>
<gefUrl>http://download.eclipse.org/tools/gef/downloads/drops/R-3.2.1-200609211617/GEF-SDK-3.2.1.zip</gefUrl>
<wtpUrl>http://download.eclipse.org/webtools/downloads/drops/R1.5/R-1.5.2-200610261841/wtp-sdk-R-1.5.2-200610261841.zip</wtpUrl>