geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment DeploymentHelper.java
Date Mon, 17 Nov 2003 00:16:43 GMT
dain        2003/11/16 16:16:43

  Modified:    modules/kernel/src/java/org/apache/geronimo/kernel/deployment
                        DeploymentHelper.java
  Log:
  Removed the check for file endings and only use the meta directory contents
  
  Revision  Changes    Path
  1.3       +12 -11    incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/DeploymentHelper.java
  
  Index: DeploymentHelper.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/deployment/DeploymentHelper.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DeploymentHelper.java	16 Nov 2003 02:09:36 -0000	1.2
  +++ DeploymentHelper.java	17 Nov 2003 00:16:43 -0000	1.3
  @@ -88,22 +88,21 @@
        * @param url Deployment URL.
        * @param urlType Type of the URL.
        */
  -    public DeploymentHelper(URL url, URLType urlType, String objectNameTypeName, String
archiveType, String j2eeDDName, String geronimoDDName) throws DeploymentException {
  +    public DeploymentHelper(URL url, URLType urlType, String objectNameTypeName, String
j2eeDDName, String geronimoDDName) throws DeploymentException {
  +        this(url, urlType, objectNameTypeName, j2eeDDName, geronimoDDName, "META-INF");
  +    }
  +
  +    public DeploymentHelper(URL url, URLType urlType, String objectNameTypeName, String
j2eeDDName, String geronimoDDName, String infDir) throws DeploymentException {
           this.url = url;
           this.urlType = urlType;
           this.objectNameTypeName = objectNameTypeName;
           try {
               if (URLType.PACKED_ARCHIVE == urlType) {
  -                if (!this.url.getPath().endsWith(archiveType)) {
  -                    j2eeURL = null;
  -                    geronimoURL = null;
  -                    return;
  -                }
  -                j2eeURL = new URL("jar:" + this.url.toExternalForm() + "!/META-INF/" +
j2eeDDName);
  -                geronimoURL = new URL("jar:" + this.url.toExternalForm() + "!/META-INF/"
+ geronimoDDName);
  +                j2eeURL = new URL("jar:" + this.url.toExternalForm() + "!/" + infDir +
"/" + j2eeDDName);
  +                geronimoURL = new URL("jar:" + this.url.toExternalForm() + "!/" + infDir
+ "/" + geronimoDDName);
               } else if (URLType.UNPACKED_ARCHIVE == urlType) {
  -                j2eeURL = new URL(this.url, "META-INF/" + j2eeDDName);
  -                geronimoURL = new URL(this.url, "META-INF/" + geronimoDDName);
  +                j2eeURL = new URL(this.url, infDir + "/" + j2eeDDName);
  +                geronimoURL = new URL(this.url, infDir + "/" + geronimoDDName);
               } else {
                   j2eeURL = null;
                   geronimoURL = null;
  @@ -129,6 +128,7 @@
           }
   
       }
  +
       /**
        * Locates the URL referencing the ra.xml deployment descriptor.
        *
  @@ -174,6 +174,7 @@
           }
           return classSpaceMetaData;
       }
  +
       /**
        * Intended to be overridden for all but the simplest packages
        * @param archives
  
  
  

Mime
View raw message