geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r491874 - in /geronimo/devtools/eclipse-plugin/trunk: ./ plugins/org.apache.geronimo.st.core/ plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/ plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v...
Date Tue, 02 Jan 2007 18:03:17 GMT
Author: sppatel
Date: Tue Jan  2 10:03:16 2007
New Revision: 491874

URL: http://svn.apache.org/viewvc?view=rev&rev=491874
Log:
 r3609@sppatel-009027152175 (orig r491865):  sppatel | 2007-01-02 12:36:35 -0500
 fix compilation errors
 r3610@sppatel-009027152175 (orig r491873):  sppatel | 2007-01-02 13:01:54 -0500
 disable DeployableModule stuff until in G

Modified:
    geronimo/devtools/eclipse-plugin/trunk/   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java

Propchange: geronimo/devtools/eclipse-plugin/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Tue Jan  2 10:03:16 2007
@@ -1,2 +1,2 @@
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:491843
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/devtools/eclipse-plugin/branches/1.2.1:491873
 47d51c14-9805-4038-8224-40f2b3020a56:/local/G1526-eclipse:3238

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?view=diff&rev=491874&r1=491873&r2=491874
==============================================================================
--- 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 Tue
Jan  2 10:03:16 2007
@@ -77,7 +77,7 @@
             <plugin>
             	<artifactId>maven-antrun-plugin</artifactId>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>dependency-maven-plugin</artifactId>
                 <executions>
@@ -99,7 +99,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -122,10 +122,10 @@
             <artifactId>xbean</artifactId>
             <version>2.0.0</version>     
         </dependency>
-        <dependency>
+        <!--<dependency>
         	<groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>eclipse-support</artifactId>
             <version>1.0-SNAPSHOT</version>
-        </dependency>
+        </dependency>-->
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.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/DeployCommand.java?view=diff&rev=491874&r1=491873&r2=491874
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java
Tue Jan  2 10:03:16 2007
@@ -23,10 +23,6 @@
 import org.apache.geronimo.st.core.DeploymentUtils;
 import org.apache.geronimo.st.core.IGeronimoServer;
 import org.apache.geronimo.st.core.internal.Trace;
-import org.apache.geronimo.xbeans.eclipse.deployment.ModuleDocument;
-import org.apache.geronimo.xbeans.eclipse.deployment.ChildrenDocument.Children;
-import org.apache.geronimo.xbeans.eclipse.deployment.ModuleDocument.Module;
-import org.apache.xmlbeans.XmlOptions;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
@@ -54,7 +50,8 @@
 		File file = null;
 		IGeronimoServer gs = getGeronimoServer();
 		if (gs.isRunFromWorkspace()) {
-			file = generateRunFromWorkspaceConfig(getModule());
+		    //TODO Re-enable after DeployableModule supported in G
+			//file = generateRunFromWorkspaceConfig(getModule());
 		} else {
 			IPath outputDir = DeploymentUtils.STATE_LOC.append("server_" + getServer().getId());
 			outputDir.toFile().mkdirs();
@@ -64,7 +61,7 @@
 		return file;
 	}
 
-	protected File generateRunFromWorkspaceConfig(IModule module) {
+	/*protected File generateRunFromWorkspaceConfig(IModule module) {
 		IPath configDir = Activator.getDefault().getStateLocation().append("looseconfig").append("server_"
+ getServer().getId());
 		configDir.toFile().mkdirs();
 
@@ -125,6 +122,6 @@
 				binaryModule.setPath(archiveComp.getUnderlyingDiskFile().getAbsolutePath());
 			}
 		}
-	}
+	}*/
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java?view=diff&rev=491874&r1=491873&r2=491874
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
Tue Jan  2 10:03:16 2007
@@ -62,13 +62,13 @@
 	 */
 	public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
             XmlObject xmlplan = getXmlObject(plan);
-            XmlObject xmlplan = getXmlObject(plan);
             if (plan != null) {
                 SchemaConversionUtils.fixGeronimoSchema(xmlplan, GerApplicationDocument.type.getDocumentElementName(),
                     GerApplicationType.type);
                 save(xmlplan, plan);
             }
             return xmlplan;
+    }
 
 	/*
 	 * (non-Javadoc)
@@ -116,13 +116,13 @@
 	}
 
  	private void save(XmlObject object, IFile file) {
-            try {
+        try {
  	        object.save(file.getLocation().toFile());
- 		file.refreshLocal(IFile.DEPTH_ONE, null);
+ 	        file.refreshLocal(IFile.DEPTH_ONE, null);
  	    } catch (IOException e) {
- 	        e.printStackTrace();
+ 	          e.printStackTrace();
  	    } catch (CoreException e) {
- 		e.printStackTrace();
+ 		     e.printStackTrace();
  	    }
  	}
 }



Mime
View raw message