geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r797365 - 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.v21.core/src/main/java/org/apache/geronimo/st/v21/core/
Date Fri, 24 Jul 2009 08:44:00 GMT
Author: mcconne
Date: Fri Jul 24 08:44:00 2009
New Revision: 797365

URL: http://svn.apache.org/viewvc?rev=797365&view=rev
Log:
GERONIMODEVTOOLS-567 Deploy EJB jar even without openejb-jar.xml file -- Thanks to Delos Dai
for this patch !!

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.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=797365&r1=797364&r2=797365&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 24 08:44:00 2009
@@ -162,6 +162,12 @@
                                 reorderedKinds.add(moduleDeltaKind);
                             }
                         }
+                    }else {
+                    	//no environment defined, do just as no parents
+                        if (!reorderedModules.contains(module)) {
+                            reorderedModules.add(module);
+                            reorderedKinds.add(moduleDeltaKind);
+                        }
                     }
                 }
             }

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=797365&r1=797364&r2=797365&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 24 08:44:00 2009
@@ -116,24 +116,32 @@
 
         Environment environment = null;
         if (isWebModule(module)) {
-            WebApp plan = getWebDeploymentPlan(module).getValue();
-            if (plan != null)
-                environment = plan.getEnvironment();
+            if (getWebDeploymentPlan(module)!=null) {
+            	WebApp plan = getWebDeploymentPlan(module).getValue();
+            	if (plan != null)
+            		environment = plan.getEnvironment();
+            }
         }
         else if (isEjbJarModule(module)) {
-            OpenejbJar plan = getOpenEjbDeploymentPlan(module).getValue();
-//            if (plan != null)
-//                environment = plan.getEnvironment();
+        	   if (getOpenEjbDeploymentPlan(module)!=null) {
+		            OpenejbJar plan = getOpenEjbDeploymentPlan(module).getValue();
+		            if (plan != null)
+		            	environment = plan.getEnvironment();
+        	   }
         }
         else if (isEarModule(module)) {
-            Application plan = getApplicationDeploymentPlan(module).getValue();
-            if (plan != null)
-                environment = plan.getEnvironment();
+        	if (getApplicationDeploymentPlan(module)!=null) {
+        		Application plan = getApplicationDeploymentPlan(module).getValue();
+        		if (plan != null)
+        			environment = plan.getEnvironment();
+        	}
         }
         else if (isRARModule(module)) {
-            Connector plan = getConnectorDeploymentPlan(module).getValue();
-            if (plan != null)
-                environment = plan.getEnvironment();
+        	if (getConnectorDeploymentPlan(module)!=null) {
+	            Connector plan = getConnectorDeploymentPlan(module).getValue();
+	            if (plan != null)
+	                environment = plan.getEnvironment();
+        	}
         }
 
         if (environment != null



Mime
View raw message