Author: dkulp
Date: Thu Nov 29 00:32:04 2007
New Revision: 599333
URL: http://svn.apache.org/viewvc?rev=599333&view=rev
Log:
[MRRESOURCES-28] Add attached configuration item to allow it to not attach the
resources dirs to the project
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java?rev=599333&r1=599332&r2=599333&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/ProcessRemoteResourcesMojo.java
Thu Nov 29 00:32:04 2007
@@ -184,6 +184,14 @@
private boolean skip;
/**
+ * Skip remote-resource processing
+ *
+ * @parameter default-value="true"
+ * @since 1.0-beta-1
+ */
+ private boolean attached = true;
+
+ /**
* Additional properties to be passed to velocity.
* <p/>
* Several properties are automatically added:<br/>
@@ -321,11 +329,14 @@
// Push our newly generated resources directory into the
MavenProject so that
// these resources can be picked up by the
process-resources phase.
//
----------------------------------------------------------------------------
- Resource resource = new Resource();
- resource.setDirectory( outputDirectory.getAbsolutePath() );
-
- project.getResources().add( resource );
- project.getTestResources().add( resource );
+ if ( attached )
+ {
+ Resource resource = new Resource();
+ resource.setDirectory(
outputDirectory.getAbsolutePath() );
+
+ project.getResources().add( resource );
+ project.getTestResources().add( resource );
+ }
//
----------------------------------------------------------------------------
// Write out archiver dot file
Modified:
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java?rev=599333&r1=599332&r2=599333&view=diff
==============================================================================
---
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
(original)
+++
maven/plugins/trunk/maven-remote-resources-plugin/src/main/java/org/apache/maven/plugin/resources/remote/RemoteResourcesClassLoader.java
Thu Nov 29 00:32:04 2007
@@ -44,10 +44,12 @@
// that we have provided. Thus, we don't pull junk from the
// system classpath jars and stuff instead of the jars
// we specifically provided
- public URL getResource(String name) {
+ public URL getResource(String name)
+ {
return findResource(name);
}
- public Enumeration getResources(String name) throws IOException {
+ public Enumeration getResources(String name) throws IOException
+ {
return findResources(name);
}