geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r320961 - in /geronimo/devtools/trunk/modules/eclipse-plugin/plugins: org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ org.apache.geronimo.runtime.v1/
Date Fri, 14 Oct 2005 01:12:25 GMT
Author: sppatel
Date: Thu Oct 13 18:12:19 2005
New Revision: 320961

URL: http://svn.apache.org/viewcvs?rev=320961&view=rev
Log:
fixGeronimoSchema calls for additional plan types

Modified:
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.devtools.eclipse.core/src/org/apache/geronimo/core/operations/ImportDeploymentPlanOperation.java
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/plugin.xml.template
    geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml

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=320961&r1=320960&r2=320961&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
Thu Oct 13 18:12:19 2005
@@ -21,6 +21,8 @@
 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.GerConnectorType;
+import org.apache.geronimo.xbeans.geronimo.j2ee.GerApplicationType;
 import org.apache.geronimo.xbeans.geronimo.web.GerWebAppType;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
@@ -35,8 +37,10 @@
 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.OpenejbOpenejbJarType;
 
-public class ImportDeploymentPlanOperation extends AbstractGeronimoJ2EEComponentOperation
{
+public class ImportDeploymentPlanOperation extends
+        AbstractGeronimoJ2EEComponentOperation {
 
     /**
      * 
@@ -60,7 +64,6 @@
      */
     public IStatus execute(IProgressMonitor monitor, IAdaptable info)
             throws ExecutionException {
-
         if (!isGeronimoRuntimeTarget())
             return Status.OK_STATUS;
 
@@ -93,9 +96,7 @@
     }
 
     public void importWebDeploymentPlan(IFile dpFile) throws XmlException {
-
         XmlObject plan = getXmlObject(dpFile);
-
         if (plan != null) {
             SchemaConversionUtils.fixGeronimoSchema(plan, "web-app",
                     GerWebAppType.type);
@@ -104,18 +105,33 @@
     }
 
     public void importEarDeploymentPlan(IFile dpFile) throws XmlException {
+        XmlObject plan = getXmlObject(dpFile);
+        if (plan != null) {
+            SchemaConversionUtils.fixGeronimoSchema(plan, "application",
+                    GerApplicationType.type);
+            save(plan, dpFile);
+        }
     }
 
     public void importEjbDeploymentPlan(IFile dpFile) throws XmlException {
-
+        XmlObject plan = getXmlObject(dpFile);
+        if (plan != null) {
+            SchemaConversionUtils.fixGeronimoSchema(plan, "openejb-jar",
+                    OpenejbOpenejbJarType.type);
+            save(plan, dpFile);
+        }
     }
 
     public void importConnectorDeploymentPlan(IFile dpFile) throws XmlException {
-
+        XmlObject plan = getXmlObject(dpFile);
+        if (plan != null) {
+            SchemaConversionUtils.fixGeronimoSchema(plan, "connector",
+                    GerConnectorType.type);
+            save(plan, dpFile);
+        }
     }
 
     private XmlObject getXmlObject(IFile dpFile) {
-
         if (dpFile.exists()) {
             try {
                 return XmlBeansUtil
@@ -128,7 +144,6 @@
                 e.printStackTrace();
             }
         }
-
         return null;
     }
 

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml?rev=320961&r1=320960&r2=320961&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/maven.xml
Thu Oct 13 18:12:19 2005
@@ -54,7 +54,8 @@
       <replaceregexp file="plugin.xml" match="@geronimo_spec_version@" replace="${geronimo_spec_version}"
byline="true"/>
       <replaceregexp file="plugin.xml" match="@mx4j_version@" replace="${mx4j_version}"
byline="true"/>  
       <replaceregexp file="plugin.xml" match="@commons_logging_version@" replace="${commons_logging_version}"
byline="true"/>   
-      <replaceregexp file="plugin.xml" match="@cglib_version@" replace="${cglib_version}"
byline="true"/>      
+      <replaceregexp file="plugin.xml" match="@cglib_version@" replace="${cglib_version}"
byline="true"/>     
+      <replaceregexp file="plugin.xml" match="@openejb_version@" replace="${openejb_version}"
byline="true"/>     
     </goal>
     
     <goal name="copyjars">        

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/plugin.xml.template
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/plugin.xml.template?rev=320961&r1=320960&r2=320961&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/plugin.xml.template
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/plugin.xml.template
Thu Oct 13 18:12:19 2005
@@ -48,6 +48,15 @@
       <library name="lib/geronimo-naming-builder-@geronimo_runtime_version@.jar">
          <export name="*"/>
       </library>
+      <library name="lib/geronimo-security-builder-@geronimo_runtime_version@.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/geronimo-j2ee-builder-@geronimo_runtime_version@.jar">
+         <export name="*"/>
+      </library>
+      <library name="lib/openejb-builder-@openejb_version@.jar">
+         <export name="*"/>
+      </library>
       <library name="lib/stax-api-1.0.jar">
          <export name="*"/>
       </library> 

Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml?rev=320961&r1=320960&r2=320961&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
(original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.runtime.v1/project.xml
Thu Oct 13 18:12:19 2005
@@ -109,9 +109,24 @@
       <artifactId>geronimo-web-builder</artifactId>
       <version>${geronimo_runtime_version}</version>
     </dependency>
-      <dependency>
+    <dependency>
       <groupId>geronimo</groupId>
       <artifactId>geronimo-naming-builder</artifactId>
+      <version>${geronimo_runtime_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>geronimo-j2ee-builder</artifactId>
+      <version>${geronimo_runtime_version}</version>
+    </dependency>
+    <dependency>
+      <groupId>openejb</groupId>
+      <artifactId>openejb-builder</artifactId>
+      <version>${openejb_version}</version>
+    </dependency>
+     <dependency>
+    <groupId>geronimo</groupId>
+      <artifactId>geronimo-security-builder</artifactId>
       <version>${geronimo_runtime_version}</version>
     </dependency>
     <dependency>



Mime
View raw message