geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1302648 - /geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
Date Mon, 19 Mar 2012 20:34:05 GMT
Author: gawor
Date: Mon Mar 19 20:34:05 2012
New Revision: 1302648

URL: http://svn.apache.org/viewvc?rev=1302648&view=rev
Log:
fix ConfigIDExtractor jarFile handling as it is completely broken

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=1302648&r1=1302647&r2=1302648&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 Mar 19 20:34:05 2012
@@ -128,15 +128,15 @@ public class ConfigIDExtractor {
             //      though that would probably be a little heavyweight.
             try {
                 JarEntry entry;
-                if(input.getJarEntry("WEB-INF/web.xml") != null || new File(module, "WEB-INF/geronimo-web.xml")
!= null) {
+                if(input.getJarEntry("WEB-INF/web.xml") != null || input.getJarEntry("WEB-INF/geronimo-web.xml")
!= null) {
                     entry = input.getJarEntry("WEB-INF/geronimo-web.xml");
-                } else if(input.getJarEntry("META-INF/application.xml") != null || new File(module,
"META-INF/geronimo-application.xml") != null) {
+                } else if(input.getJarEntry("META-INF/application.xml") != null || input.getJarEntry("META-INF/geronimo-application.xml")
!= null) {
                     entry = input.getJarEntry("META-INF/geronimo-application.xml");
-                } else if(input.getJarEntry("META-INF/ejb-jar.xml") != null || new File(module,
"META-INF/openejb-jar.xml") != null) {
+                } else if(input.getJarEntry("META-INF/ejb-jar.xml") != null || input.getJarEntry("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) {
+                } else if(input.getJarEntry("META-INF/ra.xml") != null || input.getJarEntry("META-INF/geronimo-ra.xml")
!= null) {
                     entry = input.getJarEntry("META-INF/geronimo-ra.xml");
-                } else if(input.getJarEntry("META-INF/application-client.xml") != null ||
new File(module, "META-INF/geronimo-application-client.xml") != null) {
+                } else if(input.getJarEntry("META-INF/application-client.xml") != null ||
input.getJarEntry("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