geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From johnx...@apache.org
Subject svn commit: r1294055 - /geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
Date Mon, 27 Feb 2012 08:18:38 GMT
Author: johnxiao
Date: Mon Feb 27 08:18:38 2012
New Revision: 1294055

URL: http://svn.apache.org/viewvc?rev=1294055&view=rev
Log:
GERONIMO-6260 Could not redeploy EJB module

Modified:
    geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java

Modified: geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=1294055&r1=1294054&r2=1294055&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
(original)
+++ geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
Mon Feb 27 08:18:38 2012
@@ -82,15 +82,15 @@ public class ConfigIDExtractor {
         }
         if(module.isDirectory()) {
             File target;
-            if(new File(module, "WEB-INF/web.xml").canRead()) {
+            if(new File(module, "WEB-INF/web.xml").canRead() || new File(module, "WEB-INF/geronimo-web.xml").canRead())
{
                 target = new File(module, "WEB-INF/geronimo-web.xml");
-            } else if(new File(module, "META-INF/application.xml").canRead()) {
+            } else if(new File(module, "META-INF/application.xml").canRead() || new File(module,
"META-INF/geronimo-application.xml").canRead()) {
                 target = new File(module, "META-INF/geronimo-application.xml");
-            } else if(new File(module, "META-INF/ejb-jar.xml").canRead()) {
-                target = new File(module, "META-INF/openejb-jar.xml");
-            } else if(new File(module, "META-INF/ra.xml").canRead()) {
+            } else if (new File(module, "META-INF/ejb-jar.xml").canRead() || new File(module,
"META-INF/openejb-jar.xml").canRead()) {
+            	target = new File(module, "META-INF/openejb-jar.xml");
+            } else if(new File(module, "META-INF/ra.xml").canRead() || new File(module, "META-INF/geronimo-ra.xml").canRead())
{
                 target = new File(module, "META-INF/geronimo-ra.xml");
-            } else if(new File(module, "META-INF/application-client.xml").canRead()) {
+            } else if(new File(module, "META-INF/application-client.xml").canRead() || new
File(module, "META-INF/geronimo-application-client.xml").canRead()) {
                 target = new File(module, "META-INF/geronimo-application-client.xml");
             }  else if(new File(module,"META-INF/APPLICATION.MF").canRead()) {
                 target = new File(module,"META-INF/APPLICATION.MF");
@@ -125,15 +125,15 @@ public class ConfigIDExtractor {
             //      though that would probably be a little heavyweight.
             try {
                 JarEntry entry;
-                if(input.getJarEntry("WEB-INF/web.xml") != null) {
+                if(input.getJarEntry("WEB-INF/web.xml") != null || new File(module, "WEB-INF/geronimo-web.xml")
!= null) {
                     entry = input.getJarEntry("WEB-INF/geronimo-web.xml");
-                } else if(input.getJarEntry("META-INF/application.xml") != null) {
+                } else if(input.getJarEntry("META-INF/application.xml") != null || new File(module,
"META-INF/geronimo-application.xml") != null) {
                     entry = input.getJarEntry("META-INF/geronimo-application.xml");
-                } else if(input.getJarEntry("META-INF/ejb-jar.xml") != null) {
-                    entry = input.getJarEntry("META-INF/openejb-jar.xml");
-                } else if(input.getJarEntry("META-INF/ra.xml") != null) {
+                } else if(input.getJarEntry("META-INF/ejb-jar.xml") != null || new File(module,
"META-INF/openejb-jar.xml") != null) {
+                	entry = input.getJarEntry("META-INF/openejb-jar.xml");
+                } else if(input.getJarEntry("META-INF/ra.xml") != null || new File(module,
"META-INF/geronimo-ra.xml") != null) {
                     entry = input.getJarEntry("META-INF/geronimo-ra.xml");
-                } else if(input.getJarEntry("META-INF/application-client.xml") != null) {
+                } else if(input.getJarEntry("META-INF/application-client.xml") != null ||
new File(module, "META-INF/geronimo-application-client.xml") != null) {
                     entry = input.getJarEntry("META-INF/geronimo-application-client.xml");
                 }  else if(input.getJarEntry("META-INF/APPLICATION.MF") != null) {
                     entry = input.getJarEntry("META-INF/APPLICATION.MF");



Mime
View raw message