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 2006/06/14 19:23:30 UTC
svn commit: r414319 - in /geronimo/devtools/eclipse-plugin/trunk: ./ emf/
emf/common/ emf/geronimo-1.0/ emf/geronimo-1.1/
maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/
maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/...
Author: sppatel
Date: Wed Jun 14 10:23:28 2006
New Revision: 414319
URL: http://svn.apache.org/viewvc?rev=414319&view=rev
Log:
move to Callisto
Modified:
geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.0/pom.xml
geronimo/devtools/eclipse-plugin/trunk/emf/geronimo-1.1/pom.xml
geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/.classpath
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/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.deployment.model/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.jmxagent/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.v11.deployment.model.edit/pom.xml
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
Modified: geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/common/pom.xml Wed Jun 14 10:23:28 2006
@@ -52,8 +52,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>${installLocation}/eclipse</eclipseHome>
<workspace>${project.build.directory}/workspace</workspace>
<modelProject>${project.build.directory}/org.apache.geronimo.common.deployment.model</modelProject>
<editProject>${project.build.directory}/org.apache.geronimo.common.deployment.model.edit</editProject>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -35,8 +35,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>${installLocation}/eclipse</eclipseHome>
<workspace>${project.build.directory}/workspace</workspace>
<modelProject>${project.build.directory}/org.apache.geronimo.deployment.model</modelProject>
<editProject>${project.build.directory}/org.apache.geronimo.deployment.model.edit</editProject>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -52,8 +52,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>${installLocation}/eclipse</eclipseHome>
<workspace>${project.build.directory}/workspace</workspace>
<modelProject>${project.build.directory}/org.apache.geronimo.v11.deployment.model</modelProject>
<editProject>${project.build.directory}/org.apache.geronimo.v11.deployment.model.edit</editProject>
Modified: geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/emf/pom.xml Wed Jun 14 10:23:28 2006
@@ -26,11 +26,6 @@
<artifactId>geronimo-eclipse-plugin</artifactId>
<version>1.1</version>
</parent>
- <!-- TODO remove following properties after 3.2 migration -->
- <properties>
- <installLocation>${settings.localRepository}/eclipse/temp/</installLocation>
- <platformDriver>S-3.2RC5-200605191206/eclipse-SDK-3.2RC5</platformDriver>
- </properties>
<build>
<pluginManagement>
<plugins>
@@ -50,25 +45,6 @@
<goals>
<goal>importresources</goal>
</goals>
- </execution>
- <!--
- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs
- -->
- <execution>
- <id>create-eclipse-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${platformUrl}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>${installLocation}</installLocation>
- <propsFile>${installLocation}/install.props</propsFile>
- </configuration>
</execution>
</executions>
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/GeneratorMojo.java Wed Jun 14 10:23:28 2006
@@ -17,7 +17,6 @@
import java.io.File;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
/**
@@ -45,17 +44,6 @@
* @required
*/
private String type;
-
- /* (non-Javadoc)
- * @see org.apache.emf.plugin.LaunchOSGIMojo#execute()
- */
- public void execute() throws MojoExecutionException, MojoFailureException {
- super.execute();
-
- //workaround to prevent eclipse-compiler interference with maven
- File file = new File(mavenProject.getBasedir() + File.separator + ".classpath");
- file.delete();
- }
/*
* (non-Javadoc)
@@ -86,7 +74,8 @@
}
buffer.append("-").append(type).append(SPACE);
- buffer.append(genmodel.getAbsolutePath());
+ buffer.append("-autoBuild").append(SPACE).append("false").append(SPACE);
+ buffer.append(genmodel.getAbsolutePath()).append(SPACE);
return buffer;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java Wed Jun 14 10:23:28 2006
@@ -137,6 +137,10 @@
buffer.append(pkg).append(SPACE).append(mapping).append(SPACE);
}
}
+
+ buffer.append("-refGenModel").append(SPACE);
+ buffer.append("platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel").append(SPACE).append("http://www.w3.org/XML/1998/namespace");
+
return buffer;
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/DownloadMojo.java Wed Jun 14 10:23:28 2006
@@ -72,11 +72,11 @@
* @parameter expression="${settings.localRepository}/eclipse/install.props"
*/
private File propsFile;
-
+
/**
- * @parameter expression="${forceInstall}"
+ * @parameter expression="${overwrite}";
*/
- private boolean forceInstall = false;
+ private String overwrite = null;
/**
* @parameter expression="${checkModified}"
@@ -133,7 +133,18 @@
load();
int identifier = generateInstallIdentifier(images);
- if (forceInstall || shouldExtract(identifier)) {
+
+
+ boolean extract = false;
+ if("false".equals(overwrite)) {
+ extract = false;
+ } else if("true".equals(overwrite)) {
+ extract = true;
+ } else {
+ extract = shouldExtract(identifier);
+ }
+
+ if (extract) {
clean();
Iterator i = images.iterator();
while (i.hasNext())
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java Wed Jun 14 10:23:28 2006
@@ -161,7 +161,7 @@
} else if (platform.startsWith("Linux")) {
fragment.setArtifactId(id.concat(".gtk.linux.x86"));
} else if (platform.startsWith("Mac")) {
- fragment.setArtifactId(id.concat(".carbon.macosx.ppc"));
+ fragment.setArtifactId(id.concat(".carbon.macosx"));
}
return fragment;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model.edit/pom.xml Wed Jun 14 10:23:28 2006
@@ -35,36 +35,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- <!-- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <execution>
- <id>create-emf-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${tempPlatformURL}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>
- ${settings.localRepository}/eclipse/temp/</installLocation>
- <propsFile>
- ${settings.localRepository}/eclipse/temp/install.props</propsFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -105,9 +75,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>
- ${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
<workspace>${project.basedir}/..</workspace>
<type>edit</type>
</configuration>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/.classpath?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/.classpath Wed Jun 14 10:23:28 2006
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.common.deployment.model/pom.xml Wed Jun 14 10:23:28 2006
@@ -30,36 +30,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- <!-- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <execution>
- <id>create-emf-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${tempPlatformURL}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>
- ${settings.localRepository}/eclipse/temp/</installLocation>
- <propsFile>
- ${settings.localRepository}/eclipse/temp/install.props</propsFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -99,9 +69,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>
- ${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
<workspace>${project.basedir}/..</workspace>
<type>model</type>
</configuration>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -35,36 +35,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- <!-- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <execution>
- <id>create-emf-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${tempPlatformURL}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>
- ${settings.localRepository}/eclipse/temp/</installLocation>
- <propsFile>
- ${settings.localRepository}/eclipse/temp/install.props</propsFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -105,9 +75,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>
- ${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
<workspace>${project.basedir}/..</workspace>
<type>edit</type>
</configuration>
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?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- 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 Wed Jun 14 10:23:28 2006
@@ -31,36 +31,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- <!-- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <execution>
- <id>create-emf-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${tempPlatformURL}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>
- ${settings.localRepository}/eclipse/temp/</installLocation>
- <propsFile>
- ${settings.localRepository}/eclipse/temp/install.props</propsFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -100,9 +70,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>
- ${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
<workspace>${project.basedir}/..</workspace>
<type>model</type>
</configuration>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -36,6 +36,10 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
@@ -55,21 +59,6 @@
</artifactItems>
<outputDirectory>lib</outputDirectory>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
</execution>
</executions>
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.jmxagent/pom.xml Wed Jun 14 10:23:28 2006
@@ -31,6 +31,10 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-geronimodevtools-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
@@ -93,21 +97,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -38,17 +38,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -31,17 +31,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -32,17 +32,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -31,17 +31,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -32,17 +32,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
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=414319&r1=414318&r2=414319&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 Wed Jun 14 10:23:28 2006
@@ -38,36 +38,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- <!-- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <execution>
- <id>create-emf-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${tempPlatformURL}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>
- ${settings.localRepository}/eclipse/temp/</installLocation>
- <propsFile>
- ${settings.localRepository}/eclipse/temp/install.props</propsFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -107,9 +77,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>
- ${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
<workspace>${project.basedir}/..</workspace>
<type>edit</type>
</configuration>
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?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- 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 Wed Jun 14 10:23:28 2006
@@ -31,36 +31,6 @@
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
- <executions>
- <execution>
- <id>install-dependencies</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- <goal>manifestbundles</goal>
- <goal>install</goal>
- </goals>
- </execution>
- <!-- TODO remove following execution after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <execution>
- <id>create-emf-image</id>
- <phase>validate</phase>
- <goals>
- <goal>download</goal>
- </goals>
- <configuration>
- <platformUrl>${tempPlatformURL}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- </urls>
- <installLocation>
- ${settings.localRepository}/eclipse/temp/</installLocation>
- <propsFile>
- ${settings.localRepository}/eclipse/temp/install.props</propsFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
@@ -100,9 +70,6 @@
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-emf-plugin</artifactId>
<configuration>
- <!-- TODO remove <eclipseHome> after 3.2 migration -->
- <eclipseHome>
- ${settings.localRepository}/eclipse/temp/eclipse</eclipseHome>
<workspace>${project.basedir}/..</workspace>
<type>model</type>
</configuration>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Wed Jun 14 10:23:28 2006
@@ -33,29 +33,27 @@
<artifactId>geronimo-eclipse-plugin</artifactId>
<version>1.1</version>
</parent>
-
- <!-- TODO remove following properties after 3.2 migration
- need for running osgi under 3.2 due to platform bugs -->
- <properties>
- <tempPlatformURL>http://download.eclipse.org/eclipse/downloads/drops/S-3.2RC5-200605191206/eclipse-SDK-3.2RC5</tempPlatformURL>
- </properties>
-
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-geronimodevtools-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-dependencies</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>download</goal>
+ <goal>manifestbundles</goal>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
- <plugin>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>maven-geronimodevtools-plugin</artifactId>
- <configuration>
- <platformUrl>${platformUrl}</platformUrl>
- <urls>
- <url>${emfUrl}</url>
- <url>${jemUrl}</url>
- <url>${gefUrl}</url>
- <url>${wtpUrl}</url>
- </urls>
- <eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=414319&r1=414318&r2=414319&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Wed Jun 14 10:23:28 2006
@@ -116,12 +116,12 @@
<stax-api_version>1.0</stax-api_version>
<junitVersion>3.8.1</junitVersion>
<!-- Eclipse Distribution URLs -->
- <platformDriver>R-3.1.2-200601181600/eclipse-SDK-3.1.2</platformDriver>
+ <platformDriver>S-3.2RC7-200606021317/eclipse-SDK-3.2RC7</platformDriver>
<platformUrl>http://download.eclipse.org/eclipse/downloads/drops/${platformDriver}</platformUrl>
- <emfUrl>http://download.eclipse.org/tools/emf/downloads/drops/2.1.2/R200601191349/emf-sdo-xsd-SDK-2.1.2.zip</emfUrl>
- <jemUrl>http://download.eclipse.org/tools/ve/downloads/drops/R-1.1.0.1-200509071822/JEM-SDK-1.1.0.1.zip</jemUrl>
- <gefUrl>http://download.eclipse.org/tools/gef/downloads/drops/R-3.1.1-200509301327/GEF-SDK-3.1.1.zip</gefUrl>
- <wtpUrl>http://download.eclipse.org/webtools/downloads/drops/R-1.0.2-200604280245/wtp-sdk-R-1.0.2-200604280245.zip</wtpUrl>
+ <emfUrl>http://download.eclipse.org/tools/emf/downloads/drops/2.2.0/S200605300949/emf-sdo-xsd-SDK-2.2.0RC6a.zip</emfUrl>
+ <jemUrl>http://download.eclipse.org/tools/ve/downloads/drops/S-1.2RC2-200605301123/JEM-SDK-1.2RC2.zip</jemUrl>
+ <gefUrl>http://download.eclipse.org/tools/gef/downloads/drops/S-3.2RC4-200605291641/GEF-SDK-3.2RC4.zip</gefUrl>
+ <wtpUrl>http://download.eclipse.org/webtools/downloads/drops/S-1.5RC4-200605310507/wtp-sdk-S-1.5RC4-200605310507.zip</wtpUrl>
</properties>
<distributionManagement>
@@ -150,6 +150,33 @@
<build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src/</sourceDirectory>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-geronimodevtools-plugin</artifactId>
+ <configuration>
+ <platformUrl>${platformUrl}</platformUrl>
+ <urls>
+ <url>${emfUrl}</url>
+ <url>${jemUrl}</url>
+ <url>${gefUrl}</url>
+ <url>${wtpUrl}</url>
+ </urls>
+ <eclipseHome>${settings.localRepository}/eclipse/eclipse/</eclipseHome>
+ </configuration>
+ <executions>
+ <execution>
+ <id>create-eclipse-image</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>download</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<repositories>