geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnx...@apache.org
Subject svn commit: r1360166 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/
Date Wed, 11 Jul 2012 13:09:26 GMT
Author: johnxiao
Date: Wed Jul 11 13:09:26 2012
New Revision: 1360166

URL: http://svn.apache.org/viewvc?rev=1360166&view=rev
Log:
GERONIMODEVTOOLS-798 ClassCastException deploying EAR under eclipse 3.8 & 4.2 with geronimo-3

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/DeploymentUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/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=1360166&r1=1360165&r2=1360166&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 Jul 11 13:09:26 2012
@@ -130,7 +130,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);
 			
-			model.setProperty(J2EEComponentExportDataModelProvider.PROJECT_NAME, module.getProject());
+			model.setProperty(J2EEComponentExportDataModelProvider.PROJECT_NAME, module.getProject().getName());
 			model.setProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, outputPath.append(module.getName())
 					+ extensionName);
 

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=1360166&r1=1360165&r2=1360166&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
Wed Jul 11 13:09:26 2012
@@ -196,7 +196,7 @@ public class DeploymentUtils {
         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.PROJECT_NAME, module.getProject().getName());
         model.setProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, outputPath.append(module.getName())
+ extensionName);
 
         model.setProperty(J2EEComponentExportDataModelProvider.COMPONENT, comp);



Mime
View raw message