You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ha...@apache.org on 2011/05/13 08:41:54 UTC
svn commit: r1102579 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.j2ee.v11.jaxbmodel/
org.apache.geronimo.jee.v21.jaxbmodel/
org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/
Author: hanhongfang
Date: Fri May 13 06:41:53 2011
New Revision: 1102579
URL: http://svn.apache.org/viewvc?rev=1102579&view=rev
Log:
GERONIMODEVTOOLS-670 Geronimo deployment plan doesn't be created when creating projects using the Geronimo 2.2 as the target runtime. Thanks Yi Xiao for the patch.
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml?rev=1102579&r1=1102578&r2=1102579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/pom.xml Fri May 13 06:41:53 2011
@@ -92,6 +92,14 @@
</includes>
</resource>
<resource>
+ <directory>.</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>plugin.xml</include>
+ <include>.options</include>
+ </includes>
+ </resource>
+ <resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
<includes>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml?rev=1102579&r1=1102578&r2=1102579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/pom.xml Fri May 13 06:41:53 2011
@@ -92,6 +92,14 @@
</includes>
</resource>
<resource>
+ <directory>.</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>plugin.xml</include>
+ <include>.options</include>
+ </includes>
+ </resource>
+ <resource>
<targetPath>about_files</targetPath>
<directory>.</directory>
<includes>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java?rev=1102579&r1=1102578&r2=1102579&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java Fri May 13 06:41:53 2011
@@ -30,6 +30,7 @@ import org.apache.geronimo.jee.deploymen
import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.jee.web.WebApp;
import org.apache.geronimo.st.core.operations.DeploymentPlanCreationOperation;
+import org.apache.geronimo.st.core.Activator;
import org.apache.geronimo.st.core.DeploymentPlanInstallConfig;
import org.apache.geronimo.st.v21.core.internal.Trace;
import org.eclipse.core.resources.IFile;
@@ -96,7 +97,6 @@ public class V21DeploymentPlanCreationOp
public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) throws Exception {
Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan",
dpFile, dpFile.getFullPath());
-
org.apache.geronimo.jee.web.ObjectFactory webFactory = new org.apache.geronimo.jee.web.ObjectFactory();
WebApp web = webFactory.createWebApp();
@@ -104,7 +104,11 @@ public class V21DeploymentPlanCreationOp
web.setEnvironment(getConfigEnvironment());
JAXBElement jaxbElement = webFactory.createWebApp(web);
- JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
+ try {
+ JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
+ } catch(Exception e) {
+ Activator.log(0, "marshalDeploymentPlan exception", e);
+ }
Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", jaxbElement);
return jaxbElement;