You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sn...@apache.org on 2007/08/10 00:22:22 UTC
svn commit: r564406 - in
/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war:
packaging/ArtifactsPackagingTask.java
packaging/WarProjectPackagingTask.java util/WebappStructure.java
util/WebappStructureSerializer.java
Author: snicoll
Date: Thu Aug 9 15:22:21 2007
New Revision: 564406
URL: http://svn.apache.org/viewvc?view=rev&rev=564406
Log:
- Removed wrong warning message (war type is handled)
- Create the parent of the cache if necessary
- The cache is now read properly
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
Modified: maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java?view=diff&rev=564406&r1=564405&r2=564406
==============================================================================
--- maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java (original)
+++ maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/ArtifactsPackagingTask.java Thu Aug 9 15:22:21 2007
@@ -80,6 +80,10 @@
targetFileName = targetFileName.substring( 0, targetFileName.lastIndexOf( '.' ) ) + ".jar";
copyFile( id, context, artifact.getFile(), LIB_PATH + targetFileName );
}
+ else if ( "war".equals( type ) )
+ {
+ // Nothing to do here, it is an overlay and it's already handled
+ }
else
{
context.getLog().debug(
Modified: maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java?view=diff&rev=564406&r1=564405&r2=564406
==============================================================================
--- maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java (original)
+++ maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java Thu Aug 9 15:22:21 2007
@@ -54,6 +54,7 @@
throws MojoExecutionException, MojoFailureException
{
+ context.getLog().info( "Processing war project" );
// Prepare the INF directories
File webinfDir = new File( context.getWebappDirectory(), WEB_INF_PATH );
webinfDir.mkdirs();
Modified: maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java?view=diff&rev=564406&r1=564405&r2=564406
==============================================================================
--- maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java (original)
+++ maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructure.java Thu Aug 9 15:22:21 2007
@@ -19,19 +19,18 @@
public class WebappStructure
{
- private final Map registeredFiles;
+ private Map registeredFiles;
- private final transient PathSet allFiles;
+ private transient PathSet allFiles = new PathSet();
- private final transient WebappStructure cache;
+ private transient WebappStructure cache;
/**
* Creates a new empty instance.
*/
- private WebappStructure()
+ public WebappStructure()
{
this.registeredFiles = new HashMap();
- this.allFiles = new PathSet();
this.cache = null;
}
@@ -43,7 +42,6 @@
public WebappStructure( WebappStructure cache )
{
this.registeredFiles = new HashMap();
- this.allFiles = new PathSet();
if ( cache == null )
{
this.cache = new WebappStructure();
@@ -209,6 +207,19 @@
{
getFullStructure().add( path );
getStructure( id ).add( path );
+ }
+
+ private Object readResolve()
+ {
+ // the full structure should be resolved so let's rebuild it
+ this.allFiles = new PathSet();
+ final Iterator it = registeredFiles.values().iterator();
+ while ( it.hasNext() )
+ {
+ PathSet pathSet = (PathSet) it.next();
+ this.allFiles.addAll( pathSet );
+ }
+ return this;
}
/**
Modified: maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java?view=diff&rev=564406&r1=564405&r2=564406
==============================================================================
--- maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java (original)
+++ maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/WebappStructureSerializer.java Thu Aug 9 15:22:21 2007
@@ -69,6 +69,12 @@
FileWriter writer = null;
try
{
+ if ( !targetFile.getParentFile().exists() && !targetFile.getParentFile().mkdirs() )
+ {
+ throw new IOException(
+ "Could not create parent[" + targetFile.getParentFile().getAbsolutePath() + "]" );
+ }
+
if ( !targetFile.exists() && !targetFile.createNewFile() )
{
throw new IOException( "Could not create file[" + targetFile.getAbsolutePath() + "]" );