You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by yu...@apache.org on 2008/07/25 09:23:44 UTC
svn commit: r679686 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/
org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/
org.apache.geronimo.st...
Author: yunfengma
Date: Fri Jul 25 00:23:44 2008
New Revision: 679686
URL: http://svn.apache.org/viewvc?rev=679686&view=rev
Log:
GERONIMODEVTOOLS-440 Convert the old deployment plan to the current version using NamespaceFilter
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.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/internal/DependencyHelper.java?rev=679686&r1=679685&r2=679686&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/internal/DependencyHelper.java Fri Jul 25 00:23:44 2008
@@ -451,8 +451,8 @@
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getWebDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.WEB_PLAN_NAME) && file.exists()) {
- Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", JAXBUtils.unmarshalDeploymentPlan(file));
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("Exit ", "DependencyHelper.getWebDeploymentPlan", null);
@@ -473,8 +473,8 @@
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.OPENEJB_PLAN_NAME) && file.exists()) {
- Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", JAXBUtils.unmarshalDeploymentPlan(file));
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("Exit ", "DependencyHelper.getOpenEjbDeploymentPlan", null);
@@ -495,8 +495,8 @@
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.APP_PLAN_NAME) && file.exists()) {
- Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", JAXBUtils.unmarshalDeploymentPlan(file));
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("Exit ", "DependencyHelper.getApplicationDeploymentPlan", null);
@@ -517,8 +517,8 @@
IVirtualComponent comp = GeronimoUtils.getVirtualComponent(module);
IFile file = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
if (file.getName().equals(GeronimoUtils.CONNECTOR_PLAN_NAME) && file.exists()) {
- Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan", JAXBUtils.unmarshalDeploymentPlan(file));
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan", JAXBUtils.unmarshalFilterDeploymentPlan(file));
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("Exit ", "DependencyHelper.getConnectorDeploymentPlan", null);
@@ -627,4 +627,4 @@
Trace.tracePoint("Exit ", "DependencyHelper.getJaxbElement", null);
return null;
}
-}
\ No newline at end of file
+}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.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/jaxb/JAXBUtils.java?rev=679686&r1=679685&r2=679686&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java Fri Jul 25 00:23:44 2008
@@ -89,21 +89,6 @@
}
}
- public static JAXBElement unmarshalDeploymentPlan(IFile file) {
- try {
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(file.getContents());
- return plan;
- } catch (JAXBException e) {
- Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalDeploymentPlan()", file.getFullPath());
- e.printStackTrace();
- } catch (CoreException e) {
- Trace.tracePoint("CoreException", "JAXBUtils.unmarshalDeploymentPlan()", file.getFullPath());
- e.printStackTrace();
- }
- return null;
- }
-
public static JAXBElement unmarshalFilterDeploymentPlan(IFile file) {
try {
Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.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/GeronimoV21Utils.java?rev=679686&r1=679685&r2=679686&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoV21Utils.java Fri Jul 25 00:23:44 2008
@@ -203,7 +203,7 @@
Trace.tracePoint("ENTRY", "GeronimoV21Utils.getApplicationDeploymentPlan", file);
if (file.getName().equals(APP_PLAN_NAME) && file.exists()) {
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getApplicationDeploymentPlan", null);
@@ -214,7 +214,7 @@
Trace.tracePoint("ENTRY", "GeronimoV21Utils.getApplicationClientDeploymentPlan", file);
if (file.getName().equals(APP_CLIENT_PLAN_NAME) && file.exists()) {
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getApplicationClientDeploymentPlan", null);
@@ -225,7 +225,7 @@
Trace.tracePoint("ENTRY", "GeronimoV21Utils.getWebDeploymentPlan", file);
if (file.getName().equals(WEB_PLAN_NAME) && file.exists()) {
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getWebDeploymentPlan", null);
@@ -236,7 +236,7 @@
Trace.tracePoint("ENTRY", "GeronimoV21Utils.getOpenEjbDeploymentPlan", file);
if (file.getName().equals(OPENEJB_PLAN_NAME) && file.exists()) {
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getOpenEjbDeploymentPlan", null);
@@ -247,7 +247,7 @@
Trace.tracePoint("ENTRY", "GeronimoV21Utils.getConnectorDeploymentPlan", file);
if (file.getName().equals(CONNECTOR_PLAN_NAME) && file.exists()) {
- return JAXBUtils.unmarshalDeploymentPlan(file);
+ return JAXBUtils.unmarshalFilterDeploymentPlan(file);
}
Trace.tracePoint("EXIT", "GeronimoV21Utils.getConnectorDeploymentPlan", null);