You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2009/10/12 07:00:00 UTC
svn commit: r824225 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/
org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/
org.apache.geronimo.st.v21.c...
Author: delos
Date: Mon Oct 12 04:59:59 2009
New Revision: 824225
URL: http://svn.apache.org/viewvc?rev=824225&view=rev
Log:
GERONIMODEVTOOLS-596 Move reference of DependencyHelper from GeronimoServerBehaviourDelegate into GeronimoServerBehavior
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.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.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=824225&r1=824224&r2=824225&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 Mon Oct 12 04:59:59 2009
@@ -21,7 +21,6 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.MappedByteBuffer;
@@ -44,7 +43,6 @@
import org.apache.geronimo.st.core.commands.DeploymentCmdStatus;
import org.apache.geronimo.st.core.commands.DeploymentCommandFactory;
import org.apache.geronimo.st.core.commands.IDeploymentCommand;
-import org.apache.geronimo.st.core.internal.DependencyHelper;
import org.apache.geronimo.st.core.internal.Messages;
import org.apache.geronimo.st.core.internal.Trace;
import org.apache.geronimo.st.core.operations.ISharedLibEntryCreationDataModelProperties;
@@ -238,8 +236,7 @@
// based on any discovered dependencies.
//
if (modules != null && modules.size() > 0) {
- DependencyHelper dh = new DependencyHelper();
- List list = dh.reorderModules(this.getServer(),modules, deltaKind);
+ List list = getOrderedModules(this.getServer(),modules, deltaKind);
modules = (List) list.get(0);
deltaKind = (List) list.get(1);
}
@@ -293,6 +290,12 @@
}
/*
+ * This method is used to invoke DependencyHelper of different version
+ */
+ abstract protected List getOrderedModules(IServer server, List modules, List deltaKind);
+
+
+ /*
* (non-Javadoc)
*
* @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishModule(int,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java?rev=824225&r1=824224&r2=824225&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServerBehaviour.java Mon Oct 12 04:59:59 2009
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.v11.core;
import java.net.URL;
+import java.util.List;
import java.util.Set;
import javax.management.MBeanServerConnection;
@@ -26,14 +27,13 @@
import org.apache.geronimo.gbean.AbstractNameQuery;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
import org.apache.geronimo.kernel.config.PersistentConfigurationList;
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.st.core.Activator;
import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
+import org.apache.geronimo.st.v11.core.internal.DependencyHelper;
import org.apache.geronimo.st.v11.core.internal.Trace;
import org.apache.geronimo.system.jmx.KernelDelegate;
import org.eclipse.core.runtime.IPath;
@@ -168,4 +168,12 @@
protected ClassLoader getContextClassLoader() {
return Kernel.class.getClassLoader();
}
+
+ @Override
+ protected List getOrderedModules(IServer server, List modules,
+ List deltaKind) {
+ DependencyHelper dh = new DependencyHelper();
+ List list = dh.reorderModules(this.getServer(),modules, deltaKind);
+ return list;
+ }
}
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.java?rev=824225&r1=824224&r2=824225&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServerBehaviour.java Mon Oct 12 04:59:59 2009
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.v21.core;
import java.net.URL;
+import java.util.List;
import java.util.Set;
import javax.management.MBeanServerConnection;
@@ -34,6 +35,7 @@
import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.st.core.Activator;
import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
+import org.apache.geronimo.st.core.internal.DependencyHelper;
import org.apache.geronimo.st.v21.core.internal.Trace;
import org.apache.geronimo.system.jmx.KernelDelegate;
import org.eclipse.core.runtime.IPath;
@@ -222,4 +224,12 @@
protected ClassLoader getContextClassLoader() {
return Kernel.class.getClassLoader();
}
+
+ @Override
+ protected List getOrderedModules(IServer server, List modules,
+ List deltaKind) {
+ DependencyHelper dh = new DependencyHelper();
+ List list = dh.reorderModules(this.getServer(),modules, deltaKind);
+ return list;
+ }
}
\ No newline at end of file