geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r675428 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.st.core/ org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operatio...
Date Thu, 10 Jul 2008 03:39:29 GMT
Author: mcconne
Date: Wed Jul  9 20:39:27 2008
New Revision: 675428

URL: http://svn.apache.org/viewvc?rev=675428&view=rev
Log:
GERONIMODEVTOOLS-356 Remove support for geronimo-service.xml file -- Thanks BJ Reed for this
patch !!

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/main/java/org/apache/geronimo/st/core/GeronimoUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IDeploymentPlanCreationOp.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.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.st.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/plugin.xml?rev=675428&r1=675427&r2=675428&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
Wed Jul  9 20:39:27 2008
@@ -74,7 +74,6 @@
             <facet id="jst.ear"         version="1.2,1.3,1.4,5.0"/>
             <facet id="jst.connector"   version="1.0,1.5"/>
             <facet id="jst.appclient"   version="1.2,1.3,1.4,5.0"/>
-            <facet id="jst.utility"     version="1.0"/>
         </supported>
 
         <supported>
@@ -85,7 +84,6 @@
             <facet id="jst.ear"         version="1.2,1.3,1.4,5.0"/>
             <facet id="jst.connector"   version="1.0,1.5"/>
             <facet id="jst.appclient"   version="1.2,1.3,1.4,5.0"/>
-            <facet id="jst.utility"     version="1.0"/>
         </supported>
     </extension>
     

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.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/GeronimoUtils.java?rev=675428&r1=675427&r2=675428&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/GeronimoUtils.java
Wed Jul  9 20:39:27 2008
@@ -46,8 +46,6 @@
 	public static final String APP_CLIENT_PLAN_NAME = "geronimo-application-client.xml";
 
 	public static final String CONNECTOR_PLAN_NAME = "geronimo-ra.xml";
-	
-	public static final String SERVICE_PLAN_NAME = "geronimo-service.xml";
 
 	public static boolean isWebModule(IModule module) {
 		return "jst.web".equals(module.getModuleType().getId());
@@ -69,10 +67,6 @@
 		return "jst.connector".equals(module.getModuleType().getId());
 	}
 	
-	public static boolean isUtilityModule(IModule module) {
-		return "jst.utility".equals(module.getModuleType().getId());
-	}
-
 	public static ModuleType getJSR88ModuleType(IModule module) {
 		if (isWebModule(module)) {
 			return ModuleType.WAR;
@@ -102,8 +96,6 @@
 			return getApplicationClientDeploymentPlanFile(comp);
 		} else if (IModuleConstants.JST_CONNECTOR_MODULE.equals(type)) {
 			return getConnectorDeploymentPlanFile(comp);
-		} else if (IModuleConstants.JST_UTILITY_MODULE.equals(type)) {
-			return getServiceDeploymentPlanFile(comp);
 		}
 		return null;
 	}
@@ -136,11 +128,6 @@
 		IPath deployPlanPath = comp.getRootFolder().getUnderlyingFolder().getProjectRelativePath().append("META-INF").append(CONNECTOR_PLAN_NAME);
 		return comp.getProject().getFile(deployPlanPath);
 	}
-	
-	public static IFile getServiceDeploymentPlanFile(IVirtualComponent comp) {
-		IPath deployPlanPath = comp.getRootFolder().getUnderlyingFolder().getProjectRelativePath().append("META-INF").append(SERVICE_PLAN_NAME);
-		return comp.getProject().getFile(deployPlanPath);
-	}
 
 	public static IVirtualComponent getVirtualComponent(IModule module) {
 		return ComponentCore.createComponent(module.getProject());

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.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/operations/DeploymentPlanCreationOperation.java?rev=675428&r1=675427&r2=675428&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/DeploymentPlanCreationOperation.java
Wed Jul  9 20:39:27 2008
@@ -73,8 +73,6 @@
 			createGeronimoApplicationClientDeploymentPlan(GeronimoUtils.getApplicationClientDeploymentPlanFile(comp));
 		} else if (IModuleConstants.JST_CONNECTOR_MODULE.equals(type)) {
 			createConnectorDeploymentPlan(GeronimoUtils.getConnectorDeploymentPlanFile(comp));
-		} else if (IModuleConstants.JST_UTILITY_MODULE.equals(type)) {
-			createServiceDeploymentPlan(GeronimoUtils.getServiceDeploymentPlanFile(comp));
 		}
 	}
 
@@ -98,9 +96,4 @@
 	public JAXBElement createConnectorDeploymentPlan(IFile file) {
 		return null;
 	}
-	
-	public JAXBElement createServiceDeploymentPlan(IFile file) {
-		return null;
-	}
-	
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IDeploymentPlanCreationOp.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/operations/IDeploymentPlanCreationOp.java?rev=675428&r1=675427&r2=675428&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IDeploymentPlanCreationOp.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/operations/IDeploymentPlanCreationOp.java
Wed Jul  9 20:39:27 2008
@@ -32,7 +32,5 @@
 	public JAXBElement createGeronimoApplicationDeploymentPlan(IFile file);
 
 	public JAXBElement createConnectorDeploymentPlan(IFile file);
-	
-	public JAXBElement createServiceDeploymentPlan(IFile file);
 
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=675428&r1=675427&r2=675428&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
Wed Jul  9 20:39:27 2008
@@ -30,7 +30,6 @@
             <moduleType types="jst.ejb" versions="1.1, 2.0, 2.1, 3.0"/>
             <moduleType types="jst.connector" versions="1.0, 1.5"/>
             <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0"/>
-            <moduleType types="jst.utility" versions="1.0"/>
         </runtimeType>
     </extension>
     
@@ -116,7 +115,6 @@
                     <requires facet="jst.web" version="2.3"/>
                     <requires facet="jst.web" version="2.4"/>
                     <requires facet="jst.web" version="2.5"/>
-                    <requires facet="jst.utility" version="1.0"/>
                 </or>
             </constraint>
         </project-facet-version>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=675428&r1=675427&r2=675428&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
Wed Jul  9 20:39:27 2008
@@ -37,7 +37,6 @@
             <moduleType types="jst.ejb"       versions="1.1, 2.0, 2.1, 3.0"/>
             <moduleType types="jst.connector" versions="1.0, 1.5"/>
             <moduleType types="jst.ear"       versions="1.2, 1.3, 1.4, 5.0"/>
-            <moduleType types="jst.utility"   versions="1.0"/>
         </runtimeType>
     </extension>
     
@@ -141,7 +140,6 @@
                     <requires facet="jst.web" version="2.3"/>
                     <requires facet="jst.web" version="2.4"/>
                     <requires facet="jst.web" version="2.5"/>
-                    <requires facet="jst.utility" version="1.0"/>
                 </or>
             </constraint>
         </project-facet-version>

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=675428&r1=675427&r2=675428&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
Wed Jul  9 20:39:27 2008
@@ -156,22 +156,6 @@
 	}
 
 		
-	public JAXBElement createServiceDeploymentPlan(IFile dpFile) {
-  		Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createServiceDeploymentPlan",
dpFile);
-
-		org.apache.geronimo.jee.deployment.ObjectFactory serviceFactory = new org.apache.geronimo.jee.deployment.ObjectFactory();
-		org.apache.geronimo.jee.deployment.Module module = serviceFactory.createModule();
-
-		module.setEnvironment(getConfigEnvironment());
-
-		JAXBElement jaxbElement = serviceFactory.createModule(module);
-		JAXBUtils.marshalDeploymentPlan(jaxbElement, dpFile);
-
-		Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createServiceDeploymentPlan",
jaxbElement);
-		return jaxbElement;
-	}
-
-	
 	/*
 	 * (non-Javadoc)
 	 * 



Mime
View raw message