You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/08/22 03:48:15 UTC
svn commit: r568369 - in
/portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins:
InitDbMojo.java ResourceBundleUnpacker.java UnpackResourcesMojo.java
Author: ate
Date: Tue Aug 21 18:48:14 2007
New Revision: 568369
URL: http://svn.apache.org/viewvc?rev=568369&view=rev
Log:
JS2-772: A new maven-2 unpack-resources plugin for extracting selected portal resources
- less info logging by default, which can be renabled through a verbose configuration setting
- fixing extracting one resource to multiple targets
Modified:
portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/InitDbMojo.java
portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/ResourceBundleUnpacker.java
portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/UnpackResourcesMojo.java
Modified: portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/InitDbMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/InitDbMojo.java?rev=568369&r1=568368&r2=568369&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/InitDbMojo.java (original)
+++ portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/InitDbMojo.java Tue Aug 21 18:48:14 2007
@@ -217,7 +217,7 @@
{
unpackResources.setTargetBaseDirectory(project.getBuild().getDirectory());
}
- ResourceBundleUnpacker.unpackResources(file, unpackResources.getTargetBaseDirectory(), resources, getLog());
+ ResourceBundleUnpacker.unpackResources(file, unpackResources.getTargetBaseDirectory(), resources, getLog(), false);
}
if ( (sqlScripts != null && sqlScripts.length > 0) || seedConfig != null )
Modified: portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/ResourceBundleUnpacker.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/ResourceBundleUnpacker.java?rev=568369&r1=568368&r2=568369&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/ResourceBundleUnpacker.java (original)
+++ portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/ResourceBundleUnpacker.java Tue Aug 21 18:48:14 2007
@@ -20,6 +20,7 @@
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
@@ -76,7 +77,7 @@
}
}
- public static void unpackResources(File resourceBundleFile, String targetBaseDirectory, Resources[] resources, Log log) throws MojoExecutionException
+ public static void unpackResources(File resourceBundleFile, String targetBaseDirectory, Resources[] resources, Log log, boolean verbose) throws MojoExecutionException
{
File targetBaseDir = new File(targetBaseDirectory);
if ( targetBaseDir.exists())
@@ -93,11 +94,14 @@
{
zis = new ZipInputStream( new FileInputStream( resourceBundleFile ) );
ZipEntry ze = null;
+ InputStream is = null;
+ File firstDestFile;
while ( ( ze = zis.getNextEntry() ) != null )
{
if (!ze.isDirectory())
{
+ firstDestFile = null;
for ( int i = 0; i < resources.length; i++ )
{
String destFileName = resources[i].getDestFileName(ze.getName(), targetBaseDirectory);
@@ -112,7 +116,14 @@
}
if ( destFile.lastModified() >= ze.getTime() || !resources[i].isOverwrite() )
{
- log.info(ze.getName()+" skipped: already exists at "+destFile.getAbsolutePath());
+ if (verbose)
+ {
+ log.info(ze.getName()+" skipped: already exists at "+destFile.getAbsolutePath());
+ }
+ else
+ {
+ log.debug(ze.getName()+" skipped: already exists at "+destFile.getAbsolutePath());
+ }
continue;
}
}
@@ -125,10 +136,19 @@
FileOutputStream fos = null;
try
{
+ if (firstDestFile == null)
+ {
+ firstDestFile = destFile;
+ is = zis;
+ }
+ else
+ {
+ is = new FileInputStream(firstDestFile);
+ }
fos = new FileOutputStream( destFile );
while ( ( length =
- zis.read( buffer ) ) >= 0 )
+ is.read( buffer ) ) >= 0 )
{
fos.write( buffer, 0, length );
}
@@ -138,6 +158,17 @@
}
finally
{
+ if (is != zis)
+ {
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ }
+ }
+
if ( fos != null )
{
try
@@ -150,7 +181,14 @@
}
}
destFile.setLastModified(ze.getTime());
- log.info(ze.getName()+" extracted to "+destFile.getAbsolutePath());
+ if (verbose)
+ {
+ log.info(ze.getName()+" extracted to "+destFile.getAbsolutePath());
+ }
+ else
+ {
+ log.debug(ze.getName()+" extracted to "+destFile.getAbsolutePath());
+ }
}
}
}
Modified: portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/UnpackResourcesMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/UnpackResourcesMojo.java?rev=568369&r1=568368&r2=568369&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/UnpackResourcesMojo.java (original)
+++ portals/jetspeed-2/trunk/maven/jetspeed-maven-plugins/src/main/java/org/apache/jetspeed/maven/plugins/UnpackResourcesMojo.java Tue Aug 21 18:48:14 2007
@@ -59,6 +59,12 @@
private boolean skip;
/**
+ * When true, INFO log copied/skipped resources
+ * @parameter default-value="false"
+ */
+ private boolean verbose;
+
+ /**
* @parameter
*/
private PlexusConfiguration resources;
@@ -155,6 +161,6 @@
targetBaseDirectory = project.getBuild().getDirectory();
}
File file = ResourceBundleUnpacker.getRemoteResourceBundle(resourceBundle, downloader, localRepository, remoteRepositories, artifactRepositoryFactory, mavenSession);
- ResourceBundleUnpacker.unpackResources(file, targetBaseDirectory, unpackResources, getLog());
+ ResourceBundleUnpacker.unpackResources(file, targetBaseDirectory, unpackResources, getLog(), verbose);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org