geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r803345 - /geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
Date Wed, 12 Aug 2009 01:36:56 GMT
Author: delos
Date: Wed Aug 12 01:36:56 2009
New Revision: 803345

URL: http://svn.apache.org/viewvc?rev=803345&view=rev
Log:
GERONIMODEVTOOLS-255 Can deploy and EAR file from the admin console without an application.xml
file, but fails from the Eclipse plugin

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.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/DeploymentUtils.java?rev=803345&r1=803344&r2=803345&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
Wed Aug 12 01:36:56 2009
@@ -113,7 +113,10 @@
 			return ".war";
 		}else if(GeronimoUtils.isRARModule(module)) {
 			return ".rar";
-		}
+		}else if(GeronimoUtils.isAppClientModule(module)) {
+			return ".car";
+ 		}
+
 		return ".jar";
 	}
 
@@ -124,9 +127,13 @@
 
 			IVirtualComponent comp = ComponentCore.createComponent(module.getProject());
 
+			//Here, specific extension name should be got, in case module has no standard JEE descriptor
file included
+			String extensionName = getModuleExtension(module);
+			
 			model.setProperty(J2EEComponentExportDataModelProvider.PROJECT_NAME, module.getProject());
 			model.setProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, outputPath.append(module.getName())
-					+ ".zip");
+					+ extensionName);
+
 			model.setProperty(J2EEComponentExportDataModelProvider.COMPONENT, comp);
 			model.setBooleanProperty(J2EEComponentExportDataModelProvider.OVERWRITE_EXISTING, true);
 			model.setBooleanProperty(J2EEComponentExportDataModelProvider.RUN_BUILD, false);



Mime
View raw message