svn commit: r628030 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/ test/java/org/apache/maven/plugin/eclipse/ test/resources/projects/project-myeclipse-
Author: aheritier
Date: Fri Feb 15 03:57:07 2008
New Revision: 628030
URL: http://svn.apache.org/viewvc?rev=628030&view=rev
Log:
MECLIPSE-390 : myeclipse goal ignores additionalConfig
Patch submitted by Julien Jakubowski
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/eclipse-settings/checkstyle-config.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_content
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_file
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.checkstyle_url
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.classpath
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/pom.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/java/DummyClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/main/resources/org/apache/maven/test/applicationContext-persistence.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/java/DummyTestClass.txt
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/src/test/resources/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-myeclipse-05/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/MyEclipsePlugin.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MyEclipsePluginTest.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=628030&r1=628029&r2=628030&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
Fri Feb 15 03:57:07 2008
@@ -950,6 +950,15 @@
// So the .project file must be written AFTER those have run!
new EclipseProjectWriter().init( getLog(), config ).write();
+writeAdditionalConfig();
+
+getLog().info( Messages.getString( "EclipsePlugin.wrote", new Object[]
{ //$NON-NLS-1$
+ config.getEclipseProjectName(),
eclipseProjectDir.getAbsolutePath() } ) );
+}
+
+protected void writeAdditionalConfig()
+throws MojoExecutionException
+{
if ( additionalConfig != null )
{
for ( int j = 0; j < additionalConfig.length; j++ )
@@ -1006,9 +1015,6 @@
}
}
-
-getLog().inf
svn commit: r628070 - /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Author: aheritier
Date: Fri Feb 15 06:24:38 2008
New Revision: 628070
URL: http://svn.apache.org/viewvc?rev=628070&view=rev
Log:
MECLIPSE-344 : connecting existing workspace artifact-projects
Patch submitted by Richard van Nieuwenhoven
Fix the case when the workspace directory is invalid and we can't find
available JREs
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java?rev=628070&r1=628069&r2=628070&view=diff
==
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/reader/ReadWorkspaceLocations.java
Fri Feb 15 06:24:38 2008
@@ -420,6 +420,10 @@
File prefs =
new File( workspaceLocation,
ReadWorkspaceLocations.METADATA_PLUGINS_ORG_ECLIPSE_CORE_RUNTIME_LAUNCHING_PREFS
);
+if ( !prefs.exists() )
+{
+return jreMap;
+}
Properties properties = new Properties();
properties.load( new FileInputStream( prefs ) );
vms =
svn commit: r628091 - in /maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin: eclipse/EclipsePlugin.java ide/AbstractIdeSupportMojo.java
Author: aheritier
Date: Fri Feb 15 07:40:16 2008
New Revision: 628091
URL: http://svn.apache.org/viewvc?rev=628091&view=rev
Log:
MECLIPSE-344 : connecting existing workspace artifact-projects
Patch submitted by Richard van Nieuwenhoven
Push down from AbstractIDESupportMojo to Eclipse Mojo everything related to
eclipse workspace
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/ide/AbstractIdeSupportMojo.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=628091&r1=628090&r2=628091&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
Fri Feb 15 07:40:16 2008
@@ -446,6 +446,25 @@
*/
private ResourceManager locator;
+/**
+ * This eclipse workspace is read and all artifacts detected there will be
connected as eclipse projects and will
+ * not be linked to the jars in the local repository. Requirement is that
it was created with the similar wtp
+ * settings as the reactor projects, but the project name template my
differ. The pom's in the workspace projects
+ * may not contain variables in the artefactId, groupId and version tags.
+ *
+ * @since 2.5
+ * @parameter expression="${eclipse.workspace}"
+ */
+protected String workspace;
+
+/**
+ * Limit the use of project references to the current workspace. No
project references will be created to projects
+ * in the reactor when they are not available in the workspace.
+ *
+ * @parameter expression="${eclipse.limitProjectReferencesToWorkspace}"
default-value="false"
+ */
+protected boolean limitProjectReferencesToWorkspace;
+
protected boolean isJavaProject()
{
return isJavaProject;
@@ -1459,5 +1478,78 @@
public List getExcludes()
{
return excludes;
+}
+
+/**
+ * Utility method that locates a project in the workspace for the given
artifact.
+ *
+ * @param artifact the artifact a project should produce.
+ * @return true if the artifact is produced by a reactor
projectart.
+ */
+private boolean isAvailableAsAWorkspaceProject( Artifact artifact )
+{
+IdeDependency[] workspaceArtefacts = getWorkspaceArtefacts();
+for ( int index = 0; workspaceArtefacts != null && index <
workspaceArtefacts.length; index++ )
+{
+IdeDependency workspaceArtefact = workspaceArtefacts[index];
+if ( workspaceArtefact.getGroupId().equals( artifact.getGroupId()
) &&
+workspaceArtefact.getArtifactId().equals(
artifact.getArtifactId() ) )
+{
+if ( workspaceArtefact.getVersion().equals(
artifact.getVersion() ) )
+{
+workspaceArtefact.setAddedToClasspath( true );
+getLog().debug( "Using workspace project: " +
workspaceArtefact.getEclipseProjectName() );
+return true;
+}
+else
+{
+getLog().info(
+ "Artifact " +
+ artifact.getId() +
+ " already available as a workspace
project, but with different version. Expected: " +
+ artifact.getVersion() + ", found: " +
workspaceArtefact.getVersion() );
+}
+}
+}
+return false;
+}
+
+/*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.maven.plugin.ide.AbstractIdeSupportMojo#doDependencyResolution()
+ */
+protected IdeDependency[] doDependencyResolution()
+throws MojoExecutionException
+{
+
+return super.doDependencyResolution();
+}
+
+/**
+ * Checks if jar has to be resolved for the given artifact
+ *
+ * @param art the artifact to check
+ * @return true if resolution should happen
+ */
+protected boolean hasToResolveJar( Artifact art )
+{
+return !( getUseProjectReferences() && isAvailableAsAReactorProject(
art ) ) ||
+( limitProjectReferencesToWorkspace && !(
getUseProjectReferences() && isAvailableAsAWorkspaceProject( art ) ) );
+}
+
+/**
+ * Checks if a projects reference has to be used for the given artifact
+ *
+ * @param art the artifact to check
+ * @return true if a project reference has to be used.
+ */
svn commit: r628188 - in /maven/sandbox/trunk/shared/maven-filtering/src: main/java/org/apache/maven/shared/filtering/ test/java/org/apache/maven/shared/filtering/ test/units-files/maven-resources-fil
Author: olamy
Date: Fri Feb 15 14:07:04 2008
New Revision: 628188
URL: http://svn.apache.org/viewvc?rev=628188&view=rev
Log:
add a parameter to pass a list of file extensions to not filtering
Added:
maven/sandbox/trunk/shared/maven-filtering/src/test/units-files/maven-resources-filtering/happy_duke.gif
(with props)
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/MavenResourcesFiltering.java
maven/sandbox/trunk/shared/maven-filtering/src/test/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFilteringTest.java
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java?rev=628188&r1=628187&r2=628188&view=diff
==
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenFileFilter.java
Fri Feb 15 14:07:04 2008
@@ -98,16 +98,15 @@
{
for ( Iterator i = filters.iterator(); i.hasNext(); )
{
-String filtersfile = (String) i.next();
+String filterfile = (String) i.next();
try
{
-
-Properties properties = PropertyUtils.loadPropertyFile(
new File( filtersfile ), baseProps );
+Properties properties = PropertyUtils.loadPropertyFile(
new File( filterfile ), baseProps );
filterProperties.putAll( properties );
}
catch ( IOException e )
{
-throw new MavenFilteringException( "Error loading property
file '" + filtersfile + "'", e );
+throw new MavenFilteringException( "Error loading property
file '" + filterfile + "'", e );
}
}
}
Modified:
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java?rev=628188&r1=628187&r2=628188&view=diff
==
---
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
(original)
+++
maven/sandbox/trunk/shared/maven-filtering/src/main/java/org/apache/maven/shared/filtering/DefaultMavenResourcesFiltering.java
Fri Feb 15 14:07:04 2008
@@ -27,6 +27,7 @@
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
/**
* @author mailto:[EMAIL PROTECTED]">olamy
@@ -51,15 +52,17 @@
private MavenFileFilter mavenFileFilter;
public void filterResources( List resources, File outputDirectory,
MavenProject mavenProject, String encoding,
- List fileFilters )
+ List fileFilters, List
nonFilteredFileExtensions )
throws MavenFilteringException
{
List filterWrappers = mavenFileFilter.getDefaultFilterWrappers(
mavenProject, fileFilters, true );
-filterResources( resources, outputDirectory, encoding, filterWrappers,
mavenProject.getBasedir() );
+filterResources( resources, outputDirectory, encoding, filterWrappers,
mavenProject.getBasedir(),
+ nonFilteredFileExtensions );
}
-public void filterResources( List resources, File outputDirectory, String
encoding, List filterWrappers, File resourcesBaseDirectory )
+public void filterResources( List resources, File outputDirectory, String
encoding, List filterWrappers,
+ File resourcesBaseDirectory, List
nonFilteredFileExtensions )
throws MavenFilteringException
{
for ( Iterator i = resources.iterator(); i.hasNext(); )
@@ -69,6 +72,7 @@
String targetPath = resource.getTargetPath();
File resourceDirectory = new File( resource.getDirectory() );
+
if ( !resourceDirectory.isAbsolute() )
{
resourceDirectory = new File( resourcesBaseDirectory,
resourceDirectory.getPath() );
@@ -111,7 +
svn commit: r628195 - /maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java
Author: vsiveton Date: Fri Feb 15 14:54:02 2008 New Revision: 628195 URL: http://svn.apache.org/viewvc?rev=628195&view=rev Log: MJAVADOC-176: javadoc uses the undcoumented and platform unspecific -J-fullversion to determine version instead of the more standardized -J-version Submitted by: Alexander Sack Reviewed by: Vincent Siveton o patch applied Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Modified: maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java?rev=628195&r1=628194&r2=628195&view=diff == --- maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java (original) +++ maven/plugins/trunk/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/JavadocUtil.java Fri Feb 15 14:54:02 2008 @@ -367,7 +367,7 @@ /** * Call the Javadoc tool and parse its output to find its version, i.e.: * - * javadoc.exe(or .sh) -J-fullversion + * javadoc.exe(or .sh) -J-version * * * @param javadocExe not null file @@ -389,7 +389,7 @@ Commandline cmd = new Commandline(); cmd.setExecutable( javadocExe.getAbsolutePath() ); cmd.setWorkingDirectory( javadocExe.getParentFile() ); -cmd.createArgument().setValue( "-J-fullversion" ); +cmd.createArgument().setValue( "-J-version" ); CommandLineUtils.StringStreamConsumer out = new CommandLineUtils.StringStreamConsumer(); CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer(); @@ -413,17 +413,17 @@ return parseJavadocVersion( out.getOutput() ); } -throw new IllegalArgumentException( "No output found from the command line 'javadoc -J-fullversion'" ); +throw new IllegalArgumentException( "No output found from the command line 'javadoc -J-version'" ); } /** - * Parse the output for 'javadoc -J-fullversion' and return the javadoc version recognized. + * Parse the output for 'javadoc -J-version' and return the javadoc version recognized. * - * Here are some output for 'javadoc -J-fullversion' depending the JDK used: + * Here are some output for 'javadoc -J-version' depending the JDK used: * * * JDK - * Output for 'javadoc -J-fullversion' + * Output for 'javadoc -J-version' * * * Sun 1.4 @@ -451,7 +451,7 @@ * * * - * @param output for 'javadoc -J-fullversion' + * @param output for 'javadoc -J-version' * @return the version of the javadoc for the output. * @throws PatternSyntaxException if the output doesn't match with the output pattern (?s).*?([0-9]+\\.[0-9]+)(\\.([0-9]+))?.*. * @throws IllegalArgumentException if the output is null
svn commit: r628192 - in /maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng: TestNGDirectoryTestSuite.java TestNGXmlTestSuite.java
Author: dfabulich
Date: Fri Feb 15 14:28:34 2008
New Revision: 628192
URL: http://svn.apache.org/viewvc?rev=628192&view=rev
Log:
[SUREFIRE-452] Allow the user to override the name "TestSuite" in plugin
configuration. I modified this patch to make it work with XML suites as well.
Submitted by: Erez Nahir
Reviewed by: Dan Fabulich
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=628192&r1=628191&r2=628192&view=diff
==
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
Fri Feb 15 14:28:34 2008
@@ -74,6 +74,7 @@
this.version = artifactVersion;
this.classifier = artifactClassifier;
+
}
protected SurefireTestSet createTestSet( Class testClass, ClassLoader
classLoader )
@@ -161,8 +162,8 @@
public static void startTestSuite( ReporterManager reporterManager, Object
suite )
{
String rawString = bundle.getString( "testSetStarting" );
-
-ReportEntry report = new ReportEntry( suite.getClass().getName(),
"TestSuite", rawString );
+
+ReportEntry report = new ReportEntry( suite.getClass().getName(),
getSuiteName(suite), rawString );
try
{
@@ -179,10 +180,32 @@
String rawString = bundle.getString( "testSetCompletedNormally" );
ReportEntry report =
-new ReportEntry( suite.getClass().getName(), "TestSuite",
rawString );
+new ReportEntry( suite.getClass().getName(), getSuiteName(suite),
rawString );
reporterManager.testSetCompleted( report );
reporterManager.reset();
}
+
+public String getSuiteName() {
+String result = (String) options.get("suitename");
+if (result == null) {
+result = "TestSuite";
+}
+return result;
+}
+
+private static String getSuiteName(Object suite)
+{
+String result;
+if (suite instanceof TestNGDirectoryTestSuite) {
+return ((TestNGDirectoryTestSuite) suite).getSuiteName();
+} else if (suite instanceof TestNGXmlTestSuite) {
+return ((TestNGXmlTestSuite) suite).getSuiteName();
+}else {
+result = "TestSuite";
+}
+
+return result;
+}
}
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java?rev=628192&r1=628191&r2=628192&view=diff
==
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
Fri Feb 15 14:28:34 2008
@@ -134,4 +134,12 @@
return this.testSets;
}
+
+public String getSuiteName() {
+String result = (String) options.get("suitename");
+if (result == null) {
+result = "TestSuite";
+}
+return result;
+}
}
svn commit: r628201 - in /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools: DefaultSiteTool.java SiteTool.java
Author: vsiveton
Date: Fri Feb 15 15:20:20 2008
New Revision: 628201
URL: http://svn.apache.org/viewvc?rev=628201&view=rev
Log:
o moved AbstractSiteMojo.codeToLocale() see
http://www.nabble.com/Move-AbstractSiteMojo.codeToLocale()-into-SiteTool-of-maven-doxia-tools--td15445934s177.html
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=628201&r1=628200&r2=628201&view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Fri Feb 15 15:20:20 2008
@@ -26,6 +26,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
@@ -905,6 +906,71 @@
}
}
+/** [EMAIL PROTECTED] */
+public List getAvailableLocales( String locales )
+{
+List localesList = new ArrayList();
+if ( locales != null )
+{
+String[] localesArray = StringUtils.split( locales, "," );
+
+for ( int i = 0; i < localesArray.length; i++ )
+{
+Locale locale = codeToLocale( localesArray[i] );
+
+if ( locale != null )
+{
+if ( !Arrays.asList( Locale.getAvailableLocales()
).contains( locale ) )
+{
+if ( getLogger().isWarnEnabled() )
+{
+getLogger().warn( "The locale parsed defined by '"
+ locale
++ "' is not available in this Java Virtual
Machine (" + System.getProperty( "java.version" )
++ " from " + System.getProperty( "java.vendor"
) + ") - IGNORING" );
+}
+continue;
+}
+
+// Default bundles are in English
+if ( !locale.getLanguage().equals(
DEFAULT_LOCALE.getLanguage() ) )
+{
+if ( !i18n.getBundle( "site-plugin", locale
).getLocale().getLanguage().equals(
+locale.getLanguage() ) )
+{
+StringBuffer sb = new StringBuffer();
+
+sb.append( "The locale '" ).append( locale
).append( "' (" );
+sb.append( locale.getDisplayName( Locale.ENGLISH )
);
+sb.append( ") is not currently support by Maven -
IGNORING. " );
+sb.append( "\n" );
+sb.append( "Contribution are welcome and greatly
appreciated! " );
+sb.append( "\n" );
+sb.append( "If you want to contribute a new
translation, please visit " );
+sb.append(
"http://maven.apache.org/plugins/maven-site-plugin/i18n.html " );
+sb.append( "for detailed instructions." );
+
+if ( getLogger().isWarnEnabled() )
+{
+getLogger().warn( sb.toString() );
+}
+
+continue;
+}
+}
+
+localesList.add( locale );
+}
+}
+}
+
+if ( localesList.isEmpty() )
+{
+localesList = Collections.singletonList( DEFAULT_LOCALE );
+}
+
+return localesList;
+}
+
// --
// Private methods
// --
@@ -1180,5 +1246,57 @@
private static boolean isEmptyList( List list )
{
return list == null || list.isEmpty();
+}
+
+/**
+ * Converts a locale code like "en", "en_US" or "en_US_win" to a
java.util.Locale
+ * object.
+ * If localeCode = default, return the current value of
the default locale for this instance
+ * of the Java Virtual Machine.
+ *
+ * @param localeCode the locale code string.
+ * @return a java.util.Locale object instancied or null if errors occurred
+ * @see http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html";>java.util.Locale#getDefault()
+
svn commit: r628203 - /maven/pom/trunk/maven/pom.xml
Author: epunzalan Date: Fri Feb 15 15:36:18 2008 New Revision: 628203 URL: http://svn.apache.org/viewvc?rev=628203&view=rev Log: just updating my email/organization/timezone profile Modified: maven/pom/trunk/maven/pom.xml Modified: maven/pom/trunk/maven/pom.xml URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=628203&r1=628202&r2=628203&view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Fri Feb 15 15:36:18 2008 @@ -1,4 +1,4 @@ - +
svn commit: r628202 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: AbstractSiteMojo.java SiteDescriptorAttachMojo.java SiteMojo.java SiteRunMojo.java
Author: vsiveton
Date: Fri Feb 15 15:23:08 2008
New Revision: 628202
URL: http://svn.apache.org/viewvc?rev=628202&view=rev
Log:
o fixed code due to r628201
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDescriptorAttachMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java?rev=628202&r1=628201&r2=628202&view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractSiteMojo.java
Fri Feb 15 15:23:08 2008
@@ -20,14 +20,10 @@
*/
import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.StringTokenizer;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.doxia.site.decoration.DecorationModel;
@@ -39,7 +35,6 @@
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.i18n.I18N;
-import org.codehaus.plexus.util.StringUtils;
/**
* Base class for site mojos.
@@ -50,17 +45,12 @@
extends AbstractMojo
{
/**
- * The locale by default for all default bundles
- */
-private static final Locale DEFAULT_LOCALE = Locale.ENGLISH;
-
-/**
* A comma separated list of locales supported by Maven. The first valid
token will be the default Locale
* for this instance of the Java Virtual Machine.
*
* @parameter expression="${locales}"
*/
-private String locales;
+protected String locales;
/**
* SiteTool.
@@ -129,120 +119,6 @@
* @parameter expression="${outputEncoding}" default-value="ISO-8859-1"
*/
protected String outputEncoding;
-
-/**
- * Init the localesList variable.
- * If locales variable is available, the first valid token
will be the defaultLocale
- * for this instance of the Java Virtual Machine.
- *
- * @return a list of Locale
- */
-protected List getAvailableLocales()
-{
-List localesList = new ArrayList();
-if ( locales != null )
-{
-String[] localesArray = StringUtils.split( locales, "," );
-
-for ( int i = 0; i < localesArray.length; i++ )
-{
-Locale locale = codeToLocale( localesArray[i] );
-
-if ( locale != null )
-{
-if ( !Arrays.asList( Locale.getAvailableLocales()
).contains( locale ) )
-{
-getLog().warn( "The locale parsed defined by '" +
locale
-+ "' is not available in this Java Virtual Machine
(" + System.getProperty( "java.version" )
-+ " from " + System.getProperty( "java.vendor" ) +
") - IGNORING" );
-continue;
-}
-
-// Default bundles are in English
-if ( !locale.getLanguage().equals(
DEFAULT_LOCALE.getLanguage() ) )
-{
-if ( !i18n.getBundle( "site-plugin", locale
).getLocale().getLanguage().equals(
-locale.getLanguage() ) )
-{
-StringBuffer sb = new StringBuffer();
-
-sb.append( "The locale '" ).append( locale
).append( "' (" );
-sb.append( locale.getDisplayName( Locale.ENGLISH )
);
-sb.append( ") is not currently support by Maven -
IGNORING. " );
-sb.append( "\n" );
-sb.append( "Contribution are welcome and greatly
appreciated! " );
-sb.append( "\n" );
-sb.append( "If you want to contribute a new
translation, please visit " );
-sb.append(
"http://maven.apache.org/plugins/maven-site-plugin/i18n.html " );
-sb.append( "for detailed instructions." );
-
-getLog().warn( sb.toString() );
-
-continue;
-}
-
svn commit: r628216 - in /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools: DefaultSiteTool.java SiteTool.java
Author: vsiveton
Date: Fri Feb 15 16:30:06 2008
New Revision: 628216
URL: http://svn.apache.org/viewvc?rev=628216&view=rev
Log:
o fixed due Benjamin's comment
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=628216&r1=628215&r2=628216&view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Fri Feb 15 16:30:06 2008
@@ -971,6 +971,49 @@
return localesList;
}
+/** [EMAIL PROTECTED] */
+public Locale codeToLocale( String localeCode )
+{
+if ( localeCode == null )
+{
+return null;
+}
+
+if ( "default".equalsIgnoreCase( localeCode ) )
+{
+return Locale.getDefault();
+}
+
+String language = "";
+String country = "";
+String variant = "";
+
+StringTokenizer tokenizer = new StringTokenizer( localeCode, "_" );
+if ( tokenizer.countTokens() > 3 )
+{
+if ( getLogger().isWarnEnabled() )
+{
+getLogger().warn( "Invalid java.util.Locale format for '" +
localeCode + "' entry - IGNORING" );
+}
+return null;
+}
+
+if ( tokenizer.hasMoreTokens() )
+{
+language = tokenizer.nextToken();
+if ( tokenizer.hasMoreTokens() )
+{
+country = tokenizer.nextToken();
+if ( tokenizer.hasMoreTokens() )
+{
+variant = tokenizer.nextToken();
+}
+}
+}
+
+return new Locale( language, country, variant );
+}
+
// --
// Private methods
// --
@@ -1246,57 +1289,5 @@
private static boolean isEmptyList( List list )
{
return list == null || list.isEmpty();
-}
-
-/**
- * Converts a locale code like "en", "en_US" or "en_US_win" to a
java.util.Locale
- * object.
- * If localeCode = default, return the current value of
the default locale for this instance
- * of the Java Virtual Machine.
- *
- * @param localeCode the locale code string.
- * @return a java.util.Locale object instancied or null if errors occurred
- * @see http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html";>java.util.Locale#getDefault()
- */
-private Locale codeToLocale( String localeCode )
-{
-if ( localeCode == null )
-{
-return null;
-}
-
-if ( "default".equalsIgnoreCase( localeCode ) )
-{
-return Locale.getDefault();
-}
-
-String language = "";
-String country = "";
-String variant = "";
-
-StringTokenizer tokenizer = new StringTokenizer( localeCode, "_" );
-if ( tokenizer.countTokens() > 3 )
-{
-if ( getLogger().isWarnEnabled() )
-{
-getLogger().warn( "Invalid java.util.Locale format for '" +
localeCode + "' entry - IGNORING" );
-}
-return null;
-}
-
-if ( tokenizer.hasMoreTokens() )
-{
-language = tokenizer.nextToken();
-if ( tokenizer.hasMoreTokens() )
-{
-country = tokenizer.nextToken();
-if ( tokenizer.hasMoreTokens() )
-{
-variant = tokenizer.nextToken();
-}
-}
-}
-
-return new Locale( language, country, variant );
}
}
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java?rev=628216&r1=628215&r2=628216&view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
Fri Feb 15 16:30:06 2008
@@ -221,4 +221,16 @@
* @return a list of Locale
*/
List getAvailableLocales( String locales );
+
+/**
+ * Converts a locale code
svn commit: r628217 - /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Author: vsiveton
Date: Fri Feb 15 16:34:03 2008
New Revision: 628217
URL: http://svn.apache.org/viewvc?rev=628217&view=rev
Log:
o fixed resources call
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Modified:
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=628217&r1=628216&r2=628217&view=diff
==
---
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
(original)
+++
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
Fri Feb 15 16:34:03 2008
@@ -934,7 +934,7 @@
// Default bundles are in English
if ( !locale.getLanguage().equals(
DEFAULT_LOCALE.getLanguage() ) )
{
-if ( !i18n.getBundle( "site-plugin", locale
).getLocale().getLanguage().equals(
+if ( !i18n.getBundle( "site-tool", locale
).getLocale().getLanguage().equals(
locale.getLanguage() ) )
{
StringBuffer sb = new StringBuffer();
svn commit: r628218 - in /maven/plugins/trunk/maven-war-plugin/src: it/MWAR-143/ it/MWAR-143/war-common/ it/MWAR-143/war-common/src/main/images/ main/java/org/apache/maven/plugin/war/ main/java/org/ap
Author: olamy
Date: Fri Feb 15 16:37:38 2008
New Revision: 628218
URL: http://svn.apache.org/viewvc?rev=628218&view=rev
Log:
[MWAR-145] Add a mojo parameter for file extensions which must not be filtered.
Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/images/
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/images/duke-beer.jpg
(with props)
Modified:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/AbstractWarPackagingTask.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarPackagingContext.java
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/packaging/WarProjectPackagingTask.java
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml?rev=628218&r1=628217&r2=628218&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml Fri Feb 15
16:37:38 2008
@@ -32,7 +32,13 @@
maven-war-plugin
- @pom.version@
+
+ 2.1-alpha-2-SNAPSHOT
+
+
+ jpg
+
+
Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh?rev=628218&r1=628217&r2=628218&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh (original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/verify.bsh Fri Feb 15
16:37:38 2008
@@ -23,8 +23,55 @@
boolean result = true;
+filesAreIdentical( File expected, File current )
+throws IOException
+{
+if ( expected.length() != current.length() )
+{
+return false;
+}
+FileInputStream expectedIn = new FileInputStream( expected );
+FileInputStream currentIn = new FileInputStream( current );
+try
+{
+byte[] expectedBuffer = IOUtil.toByteArray( expectedIn );
+
+byte[] currentBuffer = IOUtil.toByteArray( currentIn );
+if (expectedBuffer.length != currentBuffer.length)
+{
+return false;
+}
+for (int i = 0,size = expectedBuffer.length;ihttp://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml?rev=628218&r1=628217&r2=628218&view=diff
==
--- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml
(original)
+++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/pom.xml Fri
Feb 15 16:37:38 2008
@@ -32,13 +32,19 @@
org.apache.maven.plugins
- maven-war-plugin
+ maven-war-plugin
properties
-
+
+
+
+src/main/images
+true
+
+
Added:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/images/duke-beer.jpg
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/images/duke-beer.jpg?rev=628218&view=auto
==
Binary file - no diff available.
Propchange:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/images/duke-beer.jpg
--
svn:executable = *
Propchange:
maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/war-common/src/main/images/duke-beer.jpg
--
svn:mime-type = image/jpeg
Modified:
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=628218&r1=628217&r2=628218&view=diff
==
---
maven/plugins/trunk/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
(original)
+++
m
svn commit: r628221 - /maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml
Author: olamy Date: Fri Feb 15 16:42:57 2008 New Revision: 628221 URL: http://svn.apache.org/viewvc?rev=628221&view=rev Log: fix plugin harcoded version in it test Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml Modified: maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml?rev=628221&r1=628220&r2=628221&view=diff == --- maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml (original) +++ maven/plugins/trunk/maven-war-plugin/src/it/MWAR-143/pom.xml Fri Feb 15 16:42:57 2008 @@ -32,8 +32,7 @@ maven-war-plugin - - 2.1-alpha-2-SNAPSHOT + @pom.version@ jpg
svn commit: r628240 - in /maven/artifact/trunk/src/main/java/org/apache/maven/artifact: Artifact.java resolver/ResolutionNode.java
Author: carlos
Date: Fri Feb 15 21:22:46 2008
New Revision: 628240
URL: http://svn.apache.org/viewvc?rev=628240&view=rev
Log:
Add javadocs
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java?rev=628240&r1=628239&r2=628240&view=diff
==
--- maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
(original)
+++ maven/artifact/trunk/src/main/java/org/apache/maven/artifact/Artifact.java
Fri Feb 15 21:22:46 2008
@@ -121,8 +121,14 @@
ArtifactHandler getArtifactHandler();
+/**
+ * @return [EMAIL PROTECTED] List} < [EMAIL PROTECTED] String} > with
artifact ids
+ */
List getDependencyTrail();
+/**
+ * @param dependencyTrail [EMAIL PROTECTED] List} < [EMAIL PROTECTED]
String} > with artifact ids
+ */
void setDependencyTrail( List dependencyTrail );
void setScope( String scope );
Modified:
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
URL:
http://svn.apache.org/viewvc/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java?rev=628240&r1=628239&r2=628240&view=diff
==
---
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
(original)
+++
maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
Fri Feb 15 21:22:46 2008
@@ -111,6 +111,10 @@
trail = null;
}
+/**
+ * @return [EMAIL PROTECTED] List} < [EMAIL PROTECTED] String} > with
artifact ids
+ * @throws OverConstrainedVersionException
+ */
public List getDependencyTrail()
throws OverConstrainedVersionException
{
svn commit: r628241 - in /maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact: Artifact.java resolver/ResolutionNode.java
Author: carlos
Date: Fri Feb 15 21:25:45 2008
New Revision: 628241
URL: http://svn.apache.org/viewvc?rev=628241&view=rev
Log:
Add javadocs. Merge 628240 from
https://svn.apache.org/repos/asf/maven/artifact/trunk
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?rev=628241&r1=628240&r2=628241&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
Fri Feb 15 21:25:45 2008
@@ -123,8 +123,14 @@
ArtifactHandler getArtifactHandler();
+/**
+ * @return [EMAIL PROTECTED] List} < [EMAIL PROTECTED] String} > with
artifact ids
+ */
List getDependencyTrail();
+/**
+ * @param dependencyTrail [EMAIL PROTECTED] List} < [EMAIL PROTECTED]
String} > with artifact ids
+ */
void setDependencyTrail( List dependencyTrail );
void setScope( String scope );
Modified:
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java?rev=628241&r1=628240&r2=628241&view=diff
==
---
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
(original)
+++
maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ResolutionNode.java
Fri Feb 15 21:25:45 2008
@@ -106,6 +106,10 @@
trail = null;
}
+/**
+ * @return [EMAIL PROTECTED] List} < [EMAIL PROTECTED] String} > with
artifact ids
+ * @throws OverConstrainedVersionException
+ */
public List getDependencyTrail()
throws OverConstrainedVersionException
{
svn commit: r628242 - /maven/plugins/trunk/maven-eclipse-plugin/pom.xml
Author: aheritier Date: Fri Feb 15 23:01:26 2008 New Revision: 628242 URL: http://svn.apache.org/viewvc?rev=628242&view=rev Log: Do not use a scope in a plugin dependency to avoid resolution problems in the future 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=628242&r1=628241&r2=628242&view=diff == --- maven/plugins/trunk/maven-eclipse-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-eclipse-plugin/pom.xml Fri Feb 15 23:01:26 2008 @@ -17,8 +17,7 @@ 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"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +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";> maven-plugins org.apache.maven.plugins @@ -149,7 +148,7 @@ org.apache.maven maven-archiver 2.2 - + org.codehaus.plexus plexus-resources @@ -192,7 +191,7 @@ org.eclipse.core resources - [3.1.0,4.0.0) + 3.3.0-v20070604 org.eclipse.ant
