Author: jdcasey Date: Mon Jul 28 15:50:53 2008 New Revision: 680554 URL: http://svn.apache.org/viewvc?rev=680554&view=rev Log: Rollback switch to wagon 1.0-beta-3, including user-agent functionality.
Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java maven/components/branches/maven-2.0.10-RC/maven-core-it-runner/pom.xml maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml maven/components/branches/maven-2.0.10-RC/pom.xml Modified: maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml (original) +++ maven/components/branches/maven-2.0.10-RC/apache-maven/pom.xml Mon Jul 28 15:50:53 2008 @@ -46,6 +46,8 @@ org.codehaus.plexus:plexus-component-api </exclude> <exclude>classworlds:classworlds</exclude> + <exclude>junit:junit</exclude> + <exclude>jmock:jmock</exclude> <exclude>xml-apis:xml-apis</exclude> </excludes> </artifactSet> @@ -67,20 +69,6 @@ <relocation> <pattern>org.apache.commons.logging</pattern> </relocation> - - <!-- For jsch wagon --> - <relocation> - <pattern>com.jcraft</pattern> - </relocation> - - <!-- For wagon API --> - <relocation> - <pattern>org.cyberneko</pattern> - </relocation> - <relocation> - <pattern>org.apache.xerces</pattern> - </relocation> - <relocation> <pattern>org.codehaus.plexus.util</pattern> <excludes> Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java Mon Jul 28 15:50:53 2008 @@ -50,15 +50,11 @@ import org.codehaus.plexus.context.ContextException; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable; -import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException; import org.codehaus.plexus.util.FileUtils; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.xml.Xpp3Dom; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; import java.security.NoSuchAlgorithmException; @@ -68,19 +64,16 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Set; public class DefaultWagonManager extends AbstractLogEnabled - implements WagonManager, Contextualizable, Initializable + implements WagonManager, Contextualizable { private static final String WILDCARD = "*"; private static final String EXTERNAL_WILDCARD = "external:*"; - private static final String MAVEN_ARTIFACT_PROPERTIES = "META-INF/maven/org.apache.maven/maven-artifact/pom.properties"; - private static int anonymousMirrorIdSeed = 0; private PlexusContainer container; @@ -111,8 +104,6 @@ private RepositoryPermissions defaultRepositoryPermissions; - private String httpUserAgent; - // TODO: this leaks the component in the public api - it is never released back to the container public Wagon getWagon( Repository repository ) throws UnsupportedProtocolException, WagonConfigurationException @@ -126,7 +117,7 @@ Wagon wagon = getWagon( protocol ); - configureWagon( wagon, repository.getId(), protocol ); + configureWagon( wagon, repository.getId() ); return wagon; } @@ -1005,27 +996,21 @@ ArtifactRepository repository ) throws WagonConfigurationException { - configureWagon( wagon, repository.getId(), repository.getProtocol() ); + configureWagon( wagon, repository.getId() ); } private void configureWagon( Wagon wagon, - String repositoryId, - String protocol ) + String repositoryId ) throws WagonConfigurationException { - PlexusConfiguration config = (PlexusConfiguration) serverConfigurationMap.get( repositoryId ); - if ( protocol.startsWith( "http" ) || protocol.startsWith( "dav" ) ) - { - config = updateUserAgentForHttp( wagon, config ); - } - - if ( config != null ) + if ( serverConfigurationMap.containsKey( repositoryId ) ) { ComponentConfigurator componentConfigurator = null; try { componentConfigurator = (ComponentConfigurator) container.lookup( ComponentConfigurator.ROLE ); - componentConfigurator.configureComponent( wagon, config, container.getContainerRealm() ); + componentConfigurator.configureComponent( wagon, (PlexusConfiguration) serverConfigurationMap + .get( repositoryId ), container.getContainerRealm() ); } catch ( final ComponentLookupException e ) { @@ -1055,59 +1040,6 @@ } } - // TODO: Remove this, once the maven-shade-plugin 1.2 release is out, allowing configuration of httpHeaders in the components.xml - private PlexusConfiguration updateUserAgentForHttp( Wagon wagon, PlexusConfiguration config ) - { - if ( config == null ) - { - config = new XmlPlexusConfiguration( "configuration" ); - } - - if ( httpUserAgent != null ) - { - try - { - wagon.getClass().getMethod( "setHttpHeaders", new Class[]{ Properties.class } ); - - PlexusConfiguration headerConfig = config.getChild( "httpHeaders", true ); - PlexusConfiguration[] children = headerConfig.getChildren( "property" ); - boolean found = false; - for ( int i = 0; i < children.length; i++ ) - { - PlexusConfiguration c = children[i].getChild( "name", false ); - if ( c != null && "User-Agent".equals( c.getValue( null ) ) ) - { - found = true; - break; - } - } - if ( !found ) - { - XmlPlexusConfiguration propertyConfig = new XmlPlexusConfiguration( "property" ); - headerConfig.addChild( propertyConfig ); - - XmlPlexusConfiguration nameConfig = new XmlPlexusConfiguration( "name" ); - nameConfig.setValue( "User-Agent" ); - propertyConfig.addChild( nameConfig ); - - XmlPlexusConfiguration versionConfig = new XmlPlexusConfiguration( "value" ); - versionConfig.setValue( httpUserAgent ); - propertyConfig.addChild( versionConfig ); - } - } - catch ( SecurityException e ) - { - // forget it. this method is public, if it exists. - } - catch ( NoSuchMethodException e ) - { - // forget it. - } - } - - return config; - } - public void addConfiguration( String repositoryId, Xpp3Dom configuration ) { @@ -1125,58 +1057,4 @@ { this.defaultRepositoryPermissions = defaultRepositoryPermissions; } - - // TODO: Remove this, once the maven-shade-plugin 1.2 release is out, allowing configuration of httpHeaders in the components.xml - public void initialize() - throws InitializationException - { - if ( httpUserAgent == null ) - { - InputStream resourceAsStream = null; - try - { - Properties properties = new Properties(); - resourceAsStream = getClass().getClassLoader().getResourceAsStream( MAVEN_ARTIFACT_PROPERTIES ); - - if ( resourceAsStream != null ) - { - try - { - properties.load( resourceAsStream ); - - httpUserAgent = - "maven-artifact/" + properties.getProperty( "version" ) + " (Java " - + System.getProperty( "java.version" ) + "; " + System.getProperty( "os.name" ) + " " - + System.getProperty( "os.version" ) + ")"; - } - catch ( IOException e ) - { - getLogger().warn( - "Failed to load Maven artifact properties from:\n" + MAVEN_ARTIFACT_PROPERTIES - + "\n\nUser-Agent HTTP header may be incorrect for artifact resolution." ); - } - } - } - finally - { - IOUtil.close( resourceAsStream ); - } - } - } - - /** - * [EMAIL PROTECTED] - */ - public void setHttpUserAgent( String userAgent ) - { - this.httpUserAgent = userAgent; - } - - /** - * [EMAIL PROTECTED] - */ - public String getHttpUserAgent() - { - return httpUserAgent; - } } Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Mon Jul 28 15:50:53 2008 @@ -53,7 +53,7 @@ public class DefaultWagonManagerTest extends PlexusTestCase { - private WagonManager wagonManager; + private DefaultWagonManager wagonManager; private TransferListener transferListener = new Debug(); @@ -64,7 +64,7 @@ { super.setUp(); - wagonManager = (WagonManager) lookup( WagonManager.ROLE ); + wagonManager = (DefaultWagonManager) lookup( WagonManager.ROLE ); artifactFactory = (ArtifactFactory) lookup( ArtifactFactory.ROLE ); } Modified: maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java Mon Jul 28 15:50:53 2008 @@ -19,8 +19,6 @@ * under the License. */ -import java.io.File; -import java.io.InputStream; import java.util.HashMap; import java.util.Map; @@ -31,9 +29,7 @@ import org.apache.maven.wagon.StreamWagon; import org.apache.maven.wagon.TransferFailedException; import org.apache.maven.wagon.authentication.AuthenticationException; -import org.apache.maven.wagon.authorization.AuthorizationException; import org.apache.maven.wagon.resource.Resource; -import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.StringInputStream; import org.codehaus.plexus.util.StringOutputStream; @@ -58,7 +54,7 @@ } public void fillInputData( InputData inputData ) - throws TransferFailedException, ResourceDoesNotExistException, AuthorizationException + throws TransferFailedException, ResourceDoesNotExistException { Resource resource = inputData.getResource(); @@ -92,4 +88,11 @@ { expectedContent.clear(); } + + public void openConnection() + throws ConnectionException, AuthenticationException + { + // TODO Auto-generated method stub + + } } Modified: maven/components/branches/maven-2.0.10-RC/maven-core-it-runner/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core-it-runner/pom.xml?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-core-it-runner/pom.xml (original) +++ maven/components/branches/maven-2.0.10-RC/maven-core-it-runner/pom.xml Mon Jul 28 15:50:53 2008 @@ -23,7 +23,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.apache.maven</groupId> - <version>2.0.10-RC2-SNAPSHOT</version> + <version>2.0.10-RC4-SNAPSHOT</version> <artifactId>maven-core-it-runner</artifactId> <name>Integration Test Executor</name> Modified: maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml (original) +++ maven/components/branches/maven-2.0.10-RC/maven-core/pom.xml Mon Jul 28 15:50:53 2008 @@ -9,6 +9,13 @@ <artifactId>maven-core</artifactId> <name>Maven Core</name> + <pluginRepositories> + <pluginRepository> + <id>apache.snapshots</id> + <url>http://people.apache.org/repo/m2-snapshot-repository</url> + </pluginRepository> + </pluginRepositories> + <dependencies> <dependency> <groupId>org.apache.maven</groupId> @@ -203,4 +210,4 @@ </build> </profile> </profiles> -</project> +</project> \ No newline at end of file Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Mon Jul 28 15:50:53 2008 @@ -21,10 +21,8 @@ import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.manager.DefaultWagonManager; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.execution.BuildFailure; import org.apache.maven.execution.DefaultMavenExecutionRequest; @@ -604,49 +602,6 @@ private void resolveParameters( Settings settings ) throws ComponentLookupException, ComponentLifecycleException, SettingsConfigurationException { - // TODO: remove when components.xml can be used to configure this instead - try - { - DefaultWagonManager wagonManager = (DefaultWagonManager) container.lookup( WagonManager.ROLE ); - - String oldUserAgent = wagonManager.getHttpUserAgent(); - int firstSpace = oldUserAgent == null ? -1 : oldUserAgent.indexOf( " " ); - - StringBuffer buffer = new StringBuffer(); - - buffer.append( "Apache-Maven/" ); - - ArtifactVersion version = runtimeInformation.getApplicationVersion(); - if ( version != null ) - { - buffer.append( version.getMajorVersion() ); - buffer.append( '.' ); - buffer.append( version.getMinorVersion() ); - } - else - { - buffer.append( "unknown" ); - } - - buffer.append( ' ' ); - if ( firstSpace > -1 ) - { - buffer.append( oldUserAgent.substring( firstSpace + 1 ) ); - buffer.append( ' ' ); - buffer.append( oldUserAgent.substring( 0, firstSpace ) ); - } - else - { - buffer.append( oldUserAgent ); - } - - wagonManager.setHttpUserAgent( buffer.toString() ); - } - catch ( ClassCastException e ) - { - // ignore - } - WagonManager wagonManager = (WagonManager) container.lookup( WagonManager.ROLE ); try Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java (original) +++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/java/org/apache/maven/MavenArtifactFilterManager.java Mon Jul 28 15:50:53 2008 @@ -66,6 +66,7 @@ artifacts.add( "commons-cli" ); artifacts.add( "doxia-sink-api" ); artifacts.add( "doxia-logging-api" ); + artifacts.add( "jsch" ); artifacts.add( "maven-artifact" ); artifacts.add( "maven-artifact-manager" ); artifacts.add( "maven-core" ); @@ -83,7 +84,10 @@ artifacts.add( "maven-settings" ); artifacts.add( "plexus-container-default" ); artifacts.add( "plexus-interactivity-api" ); + //adding shared/maven-toolchain project here, even though not part of the default + //distro yet. artifacts.add( "maven-toolchain" ); + //artifacts.add( "plexus-utils" ); artifacts.add( "wagon-provider-api" ); return artifacts; } Modified: maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/components/branches/maven-2.0.10-RC/maven-core/src/main/resources/META-INF/plexus/components.xml Mon Jul 28 15:50:53 2008 @@ -583,18 +583,5 @@ </requirement> </requirements> </component> - - <!-- TODO: Re-enable this once maven-shade-plugin 1.2 is release and can be - used to merge this configuration with that of the wagon artifacts. - We also need a way not to filter in the os.name, etc during the build, just the project version - <component> - <role>org.apache.maven.artifact.manager.WagonManager</role> - <role-hint>default</role-hint> - <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation> - <configuration> - <httpUserAgent>Apache-Maven/${project.version} maven-artifact/${project.version} (Java @java.version@; @os.name@ @os.version@)</httpUserAgent> - </configuration> - </component> - --> </components> </component-set> Modified: maven/components/branches/maven-2.0.10-RC/pom.xml URL: http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.10-RC/pom.xml?rev=680554&r1=680553&r2=680554&view=diff ============================================================================== --- maven/components/branches/maven-2.0.10-RC/pom.xml (original) +++ maven/components/branches/maven-2.0.10-RC/pom.xml Mon Jul 28 15:50:53 2008 @@ -244,7 +244,7 @@ <properties> <mavenVersion>2.0.10-RC4-SNAPSHOT</mavenVersion> - <wagonVersion>1.0-beta-3</wagonVersion> + <wagonVersion>1.0-beta-2</wagonVersion> </properties> <!--start--> @@ -405,7 +405,7 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-webdav</artifactId> - <version>1.0-beta-2</version> + <version>${wagonVersion}</version> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> @@ -533,4 +533,4 @@ </reporting> </profile> </profiles> -</project> +</project> \ No newline at end of file