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 2007/09/01 06:15:37 UTC

svn commit: r571684 - in /geronimo/devtools/eclipse-plugin/trunk: ./ eclipse/ emf/ emf/geronimo-1.0/ emf/geronimo-1.1/ plugins/org.apache.geronimo.deployment.model.edit/ plugins/org.apache.geronimo.runtime.common/ plugins/org.apache.geronimo.runtime.v1...

Author: mcconne
Date: Fri Aug 31 21:15:36 2007
New Revision: 571684

URL: http://svn.apache.org/viewvc?rev=571684&view=rev
Log:
GERONIMODEVTOOLS-181 Remove personal apache repository and download eclipse artifacts directly from eclipse.org

Added:
    geronimo/devtools/eclipse-plugin/trunk/eclipse/
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
Modified:
    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/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v12/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/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.st.v20.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Added: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=571684&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Fri Aug 31 21:15:36 2007
@@ -0,0 +1,113 @@
+<?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.
+  -->
+
+<!-- ================================================================================= -->
+<!-- Download Europa Eclipse artifacts and unzip them into the user's local maven repo -->
+<!-- ================================================================================= -->
+<project name="EuropaArtifacts">
+
+    <target name="init">
+        <property name="europa.download.url"    value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/20070702/"/>
+        <property name="dtp.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/datatools/downloads/1.5/"/>
+        <property name="emf.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
+        <property name="gef.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/tools/gef/downloads/drops/R-3.3-200706281000/"/>
+        <property name="wtp.download.url"       value="http://www.eclipse.org/downloads/download.php?file=/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
+        <property name="europa.jee.win32"       value="eclipse-jee-europa-win32.zip"/>
+        <property name="europa.jee.linux"       value="eclipse-jee-europa-linux-gtk.tar"/>
+        <property name="europa.jee.linux.gz"    value="eclipse-jee-europa-linux-gtk.tar.gz"/>
+        <property name="europa.jee.macos"       value="eclipse-jee-europa-macosx-carbon.tar"/>
+        <property name="europa.jee.macos.gz"    value="eclipse-jee-europa-macosx-carbon.tar.gz"/>
+        <property name="dtp-sdk" value="dtp-sdk_1.5.zip"/>
+        <property name="emf-sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
+        <property name="gef-sdk" value="GEF-SDK-3.3.zip"/>
+        <property name="wtp-sdk" value="wtp-sdk-R-2.0-200706260303.zip"/>
+    </target>
+
+    <target name="win32" depends="init,common" description="Download Windows-specific artifact(s)">
+        <echo>Downloading ${europa.download.url}${europa.jee.win32}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${europa.download.url}${europa.jee.win32}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.win32}" usetimestamp="true"/>
+        <echo>Unzipping ${europa.jee.win32} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.win32}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="linux" depends="init,common" description="Download Linux-specific artifact(s)">
+        <echo>Downloading ${europa.download.url}${europa.jee.linux.gz}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${europa.download.url}${europa.jee.linux.gz}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.linux.gz}" usetimestamp="true"/>
+        <echo>Unzipping ${europa.jee.linux.gz} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <gunzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.linux.gz}"/>
+        <untar  src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.linux}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="macos" depends="init,common" description="Download Mac-specific artifact(s)">
+        <echo>Downloading ${europa.download.url}${europa.jee.macos.gz}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${europa.download.url}${europa.jee.macos.gz}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.macos.gz}" usetimestamp="true"/>
+        <echo>Unzipping ${europa.jee.macos.gz} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <gunzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.macos.gz}"/>
+        <untar  src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${europa.jee.macos}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="common" description="Download artifacts common to all OS'es">
+        <antcall target="dtp"/>
+        <antcall target="emf"/>
+        <antcall target="gef"/>
+        <antcall target="wtp"/>
+    </target>
+
+    <target name="dtp" description="Download Data Tools Platform (DTP) artifact">
+        <echo>Downloading ${dtp.download.url}${dtp-sdk}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${dtp.download.url}${dtp-sdk}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${dtp-sdk}" usetimestamp="true"/>
+        <echo>Unzipping ${dtp-sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${dtp-sdk}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="emf" description="Download Eclipse Modeling Framework (EMF) artifact">
+        <echo>Downloading ${emf.download.url}${emf-sdo}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${emf.download.url}${emf-sdo}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${emf-sdo}" usetimestamp="true"/>
+        <echo>Unzipping ${emf-sdo} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${emf-sdo}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="gef" description="Download Graphical Editing Framework (GEF) artifact">
+        <echo>Downloading ${gef.download.url}${gef-sdk}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${gef.download.url}${gef-sdk}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${gef-sdk}" usetimestamp="true"/>
+        <echo>Unzipping ${gef-sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${gef-sdk}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+    <target name="wtp" description="Download Web Tools Platform (WTP) artifact">
+        <echo>Downloading ${wtp.download.url}${wtp-sdk}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3"/>
+        <get src="${wtp.download.url}${wtp-sdk}&amp;r=1&amp;protocol=http" dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${wtp-sdk}" usetimestamp="true"/>
+        <echo>Unzipping ${wtp-sdk} to the expected location in ${LOCAL_M2_REPO}</echo>
+        <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
+        <unzip src="${LOCAL_M2_REPO}/org/eclipse/eclipse/3.3/${wtp-sdk}" dest="${LOCAL_M2_REPO}/eclipse"/>
+    </target>
+
+</project>

Added: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=571684&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Fri Aug 31 21:15:36 2007
@@ -0,0 +1,59 @@
+<!--
+  ~ 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: 529767 $ $Date: 2007-04-17 17:21:24 -0400 (Tue, 17 Apr 2007) $ -->
+<project>
+                                                
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.devtools</groupId>
+    <artifactId>eclipse</artifactId>
+    <packaging>pom</packaging>
+    <name>${artifactId}</name>
+                                                
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>geronimo-eclipse-plugin</artifactId>
+        <version>2.0.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+                                                
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>create-eclipse-target</id>
+                        <phase>validate</phase>
+                        <configuration>
+                            <tasks>
+                                <property name="LOCAL_M2_REPO" value="${settings.localRepository}"/>
+                                <ant antfile="${basedir}/build.xml">
+                                    <target name="${eclipsePlatformFamily}"></target>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+                                                
+</project>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml Fri Aug 31 21:15:36 2007
@@ -191,6 +191,12 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>openejb</groupId>
             <artifactId>openejb-pkgen-builder</artifactId>
             <version>${openejbVersion}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml Fri Aug 31 21:15:36 2007
@@ -193,6 +193,12 @@
 <!-- thus exclusions are needed to avoid attempt to pull in these missing transative dependencies -->
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-qname_1.1_spec</artifactId>
             <version>1.1</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml Fri Aug 31 21:15:36 2007
@@ -48,23 +48,6 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <dependencies>
-                        <dependency>
-                            <groupId>oro</groupId>
-                            <artifactId>oro</artifactId>
-                            <version>2.0.8</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-apache-oro</artifactId>
-                            <version>1.6.4</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>ant</groupId>
-                            <artifactId>ant-optional</artifactId>
-                            <version>1.5.3-1</version>
-                        </dependency>
-                    </dependencies>
                     <executions>
                         <execution>
                             <id>copy-schemas</id>

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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml Fri Aug 31 21:15:36 2007
@@ -164,6 +164,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.deployment.model</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Fri Aug 31 21:15:36 2007
@@ -131,6 +131,12 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
             <version>1.0</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v1/pom.xml Fri Aug 31 21:15:36 2007
@@ -162,6 +162,12 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v11/pom.xml Fri Aug 31 21:15:36 2007
@@ -174,6 +174,12 @@
 <!-- thus exclusions are needed to avoid attempt to pull in these missing transative dependencies -->
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v12/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v12/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v12/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v12/pom.xml Fri Aug 31 21:15:36 2007
@@ -172,6 +172,12 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Fri Aug 31 21:15:36 2007
@@ -186,6 +186,12 @@
     </build>
     <dependencies>
         <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Fri Aug 31 21:15:36 2007
@@ -85,6 +85,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml Fri Aug 31 21:15:36 2007
@@ -85,6 +85,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
         </dependency>

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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- 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 Aug 31 21:15:36 2007
@@ -64,6 +64,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- 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 Aug 31 21:15:36 2007
@@ -71,6 +71,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.deployment.model</artifactId>
             <version>${version}</version>
         </dependency>

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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- 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 Aug 31 21:15:36 2007
@@ -64,6 +64,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- 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 Aug 31 21:15:36 2007
@@ -71,6 +71,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
             <version>${version}</version>
         </dependency>

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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- 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 Aug 31 21:15:36 2007
@@ -64,6 +64,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/pom.xml Fri Aug 31 21:15:36 2007
@@ -64,6 +64,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
         </dependency>

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?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- 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 Aug 31 21:15:36 2007
@@ -164,6 +164,12 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>eclipse</artifactId>
+            <version>2.0.0</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.v11.deployment.model</artifactId>
             <version>${version}</version>
         </dependency>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=571684&r1=571683&r2=571684&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Fri Aug 31 21:15:36 2007
@@ -17,26 +17,32 @@
   -->
 <!-- $Rev$ $Date$ -->
 <project>
+                        
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>geronimo-eclipse-plugin</artifactId>
     <packaging>pom</packaging>
     <name>${artifactId}</name>
     <version>2.0.0</version>
+                        
     <parent>
         <groupId>org.apache</groupId>
         <artifactId>apache</artifactId>
         <version>4</version>
     </parent>
+                        
     <description>Apache Geronimo Eclipse Plugin and WTP Server Adapter</description>
     <url>http://geronimo.apache.org/devtools</url>
+                        
     <prerequisites>
         <maven>2.0.4</maven>
     </prerequisites>
+                        
     <issueManagement>
         <system>jira</system>
         <url>http://issues.apache.org/jira/browse/GERONIMODEVTOOLS</url>
     </issueManagement>
+                        
     <mailingLists>
         <mailingList>
             <name>Geronimo User List</name>
@@ -57,21 +63,25 @@
             <archive>http://mail-archives.apache.org/mod_mbox/geronimo-scm/</archive>
         </mailingList>
     </mailingLists>
+                        
     <scm>
         <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/</connection>
         <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/</developerConnection>
         <url>https://svn.apache.org/repos/asf/geronimo/devtools/eclipse-plugin/trunk/</url>
     </scm>
+                        
     <organization>
         <name>Geronimo</name>
         <url>http://geronimo.apache.org/</url>
     </organization>
+                        
     <distributionManagement>
         <site>
             <id>geronimo-website</id>
             <url>scp://people.apache.org/www/geronimo.apache.org/maven/devtools/eclipse-plugin</url>
         </site>
     </distributionManagement>
+                        
     <properties>
         <eclipseInstall>${settings.localRepository}/eclipse</eclipseInstall>
         <org.apache.geronimo.feature_version>2.0.0</org.apache.geronimo.feature_version>
@@ -82,6 +92,7 @@
         <org.apache.geronimo.installableruntime.tomcat.feature_version>2.0.0</org.apache.geronimo.installableruntime.tomcat.feature_version>
         <org.apache.geronimo.installableruntime.jetty.feature_version>2.0.0</org.apache.geronimo.installableruntime.jetty.feature_version>
     </properties>
+                        
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -101,53 +112,32 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+                        
     <build>
         <defaultGoal>install</defaultGoal>
         <sourceDirectory>src/</sourceDirectory>
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>create-eclipse-target</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>unpack</goal>
-                            </goals>
-                            <configuration>
-                                <markersDirectory>../../target/dependency-maven-plugin-markers</markersDirectory>
-                                <outputDirectory>${eclipseInstall}</outputDirectory>
-                                <artifactItems>
-                                    <artifactItem>
-                                        <groupId>org.eclipse.platform</groupId>
-                                        <artifactId>eclipse-sdk-${eclipsePlatformFamily}</artifactId>
-                                        <type>${artifactType}</type>
-                                    </artifactItem>
-                                    <artifactItem>
-                                        <groupId>org.eclipse.gef</groupId>
-                                        <artifactId>gef-sdk</artifactId>
-                                        <type>zip</type>
-                                    </artifactItem>
-                                    <artifactItem>
-                                        <groupId>org.eclipse.dtp</groupId>
-                                        <artifactId>dtp-sdk</artifactId>
-                                        <type>zip</type>
-                                    </artifactItem>
-                                    <artifactItem>
-                                        <groupId>org.eclipse.emf</groupId>
-                                        <artifactId>emf-sdo-xsd</artifactId>
-                                        <type>zip</type>
-                                    </artifactItem>
-                                    <artifactItem>
-                                        <groupId>org.eclipse.wtp</groupId>
-                                        <artifactId>wtp-sdk</artifactId>
-                                        <type>zip</type>
-                                    </artifactItem>
-                                </artifactItems>
-                            </configuration>
-                        </execution>
-                    </executions>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-antrun-plugin</artifactId>
+                    <dependencies>
+                        <dependency>
+                            <groupId>oro</groupId>
+                            <artifactId>oro</artifactId>
+                            <version>2.0.8</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>ant</groupId>
+                            <artifactId>ant-apache-oro</artifactId>
+                            <version>1.6.4</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>ant</groupId>
+                            <artifactId>ant-optional</artifactId>
+                            <version>1.5.3-1</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.geronimo.devtools</groupId>
@@ -174,38 +164,7 @@
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.platform</groupId>
-            <artifactId>eclipse-sdk-${eclipsePlatformFamily}</artifactId>
-            <version>3.3</version>
-            <type>${artifactType}</type>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.gef</groupId>
-            <artifactId>gef-sdk</artifactId>
-            <version>3.3</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.dtp</groupId>
-            <artifactId>dtp-sdk</artifactId>
-            <version>1.5</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>emf-sdo-xsd</artifactId>
-            <version>2.3.0</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.wtp</groupId>
-            <artifactId>wtp-sdk</artifactId>
-            <version>2.0</version>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
+                        
     <repositories>
         <repository>
             <id>apache-snapshots</id>
@@ -249,18 +208,8 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>mcconne</id>
-            <name>mcconne Repository on Apache</name>
-            <url>http://people.apache.org/~mcconne/maven/repository/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
     </repositories>
+                        
     <pluginRepositories>
         <pluginRepository>
             <id>apache.org</id>
@@ -285,6 +234,7 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
+                        
     <profiles>
         <profile>
             <id>windows</id>
@@ -295,7 +245,6 @@
             </activation>
             <properties>
                 <eclipsePlatformFamily>win32</eclipsePlatformFamily>
-                <artifactType>zip</artifactType>
             </properties>
         </profile>
         <profile>
@@ -306,8 +255,7 @@
                 </os>
             </activation>
             <properties>
-                <eclipsePlatformFamily>linux-gtk</eclipsePlatformFamily>
-                <artifactType>tar.gz</artifactType>
+                <eclipsePlatformFamily>linux</eclipsePlatformFamily>
             </properties>
         </profile>
         <profile>
@@ -318,15 +266,17 @@
                 </os>
             </activation>
             <properties>
-                <eclipsePlatformFamily>macosx-carbon</eclipsePlatformFamily>
-                <artifactType>tar.gz</artifactType>
+                <eclipsePlatformFamily>macos</eclipsePlatformFamily>
             </properties>
         </profile>
     </profiles>
+                        
     <modules>
+        <module>eclipse</module>
         <module>emf</module>
         <module>plugins</module>
         <module>features</module>
         <module>assembly</module>
     </modules>
+                        
 </project>