geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r612208 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.runtime.v20/pom.xml org.apache.geronimo.runtime.v21/pom.xml org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DistributeCommand.java
Date Tue, 15 Jan 2008 20:34:47 GMT
Author: mcconne
Date: Tue Jan 15 12:34:43 2008
New Revision: 612208

URL: http://svn.apache.org/viewvc?rev=612208&view=rev
Log:
Use only the default target configuration when distributing projects from Eclipse

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DistributeCommand.java

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=612208&r1=612207&r2=612208&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
Tue Jan 15 12:34:43 2008
@@ -192,6 +192,7 @@
                                 <include>.classpath</include>
                                 <include>lib</include>
                                 <include>bin</include>
+                                <include>*.log</include>
                             </includes>
                         </fileset>
                     </filesets>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=612208&r1=612207&r2=612208&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
Tue Jan 15 12:34:43 2008
@@ -202,6 +202,7 @@
                                 <include>.classpath</include>
                                 <include>lib</include>
                                 <include>bin</include>
+                                <include>*.log</include>
                             </includes>
                         </fileset>
                     </filesets>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DistributeCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DistributeCommand.java?rev=612208&r1=612207&r2=612208&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DistributeCommand.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DistributeCommand.java
Tue Jan 15 12:34:43 2008
@@ -53,11 +53,26 @@
 
 		if (targets == null)
 			targets = dm.getTargets();
-		
-		Trace.trace(Trace.INFO, "Target: " + targets[0]);
+
+        Trace.trace(Trace.INFO, "Available targets: ");
+        for ( int ii=0; ii<targets.length; ii++ ) {
+            Trace.trace(Trace.INFO, "--> Target[" + ii + "]: " + targets[ii]);
+        }
+
+        //
+        // Geronimo 2.1 now supports clustering which will likely result in multiple targets
getting 
+        // returned from the deployment manager. In our case though we have to ensure that
only the 
+        // first target is used, which is the default configuration store and which is explicitly

+        // configured by users. Thus, we will distribute the project to the defaultTarget
only.
+        //
+        Target[] defaultTarget = new Target[1];
+        defaultTarget[0] = targets[0];
+
+        Trace.trace(Trace.INFO, "Using default target:");
+        Trace.trace(Trace.INFO, "--> " + defaultTarget[0]);
 
 		File file = getTargetFile();
-		return new DeploymentCmdStatus(Status.OK_STATUS, dm.distribute(targets, file, null));
+		return new DeploymentCmdStatus(Status.OK_STATUS, dm.distribute( defaultTarget, file, null));
 	}
 
 	/*



Mime
View raw message