You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2007/01/02 19:01:54 UTC
svn commit: r491873 - in
/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core:
pom.xml src/org/apache/geronimo/st/core/commands/DeployCommand.java
Author: sppatel
Date: Tue Jan 2 10:01:54 2007
New Revision: 491873
URL: http://svn.apache.org/viewvc?view=rev&rev=491873
Log:
disable DeployableModule stuff until in G
Modified:
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/pom.xml
geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java
Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/pom.xml?view=diff&rev=491873&r1=491872&r2=491873
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/pom.xml Tue Jan 2 10:01:54 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/branches/1.2.1/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/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java?view=diff&rev=491873&r1=491872&r2=491873
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/commands/DeployCommand.java Tue Jan 2 10:01:54 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());
}
}
- }
+ }*/
}