Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 76552 invoked from network); 4 Sep 2009 09:30:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Sep 2009 09:30:02 -0000 Received: (qmail 74263 invoked by uid 500); 4 Sep 2009 09:30:02 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 74194 invoked by uid 500); 4 Sep 2009 09:30:02 -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 74185 invoked by uid 99); 4 Sep 2009 09:30:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 09:30:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Sep 2009 09:30:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4792F2388868; Fri, 4 Sep 2009 09:29:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811320 - in /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core: GeronimoServerBehaviourDelegate.java internal/DependencyHelper.java Date: Fri, 04 Sep 2009 09:29:39 -0000 To: scm@geronimo.apache.org From: delos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090904092940.4792F2388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: delos Date: Fri Sep 4 09:29:38 2009 New Revision: 811320 URL: http://svn.apache.org/viewvc?rev=811320&view=rev Log: GERONIMODEVTOOLS-361 GEP DependencyHelper not interrogating all contents of EAR files for dependencies Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java?rev=811320&r1=811319&r2=811320&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoServerBehaviourDelegate.java Fri Sep 4 09:29:38 2009 @@ -239,7 +239,7 @@ // if (modules != null && modules.size() > 0) { DependencyHelper dh = new DependencyHelper(); - List list = dh.reorderModules(modules, deltaKind); + List list = dh.reorderModules(this.getServer(),modules, deltaKind); modules = (List) list.get(0); deltaKind = (List) list.get(1); } Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java?rev=811320&r1=811319&r2=811320&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Fri Sep 4 09:29:38 2009 @@ -39,6 +39,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; /** @@ -74,7 +75,7 @@ * * @return List of reordered modules and deltaKind (or input if no change) */ - public List reorderModules( List modules, List deltaKind ) { + public List reorderModules(IServer server, List modules, List deltaKind ) { Trace.tracePoint("Entry", "DependencyHelper.reorderModules", modules, deltaKind); if (modules.size() == 0) { @@ -95,22 +96,26 @@ IModule[] module = (IModule[]) modules.get(ii); int moduleDeltaKind = ((Integer)deltaKind.get(ii)).intValue(); if (moduleDeltaKind != ServerBehaviourDelegate.REMOVED) { - Environment environment = getEnvironment(module[0]); - if (environment != null) { - Artifact child = environment.getModuleId(); - Dependencies dependencies = environment.getDependencies(); - if (dependencies != null) { - List depList = dependencies.getDependency(); - for ( Dependency dep : depList) { - Artifact parent = deploymentFactory.createArtifact(); - parent.setGroupId( dep.getGroupId() ); - parent.setArtifactId( dep.getArtifactId() ); - parent.setVersion( dep.getVersion() ); - parent.setType( dep.getType() ); - dm.addDependency( child, parent ); - } - } - } + //GERONIMODEVTOOLS-361 + for (IModule singleModule:module){ + Environment environment = getEnvironment(singleModule); + if (environment != null) { + Artifact child = environment.getModuleId(); + Dependencies dependencies = environment.getDependencies(); + if (dependencies != null) { + List depList = dependencies.getDependency(); + for ( Dependency dep : depList) { + Artifact parent = deploymentFactory.createArtifact(); + parent.setGroupId( dep.getGroupId() ); + parent.setArtifactId( dep.getArtifactId() ); + parent.setVersion( dep.getVersion() ); + parent.setType( dep.getType() ); + + dm.addDependency( child, parent ); + } + } + } + } } }