Author: olamy
Date: Sun Nov 6 14:13:09 2011
New Revision: 1198376
URL: http://svn.apache.org/viewvc?rev=1198376&view=rev
Log:
[MTOMCAT-100] support war overlay to add war external dependencies in tomcat run
fix extraction of war overlay content files was extracted in .
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1198376&r1=1198375&r2=1198376&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java
Sun Nov 6 14:13:09 2011
@@ -28,6 +28,7 @@ import org.codehaus.plexus.archiver.Arch
import org.codehaus.plexus.archiver.UnArchiver;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+import org.codehaus.plexus.archiver.zip.ZipUnArchiver;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.StringUtils;
@@ -130,6 +131,8 @@ public class DefaultClassLoaderEntriesCa
File tmpDir = new File( tmpExtractDatas,
artifact.getArtifactId() );
+ tmpDir.mkdirs();
+
tmpDirectories.add( tmpDir );
try
@@ -140,6 +143,8 @@ public class DefaultClassLoaderEntriesCa
unArchiver.setSourceFile( warFile );
unArchiver.setDestDirectory( tmpDir );
unArchiver.extract();
+
+
File libsDirectory = new File( tmpDir, "WEB-INF/lib" );
if ( libsDirectory.exists() )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
