Author: olamy
Date: Sat Sep 13 09:49:41 2008
New Revision: 694984
URL: http://svn.apache.org/viewvc?rev=694984&view=rev
Log:
[MRESOURCES-8] new mojo copy-resources
add a new class Resource (just extends the one from model) to have an easier
mojo configuration (no need of implementation attribute).
add an it for this new mojo
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties
(with props)
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh
(with props)
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
(with props)
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml?rev=694984&view=auto
==============================================================================
--- maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml
(added)
+++ maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml
Sat Sep 13 09:49:41 2008
@@ -0,0 +1,68 @@
+<?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>
+ <artifactId>maven-resources-plugin-copy-resources-it</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.1-SNAPSHOT</version>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>@pom.version@</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+
<outputDirectory>${basedir}/target/extra-resources</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/non-packaged-resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties?rev=694984&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties
Sat Sep 13 09:49:41 2008
@@ -0,0 +1,2 @@
+artifactId=${pom.artifactId}
+version=${pom.version}
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/src/non-packaged-resources/configuration.properties
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh?rev=694984&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh
Sat Sep 13 09:49:41 2008
@@ -0,0 +1,68 @@
+
+/*
+ * 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.
+ */
+
+import java.io.*;
+
+import org.codehaus.plexus.util.*;
+
+boolean result = true;
+
+try
+{
+ File target = new File( basedir, "target" );
+ if ( !target.exists() || !target.isDirectory() )
+ {
+ System.err.println( "target file is missing or a directory." );
+ return false;
+ }
+
+ File resource = new File( target,
"/extra-resources/configuration.properties" );
+ if ( !resource.exists() || resource.isDirectory() )
+ {
+ System.err.println( "configuration.properties is missing or not a
file." );
+ return false;
+ }
+
+ FileInputStream fis = new FileInputStream ( resource );
+ String paramContent = IOUtil.toString ( fis );
+
+ int indexOf = paramContent.indexOf(
"artifactId=maven-resources-plugin-copy-resources-it" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "configuration.properties not contains
artifactId=maven-resources-plugin-copy-resources-it" );
+ return false;
+ }
+
+ int indexOf = paramContent.indexOf( "version=1.0.1-SNAPSHOT" );
+ if ( indexOf < 0)
+ {
+ System.err.println( "configuration.properties not contains
version=1.0.1-SNAPSHOT" );
+ return false;
+ }
+
+
+}
+catch( IOException e )
+{
+ e.printStackTrace();
+ result = false;
+}
+
+return result;
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/it/copy-resources-it/verify.bsh
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java?rev=694984&view=auto
==============================================================================
---
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
(added)
+++
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
Sat Sep 13 09:49:41 2008
@@ -0,0 +1,32 @@
+package org.apache.maven.plugin.resources;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author <a href="mailto:[EMAIL PROTECTED]">olamy</a>
+ * @since 13 sept. 2008
+ * @version $Id$
+ */
+public class Resource
+ extends org.apache.maven.model.Resource
+{
+ // nothing to do here just a class prevent users adding an implementation
attribute
+ // in the mojo configuration
+}
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-resources-plugin/src/main/java/org/apache/maven/plugin/resources/Resource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Revision Id
