Author: snicoll
Date: Tue Aug 7 15:14:53 2007
New Revision: 563678
URL: http://svn.apache.org/viewvc?view=rev&rev=563678
Log:
Refactored stuff in the util package.
Added:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java
(contents, props changed)
- copied, changed from r563670,
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/CompositeMap.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java
(contents, props changed)
- copied, changed from r563670,
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/PropertyUtils.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java
(contents, props changed)
- copied, changed from r563670,
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/ReflectionProperties.java
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
- copied, changed from r563670,
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/MappingUtilsTest.java
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java
(contents, props changed)
- copied, changed from r563670,
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/PropertyUtilsTest.java
Removed:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/CompositeMap.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/PropertyUtils.java
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/ReflectionProperties.java
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/MappingUtilsTest.java
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/PropertyUtilsTest.java
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Modified:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?view=diff&rev=563678&r1=563677&r2=563678
==============================================================================
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Tue Aug 7 15:14:53 2007
@@ -30,6 +30,9 @@
import org.apache.maven.plugin.war.packaging.WarPackagingContext;
import org.apache.maven.plugin.war.packaging.WarPackagingTask;
import org.apache.maven.plugin.war.packaging.WarProjectPackagingTask;
+import org.apache.maven.plugin.war.util.CompositeMap;
+import org.apache.maven.plugin.war.util.PropertyUtils;
+import org.apache.maven.plugin.war.util.ReflectionProperties;
import org.apache.maven.plugin.war.util.WebappStructure;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.archiver.jar.JarArchiver;
Copied:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java
(from r563670,
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/CompositeMap.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java?view=diff&rev=563678&p1=maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/CompositeMap.java&r1=563670&p2=maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java&r2=563678
==============================================================================
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/CompositeMap.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java
Tue Aug 7 15:14:53 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugin.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/CompositeMap.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java
(from r563670,
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/PropertyUtils.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java?view=diff&rev=563678&p1=maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/PropertyUtils.java&r1=563670&p2=maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java&r2=563678
==============================================================================
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/PropertyUtils.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java
Tue Aug 7 15:14:53 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugin.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -47,6 +47,7 @@
* @param fail wheter to throw an exception when the file cannot
be loaded or to return null
* @param useSystemProps wheter to incorporate System.getProperties
settings into the returned Properties object.
* @return the loaded and fully resolved Properties object
+ * @throws IOException if an error failed while loading the properties
*/
public static Properties loadPropertyFile( File propfile, boolean fail,
boolean useSystemProps )
throws IOException
@@ -94,6 +95,10 @@
* the value of a property contains a key), and will
* not loop endlessly on a pair like
* test = ${test}.
+ *
+ * @param k the token
+ * @param p the properties containing the filter values
+ * @return the value
*/
private static String getPropertyValue( String k, Properties p )
{
Propchange:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/PropertyUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java
(from r563670,
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/ReflectionProperties.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java?view=diff&rev=563678&p1=maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/ReflectionProperties.java&r1=563670&p2=maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java&r2=563678
==============================================================================
---
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/ReflectionProperties.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java
Tue Aug 7 15:14:53 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugin.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MWAR-97-2/src/main/java/org/apache/maven/plugin/war/util/ReflectionProperties.java
------------------------------------------------------------------------------
svn:keywords = Id
Copied:
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
(from r563670,
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/MappingUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java?view=diff&rev=563678&p1=maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/MappingUtilsTest.java&r1=563670&p2=maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java&r2=563678
==============================================================================
---
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/MappingUtilsTest.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/MappingUtilsTest.java
Tue Aug 7 15:14:53 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugin.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,6 @@
import junit.framework.TestCase;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.war.stub.AbstractArtifactStub;
-import org.apache.maven.plugin.war.util.MappingUtils;
/**
* Tests the mapping of file names.
Copied:
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java
(from r563670,
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/PropertyUtilsTest.java)
URL:
http://svn.apache.org/viewvc/maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java?view=diff&rev=563678&p1=maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/PropertyUtilsTest.java&r1=563670&p2=maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java&r2=563678
==============================================================================
---
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/PropertyUtilsTest.java
(original)
+++
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java
Tue Aug 7 15:14:53 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.war;
+package org.apache.maven.plugin.war.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/branches/MWAR-97-2/src/test/java/org/apache/maven/plugin/war/util/PropertyUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
