You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2010/05/13 06:07:43 UTC
svn commit: r943787 - in /geronimo/devtools/eclipse-plugin/trunk: eclipse/
plugins/org.apache.geronimo.st.v30.core/
plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/
plugins/org.apache.geronimo.st.v30.core/src/main/...
Author: mcconne
Date: Thu May 13 04:07:43 2010
New Revision: 943787
URL: http://svn.apache.org/viewvc?rev=943787&view=rev
Log:
GERONIMODEVTOOLS-615 Enable deployment of EBA applications
Modified:
geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Thu May 13 04:07:43 2010
@@ -96,7 +96,7 @@
<echo>## Unzipping: ${helios_jee_win32} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+<!-- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> -->
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win32}"
dest="${LOCAL_M2_REPO}/eclipse"
@@ -122,7 +122,7 @@
<echo>## Unzipping: ${helios_jee_win64} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+<!-- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> -->
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_win64}"
dest="${LOCAL_M2_REPO}/eclipse"
@@ -154,7 +154,7 @@
<echo>## Unzipping: ${helios_jee_linux_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+<!-- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> -->
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
<gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux_gz}"/>
<untar src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux}"
@@ -181,7 +181,7 @@
<echo>## Unzipping: ${helios_jee_linux-x86_64_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+<!-- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> -->
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
<gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64_gz}"/>
<untar src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_linux-x86_64}"
@@ -208,7 +208,7 @@
<echo>## Unzipping: ${helios_jee_macos_gz} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/>
+<!-- <delete dir="${LOCAL_M2_REPO}/eclipse" quiet="true"/> -->
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
<gunzip src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos_gz}"/>
<untar src="${LOCAL_M2_REPO}/eclipse-downloads/${helios_jee_macos}"
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/pom.xml Thu May 13 04:07:43 2010
@@ -160,9 +160,5 @@
<artifactId>org.apache.geronimo.runtime.v30</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>com.ibm.etools</groupId>
- <artifactId>com.ibm.etools.aries.core</artifactId>
- </dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java Thu May 13 04:07:43 2010
@@ -16,6 +16,10 @@
*/
package org.apache.geronimo.st.v30.core;
+import com.ibm.etools.aries.internal.core.IAriesModuleConstants;
+import com.ibm.etools.aries.internal.core.datatransfer.exportmodel.ApplicationExportDataModelProvider;
+
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
@@ -136,6 +140,10 @@ public class DeploymentUtils {
Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".car");
return ".car";
}
+ else if (GeronimoUtils.isEBAModule(module)) {
+ Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".eba");
+ return ".eba";
+ }
Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".jar");
return ".jar";
@@ -154,6 +162,7 @@ public class DeploymentUtils {
//Here, specific extension name should be got, in case module has no standard JEE descriptor file included
String extensionName = getModuleExtension(module);
+ // TODO: Need to determine what properties to set for OSGi applications
model.setProperty(J2EEComponentExportDataModelProvider.PROJECT_NAME, module.getProject());
model.setProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, outputPath.append(module.getName())
+ extensionName);
@@ -165,7 +174,7 @@ public class DeploymentUtils {
if (model != null) {
try {
model.getDefaultOperation().execute(null, null);
- Trace.tracePoint("Entry", "DeploymentUtils.createJarFile",new File(model.getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION)));
+ Trace.tracePoint("Exit ", "DeploymentUtils.createJarFile",new File(model.getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION)));
return new File(model.getStringProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION));
} catch (ExecutionException e) {
e.printStackTrace();
@@ -173,7 +182,7 @@ public class DeploymentUtils {
}
}
- Trace.tracePoint("Entry", "DeploymentUtils.createJarFile", null);
+ Trace.tracePoint("Exit ", "DeploymentUtils.createJarFile", null);
return null;
}
@@ -192,6 +201,8 @@ public class DeploymentUtils {
return DataModelFactory.createDataModel(new ConnectorComponentExportDataModelProvider());
} else if (IModuleConstants.JST_APPCLIENT_MODULE.equals(type)) {
return DataModelFactory.createDataModel(new AppClientComponentExportDataModelProvider());
+ } else if (IAriesModuleConstants.OSGI_APP.equals(type)) {
+ return DataModelFactory.createDataModel(new ApplicationExportDataModelProvider());
}
Trace.tracePoint("Exit ", "DeploymentUtils.getExportDataModel", null);
@@ -220,7 +231,7 @@ public class DeploymentUtils {
try {
TargetModuleID id = isInstalledModule(dm,configId);
if (id!=null) {
- Trace.tracePoint("Entry", "DeploymentUtils.getTargetModuleID", id);
+ Trace.tracePoint("Exit ", "DeploymentUtils.getTargetModuleID", id);
return id;
}
} catch (IllegalStateException e) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java Thu May 13 04:07:43 2010
@@ -16,6 +16,8 @@
*/
package org.apache.geronimo.st.v30.core;
+import com.ibm.etools.aries.internal.core.IAriesModuleConstants;
+
import javax.enterprise.deploy.shared.ModuleType;
import javax.xml.bind.JAXBElement;
@@ -58,23 +60,27 @@ public class GeronimoUtils {
public static final String SERVICE_PLAN_NAME = "geronimo-service.xml";
public static boolean isWebModule(IModule module) {
- return "jst.web".equals(module.getModuleType().getId());
+ return IModuleConstants.JST_WEB_MODULE.equals(module.getModuleType().getId());
}
public static boolean isEjbJarModule(IModule module) {
- return "jst.ejb".equals(module.getModuleType().getId());
+ return IModuleConstants.JST_EJB_MODULE.equals(module.getModuleType().getId());
}
public static boolean isEarModule(IModule module) {
- return "jst.ear".equals(module.getModuleType().getId());
+ return IModuleConstants.JST_EAR_MODULE.equals(module.getModuleType().getId());
}
public static boolean isAppClientModule(IModule module) {
- return "jst.appclient".equals(module.getModuleType().getId());
+ return IModuleConstants.JST_APPCLIENT_MODULE.equals(module.getModuleType().getId());
}
public static boolean isRARModule(IModule module) {
- return "jst.connector".equals(module.getModuleType().getId());
+ return IModuleConstants.JST_CONNECTOR_MODULE.equals(module.getModuleType().getId());
+ }
+
+ public static boolean isEBAModule(IModule module) {
+ return IAriesModuleConstants.OSGI_APP.equals(module.getModuleType().getId());
}
public static ModuleType getJSR88ModuleType(IModule module) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoVersionHandler.java Thu May 13 04:07:43 2010
@@ -20,6 +20,7 @@ import javax.enterprise.deploy.spi.Targe
import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
import org.apache.geronimo.st.v30.core.IGeronimoVersionHandler;
+import org.apache.geronimo.st.v30.core.internal.Trace;
import org.eclipse.wst.server.core.IModule;
/**
@@ -33,6 +34,9 @@ public class GeronimoVersionHandler impl
* @see org.apache.geronimo.st.core.IGeronimoVersionHandler#getConfigID(org.eclipse.wst.server.core.IModule)
*/
public String getConfigID(IModule module) throws Exception {
+ Trace.tracePoint("Entry", "GeronimoVersionHandler.getConfigID", module);
+
+ Trace.tracePoint("Exit ", "GeronimoVersionHandler.getConfigID", GeronimoUtils.getConfigId(module));
return GeronimoUtils.getConfigId(module);
}
@@ -40,6 +44,9 @@ public class GeronimoVersionHandler impl
* @see org.apache.geronimo.st.core.IGeronimoVersionHandler#createTargetModuleId(java.lang.String)
*/
public TargetModuleID createTargetModuleId(String configId) {
+ Trace.tracePoint("Entry", "GeronimoVersionHandler.createTargetModuleId", configId);
+
+ Trace.tracePoint("Exit ", "GeronimoVersionHandler.createTargetModuleId", new TargetModuleIDImpl(null, configId));
return new TargetModuleIDImpl(null, configId);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/commands/DeployCommand.java Thu May 13 04:07:43 2010
@@ -38,7 +38,19 @@ abstract public class DeployCommand exte
super(server, module);
}
+ /**
+ * Create a zipped/jar file of the module (being deployed) on the file system relative to the Eclipse workspace and the
+ * server that the module is being deployed to. For example:
+ *
+ * <pre>
+ * C:\ECLIPSE\WORKSPACES\runtime-New_configuration\.metadata\.plugins\org.apache.geronimo.st.v30.core\server_Apache Geronimo v3.0 Server at localhost\web.war
+ * </pre>
+ *
+ * @return A File representation of the zipped/jar file
+ */
public File getTargetFile() {
+ Trace.tracePoint("Entry", "DeployCommand.getTargetFile");
+
File file = null;
IGeronimoServer gs = getGeronimoServer();
if (gs.isRunFromWorkspace()) {
@@ -50,7 +62,8 @@ abstract public class DeployCommand exte
outputDir.toFile().mkdirs();
file = DeploymentUtils.createJarFile(getModule(), outputDir);
}
- Trace.trace(Trace.INFO, "File: " + file.getAbsolutePath());
+
+ Trace.tracePoint("Exit ", "DeployCommand.getTargetFile", file);
return file;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF Thu May 13 04:07:43 2010
@@ -31,6 +31,7 @@ Require-Bundle:
org.eclipse.wst.common.project.facet.ui,
org.eclipse.wst.server.core,
org.eclipse.wst.server.ui,
- org.eclipse.wst.sse.ui
+ org.eclipse.wst.sse.ui,
+ org.eclipse.wst.xml.ui
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Apache Software Foundation
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml?rev=943787&r1=943786&r2=943787&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml Thu May 13 04:07:43 2010
@@ -290,17 +290,25 @@
## Blueprint XML Editor - Define the XML form editor class for the blueprint.xml file ##
## ##
## TODO(s) - Create JAXB model from blueprint.xsd Schema ##
- ## - Implement org.apache.geronimo.st.v30.ui.editors.BlueprintFormEditor ##
+ ## - Implement org.apache.geronimo.st.v30.ui.editors.BlueprintFormEditor and replace the default XML ##
+ ## editor being used below. When that is done, the org.eclipse.wst.xml.ui bundle can be removed from ##
+ ## the Required-Bundle list in the manifest.mf for this plugin. ##
## ##
###################################################################################################################
-->
<extension point="org.eclipse.ui.editors">
- <editor class="org.eclipse.ui.editors.text.TextEditor"
+ <editor class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
+ contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor"
+ symbolicFontName="org.eclipse.wst.sse.ui.textfont"
default="true"
filenames="blueprint.xml"
icon="icons/obj16/littleOSGi.gif"
id="org.apache.geronimo.v30.ui.editors.BlueprintFormEditor"
name="%BlueprintFormEditorName">
+ <contentTypeBinding
+ contentTypeId="org.eclipse.core.runtime.xml"/>
+ <contentTypeBinding
+ contentTypeId="org.eclipse.wst.xml.core.xmlsource"/>
</editor>
</extension>