You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/11/29 14:53:36 UTC
svn commit: r349716 -
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java
Author: sppatel
Date: Tue Nov 29 05:53:32 2005
New Revision: 349716
URL: http://svn.apache.org/viewcvs?rev=349716&view=rev
Log:
api change on SchemaConversionUtils.fixGeronimoSchema
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java?rev=349716&r1=349715&r2=349716&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java Tue Nov 29 05:53:32 2005
@@ -21,8 +21,11 @@
import org.apache.geronimo.core.internal.GeronimoUtils;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
import org.apache.geronimo.schema.SchemaConversionUtils;
+import org.apache.geronimo.xbeans.geronimo.GerConnectorDocument;
import org.apache.geronimo.xbeans.geronimo.GerConnectorType;
+import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationDocument;
import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
+import org.apache.geronimo.xbeans.geronimo.web.GerWebAppDocument;
import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -38,6 +41,7 @@
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
public class ImportDeploymentPlanOperation extends
@@ -99,7 +103,7 @@
public void importWebDeploymentPlan(IFile dpFile) throws XmlException {
XmlObject plan = getXmlObject(dpFile);
if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, "web-app",
+ SchemaConversionUtils.fixGeronimoSchema(plan, GerWebAppDocument.type.getDocumentElementName(),
GerWebAppType.type);
save(plan, dpFile);
}
@@ -108,7 +112,7 @@
public void importEarDeploymentPlan(IFile dpFile) throws XmlException {
XmlObject plan = getXmlObject(dpFile);
if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, "application",
+ SchemaConversionUtils.fixGeronimoSchema(plan, GerApplicationDocument.type.getDocumentElementName(),
GerApplicationType.type);
save(plan, dpFile);
}
@@ -117,7 +121,7 @@
public void importEjbDeploymentPlan(IFile dpFile) throws XmlException {
XmlObject plan = getXmlObject(dpFile);
if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, "openejb-jar",
+ SchemaConversionUtils.fixGeronimoSchema(plan, OpenejbOpenejbJarDocument.type.getDocumentElementName(),
OpenejbOpenejbJarType.type);
save(plan, dpFile);
}
@@ -126,7 +130,7 @@
public void importConnectorDeploymentPlan(IFile dpFile) throws XmlException {
XmlObject plan = getXmlObject(dpFile);
if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, "connector",
+ SchemaConversionUtils.fixGeronimoSchema(plan, GerConnectorDocument.type.getDocumentElementName(),
GerConnectorType.type);
save(plan, dpFile);
}