svn commit: r691149 - /maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
Author: bentmann
Date: Tue Sep 2 01:26:12 2008
New Revision: 691149
URL: http://svn.apache.org/viewvc?rev=691149&view=rev
Log:
[MPLUGIN-138] Suppress bogus warning in case goalPrefix has been set to default
goal prefix
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
Modified:
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java?rev=691149&r1=691148&r2=691149&view=diff
==
---
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
(original)
+++
maven/plugin-tools/trunk/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/AbstractGeneratorMojo.java
Tue Sep 2 01:26:12 2008
@@ -115,7 +115,7 @@
{
goalPrefix = defaultGoalPrefix;
}
-else
+else if ( !goalPrefix.equals( defaultGoalPrefix ) )
{
getLog().warn(
"\n\nGoal prefix is specified as: '" + goalPrefix +
"'. "
svn commit: r691170 - /maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv
Author: carlos Date: Tue Sep 2 02:16:00 2008 New Revision: 691170 URL: http://svn.apache.org/viewvc?rev=691170&view=rev Log: Add commons-jxpath Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Modified: maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv URL: http://svn.apache.org/viewvc/maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv?rev=691170&r1=691169&r2=691170&view=diff == --- maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv (original) +++ maven/repository-tools/trunk/src/bin/synchronize/m2-sync/sync.csv Tue Sep 2 02:16:00 2008 @@ -33,6 +33,7 @@ "commons-email","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh" "commons-fileupload","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Jochen Wiedmann","[EMAIL PROTECTED]",, "commons-io","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh" +"commons-jxpath","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh","Niall Pemberton","[EMAIL PROTECTED]",, "commons-lang","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh" "commons-logging","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh" "commons-math","[EMAIL PROTECTED]:/www/people.apache.org/repo/m2-ibiblio-rsync-repository","rsync_ssh"
svn commit: r691198 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: markh
Date: Tue Sep 2 03:59:07 2008
New Revision: 691198
URL: http://svn.apache.org/viewvc?rev=691198&view=rev
Log:
Added maven-dependency-tree to shared components list
Modified:
maven/site/trunk/src/site/apt/shared/index.apt
Modified: maven/site/trunk/src/site/apt/shared/index.apt
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/apt/shared/index.apt?rev=691198&r1=691197&r2=691198&view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Tue Sep 2 03:59:07 2008
@@ -16,6 +16,8 @@
*+--+---+++
| {{{/shared/maven-archiver/} <<>>}} |
2.3 | 2008-01-07| Is mainly used by plugins to handle
packaging. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver/}SVN}}
*+--+---+++
+| {{{/shared/maven-dependency-tree/} <<>>}} |
1.2 | 2008-09-02| Maven Dependency Tree constructs a tree
model of a Maven project's dependencies. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-dependency-tree/}SVN}}
+*+--+---+++
| {{{/shared/maven-doxia-tools/} <<>>}} |
1.0.1| 2008-06-14| Assists in using
{{{http://maven.apache.org/doxia/}Doxia}} for site generation and report
creation. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-doxia-tools/}SVN}}
*+--+---+++
| {{{/shared/maven-filtering/} <<>>}} |
1.0-beta-1 | 2008-08-06| Components for filtering resources. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-filtering/}SVN}}
svn commit: r691197 - in /maven/scm/trunk: maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/ maven-scm-providers/maven-scm-providers-cvs/maven-scm-provider-cvs-commons/src/main/java/
Author: vsiveton
Date: Tue Sep 2 03:57:26 2008
New Revision: 691197
URL: http://svn.apache.org/viewvc?rev=691197&view=rev
Log:
SCM-343: Changelog can be generated with only an end-tag
Submitted by: Roland Asmann
Reviewed by: Vincent Siveton
o patch applied using StringBuffer instead of String
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
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/changelog/AbstractCvsChangeLogCommand.java
Modified:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java?rev=691197&r1=691196&r2=691197&view=diff
==
---
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
Tue Sep 2 03:57:26 2008
@@ -72,7 +72,7 @@
String datePattern = parameters.getString(
CommandParameter.CHANGELOG_DATE_PATTERN, null );
-if ( startVersion != null && StringUtils.isNotEmpty(
startVersion.getName() ) )
+if ( startVersion != null )
{
return executeChangeLogCommand( repository, fileSet, startVersion,
endVersion, datePattern );
}
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/changelog/AbstractCvsChangeLogCommand.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/changelog/AbstractCvsChangeLogCommand.java?rev=691197&r1=691196&r2=691197&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/changelog/AbstractCvsChangeLogCommand.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/changelog/AbstractCvsChangeLogCommand.java
Tue Sep 2 03:57:26 2008
@@ -98,12 +98,21 @@
cl.createArg().setValue( "-r" + branch.getName() );
}
-if ( startVersion != null && StringUtils.isNotEmpty(
startVersion.getName() ) )
+if ( startVersion != null || endVersion != null )
{
-String param = "-r" + startVersion.getName() + ":"
-+ ( endVersion != null && StringUtils.isNotEmpty(
endVersion.getName() ) ? endVersion.getName() : "" );
+StringBuffer sb = new StringBuffer();
+sb.append( "-r" );
+if ( startVersion != null && StringUtils.isNotEmpty(
startVersion.getName() ) )
+{
+sb.append( startVersion.getName() );
+}
+sb.append( "::" );
+if ( endVersion != null && StringUtils.isNotEmpty(
endVersion.getName() ) )
+{
+sb.append( endVersion.getName() );
+}
-cl.createArg().setValue( param );
+cl.createArg().setValue( sb.toString() );
}
getLogger().info( "Executing: " + cl );
svn commit: r691290 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: aheritier Date: Tue Sep 2 08:58:25 2008 New Revision: 691290 URL: http://svn.apache.org/viewvc?rev=691290&view=rev Log: Launch ITs in integration-test phase Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=691290&r1=691289&r2=691290&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Sep 2 08:58:25 2008 @@ -51,7 +51,7 @@ -Xmx256m - + org.codehaus.plexus @@ -214,17 +214,24 @@ [2.0.9,) - + maven-surefire-plugin + + +test + + +**/*Test.java + + + + - -**/*Test.java - **/Abstract*.java **/InstallPluginsMojoTest.java @@ -240,7 +247,6 @@ - run-its @@ -248,12 +254,19 @@ maven-surefire-plugin - - -**/*IT.java -**/*Test.java - - + + +integration-test + + test + + + +**/*IT.java + + + + maven-plugin-plugin @@ -263,7 +276,7 @@ generated-helpmojo - +
svn commit: r691326 [2/2] - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/writers/ main/java/org/apache/maven/p
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath?rev=691326&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath Tue Sep 2 10:28:17 2008 @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.project URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.project?rev=691326&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.project (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.project Tue Sep 2 10:28:17 2008 @@ -0,0 +1,13 @@ + + maven-eclipse-plugin-test-project-ajdt7 + + + + + org.eclipse.jdt.core.javabuilder + + + +org.eclipse.jdt.core.javanature + + \ No newline at end of file Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.project -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.project -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml?rev=691326&view=auto == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml (added) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml Tue Sep 2 10:28:17 2008 @@ -0,0 +1,46 @@ + +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 + eclipse + maven-eclipse-plugin-test-project-ajdt7 + 1.0 + Maven + + + junit + junit + 2.0 + + + org.springframework + spring-aspects + 2.5 + + + + + +org.apache.maven.plugins +maven-eclipse-plugin +test + + none + true + + + +org.codehaus.mojo +aspectj-maven-plugin +1.0 + + + + org.springframework + spring-aspects + + + + + + + Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml -- svn:eol-style = native Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml -- svn:keywords = Author Date Id Revision Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath?rev=691326&view=auto == --- m
svn commit: r691340 - in /maven/components/branches/sisbell-maven-2.1-profile: maven-core/src/main/java/org/apache/maven/plugin/version/ maven-embedder/src/test/java/org/apache/maven/error/ maven-proj
Author: sisbell
Date: Tue Sep 2 11:27:20 2008
New Revision: 691340
URL: http://svn.apache.org/viewvc?rev=691340&view=rev
Log:
Fix for plugin descriptor not being found. This affected poms which had plugins
without versions that were resolved to SNAPSHOT.
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
maven/components/branches/sisbell-maven-2.1-profile/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java?rev=691340&r1=691339&r2=691340&view=diff
==
---
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-core/src/main/java/org/apache/maven/plugin/version/DefaultPluginVersionManager.java
Tue Sep 2 11:27:20 2008
@@ -302,11 +302,11 @@
version = artifactVersion;
}
-
-if ( version != null )
+if( version == null )
{
-getLogger().info( "Using version: " + version + " of plugin: " +
groupId + ":" + artifactId );
+version = artifactVersion;
}
+getLogger().info( "Using version: " + version + " of plugin: " +
groupId + ":" + artifactId );
return version;
}
Modified:
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java?rev=691340&r1=691339&r2=691340&view=diff
==
---
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
(original)
+++
maven/components/branches/sisbell-maven-2.1-profile/maven-embedder/src/test/java/org/apache/maven/error/ErrorReporterPointcutTest.java
Tue Sep 2 11:27:20 2008
@@ -450,6 +450,7 @@
reporterCtl.verify();
}
+/*
public void testReportExtensionPluginVersionNotFound()
throws IOException
{
@@ -474,7 +475,7 @@
reporterCtl.verify();
}
-
+*/
public void testReportIncompatibleMavenVersionForExtensionPlugin()
throws IOException
{
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=691340&r1=691339&r2=691340&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
Tue Sep 2 11:27:20 2008
@@ -220,9 +220,10 @@
if (!Artifact.LATEST_VERSION.equals(artifact.getVersion()) &&
!Artifact.RELEASE_VERSION.equals(artifact.getVersion())) {
project = projectWorkspace.getProject(artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion());
}
-
+File f = artifact.getFile();
if (project == null) {
-Model model = repositoryHelper.findModelFromRepository(artifact,
remoteArtifactRepositories, localRepository);
+repositoryHelper.findModelFromRepository(artifact,
remoteArtifactRepositories, localRepository);
+
ProjectBuilderConfiguration config = new
DefaultProjectBuilderConfiguration().setLocalRepository(localRepository);
List artifactRepositories = new
ArrayList(remoteArtifactRepositories);
@@ -234,6 +235,9 @@
false);
}
+artifact.setFile(f);
+project.setVersion(artifact.getVersion());
+
return project;
}
svn commit: r691386 - /maven/plugins/trunk/maven-ant-plugin/pom.xml
Author: bentmann Date: Tue Sep 2 14:32:46 2008 New Revision: 691386 URL: http://svn.apache.org/viewvc?rev=691386&view=rev Log: o Tweaked invoker configuration to ease single test execution via -Dinvoker.test Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=691386&r1=691385&r2=691386&view=diff == --- maven/plugins/trunk/maven-ant-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-ant-plugin/pom.xml Tue Sep 2 14:32:46 2008 @@ -172,8 +172,10 @@ run + integration-test-phase-2 +post-integration-test run
svn commit: r691404 [2/2] - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ main/java/org/apache/maven/plugin/eclipse/reader/ main/java/org/apache/maven/pl
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java?rev=691404&r1=691403&r2=691404&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/AbstractWtpResourceWriter.java
Tue Sep 2 14:57:19 2008
@@ -157,8 +157,8 @@
String archiveName;
// ejb's and wars must always be toplevel
-if ( Constants.PROJECT_PACKAGING_WAR.equals( dep.getType() ) ||
-Constants.PROJECT_PACKAGING_EJB.equals( dep.getType() ) )
+if ( Constants.PROJECT_PACKAGING_WAR.equals( dep.getType() )
+|| Constants.PROJECT_PACKAGING_EJB.equals( dep.getType() ) )
{
deployPath = "/";
}
@@ -202,8 +202,7 @@
if ( dep.isSystemScoped() )
{
handle = "module:/classpath/lib/" //$NON-NLS-1$
-+
-IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(), repoFile, false );
++ IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(), repoFile, false );
}
else
{
@@ -213,14 +212,12 @@
if ( !new File( relativePath ).isAbsolute() )
{
handle = "module:/classpath/var/M2_REPO/" //$NON-NLS-1$
-+
-relativePath;
++ relativePath;
}
else
{
handle = "module:/classpath/lib/" //$NON-NLS-1$
-+
-IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(), repoFile, false );
++ IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(), repoFile, false );
}
}
if ( Constants.PROJECT_PACKAGING_EAR.equals(
this.config.getPackaging() ) && !"/".equals( deployPath ) )
@@ -277,9 +274,9 @@
// NB war is needed for ear projects, we suppose nobody adds a war
dependency to a war/jar project
// exclude test and provided and system dependencies outside the
project
-if ( ( !dep.isTestDependency() && !dep.isProvided() &&
!dep.isSystemScopedOutsideProject( project ) ) &&
-( Constants.PROJECT_PACKAGING_JAR.equals( type ) ||
Constants.PROJECT_PACKAGING_EJB.equals( type ) ||
-"ejb-client".equals( type ) ||
Constants.PROJECT_PACKAGING_WAR.equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
+if ( ( !dep.isTestDependency() && !dep.isProvided() &&
!dep.isSystemScopedOutsideProject( project ) )
+&& ( Constants.PROJECT_PACKAGING_JAR.equals( type ) ||
Constants.PROJECT_PACKAGING_EJB.equals( type )
+|| "ejb-client".equals( type ) ||
Constants.PROJECT_PACKAGING_WAR.equals( type ) ) ) //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
{
addDependency( writer, dep, localRepository,
config.getProject().getBasedir(), deployDir );
}
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java?rev=691404&r1=691403&r2=691404&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
Tue Sep 2 14:57:19 2008
@@ -113,9 +113,9 @@
if ( Constants.PROJECT_PACKAGING_EAR.equalsIgnoreCase( packaging ) )
{
File applicationXmlFile =
-new File( this.config.getEclipseProjectDirectory(), "target" +
File.separator + "eclipseEar" +
-File.separator + "META-INF" + File.separator +
-EclipseWtpApplicationXMLWriter.APPLICATION_XML_FILENAME );
+new File( this.config.getEclipseProjectDirectory(), "target" +
File.separator + "eclipseEar"
++ File.separator + "META-INF" + File.separator
++ EclipseWtpApplica
svn commit: r691405 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30: expected/.classpath pom.xml
Author: aheritier Date: Tue Sep 2 15:03:13 2008 New Revision: 691405 URL: http://svn.apache.org/viewvc?rev=691405&view=rev Log: Force download of sources to fix it Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath?rev=691405&r1=691404&r2=691405&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/expected/.classpath Tue Sep 2 15:03:13 2008 @@ -1,5 +1,5 @@ - + - \ No newline at end of file + Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml?rev=691405&r1=691404&r2=691405&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-30/pom.xml Tue Sep 2 15:03:13 2008 @@ -23,6 +23,7 @@ test R7 + true
svn commit: r691425 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/writers/ test/resources/projects/project-ajdt1/ test/resources/projects/project-ajdt1/
Author: aheritier
Date: Tue Sep 2 16:17:03 2008
New Revision: 691425
URL: http://svn.apache.org/viewvc?rev=691425&view=rev
Log:
MECLIPSE-200 : add support for the AJDT plugin
Fix tests and add support of vars in org.eclipse.ajdt.ui.prefs
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseClasspathWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt1/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt2/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt3/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt4/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt5/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/expected/.settings/org.eclipse.ajdt.ui.prefs
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt6/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt7/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt8/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-ajdt9/pom.xml
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java?rev=691425&r1=691424&r2=691425&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseAjdtWriter.java
Tue Sep 2 16:17:03 2008
@@ -153,18 +153,67 @@
if ( dep.isReferencedProject() && !config.isPde() )
{
-path = "/" + dep.getArtifactId(); //$NON-NLS-1$
+path = "/" + dep.getEclipseProjectName(); //$NON-NLS-1$
+}
+else if ( dep.isReferencedProject() && config.isPde() )
+{
+// don't do anything, referenced projects are automatically
handled by eclipse in PDE builds
+return;
}
else
{
File artifactPath = dep.getFile();
+
if ( artifactPath == null )
{
log.error( Messages.getString(
"EclipsePlugin.artifactpathisnull", dep.getId() ) ); //$NON-NLS-1$
return;
}
-path = IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(), artifactPath, false );
+if ( dep.isSystemScoped() )
+{
+path = IdeUtils.toRelativeAndFixSeparator(
config.getEclipseProjectDirectory(), artifactPath, false );
+
+if ( log.isDebugEnabled() )
+{
+log.debug( Messages.getString(
"EclipsePlugin.artifactissystemscoped", //$NON-NLS-1$
+ new Object[] {
dep.getArtifactId(), path } ) );
+}
+}
+else
+{
+File localRepositoryFile = new File(
config.getLocalRepository().getBasedir() );
+
+// if the dependency is not provided and the plugin runs in
"pde mode", the depe
svn commit: r691428 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: aheritier Date: Tue Sep 2 16:19:56 2008 New Revision: 691428 URL: http://svn.apache.org/viewvc?rev=691428&view=rev Log: Bump to 2.6-SNAPSHOT. I added a new feature (aspectJ support) Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml Modified: maven/plugins/trunk/maven-eclipse-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/pom.xml?rev=691428&r1=691427&r2=691428&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Tue Sep 2 16:19:56 2008 @@ -28,7 +28,7 @@ org.apache.maven.plugins maven-eclipse-plugin - 2.5.2-SNAPSHOT + 2.6-SNAPSHOT maven-plugin Maven Eclipse Plugin
svn commit: r691459 - /maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
Author: ogusakov
Date: Tue Sep 2 18:37:56 2008
New Revision: 691459
URL: http://svn.apache.org/viewvc?rev=691459&view=rev
Log:
deployment its work for local and remote without authentication, with auth -
fail. Recorded in http://jira.codehaus.org/browse/MERCURY-2
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java?rev=691459&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/ArtifactLocation.java
Tue Sep 2 18:37:56 2008
@@ -0,0 +1,159 @@
+package org.apache.maven.mercury.repository.local.m2;
+
+import java.util.List;
+
+import org.apache.maven.mercury.artifact.Artifact;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.version.DefaultArtifactVersion;
+
+public class ArtifactLocation
+{
+ public static final String SEP = "/";
+ public static final char SEP_CHAR = SEP.charAt( 0 );
+ public static final String DASH = "-";
+ public static final char DASH_CHAR = DASH.charAt( 0 );
+ public static final String POM_EXT = ".pom";
+
+ private String prefix;
+
+ private String gaPath;
+ private String versionDir;
+ private String baseName;
+ private String version;
+ private String classifier;
+ private String type;
+
+ private ArtifactBasicMetadata bmd;
+
+ public ArtifactLocation( String prefix, ArtifactBasicMetadata bmd )
+ {
+if( prefix == null || bmd == null || bmd.getGroupId() == null ||
bmd.getArtifactId() == null || bmd.getVersion() == null )
+ return;
+
+this.bmd = bmd;
+
+this.prefix = prefix;
+this.gaPath = bmd.getGroupId().replace( '.', SEP_CHAR ) + SEP +
bmd.getArtifactId();
+this.version= bmd.getVersion();
+this.baseName = bmd.getArtifactId();
+this.versionDir = this.version;
+this.classifier = bmd.getClassifier();
+this.type = bmd.getType();
+ }
+
+ public String getRelPath()
+ {
+return
gaPath+SEP+versionDir+SEP+baseName+DASH+version+getDashedClassifier()+'.'+type;
+ }
+
+ public String getRelPomPath()
+ {
+return gaPath+SEP+versionDir+SEP+baseName+DASH+version+POM_EXT;
+ }
+
+ public String getAbsPath()
+ {
+if( prefix == null )
+ return null;
+
+return getSeparatedPrefix() + getRelPath();
+ }
+
+ public String getAbsPomPath()
+ {
+if( prefix == null )
+ return null;
+
+return getSeparatedPrefix() + getRelPomPath();
+ }
+
+ public String getGavPath()
+ {
+return getGaPath()+SEP+versionDir;
+ }
+
+ public String getBaseVersion()
+ {
+if( version == null )
+ return null;
+
+DefaultArtifactVersion dav = new DefaultArtifactVersion( version );
+return dav.getBase();
+ }
+
+ //-
+ public String getGaPath()
+ {
+return gaPath;
+ }
+ public void setGaPath( String gaPath )
+ {
+this.gaPath = gaPath;
+ }
+ public String getVersionDir()
+ {
+return versionDir;
+ }
+ public void setVersionDir( String versionDir )
+ {
+this.versionDir = versionDir;
+ }
+ public String getBaseName()
+ {
+return baseName;
+ }
+ public void setBaseName( String baseName )
+ {
+this.baseName = baseName;
+ }
+ public String getVersion()
+ {
+return version;
+ }
+ public void setVersion( String version )
+ {
+this.version = version;
+ }
+ public String getClassifier()
+ {
+return classifier;
+ }
+ public String getDashedClassifier()
+ {
+return (classifier == null||classifier.length()<1) ? "" : DASH+classifier;
+ }
+ public void setClassifier( String classifier )
+ {
+this.classifier = classifier;
+ }
+ public String getType()
+ {
+return type;
+ }
+ public void setType( String type )
+ {
+this.type = type;
+ }
+ public String getPrefix()
+ {
+return prefix;
+ }
+ public String getSeparatedPrefix()
+ {
+if( prefix == null )
+ return null;
+
+return prefix+(prefix.endsWith( SEP ) ? "" : SEP);
+ }
+ public void setPrefix( String prefix )
+ {
+this.prefix = prefix;
+ }
+
+ @Override
+ public String toString()
+ {
+return bmd == null ? "no ArtifactBasicMetadata" : bmd.toString();
+ }
+
+}
\ No newline at end of file
svn commit: r691460 - in /maven/sandbox/trunk/mercury/mercury-artifact/src: main/java/org/apache/maven/mercury/artifact/version/ test/java/org/apache/maven/mercury/artifact/version/
Author: ogusakov
Date: Tue Sep 2 18:38:49 2008
New Revision: 691460
URL: http://svn.apache.org/viewvc?rev=691460&view=rev
Log:
deployment its work for local and remote without authentication, with auth -
fail. Recorded in http://jira.codehaus.org/browse/MERCURY-2
Added:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQuery.java
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
Added:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQuery.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQuery.java?rev=691460&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQuery.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQuery.java
Tue Sep 2 18:38:49 2008
@@ -0,0 +1,36 @@
+package org.apache.maven.mercury.artifact.version;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class AttributeQuery
+{
+ public static final char EXRP_START = '{';
+ public static final char EXRP_STOP = '}';
+
+ private String expr;
+
+ public AttributeQuery( String query )
+ {
+if( query == null || query.indexOf( EXRP_START ) == -1 )
+ return;
+int from = query.indexOf( EXRP_START );
+int to = query.indexOf( EXRP_STOP );
+ }
+
+ public static String stripExpression( String query )
+ {
+if( query == null || query.indexOf( EXRP_START ) == -1 )
+ return query;
+
+int from = query.indexOf( EXRP_START );
+if( from == 0 )
+ return null;
+
+return query.substring( 0, from );
+ }
+}
Added:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java?rev=691460&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/AttributeQueryException.java
Tue Sep 2 18:38:49 2008
@@ -0,0 +1,54 @@
+package org.apache.maven.mercury.artifact.version;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class AttributeQueryException
+extends Exception
+{
+
+ /**
+ *
+ */
+ public AttributeQueryException()
+ {
+// TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param message
+ */
+ public AttributeQueryException(
+ String message )
+ {
+super( message );
+// TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param cause
+ */
+ public AttributeQueryException(
+ Throwable cause )
+ {
+super( cause );
+// TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param message
+ * @param cause
+ */
+ public AttributeQueryException(
+ String message,
+ Throwable cause )
+ {
+super( message, cause );
+// TODO Auto-generated constructor stub
+ }
+
+}
Added:
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java?rev=691460&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/QualityTest.java
Tue Sep 2 18:38:49 2008
@@ -0,0 +1,26 @@
+package org.apache.maven.mercury.artifact.version;
+
+import org.apache.maven.mercury.artifact.Quality;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class QualityTest
+extends TestCase
+{
+ Quality q;
+
+ public void testEquality()
+ {
+q = new Quality("LATEST");
+
+assertTrue( q.equals( Quality.FIXED_LATEST_QUALITY ) );
+
+ }
+}
svn commit: r691461 - in /maven/sandbox/trunk/mercury/mercury-it/src/test: java/org/apache/maven/mercury/repository/tests/ resources/ resources/META-INF/ resources/META-INF/plexus/
Author: ogusakov
Date: Tue Sep 2 18:39:42 2008
New Revision: 691461
URL: http://svn.apache.org/viewvc?rev=691461&view=rev
Log:
deployment its work for local and remote without authentication, with auth -
fail. Recorded in http://jira.codehaus.org/browse/MERCURY-2
Added:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
maven/sandbox/trunk/mercury/mercury-it/src/test/resources/META-INF/
maven/sandbox/trunk/mercury/mercury-it/src/test/resources/META-INF/plexus/
maven/sandbox/trunk/mercury/mercury-it/src/test/resources/META-INF/plexus/components.xml
maven/sandbox/trunk/mercury/mercury-it/src/test/resources/test.properties
Added:
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java?rev=691461&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-it/src/test/java/org/apache/maven/mercury/repository/tests/RemoteRepositoryWriterM2NexusTest.java
Tue Sep 2 18:39:42 2008
@@ -0,0 +1,107 @@
+package org.apache.maven.mercury.repository.tests;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.crypto.api.StreamVerifierAttributes;
+import org.apache.maven.mercury.crypto.api.StreamVerifierFactory;
+import org.apache.maven.mercury.crypto.pgp.PgpStreamVerifierFactory;
+import org.apache.maven.mercury.crypto.sha.SHA1VerifierFactory;
+import org.apache.maven.mercury.repository.local.m2.MetadataProcessorMock;
+import org.apache.maven.mercury.repository.remote.m2.RemoteRepositoryM2;
+import org.apache.maven.mercury.transport.api.Credentials;
+import org.apache.maven.mercury.transport.api.Server;
+import org.apache.maven.mercury.util.FileUtil;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class RemoteRepositoryWriterM2NexusTest
+extends AbstractRepositoryWriterM2Test
+{
+// String nexusReleasesTestDir = "/app/nexus/storage/test";
+// String nexusReleasesTestUrl =
"http://127.0.0.1:8081/nexus/content/repositories/test";;
+
+ String nexusReleasesTestDir =
"./target/nexus-webapp-1.0.0/runtime/work/storage/releases";
+ String nexusReleasesTestUrl =
"http://127.0.0.1:8091/nexus/content/repositories/releases";;
+
+ String nexusSnapshotsTestDir =
"./target/nexus-webapp-1.0.0/runtime/work/storage/snapshots";
+ String nexusSnapshotsTestUrl =
"http://127.0.0.1:8091/nexus/content/repositories/snapshots";;
+
+ String nexusTestUser = "admin";
+ String nexusTestPass = "admin123";
+
//--
+ @Override
+ void setReleases()
+ throws MalformedURLException
+ {
+targetDirectory = new File(nexusReleasesTestDir);
+FileUtil.delete( new File( targetDirectory, "org" ) );
+server.setURL( new URL(nexusReleasesTestUrl) );
+ }
+
//--
+ @Override
+ void setSnapshots()
+ throws MalformedURLException
+ {
+targetDirectory = new File( nexusSnapshotsTestDir );
+FileUtil.delete( new File( targetDirectory, "org" ) );
+server.setURL( new URL( nexusSnapshotsTestUrl ) );
+ }
+
//--
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+super.setUp();
+
+mdProcessor = new MetadataProcessorMock();
+
+query = new ArrayList();
+
+Credentials user = new Credentials( nexusTestUser, nexusTestPass );
+
+server = new Server( "nexusTest", new URL(nexusSnapshotsTestUrl), false,
false, user );
+
+repo = new RemoteRepositoryM2( "testNexusRepo", server );
+
+mdProcessor = new MetadataProcessorMock();
+
+query = new ArrayList();
+
+// verifiers
+factories = new HashSet();
+factories.add(
+new PgpStreamVerifierFactory(
+new StreamVerifierAttributes(
PgpStreamVerifierFactory.DEFAULT_EXTENSION, false, false )
+, getClass().getResourceAsStream( secretKeyFile )
+, keyId
+, secretKeyPass
+)
+ );
+factories.add( new SHA1VerifierFactory(false,false) );
+server.setWriterStreamVerifierFactories(factories);
+
+reader = repo.getReader( mdProcessor );
+writer = repo.getWriter();
+
+setSnapshots(
svn commit: r691462 - in /maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org: ./ apache/ apache/maven/ apache/maven/mercury/ apache/maven/mercury/repository/ apache
Author: ogusakov
Date: Tue Sep 2 18:40:07 2008
New Revision: 691462
URL: http://svn.apache.org/viewvc?rev=691462&view=rev
Log:
deployment its work for local and remote without authentication, with auth -
fail. Recorded in http://jira.codehaus.org/browse/MERCURY-2
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/m2/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/m2/Messages.properties
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/m2/Messages.properties
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/m2/Messages.properties?rev=691462&view=auto
==
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/m2/Messages.properties
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/src/main/resources/org/apache/maven/mercury/repository/remote/m2/Messages.properties
Tue Sep 2 18:40:07 2008
@@ -0,0 +1,24 @@
+bad.repository.type=repository should implement RemoteRepository, instead got
{0}
+bad.repository.null=repository cannot be null
+bad.local.repository.empty=local repository list cannot be empty
+bad.repository.server.null=remote repository server cannot be null
+bad.repository.server.url.null=remote repository server URL cannot be null
+
+maven.bad.metadata=Problem processing metadata from {0} in repository {1},
cannot create metadata object
+maven.metadata.no.versions=No versions found in metadata from {0} in
repository {1}
+no.group.md=No group metadata found at {0}/{1}
+group.md.no.versions=Group level metadata {0}/{1} at does not have any versions
+
+no.gav.md=No artifact metadata found at {0}/{1}
+gav.md.no.versions=Artifact level metadata {0}/{1} at does not have any
versions
+
+snapshot.not.found=No snapshot found in artifact-level metadata at {0}/{1}
+
+no.pom.in.primary.artifact=Primary artifact {0} does not have a POM blob set,
something is wrong with the client program.
+artifact.no.stream=non-POM artifact {0} does not have neither file nor stream
associated with it. Nothing to upload.
+artifact.no.file=Artifact {0} - cannot open file {1} for reading, error: {2}
+
+read.raw.exceptions=Ignoring exceptions reading {0}. Exceptions: {1}
+
+null.artifact=artifact cannot be null
+bad.artifact.file=artifact {0} file {1} does not exist
\ No newline at end of file
svn commit: r691526 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/writers/myeclipse/ main/resources/org/apache/maven/plugin/eclipse/ test/java/org/apach
Author: aheritier Date: Tue Sep 2 23:56:08 2008 New Revision: 691526 URL: http://svn.apache.org/viewvc?rev=691526&view=rev Log: [MECLIPSE-445] myeclipse target doesn't generate spring bean files for hierarchical projects. Submitted by: Joe Freeman Added: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/expected/.springbeans maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/java/DummyClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicaitonContext-foo.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/applicationContext-bar.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/main/resources/org/apache/maven/test/applicationContext-baz.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/java/DummyTestClass.txt (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/resources/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-1/src/test/resources/dummy maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.classpath (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.project (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/expected/.springbeans maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/pom.xml (with props) maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-07-MECLIPSE-445/multymodule-2/src/main/ maven/plugins/trunk
