You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/03/05 03:11:55 UTC

svn commit: r633747 - in /geronimo/devtools/eclipse-plugin/trunk: assembly/ assembly/src/main/assembly/ plugins/ plugins/org.apache.geronimo.runtime.v21/ plugins/org.apache.geronimo.runtime.v21/META-INF/

Author: mcconne
Date: Tue Mar  4 18:11:52 2008
New Revision: 633747

URL: http://svn.apache.org/viewvc?rev=633747&view=rev
Log:
GERONIMODEVTOOLS-267 Using only released artifacts

Modified:
    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/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=633747&r1=633746&r2=633747&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Tue Mar  4 18:11:52 2008
@@ -77,7 +77,7 @@
             <artifactId>org.apache.geronimo.st.v21.core</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
+<!--    <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.deployment.model</artifactId>
             <version>${version}</version>
@@ -86,7 +86,7 @@
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.deployment.model.edit</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency>                                       -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
@@ -102,11 +102,11 @@
             <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>
-        <dependency>
+<!--    <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v1</artifactId>
             <version>${version}</version>
-        </dependency>
+        </dependency>                                       -->
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v11</artifactId>

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?rev=633747&r1=633746&r2=633747&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Tue Mar  4 18:11:52 2008
@@ -41,8 +41,8 @@
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>        -->
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.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>

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?rev=633747&r1=633746&r2=633747&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Tue Mar  4 18:11:52 2008
@@ -31,8 +31,8 @@
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>
-                <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model.edit</include>
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.deployment.model</include>        -->
+<!--            <include>org.apache.geronimo.devtools:org.apache.geronimo.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>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=633747&r1=633746&r2=633747&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Tue Mar  4 18:11:52 2008
@@ -4,23 +4,23 @@
 Bundle-SymbolicName: org.apache.geronimo.runtime.v21;singleton:=true
 Bundle-Version: 2.1.0
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.1-SNAPSHOT.jar,
- lib/geronimo-connector-builder-2.1-SNAPSHOT.jar,
- lib/geronimo-deploy-jsr88-2.1-SNAPSHOT.jar,
- lib/geronimo-deployment-2.1-SNAPSHOT.jar,
- lib/geronimo-j2ee-builder-2.1-SNAPSHOT.jar,
- lib/geronimo-j2ee-schema-2.1-SNAPSHOT.jar,
- lib/geronimo-kernel-2.1-SNAPSHOT.jar,
- lib/geronimo-naming-builder-2.1-SNAPSHOT.jar,
- lib/geronimo-plugin-2.1-SNAPSHOT.jar,
- lib/geronimo-security-builder-2.1-SNAPSHOT.jar,
- lib/geronimo-service-builder-2.1-SNAPSHOT.jar,
- lib/geronimo-system-2.1-SNAPSHOT.jar,
- lib/geronimo-util-2.1-SNAPSHOT.jar,
- lib/geronimo-web-2.5-builder-2.1-SNAPSHOT.jar,
+Bundle-ClassPath: lib/geronimo-common-2.1.jar,
+ lib/geronimo-connector-builder-2.1.jar,
+ lib/geronimo-deploy-jsr88-2.1.jar,
+ lib/geronimo-deployment-2.1.jar,
+ lib/geronimo-j2ee-builder-2.1.jar,
+ lib/geronimo-j2ee-schema-2.1.jar,
+ lib/geronimo-kernel-2.1.jar,
+ lib/geronimo-naming-builder-2.1.jar,
+ lib/geronimo-plugin-2.1.jar,
+ lib/geronimo-security-builder-2.1.jar,
+ lib/geronimo-service-builder-2.1.jar,
+ lib/geronimo-system-2.1.jar,
+ lib/geronimo-util-2.1.jar,
+ lib/geronimo-web-2.5-builder-2.1.jar,
  lib/geronimo-schema-jee_5-1.1.jar,
- lib/geronimo-deploy-config-2.1-SNAPSHOT.jar,
- lib/geronimo-openejb-builder-2.1-SNAPSHOT.jar,
+ lib/geronimo-deploy-config-2.1.jar,
+ lib/geronimo-openejb-builder-2.1.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.jar,
  lib/plexus-archiver-1.0-alpha-7.jar
 Export-Package: 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=633747&r1=633746&r2=633747&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Tue Mar  4 18:11:52 2008
@@ -27,7 +27,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <properties>
-        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
+        <geronimoVersion>2.1</geronimoVersion>
     </properties>
     <build>
         <resources>
@@ -69,22 +69,17 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-kernel</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>geronimo-util</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-deploy-jsr88</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-common</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
@@ -94,7 +89,7 @@
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-service-builder</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
@@ -134,22 +129,22 @@
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-system</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-plugin</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-deployment</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <groupId>org.apache.geronimo.framework</groupId>
                                     <artifactId>geronimo-deploy-config</artifactId>
                                     <version>${geronimoVersion}</version>
                                 </artifactItem>
@@ -218,22 +213,17 @@
             <type>pom</type>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-util</artifactId>
-            <version>${geronimoVersion}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-common</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
@@ -243,7 +233,7 @@
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-service-builder</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
@@ -283,22 +273,22 @@
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-plugin</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deployment</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
             <version>${geronimoVersion}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=633747&r1=633746&r2=633747&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Tue Mar  4 18:11:52 2008
@@ -140,8 +140,8 @@
         <module>org.apache.geronimo.st.v11.ui</module>
         <module>org.apache.geronimo.st.v20.ui</module>
         <module>org.apache.geronimo.st.v21.ui</module>
-        <module>org.apache.geronimo.deployment.model</module>
-        <module>org.apache.geronimo.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>
         <module>org.apache.geronimo.v11.deployment.model.edit</module>
         <module>org.apache.geronimo.runtime.common</module>