svn commit: r636194 - in /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp: decorators/default.jsp include/uploadForm.jspf upload.jsp
Author: oching
Date: Tue Mar 11 21:22:17 2008
New Revision: 636194
URL: http://svn.apache.org/viewvc?rev=636194view=rev
Log:
[MRM-216]
-moved the artifact upload fields into a separate form
-added upload artifact in the navigation menu
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=636194r1=636193r2=636194view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
Tue Mar 11 21:22:17 2008
@@ -95,6 +95,10 @@
li class=none
my:currentWWUrl action=browse namespace=/Browse/my:currentWWUrl
/li
+
+ li class=none
+my:currentWWUrl action=upload namespace=/Upload
Artifact/my:currentWWUrl
+ /li
/ul
redback:ifAnyAuthorized
permissions=archiva-manage-users,archiva-access-reports,archiva-manage-configuration
Added:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf?rev=636194view=auto
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
(added)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/include/uploadForm.jspf
Tue Mar 11 21:22:17 2008
@@ -0,0 +1,33 @@
+%--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ License); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ --%
+
+%--
http://www.opensymphony.com/webwork/wikidocs/File%20Upload%20Interceptor.html
--%
+
+%@ taglib prefix=ww uri=/webwork %
+%@ taglib prefix=c uri=http://java.sun.com/jsp/jstl/core; %
+
+ww:textfield name=groupId label=Group Id size=50 required=true/
+ww:textfield name=artifactId label=Artifact Id size=50 required=true/
+ww:textfield name=version label=Version size=50 required=true/
+ww:textfield name=packaging label=Packaging size=50 required=true/
+ww:textfield name=classifier label=Classifier size=50 required=false/
+ww:select list=[EMAIL PROTECTED]@{'internal' : 'internal'}
+ name=repositoryId label=Repository Id/
+ww:file name=upload label=File/
+
Modified:
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp?rev=636194r1=636193r2=636194view=diff
==
---
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
(original)
+++
maven/archiva/trunk/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/upload.jsp
Tue Mar 11 21:22:17 2008
@@ -21,8 +21,6 @@
%@ taglib prefix=ww uri=/webwork %
%@ taglib prefix=c uri=http://java.sun.com/jsp/jstl/core; %
-%@ taglib prefix=archiva uri=http://maven.apache.org/archiva; %
-%@ taglib prefix=redback
uri=http://plexus.codehaus.org/redback/taglib-1.0; %
html
head
@@ -35,16 +33,8 @@
h1Upload Artifact/h1
div id=contentArea
ww:form action=doUpload method=post enctype=multipart/form-data
-pgroupId: input type=text name=groupId size=50 value=
id=groupId//p
-partifactId: input type=text name=artifactId size=50 value=
id=artifactId//p
-pversion: input type=text name=version size=50 value=
id=version//p
-ppackaging: input type=text name=packaging size=50 value=
id=packaging//p
-pclassifier: input type=text name=classifier size=50 value=
svn commit: r636019 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng3284-usingCachedPlugins/ resources/mng3284-usingCac
Author: brianf
Date: Tue Mar 11 10:24:58 2008
New Revision: 636019
URL: http://svn.apache.org/viewvc?rev=636019view=rev
Log:
MNG-3284: it for plugin caching
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomA/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomA/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomB/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomB/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/src/main/groovy/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/src/main/groovy/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/src/main/groovy/test/bug/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/src/main/groovy/test/bug/DepMojo.groovy
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/src/main/groovy/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/src/main/groovy/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/src/main/groovy/test/bug/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/src/main/groovy/test/bug/DepMojo.groovy
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/pom.xml
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java?rev=636019view=auto
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
(added)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
Tue Mar 11 10:24:58 2008
@@ -0,0 +1,72 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * Integration test to check MNG-3284 - that explicitly defined plugins are
used, not the one that is cached.
+ */
+public class MavenITmng3284UsingCachedPluginsTest
+extends AbstractMavenIntegrationTestCase
+{
+public void testitMNG3284Test()
+throws Exception
+{
+
+// The testdir is computed from the location of this
+// file.
+File testDir = ResourceExtractor.simpleExtractResources( getClass(),
/mng3284-usingCachedPlugins );
+
+Verifier verifier;
+
+/*
+ * Build Mojo v1
+ */
+verifier = new Verifier( new File( testDir.getAbsolutePath(), mojo
).getAbsolutePath() );
+
svn commit: r636023 - in /maven/components/trunk/maven-project/src: main/aspect/org/apache/maven/project/aspect/ main/java/org/apache/maven/project/ main/java/org/apache/maven/project/build/model/ mai
Author: jdcasey
Date: Tue Mar 11 10:27:29 2008
New Revision: 636023
URL: http://svn.apache.org/viewvc?rev=636023view=rev
Log:
Pushing project workspace usage out of ProjectCacheAspect into
DefaultMavenProjectBuilder and DefaultModelLineageBuilder, to make it easier to
understand how these critical pieces of logic execute relative to other pieces
of the project-building process, such as managed-dependency merging.
Removed:
maven/components/trunk/maven-project/src/main/aspect/org/apache/maven/project/aspect/ProjectCacheAspect.aj
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/DefaultModelLineageBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/build/model/ModelAndFile.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/workspace/DefaultProjectWorkspace.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/workspace/DefaultProjectWorkspaceTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/workspace/ModelAndFileCachingTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=636023r1=636022r2=636023view=diff
==
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Tue Mar 11 10:27:29 2008
@@ -208,10 +208,30 @@
ArtifactRepository
localRepository )
throws ProjectBuildingException
{
-Model model = findModelFromRepository( artifact,
remoteArtifactRepositories, localRepository );
+String artifactKey = artifact.getId();
-return buildInternal( model, localRepository,
remoteArtifactRepositories, artifact.getFile(), null,
- false, false, false );
+MavenProject project = null;
+if ( !Artifact.LATEST_VERSION.equals( artifact.getVersion() )
!Artifact.RELEASE_VERSION.equals( artifact.getVersion() ) )
+{
+getLogger().debug( Checking cache for project (in
buildFromRepository): + artifactKey );
+project = projectWorkspace.getProject( artifact.getGroupId(),
artifact.getArtifactId(), artifact.getVersion() );
+}
+
+if ( project == null )
+{
+getLogger().debug( Allowing buildFromRepository to proceed for:
+ artifactKey );
+
+Model model = findModelFromRepository( artifact,
remoteArtifactRepositories, localRepository );
+
+project = buildInternal( model, localRepository,
remoteArtifactRepositories, artifact.getFile(), null,
+ false, false, false );
+}
+else
+{
+getLogger().debug( Returning cached project: + project );
+}
+
+return project;
}
private Logger logger;
@@ -442,16 +462,29 @@
ProfileManager
profileManager )
throws ProjectBuildingException
{
-Model model = readModel( unknown, projectDescriptor,
STRICT_MODEL_PARSING );
+getLogger().debug( Checking cache-hit on project (in build*): +
projectDescriptor );
-MavenProject project = buildInternal( model,
-localRepository,
-buildArtifactRepositories( getSuperModel() ),
-projectDescriptor,
-profileManager,
-STRICT_MODEL_PARSING,
-true,
-true );
+MavenProject project = projectWorkspace.getProject( projectDescriptor
);
+
+if ( project == null )
+{
+getLogger().debug( Allowing project-build to proceed for: +
projectDescriptor );
+
+Model model = readModel( unknown, projectDescriptor,
STRICT_MODEL_PARSING );
+
+project = buildInternal( model,
+localRepository,
+buildArtifactRepositories( getSuperModel() ),
+projectDescriptor,
+profileManager,
+STRICT_MODEL_PARSING,
+true,
+true );
+}
+else
+{
+getLogger().debug( Returning cached project: + project );
+}
return project;
}
@@ -778,6 +811,11 @@
// Only track the file of a POM in the source tree
project.setFile( projectDescriptor );
}
+
+getLogger().debug( Caching
svn commit: r636053 - /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/identifier/
Author: brianf Date: Tue Mar 11 11:42:43 2008 New Revision: 636053 URL: http://svn.apache.org/viewvc?rev=636053view=rev Log: MNG-3284 Added: maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/plugin/identifier/
svn commit: r636103 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/MNG-3426/ resources/mng2972-overridingPluginDependency
Author: brianf Date: Tue Mar 11 14:11:00 2008 New Revision: 636103 URL: http://svn.apache.org/viewvc?rev=636103view=rev Log: MNG-2972: new IT Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2972OverridePluginDependency.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/MNG-3426/readme.txt maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/src/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/src/main/java/its/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep1/src/main/java/its/Dep.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/src/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/src/main/java/its/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/dep2/src/main/java/its/Dep.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/apache/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/apache/maven/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/apache/maven/its/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/apache/maven/its/mng2972/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/apache/maven/its/mng2972/mng2972/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mng2972/src/main/java/org/apache/maven/its/mng2972/mng2972/MyMojo.java maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mojo/ (with props) maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mojo/pom.xml maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mojo/src/ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2972-overridingPluginDependency/mojo/src/main/
svn commit: r636105 - in /maven/core-integration-testing/trunk/core-integration-tests/src/test: java/org/apache/maven/integrationtests/ resources/mng-2123-npe-with-conflicting-ranges/ resources/mng-28
Author: brianf
Date: Tue Mar 11 14:14:37 2008
New Revision: 636105
URL: http://svn.apache.org/viewvc?rev=636105view=rev
Log:
fixed the versions on some recent its
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3284UsingCachedPluginsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2123-npe-with-conflicting-ranges/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/A/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/C/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomA/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/PomB/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo/
(props changed)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng3284-usingCachedPlugins/mojo2/
(props changed)
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=636105r1=636104r2=636105view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Tue Mar 11 14:14:37 2008
@@ -183,7 +183,11 @@
suite.addTestSuite(
MavenITmng3341MetadataUpdatedFromDeploymentRepositoryTest.class );
suite.addTestSuite( MavenITmng3394POMPluginVersionDominanceTest.class
);
suite.addTestSuite( MavenITmng2861RelocationsAndRanges.class );
-
+suite.addTestSuite( MavenITmng2972OverridePluginDependency.class );
+
+//not fixed in the code yet. Test is correct.
+//suite.addTestSuite( MavenITmng3284UsingCachedPluginsTest.class );
+
//
// Tests that need to be fixed.
//
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java?rev=636105r1=636104r2=636105view=diff
==
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2123VersionRangeDependencyTest.java
Tue Mar 11 14:14:37 2008
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.List;
+import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@@ -12,6 +13,13 @@
public class MavenITmng2123VersionRangeDependencyTest
extends AbstractMavenIntegrationTestCase
{
+
+public MavenITmng2123VersionRangeDependencyTest()
+throws InvalidVersionSpecificationException
+{
+super( (2.0.8,) );
+}
+
public void testitMNG2123 ()
throws Exception
{
Modified:
svn commit: r636110 - /maven/plugin-testing/
Author: vsiveton Date: Tue Mar 11 14:28:28 2008 New Revision: 636110 URL: http://svn.apache.org/viewvc?rev=636110view=rev Log: o created new project for plugin testing see http://www.nabble.com/-proposal--Plugin-tools-and-shared-reorganization-td15916254s177.html Added: maven/plugin-testing/
svn commit: r636112 - in /maven/site/trunk/src/site: apt/shared/ apt/shared/index.apt site.xml
Author: dennisl
Date: Tue Mar 11 14:30:34 2008
New Revision: 636112
URL: http://svn.apache.org/viewvc?rev=636112view=rev
Log:
o Add an index page for Shared Components.
Added:
maven/site/trunk/src/site/apt/shared/
maven/site/trunk/src/site/apt/shared/index.apt (with props)
Modified:
maven/site/trunk/src/site/site.xml
Added: 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=636112view=auto
==
--- maven/site/trunk/src/site/apt/shared/index.apt (added)
+++ maven/site/trunk/src/site/apt/shared/index.apt Tue Mar 11 14:30:34 2008
@@ -0,0 +1,26 @@
+ -
+ Shared Components
+ -
+ Dennis Lundberg
+ -
+ March 2008
+ -
+
+Shared Components
+
+
+*+--+--++
+|| Shared Component
|| Version || Description || Source Repository
+*+--+--++
+| {{{/shared/file-management/} file-management}} |
1.2 | API to collect files from a given directory using several
include/exclude rules. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/file-management/}SVN}}
+*+--+--++
+| {{{/shared/maven-archiver/} maven-archiver}} |
2.3 | Is mainly used by plugins to handle packaging. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-archiver/}SVN}}
+*+--+--++
+| {{{/shared/maven-invoker/} maven-invoker}} |
2.0.7| Fires up a Maven build in a new JVM. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-invoker/}SVN}}
+*+--+--++
+| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | Converts between version 3.0.0 and version 4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
+*+--+--++
+| {{{/shared/maven-plugin-testing-tools/} maven-plugin-testing-tools}} |
1.0-alpha-3 | Provide a series of convenience tools for developers wishing to
test Maven plugins. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-tools/}SVN}}
+*+--+--++
+| {{{/shared/maven-shared-jar/} maven-shared-jar}} |
1.0 | Utilities that help identify the contents of a JAR, including
Java class analysis and Maven metadata analysis. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-jar/}SVN}}
+*+--+--++
Propchange: maven/site/trunk/src/site/apt/shared/index.apt
--
svn:eol-style = native
Propchange: maven/site/trunk/src/site/apt/shared/index.apt
--
svn:keywords = Date Revision Author Id
Modified: maven/site/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/maven/site/trunk/src/site/site.xml?rev=636112r1=636111r2=636112view=diff
==
--- maven/site/trunk/src/site/site.xml (original)
+++ maven/site/trunk/src/site/site.xml Tue Mar 11 14:30:34 2008
@@ -180,6 +180,7 @@
item name=JXR href=http://maven.apache.org/jxr/
item name=Doxia href=http://maven.apache.org/doxia/
item name=Maven 1.x href=http://maven.apache.org/maven-1.x/
+ item name=Shared Components href=/shared/index.html/
/menu
menu name=Related Topics
svn commit: r636113 - in /maven/plugin-testing: branches/ tags/ trunk/
Author: vsiveton Date: Tue Mar 11 14:30:44 2008 New Revision: 636113 URL: http://svn.apache.org/viewvc?rev=636113view=rev Log: o added svn structure Added: maven/plugin-testing/branches/ maven/plugin-testing/tags/ maven/plugin-testing/trunk/
svn commit: r636115 - /maven/site/trunk/pom.xml
Author: dennisl Date: Tue Mar 11 14:38:41 2008 New Revision: 636115 URL: http://svn.apache.org/viewvc?rev=636115view=rev Log: o Lock the version for maven-project-info-reports-plugin. Modified: maven/site/trunk/pom.xml Modified: maven/site/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/site/trunk/pom.xml?rev=636115r1=636114r2=636115view=diff == --- maven/site/trunk/pom.xml (original) +++ maven/site/trunk/pom.xml Tue Mar 11 14:38:41 2008 @@ -79,6 +79,7 @@ plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-project-info-reports-plugin/artifactId +version2.0.1/version reportSets reportSet reports
svn commit: r636116 - in /maven/site/trunk/src/site: apt/continuous-integration.apt apt/repository-management.apt resources/.htaccess
Author: dennisl Date: Tue Mar 11 14:39:42 2008 New Revision: 636116 URL: http://svn.apache.org/viewvc?rev=636116view=rev Log: o Set EOL style to Native. Modified: maven/site/trunk/src/site/apt/continuous-integration.apt (props changed) maven/site/trunk/src/site/apt/repository-management.apt (props changed) maven/site/trunk/src/site/resources/.htaccess (props changed) Propchange: maven/site/trunk/src/site/apt/continuous-integration.apt -- svn:eol-style = native Propchange: maven/site/trunk/src/site/apt/repository-management.apt -- svn:eol-style = native Propchange: maven/site/trunk/src/site/resources/.htaccess -- svn:eol-style = native
svn commit: r636117 - in /maven/archetype/trunk: archetype-common/src/main/java/org/apache/maven/archetype/ archetype-common/src/main/java/org/apache/maven/archetype/creator/ archetype-common/src/test
Author: rafale
Date: Tue Mar 11 14:45:01 2008
New Revision: 636117
URL: http://svn.apache.org/viewvc?rev=636117view=rev
Log:
Fix for ARCHETYPE-112.
Use -Darchetype.properties to define the additional properties
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
maven/archetype/trunk/archetype-common/src/test/java/org/apache/maven/archetype/creator/DefaultArchetypeCreatorTest.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/mojos/CreateArchetypeFromProjectMojo.java
maven/archetype/trunk/archetype-plugin/src/main/java/org/apache/maven/archetype/ui/DefaultArchetypeCreationConfigurator.java
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java?rev=636117r1=636116r2=636117view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/ArchetypeCreationRequest.java
Tue Mar 11 14:45:01 2008
@@ -34,7 +34,7 @@
private MavenProject project;
-private File propertyFile;
+//private File propertyFile;
private List languages = new ArrayList();
@@ -78,17 +78,17 @@
return this;
}
-public File getPropertyFile()
-{
-return propertyFile;
-}
-
-public ArchetypeCreationRequest setPropertyFile( File propertyFile )
-{
-this.propertyFile = propertyFile;
-
-return this;
-}
+//public File getPropertyFile()
+//{
+//return propertyFile;
+//}
+//
+//public ArchetypeCreationRequest setPropertyFile( File propertyFile )
+//{
+//this.propertyFile = propertyFile;
+//
+//return this;
+//}
public List getLanguages()
{
Modified:
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
URL:
http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java?rev=636117r1=636116r2=636117view=diff
==
---
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
(original)
+++
maven/archetype/trunk/archetype-common/src/main/java/org/apache/maven/archetype/creator/FilesetArchetypeCreator.java
Tue Mar 11 14:45:01 2008
@@ -24,7 +24,6 @@
import org.apache.maven.archetype.ArchetypeCreationRequest;
import org.apache.maven.archetype.ArchetypeCreationResult;
import org.apache.maven.archetype.common.ArchetypeFilesResolver;
-import org.apache.maven.archetype.common.ArchetypeRegistryManager;
import org.apache.maven.archetype.common.Constants;
import org.apache.maven.archetype.common.PomManager;
import org.apache.maven.archetype.common.util.FileCharsetDetector;
@@ -84,9 +83,6 @@
/** @plexus.requirement */
private PomManager pomManager;
-///** @plexus.requirement */
-//private ArchetypeRegistryManager archetypeRegistryManager;
-
/** @plexus.requirement */
private MavenProjectBuilder projectBuilder;
@@ -95,8 +91,6 @@
{
MavenProject project = request.getProject();
-//File propertyFile = request.getPropertyFile();
-
List languages = request.getLanguages();
List filtereds = request.getFiltereds();
@@ -113,27 +107,52 @@
Properties properties = new Properties();
Properties configurationProperties = new Properties();
+if( request.getProperties() != null )
+{
+properties.putAll( request.getProperties() );
+configurationProperties.putAll( request.getProperties() );
+}
-properties.setProperty( Constants.GROUP_ID, project.getGroupId() );
-configurationProperties.setProperty( Constants.GROUP_ID,
project.getGroupId() );
+if( !properties.containsKey( Constants.GROUP_ID ) )
+{
+properties.setProperty( Constants.GROUP_ID, project.getGroupId() );
+}
+configurationProperties.setProperty(
+Constants.GROUP_ID,
+properties.getProperty( Constants.GROUP_ID )
+);
-properties.setProperty( Constants.ARTIFACT_ID, project.getArtifactId()
);
-configurationProperties.setProperty( Constants.ARTIFACT_ID,
project.getArtifactId() );
+if( !properties.containsKey( Constants.ARTIFACT_ID ) )
+{
+
svn commit: r636119 - /maven/trunks/
Author: vsiveton Date: Tue Mar 11 14:54:25 2008 New Revision: 636119 URL: http://svn.apache.org/viewvc?rev=636119view=rev Log: o adding plugin-testing Modified: maven/trunks/ (props changed) Propchange: maven/trunks/ -- --- svn:externals (original) +++ svn:externals Tue Mar 11 14:54:25 2008 @@ -24,3 +24,4 @@ project https://svn.apache.org/repos/asf/maven/project enforcer https://svn.apache.org/repos/asf/maven/enforcer/trunk plugin-tools https://svn.apache.org/repos/asf/maven/plugin-tools/trunk +plugin-testing https://svn.apache.org/repos/asf/maven/plugin-testing/trunk
svn commit: r636140 - /maven/shared/trunk/pom.xml
Author: vsiveton Date: Tue Mar 11 15:58:11 2008 New Revision: 636140 URL: http://svn.apache.org/viewvc?rev=636140view=rev Log: o improved the readingness Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=636140r1=636139r2=636140view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Tue Mar 11 15:58:11 2008 @@ -19,29 +19,34 @@ -- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; xsi:noNamespaceSchemaLocation=http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion + parent groupIdorg.apache.maven/groupId artifactIdmaven-parent/artifactId version8/version relativePath../pom/maven/pom.xml/relativePath /parent + groupIdorg.apache.maven.shared/groupId artifactIdmaven-shared-components/artifactId - packagingpom/packaging version9-SNAPSHOT/version + packagingpom/packaging nameMaven Shared Components/name descriptionMaven shared components/description urlhttp://maven.apache.org/shared//url + issueManagement systemjira/system urlhttp://jira.codehaus.org/browse/MNG/url /issueManagement + distributionManagement site idapache.website/id urlscp://people.apache.org/www/maven.apache.org/shared//url /site /distributionManagement + modules modulemaven-ant/module modulemaven-archiver/module @@ -62,11 +67,13 @@ modulemaven-dependency-analyzer/module modulemaven-shared-jar/module /modules + scm connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk//connection developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk//developerConnection urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk//url /scm + build pluginManagement plugins
svn commit: r636142 - in /maven: plugin-testing/trunk/maven-plugin-testing-harness/ plugin-testing/trunk/maven-plugin-testing-tools/ plugin-testing/trunk/maven-test-tools/ shared/trunk/maven-plugin-te
Author: vsiveton Date: Tue Mar 11 16:06:04 2008 New Revision: 636142 URL: http://svn.apache.org/viewvc?rev=636142view=rev Log: o moved maven-plugin-testing-harness, maven-plugin-testing-tools, maven-test-tools projects from shared see http://www.nabble.com/-proposal--Plugin-tools-and-shared-reorganization-td15916254s177.html Added: maven/plugin-testing/trunk/maven-plugin-testing-harness/ - copied from r636128, maven/shared/trunk/maven-plugin-testing-harness/ maven/plugin-testing/trunk/maven-plugin-testing-tools/ - copied from r636128, maven/shared/trunk/maven-plugin-testing-tools/ maven/plugin-testing/trunk/maven-test-tools/ - copied from r636128, maven/shared/trunk/maven-test-tools/ Removed: maven/shared/trunk/maven-plugin-testing-harness/ maven/shared/trunk/maven-plugin-testing-tools/ maven/shared/trunk/maven-test-tools/
svn commit: r636143 - /maven/shared/trunk/pom.xml
Author: vsiveton Date: Tue Mar 11 16:07:45 2008 New Revision: 636143 URL: http://svn.apache.org/viewvc?rev=636143view=rev Log: o removed modules due to r636142 Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=636143r1=636142r2=636143view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Tue Mar 11 16:07:45 2008 @@ -59,8 +59,6 @@ modulemaven-verifier/module modulemaven-web-ui-tests/module modulemaven-app-configuration/module -modulemaven-plugin-testing-tools/module -modulemaven-test-tools/module modulemaven-repository-builder/module modulemaven-script/module modulemaven-common-artifact-filters/module
svn commit: r636145 - /maven/plugin-testing/trunk/pom.xml
Author: vsiveton Date: Tue Mar 11 16:22:54 2008 New Revision: 636145 URL: http://svn.apache.org/viewvc?rev=636145view=rev Log: o first add due to r636142 Added: maven/plugin-testing/trunk/pom.xml (with props) Added: maven/plugin-testing/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/pom.xml?rev=636145view=auto == --- maven/plugin-testing/trunk/pom.xml (added) +++ maven/plugin-testing/trunk/pom.xml Tue Mar 11 16:22:54 2008 @@ -0,0 +1,178 @@ +?xml version='1.0' encoding='UTF-8'? + +!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ License); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + -- + +project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; + modelVersion4.0.0/modelVersion + + parent +artifactIdmaven-parent/artifactId +groupIdorg.apache.maven/groupId +version8/version +relativePath../pom/maven/pom.xml/relativePath + /parent + + groupIdorg.apache.maven.plugin-testing/groupId + artifactIdmaven-plugin-testing/artifactId + version1.2-SNAPSHOT/version + packagingpom/packaging + + nameMaven Plugin Testing/name + descriptionThe Maven Plugin Testing contains the necessary tools to be able to test Maven Plugins./description + urlhttp://maven.apache.org/plugin-testing//url + inceptionYear2008/inceptionYear + + prerequisites +maven2.0.6/maven + /prerequisites + +!-- TODO see MPA-110 + issueManagement +systemjira/system +urlhttp://jira.codehaus.org/browse/MPLUGIN/url + /issueManagement +-- + scm + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/developerConnection +urlhttp://svn.apache.org/viewcvs.cgi/maven/plugin-testing/trunk/url + /scm + + mailingLists +mailingList + nameMaven User List/name + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + post[EMAIL PROTECTED]/post + archivehttp://mail-archives.apache.org/mod_mbox/maven-users/archive + otherArchives +otherArchivehttp://www.mail-archive.com/[EMAIL PROTECTED]//otherArchive + otherArchivehttp://www.nabble.com/Maven---Users-f178.html/otherArchive +otherArchivehttp://maven.users.markmail.org//otherArchive + /otherArchives +/mailingList +mailingList + nameMaven Developer List/name + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + post[EMAIL PROTECTED]/post + archivehttp://mail-archives.apache.org/mod_mbox/maven-dev/archive + otherArchives +otherArchivehttp://www.mail-archive.com/[EMAIL PROTECTED]//otherArchive + otherArchivehttp://www.nabble.com/Maven-Developers-f179.html/otherArchive +otherArchivehttp://maven.dev.markmail.org//otherArchive + /otherArchives +/mailingList +mailingList + nameMaven Issues List/name + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + archivehttp://mail-archives.apache.org/mod_mbox/maven-issues//archive + otherArchives +otherArchivehttp://www.mail-archive.com/[EMAIL PROTECTED]/otherArchive + otherArchivehttp://www.nabble.com/Maven---Issues-f15573.html/otherArchive +otherArchivehttp://maven.issues.markmail.org//otherArchive + /otherArchives +/mailingList +mailingList + nameMaven Commits List/name + subscribe[EMAIL PROTECTED]/subscribe + unsubscribe[EMAIL PROTECTED]/unsubscribe + archivehttp://mail-archives.apache.org/mod_mbox/maven-commits/archive + otherArchives + otherArchivehttp://www.mail-archive.com/commits@maven.apache.org/otherArchive + otherArchivehttp://www.nabble.com/Maven---Commits-f15575.html/otherArchive +otherArchivehttp://maven.commits.markmail.org//otherArchive + /otherArchives +/mailingList + +!-- duplication from parent pom - temporary until they inherit properly -- +mailingList + nameMaven
svn commit: r636146 - in /maven/plugin-testing/trunk: maven-plugin-testing-harness/pom.xml maven-plugin-testing-tools/pom.xml maven-test-tools/pom.xml
Author: vsiveton Date: Tue Mar 11 16:24:40 2008 New Revision: 636146 URL: http://svn.apache.org/viewvc?rev=636146view=rev Log: o using parent pom due to r636145 o improved readingness o updated scm url Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml maven/plugin-testing/trunk/maven-test-tools/pom.xml Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml?rev=636146r1=636145r2=636146view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml Tue Mar 11 16:24:40 2008 @@ -21,9 +21,9 @@ modelVersion4.0.0/modelVersion parent -groupIdorg.apache.maven.shared/groupId -artifactIdmaven-shared-components/artifactId -version8/version +groupIdorg.apache.maven.plugin-testing/groupId +artifactIdmaven-plugin-testing/artifactId +version1.2-SNAPSHOT/version /parent artifactIdmaven-plugin-testing-harness/artifactId @@ -96,8 +96,8 @@ /build scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-harness//connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-harness//developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-plugin-testing-harness//url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-harness//connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-harness//developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/plugin-testing/trunk/maven-plugin-testing-harness//url /scm /project Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml?rev=636146r1=636145r2=636146view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml Tue Mar 11 16:24:40 2008 @@ -19,15 +19,17 @@ -- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd; modelVersion4.0.0/modelVersion + parent -groupIdorg.apache.maven.shared/groupId -artifactIdmaven-shared-components/artifactId -version8/version +groupIdorg.apache.maven.plugin-testing/groupId +artifactIdmaven-plugin-testing/artifactId +version1.2-SNAPSHOT/version /parent + artifactIdmaven-plugin-testing-tools/artifactId version1.0-alpha-4-SNAPSHOT/version nameMaven Plugin Testing Tools/name - urlhttp://maven.apache.org/url + dependencies dependency groupIdorg.codehaus.plexus/groupId @@ -70,13 +72,8 @@ version1.0-alpha-2/version scopetest/scope /dependency -dependency - groupIdjunit/groupId - artifactIdjunit/artifactId - version3.8.1/version - scopetest/scope -/dependency /dependencies + build plugins plugin @@ -107,9 +104,10 @@ /plugin /plugins /build + scm - connectionscm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-tools/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-tools/developerConnection - urlhttp://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-plugin-testing-tools/url + connectionscm:svn:http://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-tools/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/maven/plugin-testing/trunk/maven-plugin-testing-tools/developerConnection + urlhttp://svn.apache.org/viewcvs.cgi/maven/plugin-testing/trunk/maven-plugin-testing-tools/url /scm /project Modified: maven/plugin-testing/trunk/maven-test-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-test-tools/pom.xml?rev=636146r1=636145r2=636146view=diff == --- maven/plugin-testing/trunk/maven-test-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-test-tools/pom.xml Tue Mar 11 16:24:40 2008 @@ -19,15 +19,17 @@ -- project xmlns=http://maven.apache.org/POM/4.0.0; xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd;
svn commit: r636147 - in /maven/plugins/trunk/maven-site-plugin/src: main/java/org/apache/maven/plugins/site/ test/java/org/apache/maven/plugins/site/
Author: dennisl
Date: Tue Mar 11 16:25:22 2008
New Revision: 636147
URL: http://svn.apache.org/viewvc?rev=636147view=rev
Log:
[MSITE-211] Can't deploy site using site:deploy due to a ProxyHTTP error
Submitted by: Cyrille Le Clerc
Reviewed by: Dennis Lundberg
o I modified the handling of wildcards and the associated tests.
Added:
maven/plugins/trunk/maven-site-plugin/src/test/java/org/apache/maven/plugins/site/SiteDeployMojoTest.java
(with props)
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=636147r1=636146r2=636147view=diff
==
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Tue Mar 11 16:25:22 2008
@@ -23,6 +23,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.manager.WagonConfigurationException;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.model.DistributionManagement;
@@ -30,7 +31,6 @@
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Settings;
import org.apache.maven.wagon.CommandExecutionException;
import org.apache.maven.wagon.CommandExecutor;
@@ -56,11 +56,11 @@
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
/**
- * Deploys website using scp/file protocol.
+ * Deploys the site using scp/file protocol.
* For scp protocol, website files are packaged into zip archive,
- * then archive is transfred to remote host, nextly it is un-archived.
+ * then the archive is transfered to the remote host, next it is un-archived.
* This method of deployment should normally be much faster
- * then making file by file copy. For file protocol, the files are copied
+ * then making a file by file copy. For file protocol, the files are copied
* directly to the destination directory.
*
* @author a href=mailto:[EMAIL PROTECTED]Michal Maczka/a
@@ -171,7 +171,7 @@
wagon.addTransferListener( debug );
-ProxyInfo proxyInfo = getProxyInfo( settings );
+ProxyInfo proxyInfo = getProxyInfo( repository, wagonManager );
if ( proxyInfo != null )
{
wagon.connect( repository, wagonManager.getAuthenticationInfo(
id ), proxyInfo );
@@ -229,27 +229,65 @@
}
/**
- * Convenience method to map a codeProxy/code object from the user
system settings to a
- * codeProxyInfo/code object.
- *
- * @return a proxyInfo object instancied or null if no active proxy is
define in the settings.xml
+ * p
+ * Get the codeProxyInfo/code of the proxy associated with the
codehost/code
+ * and the codeprotocol/code of the given coderepository/code
+ * /p
+ * p
+ * Extract from a
href=http://java.sun.com/j2se/1.5.0/docs/guide/net/properties.html;
+ * J2SE Doc : Networking Properties - nonProxyHosts/a : The value can
be a list of hosts,
+ * each separated by a |, and in addition a wildcard character (*) can be
used for matching
+ * /p
+ * p
+ * Defensively support for comma (,) and semi colon (;) in addition to
pipe (|) as separator.
+ * /p
+ *
+ * @return a ProxyInfo object instantiated or codenull/code if no
matching proxy is found
*/
-public static ProxyInfo getProxyInfo( Settings settings )
+public static ProxyInfo getProxyInfo( Repository repository, WagonManager
wagonManager )
{
-ProxyInfo proxyInfo = null;
-if ( settings != null settings.getActiveProxy() != null )
-{
-Proxy settingsProxy = settings.getActiveProxy();
+ProxyInfo proxyInfo = wagonManager.getProxy( repository.getProtocol()
);
-proxyInfo = new ProxyInfo();
-proxyInfo.setHost( settingsProxy.getHost() );
-proxyInfo.setType( settingsProxy.getProtocol() );
-proxyInfo.setPort( settingsProxy.getPort() );
-proxyInfo.setNonProxyHosts( settingsProxy.getNonProxyHosts() );
-proxyInfo.setUserName( settingsProxy.getUsername() );
-proxyInfo.setPassword( settingsProxy.getPassword() );
+if ( proxyInfo == null )
+{
+return null;
svn commit: r636148 - /maven/plugin-testing/trunk/
Author: vsiveton Date: Tue Mar 11 16:26:28 2008 New Revision: 636148 URL: http://svn.apache.org/viewvc?rev=636148view=rev Log: o ignored target and IDE files Modified: maven/plugin-testing/trunk/ (props changed) Propchange: maven/plugin-testing/trunk/ -- --- svn:ignore (added) +++ svn:ignore Tue Mar 11 16:26:28 2008 @@ -0,0 +1,4 @@ +target +maven-plugin-testing.iml +maven-plugin-testing.ipr +maven-plugin-testing.iws
svn commit: r636149 - in /maven/plugin-testing/trunk: maven-plugin-testing-harness/pom.xml maven-plugin-testing-tools/pom.xml maven-test-tools/pom.xml
Author: vsiveton Date: Tue Mar 11 16:27:04 2008 New Revision: 636149 URL: http://svn.apache.org/viewvc?rev=636149view=rev Log: o aligned version to 1.2-SNAPSHOT Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml maven/plugin-testing/trunk/maven-test-tools/pom.xml Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml?rev=636149r1=636148r2=636149view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-harness/pom.xml Tue Mar 11 16:27:04 2008 @@ -27,7 +27,6 @@ /parent artifactIdmaven-plugin-testing-harness/artifactId - version1.2-SNAPSHOT/version nameMaven Plugin Testing Mechanism/name descriptionThe Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo./description Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml?rev=636149r1=636148r2=636149view=diff == --- maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-plugin-testing-tools/pom.xml Tue Mar 11 16:27:04 2008 @@ -27,7 +27,6 @@ /parent artifactIdmaven-plugin-testing-tools/artifactId - version1.0-alpha-4-SNAPSHOT/version nameMaven Plugin Testing Tools/name dependencies Modified: maven/plugin-testing/trunk/maven-test-tools/pom.xml URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-test-tools/pom.xml?rev=636149r1=636148r2=636149view=diff == --- maven/plugin-testing/trunk/maven-test-tools/pom.xml (original) +++ maven/plugin-testing/trunk/maven-test-tools/pom.xml Tue Mar 11 16:27:04 2008 @@ -27,7 +27,6 @@ /parent artifactIdmaven-test-tools/artifactId - version1.0-alpha-3-SNAPSHOT/version nameMaven Testing Tools/name dependencies
svn commit: r636153 - /maven/site/trunk/src/site/apt/shared/index.apt
Author: dennisl
Date: Tue Mar 11 16:43:54 2008
New Revision: 636153
URL: http://svn.apache.org/viewvc?rev=636153view=rev
Log:
o Remove maven-plugin-testing-tools that has moved elsewhere.
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=636153r1=636152r2=636153view=diff
==
--- maven/site/trunk/src/site/apt/shared/index.apt (original)
+++ maven/site/trunk/src/site/apt/shared/index.apt Tue Mar 11 16:43:54 2008
@@ -20,7 +20,5 @@
*+--+--++
| {{{/shared/maven-model-converter/} maven-model-converter}} |
2.2 | Converts between version 3.0.0 and version 4.0.0 models. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-model-converter/}SVN}}
*+--+--++
-| {{{/shared/maven-plugin-testing-tools/} maven-plugin-testing-tools}} |
1.0-alpha-3 | Provide a series of convenience tools for developers wishing to
test Maven plugins. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-plugin-testing-tools/}SVN}}
-*+--+--++
| {{{/shared/maven-shared-jar/} maven-shared-jar}} |
1.0 | Utilities that help identify the contents of a JAR, including
Java class analysis and Maven metadata analysis. |
{{{http://svn.apache.org/repos/asf/maven/shared/trunk/maven-shared-jar/}SVN}}
*+--+--++
svn commit: r636154 - /maven/shared/trunk/pom.xml
Author: vsiveton Date: Tue Mar 11 16:52:02 2008 New Revision: 636154 URL: http://svn.apache.org/viewvc?rev=636154view=rev Log: o sorted modules o added missing modules Modified: maven/shared/trunk/pom.xml Modified: maven/shared/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/pom.xml?rev=636154r1=636153r2=636154view=diff == --- maven/shared/trunk/pom.xml (original) +++ maven/shared/trunk/pom.xml Tue Mar 11 16:52:02 2008 @@ -48,22 +48,26 @@ /distributionManagement modules +modulefile-management/module modulemaven-ant/module +modulemaven-app-configuration/module modulemaven-archiver/module -modulemaven-reporting-impl/module +modulemaven-common-artifact-filters/module +modulemaven-dependency-analyzer/module +modulemaven-dependency-tree/module +modulemaven-downloader/module +modulemaven-doxia-tools/module +modulemaven-invoker/module modulemaven-model-converter/module +modulemaven-osgi/module +modulemaven-reporting-impl/module +modulemaven-repository-builder/module +modulemaven-script/module modulemaven-shared-io/module +modulemaven-shared-jar/module modulemaven-shared-monitor/module -modulefile-management/module -modulemaven-invoker/module modulemaven-verifier/module modulemaven-web-ui-tests/module -modulemaven-app-configuration/module -modulemaven-repository-builder/module -modulemaven-script/module -modulemaven-common-artifact-filters/module -modulemaven-dependency-analyzer/module -modulemaven-shared-jar/module /modules scm
svn commit: r636158 - /maven/pom/trunk/maven/pom.xml
Author: bentmann Date: Tue Mar 11 17:15:15 2008 New Revision: 636158 URL: http://svn.apache.org/viewvc?rev=636158view=rev Log: o Test, test, 1-2-3, is this thing on? 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=636158r1=636157r2=636158view=diff == --- maven/pom/trunk/maven/pom.xml (original) +++ maven/pom/trunk/maven/pom.xml Tue Mar 11 17:15:15 2008 @@ -598,6 +598,15 @@ /roles /developer developer + idbentmann/id + nameBenjamin Bentmann/name + email[EMAIL PROTECTED]/email + roles +roleCommitter/role + /roles + timezone+1/timezone +/developer +developer idchrisjs/id nameChris Stevenson/name roles
