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 2006/08/04 17:44:34 UTC
svn commit: r428759 - in /geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.st.core/
org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/
org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/
org.apache.geron...
Author: sppatel
Date: Fri Aug 4 08:44:33 2006
New Revision: 428759
URL: http://svn.apache.org/viewvc?rev=428759&view=rev
Log:
GERONIMODEVTOOLS-94 fix importing non-qualified deployment plans
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java
- copied, changed from r428418, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/ImportDeploymentPlanOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java (with props)
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java (with props)
Removed:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/ImportDeploymentPlanOperation.java
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml Fri Aug 4 08:44:33 2006
@@ -60,5 +60,24 @@
<description>%geronimo-facet-description</description>
</project-facet>
</extension>
+
+ <extension id="GeronimoOpExtensions" name="GeronimoOpExtensions" point="org.eclipse.wst.common.frameworks.OperationExtension">
+ <operationExtension
+ id="org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportOperation"
+ postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
+ </operationExtension>
+ <operationExtension
+ id="org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EJBComponentImportOperation"
+ postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
+ </operationExtension>
+ <operationExtension
+ id="org.eclipse.jst.j2ee.internal.archive.operations.EARComponentImportOperation"
+ postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
+ </operationExtension>
+ <operationExtension
+ id="org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentImportOperation"
+ postOperationClass="org.apache.geronimo.st.core.operations.ImportDeploymentPlanOperation">
+ </operationExtension>
+ </extension>
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/GenericGeronimoServerRuntime.java Fri Aug 4 08:44:33 2006
@@ -28,7 +28,7 @@
import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
import org.eclipse.osgi.util.NLS;
-public class GenericGeronimoServerRuntime extends GenericServerRuntime implements IGeronimoRuntime {
+abstract public class GenericGeronimoServerRuntime extends GenericServerRuntime implements IGeronimoRuntime {
public static final int NO_IMAGE = 0;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/IGeronimoRuntime.java Fri Aug 4 08:44:33 2006
@@ -15,6 +15,18 @@
*/
package org.apache.geronimo.st.core;
+import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlObject;
+import org.eclipse.core.resources.IFile;
+
public interface IGeronimoRuntime {
+
+ public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException;
+
+ public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException;
+
+ public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException;
+
+ public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/AbstractGeronimoJ2EEComponentOperation.java Fri Aug 4 08:44:33 2006
@@ -21,13 +21,14 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
+import org.eclipse.jst.server.core.FacetUtil;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-public abstract class AbstractGeronimoJ2EEComponentOperation extends
- AbstractDataModelOperation {
+public abstract class AbstractGeronimoJ2EEComponentOperation extends AbstractDataModelOperation {
public AbstractGeronimoJ2EEComponentOperation() {
super();
@@ -46,8 +47,7 @@
* @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor,
* org.eclipse.core.runtime.IAdaptable)
*/
- public IStatus redo(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
+ public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return null;
}
@@ -57,14 +57,24 @@
* @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor,
* org.eclipse.core.runtime.IAdaptable)
*/
- public IStatus undo(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
+ public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return null;
}
public boolean isGeronimoRuntimeTarget() {
- String runtimeID = model.getStringProperty(IJ2EEFacetInstallDataModelProperties.RUNTIME_TARGET_ID);
- return runtimeID != null && runtimeID.startsWith("Apache Geronimo");
+ org.eclipse.wst.server.core.IRuntime runtime = getRuntime();
+ if (runtime != null) {
+ return runtime.getRuntimeType().getId().startsWith("org.apache.geronimo");
+ }
+ return false;
+ }
+
+ public org.eclipse.wst.server.core.IRuntime getRuntime() {
+ IRuntime runtime = (IRuntime) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_RUNTIME);
+ if (runtime != null) {
+ return FacetUtil.getRuntime(runtime);
+ }
+ return null;
}
public IProject getProject() {
Copied: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java (from r428418, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/ImportDeploymentPlanOperation.java)
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java?p2=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java&p1=geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/ImportDeploymentPlanOperation.java&r1=428418&r2=428759&rev=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/operations/ImportDeploymentPlanOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/operations/ImportDeploymentPlanOperation.java Fri Aug 4 08:44:33 2006
@@ -13,21 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.st.v1.core.operations;
+package org.apache.geronimo.st.core.operations;
import java.io.IOException;
import java.net.MalformedURLException;
-import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.st.core.GeronimoUtils;
-import org.apache.geronimo.st.core.operations.AbstractGeronimoJ2EEComponentOperation;
-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.geronimo.st.core.IGeronimoRuntime;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
import org.eclipse.core.commands.ExecutionException;
@@ -42,11 +34,8 @@
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
- AbstractGeronimoJ2EEComponentOperation {
+public class ImportDeploymentPlanOperation extends AbstractGeronimoJ2EEComponentOperation {
/**
*
@@ -68,76 +57,40 @@
* @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor,
* org.eclipse.core.runtime.IAdaptable)
*/
- public IStatus execute(IProgressMonitor monitor, IAdaptable info)
- throws ExecutionException {
+ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
if (!isGeronimoRuntimeTarget())
return Status.OK_STATUS;
+ IGeronimoRuntime runtime = (IGeronimoRuntime) getRuntime().loadAdapter(IGeronimoRuntime.class, null);
IVirtualComponent comp = ComponentCore.createComponent(getProject());
String type = J2EEProjectUtilities.getJ2EEProjectType(getProject());
+ IFile planFile = null;
+ XmlObject plan = null;
+
try {
if (type.equals(IModuleConstants.JST_WEB_MODULE)) {
- importWebDeploymentPlan(GeronimoUtils.getWebDeploymentPlanFile(comp));
+ planFile = GeronimoUtils.getWebDeploymentPlanFile(comp);
+ plan = runtime.fixGeronimoWebSchema(planFile);
} else if (type.equals(IModuleConstants.JST_EJB_MODULE)) {
- importEjbDeploymentPlan(GeronimoUtils.getOpenEjbDeploymentPlanFile(comp));
+ planFile = GeronimoUtils.getOpenEjbDeploymentPlanFile(comp);
+ runtime.fixGeronimoEjbSchema(planFile);
} else if (type.equals(IModuleConstants.JST_EAR_MODULE)) {
- importEarDeploymentPlan(GeronimoUtils.getApplicationDeploymentPlanFile(comp));
+ planFile = GeronimoUtils.getApplicationDeploymentPlanFile(comp);
+ plan = runtime.fixGeronimoEarSchema(planFile);
} else if (type.equals(IModuleConstants.JST_CONNECTOR_MODULE)) {
- importConnectorDeploymentPlan(GeronimoUtils.getConnectorDeploymentPlanFile(comp));
+ planFile = GeronimoUtils.getConnectorDeploymentPlanFile(comp);
+ plan = runtime.fixGeronimoConnectorSchema(planFile);
+ }
+
+ if (planFile != null && plan != null) {
+ save(plan, planFile);
}
} catch (XmlException e) {
- e.printStackTrace();
+ throw new ExecutionException("Error fixing plan., e");
}
return Status.OK_STATUS;
- }
-
- public void importWebDeploymentPlan(IFile dpFile) throws XmlException {
- XmlObject plan = getXmlObject(dpFile);
- if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, GerWebAppDocument.type.getDocumentElementName(), GerWebAppType.type);
- save(plan, dpFile);
- }
- }
-
- public void importEarDeploymentPlan(IFile dpFile) throws XmlException {
- XmlObject plan = getXmlObject(dpFile);
- if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, GerApplicationDocument.type.getDocumentElementName(), GerApplicationType.type);
- save(plan, dpFile);
- }
- }
-
- public void importEjbDeploymentPlan(IFile dpFile) throws XmlException {
- XmlObject plan = getXmlObject(dpFile);
- if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, OpenejbOpenejbJarDocument.type.getDocumentElementName(), OpenejbOpenejbJarType.type);
- save(plan, dpFile);
- }
- }
-
- public void importConnectorDeploymentPlan(IFile dpFile) throws XmlException {
- XmlObject plan = getXmlObject(dpFile);
- if (plan != null) {
- SchemaConversionUtils.fixGeronimoSchema(plan, GerConnectorDocument.type.getDocumentElementName(), GerConnectorType.type);
- save(plan, dpFile);
- }
- }
-
- private XmlObject getXmlObject(IFile dpFile) {
- if (dpFile.exists()) {
- try {
- return XmlBeansUtil.parse(dpFile.getLocation().toFile().toURL());
- } catch (MalformedURLException e) {
- e.printStackTrace();
- } catch (IOException e) {
- e.printStackTrace();
- } catch (XmlException e) {
- e.printStackTrace();
- }
- }
- return null;
}
private void save(XmlObject object, IFile file) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/plugin.xml Fri Aug 4 08:44:33 2006
@@ -6,7 +6,7 @@
<runtimeType id="org.apache.geronimo.generic.runtime.10"
name="%runtimeTypeName" description="%runtimeTypeDescription"
vendor="%runtimeTypeVendor" version="1.0"
- class="org.apache.geronimo.st.core.GenericGeronimoServerRuntime">
+ class="org.apache.geronimo.st.v1.core.GeronimoRuntime">
<moduleType types="jst.web" versions="2.2, 2.3, 2.4"/>
<moduleType types="jst.ejb" versions="1.1, 2.0, 2.1"/>
<moduleType types="jst.connector" versions="1.0, 1.5"/>
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java?rev=428759&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java Fri Aug 4 08:44:33 2006
@@ -0,0 +1,88 @@
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v1.core;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.schema.SchemaConversionUtils;
+import org.apache.geronimo.st.core.GenericGeronimoServerRuntime;
+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;
+import org.eclipse.core.resources.IFile;
+import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
+import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+
+public class GeronimoRuntime extends GenericGeronimoServerRuntime {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoConnectorSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerConnectorDocument.type.getDocumentElementName(), GerConnectorType.type);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEarSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerApplicationDocument.type.getDocumentElementName(), GerApplicationType.type);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEjbSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), OpenejbOpenejbJarDocument.type.getDocumentElementName(), OpenejbOpenejbJarType.type);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoWebSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerWebAppDocument.type.getDocumentElementName(), GerWebAppType.type);
+ }
+
+ private XmlObject getXmlObject(IFile plan) {
+ if (plan.exists()) {
+ try {
+ return XmlBeansUtil.parse(plan.getLocation().toFile().toURL());
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (XmlException e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v1.core/src/org/apache/geronimo/st/v1/core/GeronimoRuntime.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Fri Aug 4 08:44:33 2006
@@ -25,7 +25,8 @@
org.eclipse.wst.common.project.facet.core,
org.apache.ant,
org.apache.geronimo.runtime.common,
- org.eclipse.jst.common.frameworks
+ org.eclipse.jst.common.frameworks,
+ org.eclipse.jst.server.core
Eclipse-LazyStart: true
Export-Package: org.apache.geronimo.st.v11.core.operations,
org.apache.geronimo.st.v11.core.internal,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml?rev=428759&r1=428758&r2=428759&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/plugin.xml Fri Aug 4 08:44:33 2006
@@ -5,7 +5,7 @@
<runtimeType id="org.apache.geronimo.generic.runtime.11"
name="%runtimeTypeName" description="%runtimeTypeDescription"
vendor="%runtimeTypeVendor" version="1.1"
- class="org.apache.geronimo.st.core.GenericGeronimoServerRuntime">
+ class="org.apache.geronimo.st.v11.core.GeronimoRuntime">
<moduleType types="jst.web" versions="2.2, 2.3, 2.4"/>
<moduleType types="jst.ejb" versions="1.1, 2.0, 2.1"/>
<moduleType types="jst.connector" versions="1.0, 1.5"/>
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java?rev=428759&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java Fri Aug 4 08:44:33 2006
@@ -0,0 +1,89 @@
+/**
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v11.core;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.schema.SchemaConversionUtils;
+import org.apache.geronimo.st.core.GenericGeronimoServerRuntime;
+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;
+import org.eclipse.core.resources.IFile;
+import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
+import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
+
+public class GeronimoRuntime extends GenericGeronimoServerRuntime {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoConnectorSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoConnectorSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerConnectorDocument.type.getDocumentElementName(), GerConnectorType.type);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEarSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoEarSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerApplicationDocument.type.getDocumentElementName(), GerApplicationType.type);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoEjbSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoEjbSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), OpenejbOpenejbJarDocument.type.getDocumentElementName(), OpenejbOpenejbJarType.type);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.geronimo.st.core.IGeronimoRuntime#fixGeronimoWebSchema(org.eclipse.core.resources.IFile)
+ */
+ public XmlObject fixGeronimoWebSchema(IFile plan) throws XmlException {
+ return SchemaConversionUtils.fixGeronimoSchema(getXmlObject(plan), GerWebAppDocument.type.getDocumentElementName(), GerWebAppType.type);
+ }
+
+ private XmlObject getXmlObject(IFile plan) {
+ if (plan.exists()) {
+ try {
+ return XmlBeansUtil.parse(plan.getLocation().toFile().toURL());
+ } catch (MalformedURLException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (XmlException e) {
+ e.printStackTrace();
+ }
+ }
+ return null;
+ }
+
+}
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
------------------------------------------------------------------------------
svn:keywords = Date Rev
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/org/apache/geronimo/st/v11/core/GeronimoRuntime.java
------------------------------------------------------------------------------
svn:mime-type = text/plain