Author: jvanzyl
Date: Wed Apr 22 03:34:00 2009
New Revision: 767358
URL: http://svn.apache.org/viewvc?rev=767358&view=rev
Log:
o making sure everything is in before merging
Added:
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
(contents, props changed)
- copied, changed from r759553,
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java
Removed:
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
maven/components/branches/MNG-2766/maven-repository/pom.xml
Modified:
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=767358&r1=767357&r2=767358&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Wed Apr 22 03:34:00 2009
@@ -1288,7 +1288,7 @@
// Fire the event
ComponentDiscoveryEvent event = new ComponentDiscoveryEvent(
componentSetDescriptor );
- manager.fireComponentDiscoveryEvent( event );
+ componentDiscovererManager.fireComponentDiscoveryEvent( event
);
}
catch ( IOException ex )
{
@@ -1305,7 +1305,7 @@
public void setManager( ComponentDiscovererManager manager )
{
- this.manager = manager;
+ this.componentDiscovererManager = manager;
}
// ----------------------------------------------------------------------
@@ -1316,7 +1316,7 @@
private Map pluginIdsByPrefix = new HashMap();
- private ComponentDiscovererManager manager;
+ private ComponentDiscovererManager componentDiscovererManager;
public void componentDiscovered( ComponentDiscoveryEvent event )
{
Modified:
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java?rev=767358&r1=767357&r2=767358&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
Wed Apr 22 03:34:00 2009
@@ -1,50 +1,35 @@
/*
-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.
-*/
+ * 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.
+ */
package org.apache.maven.repository;
-import java.io.IOException;
-
+import org.codehaus.plexus.PlexusTestCase;
/**
- *
- *
+ *
+ *
* @author Oleg Gusakov
* @version $Id$
- *
+ *
*/
public class LegacyMavenRepositorySystemTest
-extends AbstractMavenRepositorySystemTest
+ extends PlexusTestCase
{
protected void setUp()
throws Exception
{
- super.setUp();
-
- _mrs = getContainer().lookup( RepositorySystem.class, "default" );
- }
-
- // TODO: 2009-03-Oleg : turned it off till we figure out which methods
work, which don't
- @Override
- public void testRetrieve()
- throws IOException
- {
-// super.testRetrieve();
+ lookup( RepositorySystem.class, "default" );
}
}
Copied:
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
(from r759553,
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java?p2=maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java&p1=maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java&r1=759553&r2=767358&rev=767358&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
Wed Apr 22 03:34:00 2009
@@ -17,7 +17,7 @@
under the License.
*/
-package org.apache.maven.repository;
+package org.apache.maven.repository.mercury;
import java.io.File;
import java.io.IOException;
@@ -35,13 +35,12 @@
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.mercury.util.FileUtil;
+import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
-import org.sonatype.plexus.jetty.DefaultServletContainer;
+import org.codehaus.plexus.util.FileUtils;
import org.sonatype.plexus.webcontainer.ServletContainer;
/**
Propchange:
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/AbstractMavenRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Apr 22 03:34:00 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:679206,708871,720042,726541,727548,727998,728264,728940,729060,729738,729785,730631
+/maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:739385,741841,747468,748815,749612
+/maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:738757-738972
+/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/AbstractMavenRepositorySystemTest.java:688587-696625,696644-699681
Modified:
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java?rev=767358&r1=767357&r2=767358&view=diff
==============================================================================
---
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
(original)
+++
maven/components/branches/MNG-2766/maven-repository-mercury/src/test/java/org/apache/maven/repository/mercury/MercuryRepositorySystemTest.java
Wed Apr 22 03:34:00 2009
@@ -19,7 +19,6 @@
package org.apache.maven.repository.mercury;
-import org.apache.maven.repository.AbstractMavenRepositorySystemTest;
import org.apache.maven.repository.RepositorySystem;
/**
Modified: maven/components/branches/MNG-2766/maven-repository/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-repository/pom.xml?rev=767358&r1=767357&r2=767358&view=diff
==============================================================================
--- maven/components/branches/MNG-2766/maven-repository/pom.xml (original)
+++ maven/components/branches/MNG-2766/maven-repository/pom.xml Wed Apr 22
03:34:00 2009
@@ -33,74 +33,29 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
<scope>test</scope>
- </dependency>
-
+ </dependency>
<dependency>
<groupId>org.sonatype.plexus</groupId>
<artifactId>plexus-jetty6</artifactId>
<scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.sonatype.spice</groupId>
- <artifactId>plexus-webdav</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-event</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- <version>${mercuryVersion}</version>
- <scope>test</scope>
- </dependency>
-
+ </dependency>
</dependencies>
<build>
@@ -117,7 +72,6 @@
</execution>
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -129,8 +83,7 @@
</goals>
</execution>
</executions>
- </plugin>
-
+ </plugin>
</plugins>
</build>
</project>
