You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2006/11/04 12:22:17 UTC

svn commit: r471164 - /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java

Author: lgawron
Date: Sat Nov  4 03:22:15 2006
New Revision: 471164

URL: http://svn.apache.org/viewvc?view=rev&rev=471164
Log:
extract proper destination path
probably needs checking on other platforms

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java?view=diff&rev=471164&r1=471163&r2=471164
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java Sat Nov  4 03:22:15 2006
@@ -29,6 +29,7 @@
 
 import javax.servlet.ServletContext;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -94,12 +95,16 @@
                 final JarFile jarFile = connection.getJarFile();
                 String blockName = jarFile.getManifest().getMainAttributes().getValue("Implementation-Title");
                 if ( blockName == null ) {
-                    blockName = jarFile.getName();
+                    String jarPath = jarFile.getName();
+                    // extract jar name
+                    String jarName = jarPath.substring(jarPath.lastIndexOf(File.separatorChar) + 1);
+                    // drop file extension
+                    blockName = jarName.substring(0, jarName.lastIndexOf('.'));
                 }
                 final StringBuffer buffer = new StringBuffer(this.destinationDirectory);
-                buffer.append(File.separator);
+                buffer.append(File.separatorChar);
                 buffer.append(relativeDirectory);
-                buffer.append(File.separator);
+                buffer.append(File.separatorChar);
                 buffer.append(blockName);
                 this.deploy(jarFile, resourcePattern, buffer.toString());
             }