Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 95490 invoked from network); 13 Apr 2006 15:30:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Apr 2006 15:30:07 -0000 Received: (qmail 66924 invoked by uid 500); 13 Apr 2006 15:29:44 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 66876 invoked by uid 500); 13 Apr 2006 15:29:43 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 66865 invoked by uid 99); 13 Apr 2006 15:29:43 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Apr 2006 08:29:43 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 13 Apr 2006 08:29:42 -0700 Received: (qmail 94595 invoked by uid 65534); 13 Apr 2006 15:28:46 -0000 Message-ID: <20060413152846.94341.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r393829 - in /geronimo/devtools/eclipse-plugin/trunk: ./ maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ plugins/org.apache.geronimo.deployment.model.edit/ plugins/org.apache.geronimo.deployme... Date: Thu, 13 Apr 2006 15:22:19 -0000 To: scm@geronimo.apache.org From: sppatel@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: sppatel Date: Thu Apr 13 08:21:04 2006 New Revision: 393829 URL: http://svn.apache.org/viewcvs?rev=393829&view=rev Log: move to using manifest dependencies Modified: 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/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ManifestDependenciesMojo.java geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/META-INF/MANIFEST.MF geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml geronimo/devtools/eclipse-plugin/trunk/pom.xml 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/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java?rev=393829&r1=393828&r2=393829&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 Thu Apr 13 08:21:04 2006 @@ -90,9 +90,11 @@ /** * @parameter expression="${useDistributionVersions}" */ - protected boolean useDistributionVersion; + protected boolean useDistributionVersion = true; private List removeList = new ArrayList(); + + private List addList = new ArrayList(); private int depth = 0; @@ -113,6 +115,7 @@ processDependencies(); project.getDependencies().removeAll(removeList); + project.getDependencies().addAll(addList); } protected void processDependencies() { @@ -122,8 +125,12 @@ Dependency dependency = (Dependency) i.next(); if (GROUP_ID.equals(dependency.getGroupId())) { updateForSWTFragment(dependency); - File file = findBundleForDependency(dependency); - process(file, dependency); + File bundle = findBundleForDependency(dependency); + process(bundle, dependency); + if(bundle.isDirectory() && getBundleName(bundle).equals(dependency.getArtifactId())) { + getLog().info("Removing bundle directory dependency " + dependency.getArtifactId()); + removeList.add(dependency); + } } } } @@ -172,12 +179,6 @@ } else { if (file.getName().endsWith(".jar")) { File bundle = getBundle(file); - - if(bundle.isDirectory()) { - getLog().info("removing dependency " + dependency.getArtifactId()); - removeList.add(dependency); - } - install(file, bundle); if (useDistributionVersion) dependency.setVersion(getBundleVersion(bundle)); @@ -192,6 +193,9 @@ if (!useDistributionVersion) version = fixVersion(version); + + if(bundle.isDirectory()) + addList.add(createDependency(artifactId, version)); try { doIt(artifact, GROUP_ID, artifactId, version, "jar"); @@ -317,4 +321,11 @@ return fileName; } + private Dependency createDependency(String artifactId, String version) { + Dependency dependency = new Dependency(); + dependency.setGroupId("org.eclipse.plugins"); + dependency.setArtifactId(artifactId); + dependency.setVersion(version); + return dependency; + } } Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ManifestDependenciesMojo.java URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ManifestDependenciesMojo.java?rev=393829&r1=393828&r2=393829&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ManifestDependenciesMojo.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ManifestDependenciesMojo.java Thu Apr 13 08:21:04 2006 @@ -68,7 +68,11 @@ StringTokenizer st = new StringTokenizer(bundles); List bundleEntries = new ArrayList(); while (st.hasMoreTokens()) { - bundleEntries.add(st.nextToken(",")); + String bundle = st.nextToken(","); + int extraInfoIndex = bundle.indexOf(";"); + if(extraInfoIndex != -1) + bundle = bundle.substring(0, extraInfoIndex); + bundleEntries.add(bundle); } List excludeList = new ArrayList(); Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?rev=393829&r1=393828&r2=393829&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 Thu Apr 13 08:21:04 2006 @@ -37,6 +37,7 @@ install-dependencies validate + manifestbundles download install @@ -166,11 +167,5 @@ org.apache.geronimo.deployment.model ${org.apache.geronimo.deployment.model_version} - - - org.eclipse.plugins - org.eclipse.emf.edit - ${org.eclipse.emf.edit_version} - Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF?rev=393829&r1=393828&r2=393829&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/META-INF/MANIFEST.MF Thu Apr 13 08:21:04 2006 @@ -8,7 +8,9 @@ Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi + org.eclipse.emf.ecore.xmi, + org.eclipse.emf.common, + org.eclipse.osgi Eclipse-AutoStart: true Export-Package: org.apache.geronimo.deployment.model, org.apache.geronimo.xml.ns.deployment, Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=393829&r1=393828&r2=393829&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 Thu Apr 13 08:21:04 2006 @@ -40,6 +40,7 @@ install-dependencies validate + manifestbundles download install @@ -161,37 +162,4 @@ - - - - org.eclipse.plugins - org.eclipse.osgi - ${org.eclipse.osgi_version} - - - org.eclipse.plugins - org.eclipse.core.runtime - ${org.eclipse.core.runtime_version} - - - org.eclipse.plugins - org.eclipse.emf.ecore - ${org.eclipse.emf.ecore_version} - - - org.eclipse.plugins - org.eclipse.emf.ecore.edit - ${org.eclipse.emf.ecore.edit_version} - - - org.eclipse.plugins - org.eclipse.emf.common - ${org.eclipse.emf.common_version} - - - org.eclipse.plugins - org.eclipse.emf.ecore.xmi - ${org.eclipse.emf.ecore.xmi_version} - - Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/META-INF/MANIFEST.MF?rev=393829&r1=393828&r2=393829&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/META-INF/MANIFEST.MF (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/META-INF/MANIFEST.MF Thu Apr 13 08:21:04 2006 @@ -31,6 +31,9 @@ org.eclipse.wst.server.core, org.eclipse.jst.common.frameworks, org.eclipse.wst.common.project.facet.core, - org.eclipse.wst.web + org.eclipse.wst.web, + org.eclipse.emf.ecore, + org.eclipse.osgi, + org.eclipse.emf.common Eclipse-AutoStart: true Export-Package: org.apache.geronimo.core.internal;x-friends:="org.apache.geronimo.ui" Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml?rev=393829&r1=393828&r2=393829&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.devtools.eclipse.core/pom.xml Thu Apr 13 08:21:04 2006 @@ -61,6 +61,7 @@ install-dependencies validate + manifestbundles download install @@ -91,101 +92,5 @@ org.apache.geronimo.runtime.v1 ${org.apache.geronimo.runtime.v1_version} - - - org.eclipse.plugins - org.eclipse.core.resources - ${org.eclipse.core.resources_version} - - - org.eclipse.plugins - org.eclipse.debug.core - ${org.eclipse.debug.core_version} - - - org.eclipse.plugins - org.eclipse.jdt.core - ${org.eclipse.jdt.core_version} - - - org.eclipse.plugins - org.eclipse.jdt.launching - ${org.eclipse.jdt.launching_version} - - - org.eclipse.plugins - org.eclipse.wst.server.core - ${org.eclipse.wst.server.core_version} - - - org.eclipse.plugins - org.eclipse.jst.server.core - ${org.eclipse.jst.server.core_version} - - - org.eclipse.plugins - org.eclipse.core.commands - ${org.eclipse.core.commands_version} - - - org.eclipse.plugins - org.eclipse.wst.web - ${org.eclipse.wst.web_version} - - - org.eclipse.plugins - org.eclipse.jst.j2ee - ${org.eclipse.jst.j2ee_version} - - - org.eclipse.plugins - org.eclipse.jst.j2ee.web - ${org.eclipse.jst.j2ee.web_version} - - - org.eclipse.plugins - org.eclipse.jst.j2ee.ejb - ${org.eclipse.jst.j2ee.ejb_version} - - - org.eclipse.plugins - org.eclipse.jst.j2ee.jca - ${org.eclipse.jst.j2ee.jca_version} - - - org.eclipse.plugins - org.eclipse.jst.server.generic.core - ${org.eclipse.jst.server.generic.core_version} - - - org.eclipse.plugins - org.eclipse.wst.common.modulecore - ${org.eclipse.wst.common.modulecore_version} - - - org.eclipse.plugins - org.eclipse.jem.util.util - ${org.eclipse.jem.util.util_version} - - - org.eclipse.plugins - org.eclipse.jst.j2ee.core - ${org.eclipse.jst.j2ee.core_version} - - - org.eclipse.plugins - org.eclipse.wst.common.frameworks - ${org.eclipse.wst.common.frameworks_version} - - - org.eclipse.plugins - org.eclipse.jst.common.frameworks - ${org.eclipse.jst.common.frameworks_version} - - - org.eclipse.plugins - org.eclipse.wst.common.project.facet.core - ${org.eclipse.wst.common.project.facet.core_version} - Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml?rev=393829&r1=393828&r2=393829&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.ui/pom.xml Thu Apr 13 08:21:04 2006 @@ -54,6 +54,7 @@ install-dependencies validate + manifestbundles download install @@ -89,81 +90,6 @@ org.eclipse.plugins org.eclipse.swt.fragment ${org.eclipse.swt.fragment_version} - - - org.eclipse.plugins - org.eclipse.jface - ${org.eclipse.jface_version} - - - org.eclipse.plugins - org.eclipse.ui - ${org.eclipse.ui_version} - - - org.eclipse.plugins - org.eclipse.ui.browser - ${org.eclipse.ui.browser_version} - - - org.eclipse.plugins - org.eclipse.ui.editors - ${org.eclipse.ui.editors_version} - - - org.eclipse.plugins - org.eclipse.ui.forms - ${org.eclipse.ui.forms_version} - - - org.eclipse.plugins - org.eclipse.ui.ide - ${org.eclipse.ui.ide_version} - - - org.eclipse.plugins - org.eclipse.ui.workbench - ${org.eclipse.ui.workbench_version} - - - org.eclipse.plugins - org.eclipse.core.commands - ${org.eclipse.core.commands_version} - - - org.eclipse.plugins - org.eclipse.ui.workbench.texteditor - ${org.eclipse.ui.workbench.texteditor_version} - - - org.eclipse.plugins - org.eclipse.wst.server.ui - ${org.eclipse.wst.server.ui_version} - - - org.eclipse.plugins - org.eclipse.jst.server.generic.ui - ${org.eclipse.jst.server.generic.ui_version} - - - org.eclipse.plugins - org.eclipse.wst.common.modulecore - ${org.eclipse.wst.common.modulecore_version} - - - org.eclipse.plugins - org.eclipse.debug.core - ${org.eclipse.debug.core_version} - - - org.eclipse.plugins - org.eclipse.jdt.launching - ${org.eclipse.debug.core_version} - - - org.eclipse.plugins - org.eclipse.emf.edit.ui - ${org.eclipse.emf.edit.ui_version} Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=393829&r1=393828&r2=393829&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Thu Apr 13 08:21:04 2006 @@ -130,57 +130,6 @@ http://download.eclipse.org/tools/ve/downloads/drops/R-1.1.0.1-200509071822/JEM-SDK-1.1.0.1.zip http://download.eclipse.org/tools/gef/downloads/drops/R-3.1.1-200509301327/GEF-SDK-3.1.1.zip http://download.eclipse.org/webtools/downloads/drops/M-M200603280054-200603280054/wtp-sdk-M-M200603280054-200603280054.zip - - [3.1.2,) - [2.1.0,) - 1.0.1-1 - 1.0.1 - - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - ${platformVersion} - - ${emfVersion} - ${emfVersion} - ${emfVersion} - ${emfVersion} - ${emfVersion} - ${emfVersion} - - - ${jemVersion} - - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion} - ${wtpVersion}