svn commit: r691563 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/ide/ test/java/org/apache/maven/plugin/eclipse/it/
Author: aheritier Date: Wed Sep 3 03:29:45 2008 New Revision: 691563 URL: http://svn.apache.org/viewvc?rev=691563&view=rev Log: MECLIPSE-445 : myeclipse target doesn't generate spring bean files for hierarchical projects. Submitted by : Joe Freeman + fix imports Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/expected/.springbeans maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicaitonContext-foo.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/applicationContext-bar.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/org/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/org/apache/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/org/apache/maven/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/org/apache/maven/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/main/resources/org/apache/maven/test/applicationContext-baz.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/test/java/DummyTestClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-06-MECLIPSE-427/src/test/resources/dummy Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/EclipseAjdtPluginIT.java maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/it/MyEclipsePluginIT.java Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java?rev=691563&r1=691562&r2=691563&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipsePlugin.java Wed Sep 3 03:29:45 2008 @@ -32,7 +32,6 @@ import java.util.ListIterator; import java.util.Map; import java.util.Set; -import java.util.TreeSet; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.handler.ArtifactHandler; Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenM
svn commit: r691594 - in /maven/sandbox/trunk/scm/maven-scm-provider-svnjava: ./ src/main/java/org/apache/maven/scm/provider/svn/svnjava/ src/main/java/org/apache/maven/scm/provider/svn/svnjava/comman
Author: vsiveton Date: Wed Sep 3 05:54:37 2008 New Revision: 691594 URL: http://svn.apache.org/viewvc?rev=691594&view=rev Log: o using latest parent o using svnkit:1.1.2 o updated code regarding the SCM API o added 'javasvn' as Plexus role hint o updated test cases Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/add/SvnAddCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/status/SvnStatusCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/tag/SvnTagCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/test/java/org/apache/maven/scm/provider/svn/svnjava/repository/SvnScmProviderRepositoryTest.java Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml?rev=691594&r1=691593&r2=691594&view=diff == --- maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml (original) +++ maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml Wed Sep 3 05:54:37 2008 @@ -17,16 +17,37 @@ ~ under the License. --> - +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";> + 4.0.0 + maven-scm-providers-svn org.apache.maven.scm -1.0-beta-3 +1.1.1-SNAPSHOT - 4.0.0 + maven-scm-provider-svnjava Maven SCM Subversion Provider - Java Impl. - 1.0-beta-3-SNAPSHOT + + + + org.apache.maven.scm + maven-scm-provider-svn-commons + + + org.tmatesoft + svnkit + 1.1.2 + + + + + org.apache.maven.scm + maven-scm-provider-svntest + test + + + @@ -40,29 +61,17 @@ + +org.codehaus.plexus +plexus-maven-plugin + + + + descriptor + + + + - - - org.apache.maven.scm - maven-scm-provider-svn-commons - 1.0-beta-3 - - - org.tmate - javasvn - 1.0.4 - - - - org.apache.maven.scm - maven-scm-provider-svntest - 1.0-beta-3 - test - - Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java?rev=691594&r1=691593&r2=691594&view=diff == --- maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java (original) +++ maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java Wed Sep 3 05:54:37 2008 @@ -16,6 +16,7 @@ * limitations under the License. */ +import org.apache.maven.scm.ScmException; import org.apache.maven.scm.provider.ScmProviderRepository; import org.apache.maven.scm.provider.svn.AbstractSvnScmProvider; import org.apache.maven.scm.provider.svn.command.SvnCommand; @@ -34,14 +35,16 @@ import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.internal.io.dav.DAVRepositoryFactory; -//import org.tmatesoft.svn.core.internal.io.fs.FSRepositoryFactory; import org.tmatesoft.svn.core.internal.io.svn.SVNRepositoryFactoryImpl;
svn commit: r691597 - /maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml
Author: vsiveton Date: Wed Sep 3 05:59:34 2008 New Revision: 691597 URL: http://svn.apache.org/viewvc?rev=691597&view=rev Log: o added encoding Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml?rev=691597&r1=691596&r2=691597&view=diff == --- maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml (original) +++ maven/sandbox/trunk/scm/maven-scm-provider-svnjava/pom.xml Wed Sep 3 05:59:34 2008 @@ -1,3 +1,5 @@ + +
svn commit: r691598 - /maven/sandbox/trunk/scm/maven-scm-provider-svnjava/
Author: vsiveton Date: Wed Sep 3 06:00:40 2008 New Revision: 691598 URL: http://svn.apache.org/viewvc?rev=691598&view=rev Log: o ignored Eclipse files Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/ (props changed) Propchange: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/ -- --- svn:ignore (original) +++ svn:ignore Wed Sep 3 06:00:40 2008 @@ -2,3 +2,6 @@ target maven-scm-provider-svnjava.iml maven-scm-provider-svnjava.ipr +.settings +.classpath +.project
svn commit: r691599 - /maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java
Author: vsiveton Date: Wed Sep 3 06:04:22 2008 New Revision: 691599 URL: http://svn.apache.org/viewvc?rev=691599&view=rev Log: o removed unused import Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java Modified: maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java?rev=691599&r1=691598&r2=691599&view=diff == --- maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java (original) +++ maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java Wed Sep 3 06:04:22 2008 @@ -30,7 +30,6 @@ import org.apache.maven.scm.provider.svn.svnjava.SvnJavaScmProvider; import org.apache.maven.scm.provider.svn.svnjava.repository.SvnJavaScmProviderRepository; import org.apache.maven.scm.provider.svn.svnjava.util.SvnJavaUtil; -import org.codehaus.plexus.util.StringUtils; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNNodeKind; import org.tmatesoft.svn.core.wc.SVNEvent;
svn commit: r691600 - in /maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava: SvnJavaScmProvider.java command/changelog/SvnChangeLogCommand.java
Author: vsiveton
Date: Wed Sep 3 06:04:58 2008
New Revision: 691600
URL: http://svn.apache.org/viewvc?rev=691600&view=rev
Log:
o throw UnsupportedOperationException() for unimplemented methods
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java?rev=691600&r1=691599&r2=691600&view=diff
==
---
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java
(original)
+++
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/SvnJavaScmProvider.java
Wed Sep 3 06:04:58 2008
@@ -167,28 +167,28 @@
protected SvnCommand getBranchCommand()
{
// TODO Auto-generated method stub
-return null;
+throw new UnsupportedOperationException( "getBranchCommand() is not
implemented" );
}
/** [EMAIL PROTECTED] */
protected SvnCommand getExportCommand()
{
// TODO Auto-generated method stub
-return null;
+throw new UnsupportedOperationException( "getExportCommand() is not
implemented" );
}
/** [EMAIL PROTECTED] */
protected SvnCommand getInfoCommand()
{
// TODO Auto-generated method stub
-return null;
+throw new UnsupportedOperationException( "getInfoCommand() is not
implemented" );
}
/** [EMAIL PROTECTED] */
protected SvnCommand getListCommand()
{
// TODO Auto-generated method stub
-return null;
+throw new UnsupportedOperationException( "getListCommand() is not
implemented" );
}
/** [EMAIL PROTECTED] */
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java?rev=691600&r1=691599&r2=691600&view=diff
==
---
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java
(original)
+++
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/changelog/SvnChangeLogCommand.java
Wed Sep 3 06:04:58 2008
@@ -60,7 +60,9 @@
throws ScmException
{
// TODO Auto-generated method stub
-return super.executeChangeLogCommand( repository, fileSet,
startVersion, endVersion, datePattern );
+throw new UnsupportedOperationException( "executeChangeLogCommand(
ScmProviderRepository repository, "
++ "ScmFileSet fileSet, ScmVersion startVersion, ScmVersion
endVersion, String datePattern ) is not "
++ "implemented" );
}
/** [EMAIL PROTECTED] */
svn commit: r691615 - in /maven/plugins/trunk/maven-ant-plugin/src: it/webapp-it/ it/webapp-it/src/main/java/ it/webapp-it/src/main/java/org/ it/webapp-it/src/main/resources/ it/webapp-it/src/main/web
Author: bentmann
Date: Wed Sep 3 06:52:16 2008
New Revision: 691615
URL: http://svn.apache.org/viewvc?rev=691615&view=rev
Log:
[MANT-45] basedir attribute of task of package target in generated Ant
build causes files to be archived twice
Added:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java
(with props)
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties
(with props)
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
(with props)
Modified:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml?rev=691615&r1=691614&r2=691615&view=diff
==
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml Wed Sep 3
06:52:16 2008
@@ -38,6 +38,10 @@
+
+extJavac
+
+
ant-webapp-test
Added:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java?rev=691615&view=auto
==
---
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java
(added)
+++
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java
Wed Sep 3 06:52:16 2008
@@ -0,0 +1,5 @@
+package org;
+
+public class MyClass
+{
+}
Propchange:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/java/org/MyClass.java
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties?rev=691615&view=auto
==
---
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties
(added)
+++
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties
Wed Sep 3 06:52:16 2008
@@ -0,0 +1 @@
+key=value
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/resources/test.properties
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt?rev=691615&view=auto
==
---
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
(added)
+++
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
Wed Sep 3 06:52:16 2008
@@ -0,0 +1 @@
+Test
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/test.txt
--
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh?rev=691615&r1=691614&r2=691615&view=diff
==
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh (original)
+++ maven/plugins/trunk/maven-ant-plugi
svn commit: r691629 - in /maven/plugins/trunk/maven-ant-plugin/src: it/webapp-it/pom.xml it/webapp-it/verify.bsh main/java/org/apache/maven/plugin/ant/AntBuildWriter.java main/java/org/apache/maven/pl
Author: bentmann
Date: Wed Sep 3 07:43:28 2008
New Revision: 691629
URL: http://svn.apache.org/viewvc?rev=691629&view=rev
Log:
[MANT-44] Generated ant copy commands in package target point to hard-coded
local repository instead of ${maven.repo.local}
Modified:
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml?rev=691629&r1=691628&r2=691629&view=diff
==
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml Wed Sep 3
07:43:28 2008
@@ -29,8 +29,14 @@
1.0-SNAPSHOT
Webapp project
http://maven.apache.org
+
+ log4j
+ log4j
+ 1.2.14
+
+
junit
junit
3.8.2
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh?rev=691629&r1=691628&r2=691629&view=diff
==
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/verify.bsh Wed Sep 3
07:43:28 2008
@@ -2,8 +2,9 @@
import java.io.File;
import java.io.IOException;
import java.util.jar.*;
+import java.util.regex.*;
-import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.*;
try
{
@@ -19,12 +20,24 @@
System.err.println( "The file '" + build.getAbsolutePath() + "' is a
directory or doesn't exist." );
return false;
}
+
mavenBuild = new File( basedir, "maven-build.xml" );
if ( mavenBuild.isDirectory() || !mavenBuild.exists() )
{
System.err.println( "The file '" + mavenBuild.getAbsolutePath() + "' is a
directory or doesn't exist." );
return false;
}
+
+ String xml = FileUtils.fileRead( mavenBuild, "UTF-8" );
+ Matcher m0 = Pattern.compile(
" from
${maven.repo.local} for WAR libs" );
+ if ( !m0.find() )
+ {
+ System.err.println( "FAILED!\n" + xml );
+ return false;
+ }
+
mavenBuildProperties = new File( basedir, "maven-build.properties" );
if ( mavenBuildProperties.isDirectory() || !mavenBuildProperties.exists() )
{
@@ -48,6 +61,7 @@
"WEB-INF/test.txt",
"WEB-INF/classes/test.properties",
"WEB-INF/classes/org/MyClass.class",
+"WEB-INF/lib/log4j-1.2.14.jar",
};
for ( String entry : expected )
{
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=691629&r1=691628&r2=691629&view=diff
==
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
Wed Sep 3 07:43:28 2008
@@ -1039,7 +1039,7 @@
}
else if ( AntBuildWriterUtil.isEarPackaging( project ) )
{
-AntBuildWriterUtil.writeEarTask( writer, project );
+AntBuildWriterUtil.writeEarTask( writer, project,
localRepository );
synonym = "ear";
}
else if ( AntBuildWriterUtil.isWarPackaging( project ) )
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=691629&r1=691628&r2=691629&view=diff
==
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Wed Sep 3 07:43:28 2008
@@ -452,12 +452,13 @@
*
* @param writer not null
* @param project not null
+ * @param localRepository not null
* @throws IOException if any
*/
-public static void writeEarTask( XMLWriter writer, MavenProject project )
+public static void writeEarTask( XMLWriter writer, MavenProject project,
File localRepository )
throws IOException
{
-writeCopyLib(
svn commit: r691718 - in /maven/shared/trunk/file-management/src: main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java test/java/org/apache/maven/shared/model/fileset/util/FileSetU
Author: bentmann
Date: Wed Sep 3 11:30:43 2008
New Revision: 691718
URL: http://svn.apache.org/viewvc?rev=691718&view=rev
Log:
[MSHARED-57] FileSetManager.isSymlink() produces false negatives
o Fixed symlink detection as inspired by FileUtils.isSymlink() from Commons IO
2.0
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Modified:
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java?rev=691718&r1=691717&r2=691718&view=diff
==
---
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
(original)
+++
maven/shared/trunk/file-management/src/main/java/org/apache/maven/shared/model/fileset/util/FileSetManager.java
Wed Sep 3 11:30:43 2008
@@ -371,17 +371,25 @@
private boolean isSymlink( File file )
throws IOException
{
-File parent = file.getParentFile();
-File canonicalFile = file.getCanonicalFile();
-
+File fileInCanonicalParent = null;
+File parentDir = file.getParentFile();
+if ( parentDir == null )
+{
+fileInCanonicalParent = file;
+}
+else
+{
+fileInCanonicalParent = new File( parentDir.getCanonicalPath(),
file.getName() );
+}
if ( messages != null && messages.isDebugEnabled() )
{
-messages.addDebugMessage( "Checking for symlink:\nParent file's
canonical path: "
-+ parent.getCanonicalPath() + "\nMy canonical path: " +
canonicalFile.getPath() ).flush();
+messages.addDebugMessage(
+ "Checking for symlink:\nFile's canonical
path: "
+ +
fileInCanonicalParent.getCanonicalPath()
+ + "\nFile's absolute path with
canonical parent: "
+ + fileInCanonicalParent.getPath()
).flush();
}
-return parent != null
-&& ( !canonicalFile.getName().equals( file.getName() ) ||
!canonicalFile.getPath()
-.startsWith( parent.getCanonicalPath() ) );
+return !fileInCanonicalParent.getCanonicalFile().equals(
fileInCanonicalParent.getAbsoluteFile() );
}
private Set findDeletablePaths( FileSet fileSet )
Modified:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=691718&r1=691717&r2=691718&view=diff
==
---
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
(original)
+++
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Wed Sep 3 11:30:43 2008
@@ -94,7 +94,7 @@
throws IOException, InterruptedException, CommandLineException
{
File directory = setupTestDirectory( "testIncludesDontFollowSymlinks"
);
-File subdir = new File( directory, "linked-to-self" );
+File subdir = new File( directory, directory.getName() );
if ( !createSymlink( directory, subdir ) )
{
@@ -124,7 +124,7 @@
throws IOException, InterruptedException, CommandLineException
{
File directory = setupTestDirectory( "testDeleteDontFollowSymlinks" );
-File subdir = new File( directory, "linked-to-self" );
+File subdir = new File( directory, directory.getName() );
if ( !createSymlink( directory, subdir ) )
{
@@ -136,7 +136,7 @@
FileSet set = new FileSet();
set.setDirectory( directory.getPath() );
set.addInclude( "**/included.txt" );
-set.addInclude( "**/linked-to-self" );
+set.addInclude( "**/" + subdir.getName() );
set.setFollowSymlinks( false );
FileSetManager fileSetManager = new FileSetManager();
svn commit: r691720 - /maven/shared/trunk/file-management/pom.xml
Author: bentmann Date: Wed Sep 3 11:37:21 2008 New Revision: 691720 URL: http://svn.apache.org/viewvc?rev=691720&view=rev Log: o Reordered POM Modified: maven/shared/trunk/file-management/pom.xml Modified: maven/shared/trunk/file-management/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/pom.xml?rev=691720&r1=691719&r2=691720&view=diff == --- maven/shared/trunk/file-management/pom.xml (original) +++ maven/shared/trunk/file-management/pom.xml Wed Sep 3 11:37:21 2008 @@ -1,22 +1,24 @@ + + 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";> 4.0.0 @@ -28,13 +30,10 @@ file-management 1.3-SNAPSHOT + Maven File Management API API to collect files from a given directory using several include/exclude rules. - -2.0.6 - - Joakim Erdfelt @@ -42,36 +41,15 @@ - - - -org.codehaus.modello -modello-maven-plugin -1.0-alpha-17 - - -fileset - - xpp3-reader - xpp3-writer - java - xsd - - - src/main/mdo/fileset.mdo - - - - - 1.1.0 - - - -maven-surefire-plugin -2.3 - - - + +2.0.6 + + + + scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/file-management + scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/file-management +http://svn.apache.org/viewvc/maven/shared/trunk/file-management + @@ -107,9 +85,34 @@ - - scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/file-management - scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/file-management -http://svn.apache.org/viewvc/maven/shared/trunk/file-management - + + + +org.codehaus.modello +modello-maven-plugin +1.0-alpha-17 + + +fileset + + xpp3-reader + xpp3-writer + java + xsd + + + src/main/mdo/fileset.mdo + + + + + 1.1.0 + + + +maven-surefire-plugin +2.3 + + +
svn commit: r691724 - /maven/shared/trunk/file-management/pom.xml
Author: bentmann Date: Wed Sep 3 11:44:46 2008 New Revision: 691724 URL: http://svn.apache.org/viewvc?rev=691724&view=rev Log: o Changed version to 1.2.1-SNAPSHOT (it's only a bugfix release so far) o Updated to junit:3.8.2 o Updated to plexus-utils:1.5.6 o Updated to maven-surefire-plugin:2.4.3 o Updated to modello-maven-plugin:1.0-alpha-21 Modified: maven/shared/trunk/file-management/pom.xml Modified: maven/shared/trunk/file-management/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/file-management/pom.xml?rev=691724&r1=691723&r2=691724&view=diff == --- maven/shared/trunk/file-management/pom.xml (original) +++ maven/shared/trunk/file-management/pom.xml Wed Sep 3 11:44:46 2008 @@ -29,7 +29,7 @@ file-management - 1.3-SNAPSHOT + 1.2.1-SNAPSHOT Maven File Management API API to collect files from a given directory using several include/exclude rules. @@ -68,7 +68,7 @@ org.codehaus.plexus plexus-utils - 1.4.6 + 1.5.6 org.codehaus.plexus @@ -80,7 +80,7 @@ junit junit - 3.8.1 + 3.8.2 test @@ -90,7 +90,7 @@ org.codehaus.modello modello-maven-plugin -1.0-alpha-17 +1.0-alpha-21 fileset @@ -101,7 +101,9 @@ xsd - src/main/mdo/fileset.mdo + +src/main/mdo/fileset.mdo + @@ -111,7 +113,7 @@ maven-surefire-plugin -2.3 +2.4.3
svn commit: r691750 - in /maven/shared/trunk/file-management/src/test: java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java resources/testDeleteDanglingSymlink/ resources/testDeleteDa
Author: bentmann
Date: Wed Sep 3 12:53:40 2008
New Revision: 691750
URL: http://svn.apache.org/viewvc?rev=691750&view=rev
Log:
[MSHARED-58] FileSetManager.delete() fails to delete dangling symlinks
o Added to test to prove fix from PLXUTILS-28
Added:
maven/shared/trunk/file-management/src/test/resources/testDeleteDanglingSymlink/
maven/shared/trunk/file-management/src/test/resources/testDeleteDanglingSymlink/test.txt
(with props)
Modified:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Modified:
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java?rev=691750&r1=691749&r2=691750&view=diff
==
---
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
(original)
+++
maven/shared/trunk/file-management/src/test/java/org/apache/maven/shared/model/fileset/util/FileSetUtilsTest.java
Wed Sep 3 12:53:40 2008
@@ -168,6 +168,34 @@
}
/**
+ * @throws Exception if any
+ */
+public void testDeleteDanglingSymlink()
+throws Exception
+{
+File directory = setupTestDirectory( "testDeleteDanglingSymlink" );
+File targetFile = new File( directory, "test.txt" );
+File linkFile = new File( directory, "symlink" );
+
+if ( !createSymlink( targetFile, linkFile ) )
+{
+// symlinks apparently not supported, skip test
+return;
+}
+targetFile.delete();
+
+FileSet set = new FileSet();
+set.setDirectory( directory.getPath() );
+set.addInclude( "**" );
+
+FileSetManager fileSetManager = new FileSetManager();
+
+fileSetManager.delete( set );
+
+Assert.assertFalse( "directory still exists", directory.exists() );
+}
+
+/**
* @param from
* @param to
* @return
@@ -184,9 +212,9 @@
Commandline cli = new Commandline();
cli.setExecutable( "ln" );
-cli.createArgument().setLine( "-s" );
-cli.createArgument().setLine( from.getPath() );
-cli.createArgument().setLine( to.getPath() );
+cli.createArg().setLine( "-s" );
+cli.createArg().setLine( from.getPath() );
+cli.createArg().setLine( to.getPath() );
int result = cli.execute().waitFor();
Added:
maven/shared/trunk/file-management/src/test/resources/testDeleteDanglingSymlink/test.txt
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/file-management/src/test/resources/testDeleteDanglingSymlink/test.txt?rev=691750&view=auto
==
(empty)
Propchange:
maven/shared/trunk/file-management/src/test/resources/testDeleteDanglingSymlink/test.txt
--
svn:eol-style = native
Propchange:
maven/shared/trunk/file-management/src/test/resources/testDeleteDanglingSymlink/test.txt
--
svn:keywords = Author Date Id Revision
svn commit: r691751 - /maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
Author: brianf
Date: Wed Sep 3 12:55:51 2008
New Revision: 691751
URL: http://svn.apache.org/viewvc?rev=691751&view=rev
Log:
added some tests to probe MENFORCER-50
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
Modified:
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
URL:
http://svn.apache.org/viewvc/maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java?rev=691751&r1=691750&r2=691751&view=diff
==
---
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
(original)
+++
maven/enforcer/trunk/enforcer-rules/src/test/java/org/apache/maven/plugins/enforcer/TestAbstractVersionEnforcer.java
Wed Sep 3 12:55:51 2008
@@ -79,6 +79,11 @@
assertTrue( AbstractVersionEnforcer.containsVersion(
VersionRange.createFromVersionSpec( "[1.5.0,)" ), version ) );
assertTrue( AbstractVersionEnforcer.containsVersion(
VersionRange.createFromVersionSpec( "[1.5,1.6)" ), version ) );
+//MENFORCER-50
+version = new DefaultArtifactVersion ("2.1.0-M1-RC12");
+assertTrue( AbstractVersionEnforcer.containsVersion(
VersionRange.createFromVersionSpec( "[2.1.0-M1-RC12,)" ), version ) );
+assertFalse( AbstractVersionEnforcer.containsVersion(
VersionRange.createFromVersionSpec( "[2.1.0-M1,)" ), version ) );
+
}
/**
svn commit: r691767 - in /maven/plugins/trunk/maven-clean-plugin/src/it: default/ file-sets-relative-paths/ file-sets-relative-paths/child-a/ file-sets-relative-paths/child-a/target/ file-sets-relativ
Author: bentmann Date: Wed Sep 3 13:47:09 2008 New Revision: 691767 URL: http://svn.apache.org/viewvc?rev=691767&view=rev Log: o Added integration test to check handling of relative for file sets Added: maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/target/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/target/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/temp-stuff/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/temp-stuff/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/deploy/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/deploy/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/pom.xml (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/target/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-b/target/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/deploy/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/deploy/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/pom.xml (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/target/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/target/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/temp-stuff/ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/temp-stuff/test.txt (with props) maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/verify.bsh (with props) Modified: maven/plugins/trunk/maven-clean-plugin/src/it/default/pom.xml Modified: maven/plugins/trunk/maven-clean-plugin/src/it/default/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/default/pom.xml?rev=691767&r1=691766&r2=691767&view=diff == --- maven/plugins/trunk/maven-clean-plugin/src/it/default/pom.xml (original) +++ maven/plugins/trunk/maven-clean-plugin/src/it/default/pom.xml Wed Sep 3 13:47:09 2008 @@ -1,22 +1,23 @@ + +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. +--> http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; @@ -28,6 +29,7 @@ 1.0-SNAPSHOT Test for clean + Check for proper cleaning of default output files. UTF-8 Added: maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml?rev=691767&view=auto == --- maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml (added) +++ maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-relative-paths/child-a/pom.xml Wed Sep 3 13:47:09 2008 @@ -0,0 +1,61 @@ + + + + +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";> + 4.0.0 + + +test +parent +1.0-SNAPSHOT + + + test + child-a + 1.0-SNAPSHOT + + Child A + Check for proper cleaning of file sets with relative paths during reactor build. + + +UTF-8 + + + + + +org.apache.maven.plugins +maven-clean-plugin + + + + + tem
svn commit: r691788 - /maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
Author: bentmann
Date: Wed Sep 3 14:32:24 2008
New Revision: 691788
URL: http://svn.apache.org/viewvc?rev=691788&view=rev
Log:
[MCLEAN-31] Always resolve relative path against the project's base directory
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java?rev=691788&r1=691787&r2=691788&view=diff
==
---
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/CleanMojo.java
Wed Sep 3 14:32:24 2008
@@ -24,7 +24,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.model.fileset.FileSet;
import org.apache.maven.shared.model.fileset.util.FileSetManager;
-import org.codehaus.plexus.util.StringUtils;
import java.io.File;
import java.io.IOException;
@@ -200,31 +199,9 @@
{
for ( Iterator it = filesets.iterator(); it.hasNext(); )
{
-Fileset fileset = (Fileset) it.next();
+FileSet fileset = (FileSet) it.next();
-try
-{
-getLog().info( "Deleting " + fileset );
-
-if ( !project.isExecutionRoot() )
-{
-String projectBasedir = StringUtils.replace(
project.getBasedir().getAbsolutePath(),
- "\\", "/"
);
-String filesetDir = StringUtils.replace(
fileset.getDirectory(), "\\", "/" );
-
-if ( filesetDir.indexOf( projectBasedir ) == -1 )
-{
-fileset.setDirectory( projectBasedir + "/" +
filesetDir );
-}
-}
-
-fileSetManager.delete( fileset, failOnError );
-}
-catch ( IOException e )
-{
-throw new MojoExecutionException( "Failed to delete
directory: " + fileset.getDirectory()
-+ ". Reason: " + e.getMessage(), e );
-}
+removeFileSet( fileset );
}
}
}
@@ -250,27 +227,45 @@
throw new MojoExecutionException( dir + " is not a directory."
);
}
-FileSet fs = new FileSet();
+FileSet fs = new Fileset();
fs.setDirectory( dir.getPath() );
-fs.addInclude( "**/**" );
+fs.addInclude( "**" );
fs.setFollowSymlinks( followSymLinks );
-try
-{
-getLog().info( "Deleting directory " + dir.getAbsolutePath() );
-fileSetManager.delete( fs, failOnError );
-}
-catch ( IOException e )
-{
-throw new MojoExecutionException( "Failed to delete directory:
" + dir + ". Reason: " + e.getMessage(),
- e );
-}
-catch ( IllegalStateException e )
+removeFileSet( fs );
+}
+}
+
+/**
+ * Deletes the specified file set. If the base directory of the file set
is relative, it will be resolved against
+ * the base directory of the current project.
+ *
+ * @param fileset The file set to delete, must not be null.
+ * @throws MojoExecutionException When the file set failed to get deleted.
+ */
+private void removeFileSet( FileSet fileset )
+throws MojoExecutionException
+{
+try
+{
+if ( !new File( fileset.getDirectory() ).isAbsolute() )
{
-// TODO: IOException from plexus-utils should be acceptable
here
-throw new MojoExecutionException( "Failed to delete directory:
" + dir + ". Reason: " + e.getMessage(),
- e );
+fileset.setDirectory( new File( project.getBasedir(),
fileset.getDirectory() ).getPath() );
}
+
+getLog().info( "Deleting " + fileset );
+fileSetManager.delete( fileset, failOnError );
+}
+catch ( IOException e )
+{
+throw new MojoExecutionException( "Failed to delete directory: " +
fileset.getDirectory() + ". Reason: "
++ e.getMessage(), e );
+}
+catch ( IllegalStateException e )
+{
+// TODO: IOException from plexus-utils should be acceptable here
+throw new MojoExecutionException( "Failed to delete directory: " +
fileset.get
svn commit: r691791 - /maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
Author: bentmann
Date: Wed Sep 3 14:36:19 2008
New Revision: 691791
URL: http://svn.apache.org/viewvc?rev=691791&view=rev
Log:
o Beautified string representation
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
Modified:
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java?rev=691791&r1=691790&r2=691791&view=diff
==
---
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
(original)
+++
maven/plugins/trunk/maven-clean-plugin/src/main/java/org/apache/maven/plugin/clean/Fileset.java
Wed Sep 3 14:36:19 2008
@@ -47,6 +47,6 @@
*/
public String toString()
{
-return "file-set: " + getDirectory() + " (included: " + getIncludes()
+ ", excluded: " + getExcludes() + ")";
+return "file set: " + getDirectory() + " (included: " + getIncludes()
+ ", excluded: " + getExcludes() + ")";
}
}
svn commit: r691793 - /maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Author: jdcasey
Date: Wed Sep 3 14:39:32 2008
New Revision: 691793
URL: http://svn.apache.org/viewvc?rev=691793&view=rev
Log:
[MNG-3740] Be more careful to track processed projects through concrete and
restore methods, to avoid infinite recursion when plugin projects in the
reactor used by their parents (in an older version) are processed...for
instance. I'm not sure this is the only case where this can happen, just know
it's one.
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=691793&r1=691792&r2=691793&view=diff
==
---
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Sep 3 14:39:32 2008
@@ -1833,7 +1833,12 @@
private void calculateConcreteStateInternal( MavenProject project,
ProjectBuilderConfiguration config, boolean processProjectReferences, Set
processedProjects )
throws ModelInterpolationException
{
-restoreDynamicState( project, config, false );
+if ( processProjectReferences )
+{
+processedProjects.add( project.getId() );
+}
+
+restoreDynamicStateInternal( project, config,
processProjectReferences, processProjectReferences ? new HashSet(
processedProjects ) : null );
if ( !project.isConcrete() )
{
@@ -1914,7 +1919,6 @@
if ( processProjectReferences )
{
-processedProjects.add( project.getId() );
calculateConcreteProjectReferences( project, config,
processedProjects );
}
}
@@ -2003,6 +2007,11 @@
private void restoreDynamicStateInternal( MavenProject project,
ProjectBuilderConfiguration config, boolean processProjectReferences, Set
processedProjects )
throws ModelInterpolationException
{
+if ( processProjectReferences )
+{
+processedProjects.add( project.getId() );
+}
+
if ( project.isConcrete() && projectWasChanged( project ) )
{
if ( project.getParent() != null )
@@ -2023,7 +2032,6 @@
if ( processProjectReferences )
{
-processedProjects.add( project.getId() );
restoreDynamicProjectReferences( project, config,
processedProjects );
}
}
svn commit: r691795 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng-3740-selfReferentialReactorProjects/ resources/mng
Author: jdcasey Date: Wed Sep 3 14:40:03 2008 New Revision: 691795 URL: http://svn.apache.org/viewvc?rev=691795&view=rev Log: [MNG-3740] Integration test. Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3740SelfReferentialReactorProjectsTest.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/maven-mng3740-plugin.v1/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/src/main/java/jar/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/maven-mng3740-plugin/src/main/java/jar/MyMojo.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v1/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/src/main/java/jar/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/maven-mng3740-plugin/src/main/java/jar/MyMojo.java (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/projects.v2/pom.xml (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3740-selfReferentialReactorProjects/readme.txt (with props) Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=691795&r1=691794&r2=691795&view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Wed Sep 3 14:40:03 2008 @@ -76,6 +76,7 @@ MavenITmng3645POMSyntaxErrorTest */ +suite.addTestSuite( MavenITmng3740SelfReferentialReactorProjectsTest.class ); suite.addTestSuite( MavenITmng3729MultiForkAggregatorsTest.class ); suite.addTestSuite( MavenITmng3724ExecutionProjectSyncTest.cla
svn commit: r691797 - in /maven/components/branches/maven-2.1.x: ./ maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java maven-project/src/test/java/org/apache/maven/pr
Author: jdcasey
Date: Wed Sep 3 14:41:54 2008
New Revision: 691797
URL: http://svn.apache.org/viewvc?rev=691797&view=rev
Log:
[MNG-3740] Merging fix from r691793 on RC branch.
Modified:
maven/components/branches/maven-2.1.x/ (props changed)
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
(props changed)
Propchange: maven/components/branches/maven-2.1.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 3 14:41:54 2008
@@ -1,4 +1,4 @@
/maven/components/branches/maven-2.0.10-RC:679193-679867,680477-62
/maven/components/branches/maven-2.0.x:679552-679867
-/maven/components/branches/maven-2.1.0-M1-RC:690315
+/maven/components/branches/maven-2.1.0-M1-RC:690315,691793
/maven/components/branches/maven-2.1.0-RC:63,689695,689990
Modified:
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=691797&r1=691796&r2=691797&view=diff
==
---
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Wed Sep 3 14:41:54 2008
@@ -1833,7 +1833,12 @@
private void calculateConcreteStateInternal( MavenProject project,
ProjectBuilderConfiguration config, boolean processProjectReferences, Set
processedProjects )
throws ModelInterpolationException
{
-restoreDynamicState( project, config, false );
+if ( processProjectReferences )
+{
+processedProjects.add( project.getId() );
+}
+
+restoreDynamicStateInternal( project, config,
processProjectReferences, processProjectReferences ? new HashSet(
processedProjects ) : null );
if ( !project.isConcrete() )
{
@@ -1914,7 +1919,6 @@
if ( processProjectReferences )
{
-processedProjects.add( project.getId() );
calculateConcreteProjectReferences( project, config,
processedProjects );
}
}
@@ -2003,6 +2007,11 @@
private void restoreDynamicStateInternal( MavenProject project,
ProjectBuilderConfiguration config, boolean processProjectReferences, Set
processedProjects )
throws ModelInterpolationException
{
+if ( processProjectReferences )
+{
+processedProjects.add( project.getId() );
+}
+
if ( project.isConcrete() && projectWasChanged( project ) )
{
if ( project.getParent() != null )
@@ -2023,7 +2032,6 @@
if ( processProjectReferences )
{
-processedProjects.add( project.getId() );
restoreDynamicProjectReferences( project, config,
processedProjects );
}
}
Propchange:
maven/components/branches/maven-2.1.x/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 3 14:41:54 2008
@@ -1,2 +1,2 @@
-/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315
+/maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:690315,691793
/maven/components/branches/maven-2.1.0-RC/maven-project/src/test/java/org/apache/maven/project/interpolation/AbstractModelInterpolatorTest.java:63,689695,689990
svn commit: r691803 - in /maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths: ./ child-a/ child-a/pom.xml delete-me/ delete-me/test.txt pom.xml verify.bsh
Author: bentmann
Date: Wed Sep 3 15:04:55 2008
New Revision: 691803
URL: http://svn.apache.org/viewvc?rev=691803&view=rev
Log:
[MCLEAN-36] filesets with an absolute path directory are ignored when
!project.isExecutionRoot()
o Added integration test to prove fix established by MCLEAN-31
Added:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
(with props)
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt
(with props)
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml
(with props)
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/verify.bsh
(with props)
Added:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml?rev=691803&view=auto
==
---
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
(added)
+++
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
Wed Sep 3 15:04:55 2008
@@ -0,0 +1,60 @@
+
+
+
+
+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";>
+ 4.0.0
+
+
+test
+parent
+1.0-SNAPSHOT
+
+
+ test
+ child-a
+ 1.0-SNAPSHOT
+
+ Child A
+ Check for proper cleaning of file sets with absolute paths
during reactor build.
+
+
+UTF-8
+
+
+
+
+
+org.apache.maven.plugins
+maven-clean-plugin
+
+
+
+ ${deploy.dir}
+
+
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/child-a/pom.xml
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt?rev=691803&view=auto
==
---
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt
(added)
+++
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt
Wed Sep 3 15:04:55 2008
@@ -0,0 +1 @@
+Test
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/delete-me/test.txt
--
svn:keywords = Author Date Id Revision
Added:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml?rev=691803&view=auto
==
---
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml
(added)
+++
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml
Wed Sep 3 15:04:55 2008
@@ -0,0 +1,55 @@
+
+
+
+
+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";>
+ 4.0.0
+
+ test
+ parent
+ 1.0-SNAPSHOT
+ pom
+
+ Test for clean
+
+
+child-a
+
+
+
+UTF-8
+
@project.build.directory@/it/file-sets-absolute-paths/delete-me
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-clean-plugin
+ @pom.version@
+
+
+
+
+
+
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-clean-plugin/src/it/file-sets-absolute-paths/pom.xml
--
svn commit: r691811 - in /maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command: add/ checkin/ checkout/ diff/ remove/ status/ tag/ update/
Author: vsiveton
Date: Wed Sep 3 15:38:59 2008
New Revision: 691811
URL: http://svn.apache.org/viewvc?rev=691811&view=rev
Log:
SCM-411: Performance: logger calls are not optimal
o improved all logging call (debug, error, warn and info)
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/add/SvnAddCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/diff/SvnDiffCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/remove/SvnRemoveCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/status/SvnStatusCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/tag/SvnTagCommand.java
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/update/SvnUpdateCommand.java
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/add/SvnAddCommand.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/add/SvnAddCommand.java?rev=691811&r1=691810&r2=691811&view=diff
==
---
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/add/SvnAddCommand.java
(original)
+++
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/add/SvnAddCommand.java
Wed Sep 3 15:38:59 2008
@@ -91,7 +91,10 @@
{
File fileToAdd = new File( fileSet.getBasedir(),
files[i].toString() );
-getLogger().debug( "SVN adding file: " +
fileToAdd.getAbsolutePath() );
+if ( getLogger().isDebugEnabled() )
+{
+getLogger().debug( "SVN adding file: " +
fileToAdd.getAbsolutePath() );
+}
SvnJavaUtil.add( clientManager, fileToAdd, false );
}
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java?rev=691811&r1=691810&r2=691811&view=diff
==
---
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java
(original)
+++
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkin/SvnCheckInCommand.java
Wed Sep 3 15:38:59 2008
@@ -53,7 +53,10 @@
String message,
ScmVersion tag )
throws ScmException
{
-getLogger().info( "SVN commit directory: " +
fileSet.getBasedir().getAbsolutePath() );
+if ( getLogger().isInfoEnabled() )
+{
+getLogger().info( "SVN commit directory: " +
fileSet.getBasedir().getAbsolutePath() );
+}
SvnJavaScmProviderRepository javaRepo = (SvnJavaScmProviderRepository)
repo;
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java?rev=691811&r1=691810&r2=691811&view=diff
==
---
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java
(original)
+++
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/command/checkout/SvnCheckOutCommand.java
Wed Sep 3 15:38:59 2008
@@ -50,7 +50,10 @@
ScmVersion tag,
boolean recursive )
throws ScmException
{
-getLogger().info( "SVN checkout directory: " +
fi
svn commit: r691813 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test/resources: mng-3475-baseAlignedDir/plugin/src/main/java/test/ mng-3703-executionProjectRelativePaths/mave
Author: jdcasey Date: Wed Sep 3 15:45:14 2008 New Revision: 691813 URL: http://svn.apache.org/viewvc?rev=691813&view=rev Log: Fixing for MNG-3741. Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java?rev=691813&r1=691812&r2=691813&view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3475-baseAlignedDir/plugin/src/main/java/test/Mojo3475.java Wed Sep 3 15:45:14 2008 @@ -34,7 +34,10 @@ testDirectoryAbsolutePath( build.getTestOutputDirectory(), failed ); testDirectoryAbsolutePath( build.getSourceDirectory(), failed ); testDirectoryAbsolutePath( build.getTestSourceDirectory(), failed ); -testDirectoryAbsolutePath( build.getScriptSourceDirectory(), failed ); + +// MNG-3741: Don't worry about relative script source directory. +// testDirectoryAbsolutePath( build.getScriptSourceDirectory(), failed ); + testDirectoryAbsolutePath( project.getReporting().getOutputDirectory(), failed ); if ( !failed.isEmpty() ) Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java?rev=691813&r1=691812&r2=691813&view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java Wed Sep 3 15:45:14 2008 @@ -64,7 +64,9 @@ checkListOfPaths( getTestProject().getCompileSourceRoots(), executionBasedir, "compileSourceRoots", failedPaths ); checkListOfPaths( getTestProject().getTestCompileSourceRoots(), executionBasedir, "testCompileSourceRoots", failedPaths ); -checkListOfPaths( getTestProject().getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths ); + +// MNG-3741: Don't worry about relative paths in scriptSourceRoots. +// checkListOfPaths( getTestProject().getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths ); if ( !failedPaths.isEmpty() ) Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java?rev=691813&r1=691812&r2=691813&view=diff == --- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3703-executionProjectRelativePaths/maven-mng3703-plugin/src/main/java/jar/CheckReport.java Wed Sep 3 15:45:14 2008 @@ -77,7 +77,9 @@ checkListOfPaths( executionProject.getCompileSourceRoots(), executionBasedir, "compileSourceRoots", failedPaths ); checkListOfPaths( executionProject.getTestCompileSourceRoots(), executionBasedir, "testCompileSourceRoots", failedPaths ); -checkListOfPaths( executionProject.getScriptSourceRoots(), executionBasedir, "scr
svn commit: r691814 - in /maven/components/branches/maven-2.1.0-M1-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ m
Author: jdcasey Date: Wed Sep 3 15:54:31 2008 New Revision: 691814 URL: http://svn.apache.org/viewvc?rev=691814&view=rev Log: [maven-release-plugin] prepare release maven-2.1.0-M1-RC13 Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-model/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-monitor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-registry/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-profile/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-project/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-repository-metadata/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-settings/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain/pom.xml maven/components/branches/maven-2.1.0-M1-RC/pom.xml Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml?rev=691814&r1=691813&r2=691814&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml Wed Sep 3 15:54:31 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC13-SNAPSHOT +2.1.0-M1-RC13 apache-maven Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml?rev=691814&r1=691813&r2=691814&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml Wed Sep 3 15:54:31 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC13-SNAPSHOT +2.1.0-M1-RC13 4.0.0 maven-artifact-manager Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml?rev=691814&r1=691813&r2=691814&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml Wed Sep 3 15:54:31 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC13-SNAPSHOT +2.1.0-M1-RC13 4.0.0 maven-artifact-test Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml?rev=691814&r1=691813&r2=691814&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml Wed Sep 3 15:54:31 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC13-SNAPSHOT +2.1.0-M1-RC13 4.0.0 maven-artifact Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml?rev=691814&r1=691813&r2=691814&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml Wed Sep 3 15:54:31 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC13-SNAPSHOT +2.1.0-M1-RC13
svn commit: r691815 - in /maven/components/tags/maven-2.1.0-M1-RC13: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ mav
Author: jdcasey Date: Wed Sep 3 15:54:54 2008 New Revision: 691815 URL: http://svn.apache.org/viewvc?rev=691815&view=rev Log: [maven-release-plugin] copy for tag maven-2.1.0-M1-RC13 Added: maven/components/tags/maven-2.1.0-M1-RC13/ - copied from r691729, maven/components/branches/maven-2.1.0-M1-RC/ maven/components/tags/maven-2.1.0-M1-RC13/apache-maven/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-artifact-manager/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-artifact-test/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-artifact/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-core/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-error-diagnostics/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-error-diagnostics/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-model/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-model/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-monitor/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-monitor/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-plugin-api/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-api/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-plugin-descriptor/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-descriptor/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-plugin-parameter-documenter/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-parameter-documenter/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-plugin-registry/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-registry/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-profile/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-profile/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-project/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-project/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java - copied unchanged from r691793, maven/components/branches/maven-2.1.0-M1-RC/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java maven/components/tags/maven-2.1.0-M1-RC13/maven-reporting/maven-reporting-api/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/maven-reporting-api/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-reporting/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-repository-metadata/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-repository-metadata/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-script/maven-script-ant/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-ant/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-script/maven-script-beanshell/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-beanshell/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-script/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-script/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-settings/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-settings/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/maven-toolchain/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain/pom.xml maven/components/tags/maven-2.1.0-M1-RC13/pom.xml - copied unchanged from r691814, maven/components/branches/maven-2.1.0-M1-RC/pom.xml
svn commit: r691816 - in /maven/components/branches/maven-2.1.0-M1-RC: ./ apache-maven/ maven-artifact-manager/ maven-artifact-test/ maven-artifact/ maven-core/ maven-error-diagnostics/ maven-model/ m
Author: jdcasey Date: Wed Sep 3 15:55:13 2008 New Revision: 691816 URL: http://svn.apache.org/viewvc?rev=691816&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-error-diagnostics/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-model/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-monitor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-descriptor/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-parameter-documenter/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-plugin-registry/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-profile/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-project/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/maven-reporting-api/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-reporting/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-repository-metadata/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-ant/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/maven-script-beanshell/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-script/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-settings/pom.xml maven/components/branches/maven-2.1.0-M1-RC/maven-toolchain/pom.xml maven/components/branches/maven-2.1.0-M1-RC/pom.xml Modified: maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml?rev=691816&r1=691815&r2=691816&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/apache-maven/pom.xml Wed Sep 3 15:55:13 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC13 +2.1.0-M1-RC14-SNAPSHOT apache-maven Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml?rev=691816&r1=691815&r2=691816&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-manager/pom.xml Wed Sep 3 15:55:13 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC13 +2.1.0-M1-RC14-SNAPSHOT 4.0.0 maven-artifact-manager Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml?rev=691816&r1=691815&r2=691816&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact-test/pom.xml Wed Sep 3 15:55:13 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC13 +2.1.0-M1-RC14-SNAPSHOT 4.0.0 maven-artifact-test Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml?rev=691816&r1=691815&r2=691816&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-artifact/pom.xml Wed Sep 3 15:55:13 2008 @@ -3,7 +3,7 @@ maven org.apache.maven -2.1.0-M1-RC13 +2.1.0-M1-RC14-SNAPSHOT 4.0.0 maven-artifact Modified: maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml?rev=691816&r1=691815&r2=691816&view=diff == --- maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.1.0-M1-RC/maven-core/pom.xml Wed Sep 3 15:55:13 2008 @@ -4,7 +4,7 @@ maven org.apache.maven -2.1.0-M1-RC13 +2.1.0-M1-RC14-SNAPSHOT
svn commit: r691831 - in /maven/components/branches/sisbell-maven-2.1-profile: maven-core/src/main/java/org/apache/maven/ maven-core/src/main/java/org/apache/maven/execution/ maven-core/src/test/java/
Author: sisbell
Date: Wed Sep 3 16:36:03 2008
New Revision: 691831
URL: http://svn.apache.org/viewvc?rev=691831&view=rev
Log:
Moved Project sorter out of maven-project. Only one class from a different
package used it. Now its an inner class of ReactorManager.
Added:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/test/java/org/apache/maven/execution/ProjectSorterTest.java
Removed:
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/aspect/org/apache/maven/project/aspect/ProjectCollisionReporterAspect.aj
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/ProjectSorter.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/java/org/apache/maven/project/ProjectSorterTest.java
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java?rev=691831&r1=691830&r2=691831&view=diff
==
---
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/ProjectCycleException.java
Wed Sep 3 16:36:03 2008
@@ -1,7 +1,6 @@
package org.apache.maven;
import org.apache.maven.execution.ReactorManager;
-import org.apache.maven.project.ProjectSorter;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import java.util.List;
@@ -9,7 +8,7 @@
/**
* Exception which occurs when creating a new [EMAIL PROTECTED]
ReactorManager} instance,
* due to failure to sort the current projects. The embedded [EMAIL PROTECTED]
CycleDetectedException}
- * is thrown by the [EMAIL PROTECTED] ProjectSorter}, and context of this
wrapped exception
+ * is thrown by the ProjectSorter and context of this wrapped exception
* includes the list of projects that contain the cycle, along with a friendly
* rendering of the cycle message indicating that it comes from the current
projects list.
*
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java?rev=691831&r1=691830&r2=691831&view=diff
==
---
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/execution/ReactorManager.java
Wed Sep 3 16:36:03 2008
@@ -24,14 +24,15 @@
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.project.DuplicateProjectException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectSorter;
+import org.apache.maven.model.Dependency;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
+import org.apache.maven.model.Extension;
import org.codehaus.plexus.util.dag.CycleDetectedException;
+import org.codehaus.plexus.util.dag.DAG;
+import org.codehaus.plexus.util.dag.TopologicalSorter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class ReactorManager
{
@@ -188,4 +189,210 @@
{
return buildFailuresByProject.size() + buildSuccessesByProject.size()
> 1;
}
+
+protected static class ProjectSorter
+{
+private final DAG dag;
+
+private final List sortedProjects;
+
+private MavenProject topLevelProject;
+
+/**
+ * Sort a list of projects.
+ *
+ * collect all the vertices for the projects that we want to
build.
+ * iterate through the deps of each project and if that dep is
within
+ * the set of projects we want to build then add an edge, otherwise
throw
+ * the edge away because that dependency is not within the set of
projects
+ * we are trying to build. we assume a closed set.
+ * do a topo sort on the graph that remains.
+ *
+ * @throws DuplicateProjectException if any projects are duplicated by
id
+ */
+// MAVENAPI FIXME: the DAG u
svn commit: r691833 - /maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
Author: vsiveton
Date: Wed Sep 3 16:55:01 2008
New Revision: 691833
URL: http://svn.apache.org/viewvc?rev=691833&view=rev
Log:
SCM-411: Performance: logger calls are not optimal
o improved all logging call (debug, error, warn and info)
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
Modified:
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java?rev=691833&r1=691832&r2=691833&view=diff
==
---
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
(original)
+++
maven/sandbox/trunk/scm/maven-scm-provider-svnjava/src/main/java/org/apache/maven/scm/provider/svn/svnjava/util/ScmFileEventHandler.java
Wed Sep 3 16:55:01 2008
@@ -79,8 +79,11 @@
if ( status == null )
{
-logger.info( "Unknown SVN file status: '" +
event.getExpectedAction() + "' for file: "
-+ event.getFile().getAbsolutePath() );
+if ( logger.isInfoEnabled() )
+{
+logger.info( "Unknown SVN file status: '" +
event.getExpectedAction() + "' for file: "
++ event.getFile().getAbsolutePath() );
+}
status = ScmFileStatus.UNKNOWN;
}
svn commit: r691832 [2/2] - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/log/ maven-scm-providers/maven-scm-provider-bazaar/src/main/java/org/apache/maven/scm/provider/bazaar/
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java?rev=691832&r1=691831&r2=691832&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/list/CvsListConsumer.java
Wed Sep 3 16:54:44 2008
@@ -45,25 +45,25 @@
public class CvsListConsumer
implements StreamConsumer
{
-private ScmLogger m_logger;
+private ScmLogger logger;
-private List m_entries;
+private List entries;
/**
* @param logger is a logger
*/
public CvsListConsumer( ScmLogger logger )
{
-m_logger = logger;
-m_entries = new LinkedList();
+this.logger = logger;
+this.entries = new LinkedList();
}
/** [EMAIL PROTECTED] */
public void consumeLine( String i_line )
{
-if ( m_logger.isDebugEnabled() )
+if ( logger.isDebugEnabled() )
{
-m_logger.debug( i_line );
+logger.debug( i_line );
}
String[] params = i_line.split( "/" );
@@ -71,15 +71,15 @@
{
if ( StringUtils.isNotEmpty( i_line ) )
{
-if ( m_logger.isWarnEnabled() )
+if ( logger.isWarnEnabled() )
{
-m_logger.warn( "Unable to parse it as CVS/Entries format:
" + i_line + "." );
+logger.warn( "Unable to parse it as CVS/Entries format: "
+ i_line + "." );
}
}
}
else
{
-m_entries.add( new ScmFile( params[1], ScmFileStatus.UNKNOWN ) );
+entries.add( new ScmFile( params[1], ScmFileStatus.UNKNOWN ) );
}
}
@@ -88,6 +88,6 @@
*/
public List getEntries()
{
-return m_entries;
+return entries;
}
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java?rev=691832&r1=691831&r2=691832&view=diff
==
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/login/CvsPass.java
Wed Sep 3 16:54:44 2008
@@ -94,9 +94,11 @@
throw new ScmException( "cvsroot is required" );
}
-logger.debug( "cvsRoot: " + cvsRoot );
-
-logger.debug( "passFile: " + passFile );
+if ( logger.isDebugEnabled() )
+{
+logger.debug( "cvsRoot: " + cvsRoot );
+logger.debug( "passFile: " + passFile );
+}
BufferedReader reader = null;
@@ -119,8 +121,11 @@
}
else
{
-logger.debug(
-"cvsroot " + cvsRoot + " already exist in " +
passFile.getAbsolutePath() + ". SKIPPED." );
+if ( logger.isDebugEnabled() )
+{
+logger.debug( "cvsroot " + cvsRoot + " already
exist in " + passFile.getAbsolutePath()
++ ". SKIPPED." );
+}
return;
}
@@ -141,7 +146,10 @@
String pwdfile = buf.toString() + "/1 " + cvsRoot + " A" + mangle(
password );
-logger.debug( "Writing -> " + pwdfile + " in " +
passFile.getAbsolutePath() );
+if ( logger.isDebugEnabled() )
+{
+logger.debug( "Writing -> " + pwdfile + " in " +
passFile.getAbsolutePath() );
+}
writer = new PrintWriter( new FileWriter( passFile ) );
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/org/apache/maven/scm/provider/cvslib/command/status/CvsStatusCo
svn commit: r691836 - in /maven/components/branches/sisbell-maven-2.1-profile/maven-project/src: main/java/org/apache/maven/project/ main/resources/META-INF/plexus/ test/resources/org/apache/maven/pro
Author: sisbell Date: Wed Sep 3 17:04:33 2008 New Revision: 691836 URL: http://svn.apache.org/viewvc?rev=691836&view=rev Log: Cleaned out the model lineage references in builder. Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=691836&r1=691835&r2=691836&view=diff == --- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java (original) +++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java Wed Sep 3 17:04:33 2008 @@ -39,10 +39,8 @@ import org.apache.maven.profiles.activation.ProfileActivationException; import org.apache.maven.profiles.build.ProfileAdvisor; import org.apache.maven.project.artifact.InvalidDependencyVersionException; -import org.apache.maven.project.build.model.ModelLineageBuilder; import org.apache.maven.project.builder.PomArtifactResolver; import org.apache.maven.project.builder.ProjectBuilder; -import org.apache.maven.project.inheritance.ModelInheritanceAssembler; import org.apache.maven.project.injection.ModelDefaultsInjector; import org.apache.maven.project.interpolation.ModelInterpolationException; import org.apache.maven.project.interpolation.ModelInterpolator; @@ -111,8 +109,6 @@ private ArtifactFactory artifactFactory; -private ModelInheritanceAssembler modelInheritanceAssembler; - private ModelValidator validator; // TODO: make it a component @@ -124,8 +120,6 @@ private ModelInterpolator modelInterpolator; -private ModelLineageBuilder modelLineageBuilder; - private ProfileAdvisor profileAdvisor; private MavenTools mavenTools; Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java?rev=691836&r1=691835&r2=691836&view=diff == --- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java (original) +++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultRepositoryHelper.java Wed Sep 3 17:04:33 2008 @@ -83,7 +83,7 @@ File file = projectArtifact.getFile(); artifact.setFile(file); -legacy_model = readModelLegacy(projectId, file, true); +legacy_model = readModelLegacy(projectId, file, false); String downloadUrl = null; Modified: maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml?rev=691836&r1=691835&r2=691836&view=diff == --- maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/resources/META-INF/plexus/components.xml Wed Sep 3 17:04:33 2008 @@ -144,9 +144,6 @@ org.apache.maven.artifact.metadata.ArtifactMetadataSource - org.apache.maven.project.build.model.ModelLineageBuilder - - org.apache.maven.profiles.build.ProfileAdvisor @@ -159,9 +156,6 @@ org.apache.maven.project.interpolation.ModelInterpolator - org.apache.maven.project.inheritance.ModelInheritanceAssembler - - org.apache.maven.pro
svn commit: r691844 - /maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
Author: jvanzyl
Date: Wed Sep 3 17:55:12 2008
New Revision: 691844
URL: http://svn.apache.org/viewvc?rev=691844&view=rev
Log:
[MSHADE-39] adding a resource transformer that can deal with META-INF/services
entries.
Added:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
(with props)
Added:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java?rev=691844&view=auto
==
---
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
(added)
+++
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
Wed Sep 3 17:55:12 2008
@@ -0,0 +1,95 @@
+package org.apache.maven.plugins.shade.resource;
+
+/*
+ * 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.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+
+import org.codehaus.plexus.util.IOUtil;
+import org.jdom.Content;
+
+/**
+ * Resources transformer that appends entries in META-INF/services resources
into
+ * a single resource. For example, if there are several
META-INF/services/org.apache.maven.project.ProjectBuilder
+ * resources spread across many JARs the individual entries will all be
concatenated into a single
+ * META-INF/services/org.apache.maven.project.ProjectBuilder resource packaged
into the resultant JAR produced
+ * by the shading process.
+ *
+ * @author jvanzyl
+ */
+public class ServicesResourceTransformer
+implements ResourceTransformer
+{
+private static final String SERVICES_PATH = "META-INF/services";
+
+private ByteArrayOutputStream data;
+
+private Map serviceEntries = new HashMap();
+
+public boolean canTransformResource( String resource )
+{
+if ( resource.startsWith( SERVICES_PATH ) )
+{
+data = (ByteArrayOutputStream) serviceEntries.get( resource );
+
+if ( data == null )
+{
+data = new ByteArrayOutputStream();
+serviceEntries.put( resource, data );
+}
+
+return true;
+}
+
+return false;
+}
+
+public void processResource( InputStream is )
+throws IOException
+{
+IOUtil.copy( is, data );
+is.close();
+}
+
+public boolean hasTransformedResource()
+{
+return serviceEntries.size() > 0;
+}
+
+public void modifyOutputStream( JarOutputStream jos )
+throws IOException
+{
+for ( Iterator i = serviceEntries.keySet().iterator(); i.hasNext(); )
+{
+String key = (String) i.next();
+ByteArrayOutputStream data = (ByteArrayOutputStream)
serviceEntries.get( key );
+jos.putNextEntry( new JarEntry( key ) );
+IOUtil.copy( new ByteArrayInputStream( data.toByteArray() ), jos );
+data.reset();
+}
+}
+}
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
--
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
--
svn:keywords = "Author Date Id Revision"
