You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/01/20 00:52:45 UTC
svn commit: r613480 - in /maven/plugins/trunk/maven-resources-plugin: ./
src/it/filter/ src/main/java/org/apache/maven/plugin/resources/ src/site/
src/site/apt/ src/site/apt/examples/ src/site/fml/
src/test/java/org/apache/maven/plugin/resources/ src/t...
Author: vsiveton
Date: Sat Jan 19 15:52:44 2008
New Revision: 613480
URL: http://svn.apache.org/viewvc?rev=613480&view=rev
Log:
o fixed license header
o no code change
Modified:
maven/plugins/trunk/maven-resources-plugin/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/include-exclude.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/resource-directory.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt
maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt
maven/plugins/trunk/maven-resources-plugin/src/site/fml/faq.fml
maven/plugins/trunk/maven-resources-plugin/src/site/site.xml
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AdvancePropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/EnhancedPropertyUtilsTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ReflectionPropertiesTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java
maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java
maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/reflectionproperties-test/plugin-config.xml
maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-absolute-path.xml
maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-relative-path.xml
maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config.xml
Modified: maven/plugins/trunk/maven-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/pom.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/pom.xml Sat Jan 19 15:52:44 2008
@@ -1,4 +1,24 @@
-<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd' xmlns='http://maven.apache.org/POM/4.0.0'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
@@ -8,16 +28,16 @@
<artifactId>maven-resources-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Resources Plugin</name>
- <description>
- The Resources Plugin handles the copying or transfering of project resources to the output directory. Resources
- are categorized into two: main resources and test resources. The difference is that the main resources are the
- resources associated to the main code while teh test resources are that of the test code.
-
+ <description>
+ The Resources Plugin handles the copying or transfering of project resources to the output directory. Resources
+ are categorized into two: main resources and test resources. The difference is that the main resources are the
+ resources associated to the main code while teh test resources are that of the test code.
+
This, thus, allows the separation of resources of the main code (what your plugin actually does) and its unit
tests.
</description>
<version>2.3-SNAPSHOT</version>
- <issueManagement>
+ <issueManagement>
<system> jira </system>
<url>http://jira.codehaus.org/browse/MRESOURCES</url>
</issueManagement>
Modified: maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/filter/pom.xml Sat Jan 19 15:52:44 2008
@@ -1,6 +1,24 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins</groupId>
@@ -20,10 +38,10 @@
</filters>
</build>
- <!--
- Look at SomeResource.txt after being processed with filtering.
+ <!--
+ Look at SomeResource.txt after being processed with filtering.
Note the tokens for ${projectProperty} and ${profileProperty} for the "filter resolution" case should be resolved and evaluated
- using the POM property values of the filter tokens
+ using the POM property values of the filter tokens
-->
<properties>
<projectProperty>foo-projectProperty-bar</projectProperty>
Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/PropertyUtils.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.codehaus.plexus.util.IOUtil;
@@ -44,7 +47,7 @@
* The properties are resolved iteratively, so if the value of property A refers to property B, then after resolution
* the value of property B will contain the value of property B.
* </p>
- *
+ *
* @param propFile The property file to load.
* @param baseProps Properties containing the initial values to subsitute into the properties file.
* @return Properties object containing the properties in the file with their values fully resolved.
@@ -76,7 +79,7 @@
// The algorithm iterates only over the fileProps which is all that is required to resolve
// the properties defined within the file. This is slighlty different to current, however
// I suspect that this was the actual original intent.
- //
+ //
// The difference is that #loadPropertyFile(File, boolean, boolean) also resolves System properties
// whose values contain expressions. I believe this is unexpected and is not validated by the test cases,
// as can be verified by replacing the implementation of #loadPropertyFile(File, boolean, boolean)
@@ -103,27 +106,27 @@
public static Properties loadPropertyFile( File propfile, boolean fail, boolean useSystemProps )
throws IOException
{
-
+
final Properties baseProps = new Properties();
- if (useSystemProps)
+ if (useSystemProps)
{
baseProps.putAll(System.getProperties());
}
final Properties resolvedProps = new Properties();
- try
+ try
{
resolvedProps.putAll(loadPropertyFile(propfile, baseProps));
} catch (FileNotFoundException e)
{
- if (fail)
+ if (fail)
{
throw new FileNotFoundException(propfile.toString());
}
}
- if (useSystemProps)
+ if (useSystemProps)
{
resolvedProps.putAll(baseProps);
}
Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ReflectionProperties.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.maven.project.MavenProject;
@@ -35,7 +38,7 @@
boolean escapedBackslashesInFilePath;
- public ReflectionProperties( MavenProject aProject, boolean escapedBackslashesInFilePath )
+ public ReflectionProperties( MavenProject aProject, boolean escapedBackslashesInFilePath )
{
super();
@@ -43,11 +46,11 @@
this.escapedBackslashesInFilePath = escapedBackslashesInFilePath;
}
-
+
public Object get( Object key )
{
Object value = null;
- try
+ try
{
value = ReflectionValueExtractor.evaluate( "" + key , project );
@@ -64,10 +67,10 @@
}
}
}
- catch ( Exception e )
+ catch ( Exception e )
{
//TODO: remove the try-catch block when ReflectionValueExtractor.evaluate() throws no more exceptions
- }
+ }
return value;
}
}
Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/ResourcesMojo.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2005 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.maven.model.Resource;
@@ -46,14 +49,14 @@
public class ResourcesMojo
extends AbstractMojo
{
-
+
/**
* The character encoding scheme to be applied.
- *
+ *
* @parameter
*/
private String encoding;
-
+
/**
* The output directory into which to copy the resources.
*
@@ -84,9 +87,9 @@
private static final String[] DEFAULT_INCLUDES = {"**/**"};
/**
- * The list of additional key-value pairs aside from that of the System,
- * and that of the project, which would be used for the filtering.
- *
+ * The list of additional key-value pairs aside from that of the System,
+ * and that of the project, which would be used for the filtering.
+ *
* @parameter expression="${project.build.filters}"
*/
private List filters;
@@ -110,7 +113,7 @@
{
getLog().info( "Using '" + encoding + "' to copy filtered resources." );
}
-
+
for ( Iterator i = resources.iterator(); i.hasNext(); )
{
Resource resource = (Resource) i.next();
@@ -201,26 +204,26 @@
throws MojoExecutionException
{
filterProperties = new Properties();
-
+
// System properties
filterProperties.putAll( System.getProperties() );
-
+
// Project properties
filterProperties.putAll( project.getProperties() );
-
- // Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated
- // to subsequent filter files. NB this replicates current behaviour and seems to make sense.
+
+ // Take a copy of filterProperties to ensure that evaluated filterTokens are not propagated
+ // to subsequent filter files. NB this replicates current behaviour and seems to make sense.
final Properties baseProps = new Properties();
baseProps.putAll( this.filterProperties );
-
+
for ( Iterator i = filters.iterator(); i.hasNext(); )
{
String filtersfile = (String) i.next();
-
+
try
{
Properties properties = PropertyUtils.loadPropertyFile( new File( filtersfile ), baseProps );
-
+
filterProperties.putAll( properties );
}
catch ( IOException e )
Modified: maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/TestResourcesMojo.java Sat Jan 19 15:52:44 2008
@@ -1,30 +1,32 @@
package org.apache.maven.plugin.resources;
-import org.apache.maven.plugin.MojoExecutionException;
-
-import java.util.List;
-
/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
+import org.apache.maven.plugin.MojoExecutionException;
+
+import java.util.List;
import java.io.File;
/**
* Copy resources for the test source code to the test output directory.
- *
+ *
* @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
* @version $Id$
@@ -36,7 +38,7 @@
{
/**
* The output directory into which to copy the resources.
- *
+ *
* @parameter expression="${project.build.testOutputDirectory}"
* @required
*/
@@ -44,7 +46,7 @@
/**
* The list of resources we want to transfer.
- *
+ *
* @parameter expression="${project.testResources}"
* @required
*/
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/encoding.apt Sat Jan 19 15:52:44 2008
@@ -6,6 +6,25 @@
July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
Specifying a character encoding scheme
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/filter.apt Sat Jan 19 15:52:44 2008
@@ -6,21 +6,40 @@
July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
Filtering
- Variables can be included in your resources. These variables, denoted by the
- $\{...\} delimiters, can come from the System properties, your project
- properties, from your filter resources and from the command lines.
-
+ Variables can be included in your resources. These variables, denoted by the
+ $\{...\} delimiters, can come from the System properties, your project
+ properties, from your filter resources and from the command lines.
+
For example, if we have a resource src/main/resources/hello.txt containing
-
+
+-----+
Hello ${name}
+-----+
And a pom like this
-
+
+-----+
<project>
[...]
@@ -40,14 +59,14 @@
[...]
</project>
+-----+
-
+
Upon calling
-
+
+-----+
mvn resources:resources
+-----+
- This will create a resource output in target/class/hello.txt which contains
+ This will create a resource output in target/class/hello.txt which contains
exactly the same.
+-----+
@@ -55,7 +74,7 @@
+-----+
However, if we add a filtering tag to our pom and set it to true such as this
-
+
+-----+
[...]
<resource>
@@ -65,41 +84,41 @@
[...]
+-----+
- Our target/class/hello.txt after calling
-
+ Our target/class/hello.txt after calling
+
+-----+
-mvn resources:resources
+mvn resources:resources
+-----+
-
+
would be
-
+
+-----+
Hello My Resources Plugin Practice Project
+-----+
- That's because the name variable was replaced by the value of the project's
+ That's because the name variable was replaced by the value of the project's
name (which was specified
in the pom).
-
- Moreover, we can also assign values through the command line using the "-D"
- tag. For example, to change the value for the variable name to "world", we can
+
+ Moreover, we can also assign values through the command line using the "-D"
+ tag. For example, to change the value for the variable name to "world", we can
simply invoke this command
-
+
+-----+
mvn resources:resources -Dname="world"
+-----+
- And the output in target/class/hello.txt would be
-
+ And the output in target/class/hello.txt would be
+
+-----+
Hello world
+-----+
-
- Furthermore, we are not limited to use pre-defined project variables. We can
- specify our own variables and their values under the properties tag. For
- example, if we want to change the variable from "name" to "your.name", we can
+
+ Furthermore, we are not limited to use pre-defined project variables. We can
+ specify our own variables and their values under the properties tag. For
+ example, if we want to change the variable from "name" to "your.name", we can
do so by adding a "your.name" tag under the "properties" tag.
-
+
+-----+
<project>
[...]
@@ -110,11 +129,11 @@
</project>
+-----+
- But to organize your project, you may want to put all your variables and their
+ But to organize your project, you may want to put all your variables and their
values on a separate file so that you will not have to rewrite your pom, or set
- their values all the time with every build. This can be done by adding a
+ their values all the time with every build. This can be done by adding a
filter.
-
+
+-----+
<project>
[...]
@@ -131,16 +150,16 @@
[...]
</project>
+-----+
-
- For example, we can separate "your.name" from pom by specifying a filter, "my
+
+ For example, we can separate "your.name" from pom by specifying a filter, "my
filter values.properties" containing
-
+
+-----+
your.name = world
+-----+
and adding that to our pom
-
+
+-----+
[...]
<filters>
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/include-exclude.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/include-exclude.apt?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/include-exclude.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/include-exclude.apt Sat Jan 19 15:52:44 2008
@@ -6,15 +6,34 @@
July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
Including and excluding files and directories
- When specifying a resource directory, every file within that directory may not
+ When specifying a resource directory, every file within that directory may not
be used. Thus, we may have to specify only the files that we want to inlcude or
specify the files that we want to exclude.
-
+
To include a resource, we only need to add an includes tag.
-
+
+-----+
<project>
[...]
@@ -43,7 +62,7 @@
+-----+
And to exclude a resource, we only need to add an excludes tag.
-
+
+-----+
<project>
[...]
@@ -71,10 +90,10 @@
</project>
+-----+
- For example, if we want to include all text and rtf files under our
- src/my-resources directory and in all its subdirectory, we can do the
+ For example, if we want to include all text and rtf files under our
+ src/my-resources directory and in all its subdirectory, we can do the
following
-
+
+-----+
<project>
[...]
@@ -99,9 +118,9 @@
</project>
+-----+
- Also, if we want to include everything except the bitmaps, jpegs, and gifs, we
+ Also, if we want to include everything except the bitmaps, jpegs, and gifs, we
can simply exclude them by
-
+
+-----+
<project>
[...]
@@ -128,10 +147,10 @@
</project>
+-----+
- Of course, we can also have both includes and exclude tags. For example, if we
- want to include all text files that does not contain the word "test" in their
+ Of course, we can also have both includes and exclude tags. For example, if we
+ want to include all text files that does not contain the word "test" in their
filename
-
+
+-----+
<project>
[...]
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/resource-directory.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/resource-directory.apt?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/resource-directory.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/examples/resource-directory.apt Sat Jan 19 15:52:44 2008
@@ -6,12 +6,31 @@
July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
Specifying resource directories
- By default, maven will look for your project's resources under
+ By default, maven will look for your project's resources under
src/main/resources
-
+
+-----+
Project
|-- pom.xml
@@ -19,10 +38,10 @@
`-- main
`-- resources
+-----+
-
- However, all your resources may not be in src/main/resources. Thus, you'd have
+
+ However, all your resources may not be in src/main/resources. Thus, you'd have
to specify those directories by adding the following to your pom.
-
+
+-----+
<project>
[...]
@@ -39,7 +58,7 @@
</project>
+-----+
- So if your resources resides in my-resources
+ So if your resources resides in my-resources
+-----+
Project
@@ -49,7 +68,7 @@
+-----+
you can specify that director by doing the following
-
+
+-----+
[...]
<resources>
@@ -61,7 +80,7 @@
+-----+
Furthermore, you can have several directories by adding resource tags
-
+
+-----+
[...]
<resources>
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/index.apt Sat Jan 19 15:52:44 2008
@@ -6,35 +6,54 @@
12 July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
Maven 2 Resources Plugin
- The Resources Plugin handles the copying of project resources to the output
- directory. Resources come in two: main resources and test resources. The
- difference is that the main resources are the resources associated to the main
- source code while the test resources are that for the test code.
-
- Thus, this allows the separation of resources for the main source code and its
+ The Resources Plugin handles the copying of project resources to the output
+ directory. Resources come in two: main resources and test resources. The
+ difference is that the main resources are the resources associated to the main
+ source code while the test resources are that for the test code.
+
+ Thus, this allows the separation of resources for the main source code and its
unit tests.
* Goals Overview
The Resources Plugin has two goals:
- * {{{resources-mojo.html}resources:resources}} copies the
+ * {{{resources-mojo.html}resources:resources}} copies the
resources for the main source code to the main output directory.
- * {{{testResources-mojo.html}resources:testResources}} copies the
+ * {{{testResources-mojo.html}resources:testResources}} copies the
resources for the test source code to the test output directory.
* Usage
- Instructions on how to use the Resources Plugin can be found
+ Instructions on how to use the Resources Plugin can be found
{{{usage.html}here}}.
* Examples
- The following examples show how to use the Resources Plugin in more advanced
+ The following examples show how to use the Resources Plugin in more advanced
usecases:
* {{{examples/encoding.html}Specifying a character encoding scheme}}
@@ -42,9 +61,9 @@
* {{{examples/resource-directory.html}Specifying resource directories}}
* {{{examples/filter.html}Filtering}}
-
- * {{{examples/include-exclude.html}Including and excluding files and
+
+ * {{{examples/include-exclude.html}Including and excluding files and
directories}}
-
-
+
+
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/apt/usage.apt Sat Jan 19 15:52:44 2008
@@ -6,9 +6,29 @@
12 July 2006
------
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/guides/mini/guide-apt-format.html
+
Usage
- The Resources Plugin handles the copying of project resources to the output
+ The Resources Plugin handles the copying of project resources to the output
directory. The following examples describe the basic usage of the Plugin.
* Copy resources for the main source code
@@ -17,10 +37,10 @@
mvn resources:resources
+-----+
- Upon executing this command, the resources for your main source code would be
- copied to the resources for your main output build. This does not affect the
+ Upon executing this command, the resources for your main source code would be
+ copied to the resources for your main output build. This does not affect the
resources for your test code.
-
+
Moreover, this goal is bounded to the process-resources phase.
* Copy resources for the unit tests
@@ -32,5 +52,5 @@
Like the first goal, this goal copies the resources for your test code to your
test output build. Also, this does not affect the resources for the main source
code.
-
+
Furthermore, this is bounded to the process-test-resources
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/fml/faq.fml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/fml/faq.fml Sat Jan 19 15:52:44 2008
@@ -1,4 +1,23 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
<faqs id="FAQ" title="Frequently Asked Questions">
<part id="General">
<faq id="What are resources?">
@@ -16,14 +35,14 @@
</question>
<answer>
<p>The maven resource plugin simply copies resources from your source to
- your build output (with the optional filtering). So if that's the only
- operation you are interested in, you can skip the other phases such as
- compilation and testing and simply do mvn
+ your build output (with the optional filtering). So if that's the only
+ operation you are interested in, you can skip the other phases such as
+ compilation and testing and simply do mvn
resources:resources.</p>
- <p>For example, if you just debugged your configuration file and you
- want to manually test it in your container if it works, you can simply
+ <p>For example, if you just debugged your configuration file and you
+ want to manually test it in your container if it works, you can simply
do mvn resources:resources to produce those configuration files on your
- output thus skipping the other phases which may eat up a huge amount of
+ output thus skipping the other phases which may eat up a huge amount of
your time.</p>
</answer>
</faq>
@@ -32,7 +51,7 @@
Do my main resources go to my test resources as well?
</question>
<answer>
- <p>No. Your main resources and your test resources are separated from
+ <p>No. Your main resources and your test resources are separated from
each other.</p>
<p>Your test resources should only be used by your tests. Thus, they are
separated from the main to avoid any side effects that may occur.</p>
@@ -43,8 +62,8 @@
What encoding values are allowed?
</question>
<answer>
- <p>The Maven Resource Plugin only allows encoding values representing
- the charsets supported by the Java platform, namely US-ASCII,
+ <p>The Maven Resource Plugin only allows encoding values representing
+ the charsets supported by the Java platform, namely US-ASCII,
ISO-8859-1, UTF-8, UTF-16BE, UTF-16LE, and UTF-16</p>
</answer>
</faq>
Modified: maven/plugins/trunk/maven-resources-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/site/site.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/site/site.xml Sat Jan 19 15:52:44 2008
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<project>
@@ -27,14 +27,14 @@
<item name="FAQ" href="faq.html"/>
</menu>
<menu name="Examples">
- <item name="Specifying a character encoding scheme"
- href="/examples/encoding.html"/>
- <item name="Specifying resource directories"
- href="/examples/resource-directory.html"/>
- <item name="Filtering"
- href="/examples/filter.html"/>
- <item name="Including and excluding files and directories"
- href="/examples/include-exclude.html"/>
+ <item name="Specifying a character encoding scheme"
+ href="/examples/encoding.html"/>
+ <item name="Specifying resource directories"
+ href="/examples/resource-directory.html"/>
+ <item name="Filtering"
+ href="/examples/filter.html"/>
+ <item name="Including and excluding files and directories"
+ href="/examples/include-exclude.html"/>
</menu>
</body>
</project>
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AbstractPropertyUtilsTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AdvancePropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AdvancePropertyUtilsTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AdvancePropertyUtilsTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/AdvancePropertyUtilsTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/BasicPropertyUtilsTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/EnhancedPropertyUtilsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/EnhancedPropertyUtilsTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/EnhancedPropertyUtilsTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/EnhancedPropertyUtilsTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
@@ -22,7 +25,7 @@
/**
* Tests {@link PropertyUtils#loadPropertyFile(File, Properties)}.
- *
+ *
* @author William Ferguson
*/
public class EnhancedPropertyUtilsTest
@@ -68,7 +71,7 @@
/**
* Load property test case can be adjusted by modifying the enhanced.properties and enhanced_validation properties.
- *
+ *
* @throws Exception
*/
public void testBasicLoadProperty()
@@ -82,7 +85,7 @@
/**
* Load property test case can be adjusted by modifying the enhanced.properties and enhanced_validation properties.
- *
+ *
* @throws Exception
*/
public void testNonExistentProperty()
@@ -96,7 +99,7 @@
/**
* Load property test case can be adjusted by modifying the enhanced.properties and enhanced_validation properties.
- *
+ *
* @throws Exception
*/
public void testException()
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ReflectionPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ReflectionPropertiesTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ReflectionPropertiesTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ReflectionPropertiesTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.maven.plugin.resources.stub.MavenProjectBasicStub;
@@ -52,7 +55,7 @@
// project property to be verified
String reflectPropValue = (String) reflectProp.get( "description" );
- // expected value is c\:\\\\org\\apache\\test
+ // expected value is c\:\\\\org\\apache\\test
assertTrue( reflectPropValue.equals( "c\\:\\\\\\\\org\\\\apache\\\\test" ) );
}
@@ -71,7 +74,7 @@
// project property to be verified
String reflectPropValue = (String) reflectProp.get( "description" );
- // expected value is c:\\org\apache\test
+ // expected value is c:\\org\apache\test
assertTrue( reflectPropValue.equals( "c:\\\\org\\apache\\test" ) );
}
}
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/ResourcesMojoTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.BufferedReader;
@@ -418,10 +421,10 @@
/**
* Validates that a Filter token containing a project property will be
* resolved before the Filter is applied to the resources.
- *
+ *
* @throws Exception
*/
- public void testPropertyFiles_Filtering_TokensInFilters()
+ public void testPropertyFiles_Filtering_TokensInFilters()
throws Exception
{
final File testPom = new File(getBasedir(), defaultPomFilePath);
@@ -450,8 +453,8 @@
final String checkString = "current working directory=foobar";
assertContent(resourcesDir + "/file4.properties", checkString);
- }
-
+ }
+
/**
* Ensures the file exists and its first line equals the given data.
*/
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/TestResourcesTest.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBasicStub.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources.stub;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectBuildStub.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources.stub;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
@@ -145,7 +148,7 @@
private void setupBuild()
{
// check getBasedir method for the exact path
- // we need to recreate the dir structure in
+ // we need to recreate the dir structure in
// an isolated environment
srcDirectory = testRootDir + "/src";
buildDirectory = testRootDir + "/target";
@@ -178,7 +181,7 @@
createDirectories( resourcesDirectory, testResourcesDirectory );
createFiles( resourcesDirectory, testResourcesDirectory );
- // setup target dir
+ // setup target dir
if ( !FileUtils.fileExists( outputDirectory ) )
{
FileUtils.mkdir( outputDirectory );
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/java/org/apache/maven/plugin/resources/stub/MavenProjectResourcesStub.java Sat Jan 19 15:52:44 2008
@@ -1,19 +1,22 @@
package org.apache.maven.plugin.resources.stub;
/*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import org.apache.maven.model.Resource;
@@ -82,7 +85,7 @@
{
Resource resource = new Resource();
- // see MavenProjectBasicStub for details
+ // see MavenProjectBasicStub for details
// of getBasedir
// setup default resources
@@ -96,10 +99,10 @@
{
Resource resource = new Resource();
- // see MavenProjectBasicStub for details
- // of getBasedir
+ // see MavenProjectBasicStub for details
+ // of getBasedir
- // setup default test resources
+ // setup default test resources
resource.setDirectory( getBasedir().getPath() + "/src/test/resources" );
resource.setFiltering( false );
resource.setTargetPath( null );
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/reflectionproperties-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/reflectionproperties-test/plugin-config.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/reflectionproperties-test/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/reflectionproperties-test/plugin-config.xml Sat Jan 19 15:52:44 2008
@@ -1,4 +1,24 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<description>c:\root\home\my_dir</description>
<build>
<plugins>
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-absolute-path.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-absolute-path.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-absolute-path.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-absolute-path.xml Sat Jan 19 15:52:44 2008
@@ -1,4 +1,24 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>test2</name>
<build>
<plugins>
@@ -6,7 +26,7 @@
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<outputDirectory>/test-classes/unit/result-dir</outputDirectory>
- </configuration>
+ </configuration>
</plugin>
</plugins>
<resources>
@@ -14,14 +34,14 @@
<filtering>false</filtering>
<directory>/src/test/resources/unit/test-dir</directory>
<includes>
- **/*.include
+ **/*.include
**/*.test
</includes>
<excludes>
- **/*.exclude
+ **/*.exclude
**/*.nottest
</excludes>
- </resource>
+ </resource>
</resources>
</build>
</project>
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-relative-path.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-relative-path.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-relative-path.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config-relative-path.xml Sat Jan 19 15:52:44 2008
@@ -1,4 +1,24 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>test3</name>
<build>
<plugins>
@@ -6,7 +26,7 @@
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<outputDirectory>/test-classes/unit/result-dir</outputDirectory>
- </configuration>
+ </configuration>
</plugin>
</plugins>
<resources>
@@ -14,14 +34,14 @@
<filtering>false</filtering>
<directory>../src/test/resources/unit/test-dir</directory>
<includes>
- **/*.include
+ **/*.include
**/*.test
</includes>
<excludes>
- **/*.exclude
+ **/*.exclude
**/*.nottest
</excludes>
- </resource>
+ </resource>
</resources>
</build>
</project>
Modified: maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config.xml?rev=613480&r1=613479&r2=613480&view=diff
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config.xml (original)
+++ maven/plugins/trunk/maven-resources-plugin/src/test/resources/unit/resources-test/plugin-config.xml Sat Jan 19 15:52:44 2008
@@ -1,4 +1,24 @@
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<name>test1</name>
<build>
<plugins>
@@ -14,14 +34,14 @@
<filtering>false</filtering>
<directory>/test/resources/unit/test-dir</directory>
<includes>
- **/*.include
+ **/*.include
**/*.test
</includes>
<excludes>
- **/**.exclude
+ **/**.exclude
**/*.nottest
</excludes>
- </resource>
+ </resource>
</resources>
</build>
</project>