Author: olamy
Date: Sat Aug 4 21:28:22 2012
New Revision: 1369472
URL: http://svn.apache.org/viewvc?rev=1369472&view=rev
Log:
remove dependency on maven tree component
Added:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java
(with props)
Removed:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DefaultDependencyTreeBuilder.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderTest.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
archiva/trunk/pom.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1369472&r1=1369471&r2=1369472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
Sat Aug 4 21:28:22 2012
@@ -21,7 +21,6 @@ package org.apache.archiva.rest.services
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.utils.VersionComparator;
import org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder;
-import org.apache.archiva.dependency.tree.maven2.Maven3DependencyTreeBuilder;
import org.apache.archiva.maven2.model.Artifact;
import org.apache.archiva.maven2.model.TreeEntry;
import org.apache.archiva.metadata.generic.GenericMetadataFacet;
@@ -91,9 +90,6 @@ public class DefaultBrowseService
private DependencyTreeBuilder dependencyTreeBuilder;
@Inject
- private Maven3DependencyTreeBuilder maven3DependencyTreeBuilder;
-
- @Inject
private RepositoryContentFactory repositoryContentFactory;
public BrowseResult getRootGroups( String repositoryId )
@@ -429,7 +425,7 @@ public class DefaultBrowseService
try
{
- return maven3DependencyTreeBuilder.buildDependencyTree(
selectedRepos, groupId, artifactId, version );
+ return dependencyTreeBuilder.buildDependencyTree( selectedRepos,
groupId, artifactId, version );
}
catch ( Exception e )
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java?rev=1369472&r1=1369471&r2=1369472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
Sat Aug 4 21:28:22 2012
@@ -21,12 +21,11 @@ package org.apache.archiva.web.tags;
import com.opensymphony.xwork2.ActionContext;
import org.apache.archiva.common.ArchivaException;
-import org.apache.archiva.dependency.tree.maven2.Maven3DependencyTreeBuilder;
+import org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder;
import org.apache.archiva.model.Keys;
import org.apache.archiva.security.ArchivaXworkUser;
import org.apache.archiva.security.UserRepositories;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonatype.aether.artifact.Artifact;
@@ -48,7 +47,7 @@ public class DependencyTree
@Inject
- private Maven3DependencyTreeBuilder dependencyTreeBuilder;
+ private DependencyTreeBuilder dependencyTreeBuilder;
@Inject
private UserRepositories userRepositories;
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml?rev=1369472&r1=1369471&r2=1369472&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/pom.xml Sat Aug 4
21:28:22 2012
@@ -110,16 +110,6 @@
</dependency>
<dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-dependency-tree</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java?rev=1369472&r1=1369471&r2=1369472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilder.java
Sat Aug 4 21:28:22 2012
@@ -1,5 +1,4 @@
package org.apache.archiva.dependency.tree.maven2;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -9,7 +8,7 @@ package org.apache.archiva.dependency.tr
* "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
+ * 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
@@ -19,28 +18,21 @@ package org.apache.archiva.dependency.tr
* under the License.
*/
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+import org.apache.archiva.maven2.model.TreeEntry;
+import org.sonatype.aether.graph.DependencyVisitor;
import java.util.List;
/**
- * Builds a tree of dependencies for a given Maven project. Customized wrapper
for maven-dependency-tree to use
- * maven-model-builder instead of maven-project.
+ * @author Olivier Lamy
*/
public interface DependencyTreeBuilder
{
- /**
- * Builds a tree of dependencies for the specified Maven project.
- *
- * @param repositoryIds the list of repositories to search for metadata
- * @param groupId the project groupId to build the tree for
- * @param artifactId the project artifactId to build the tree for
- * @param version the project version to build the tree for
- * @param nodeVisitor visitor to apply to all nodes discovered
- * @throws DependencyTreeBuilderException if the dependency tree cannot be
resolved
- */
void buildDependencyTree( List<String> repositoryIds, String groupId,
String artifactId, String version,
- DependencyNodeVisitor nodeVisitor )
- throws DependencyTreeBuilderException;
+ DependencyVisitor dependencyVisitor )
+ throws Exception;
+
+ List<TreeEntry> buildDependencyTree( List<String> repositoryIds, String
groupId, String artifactId, String version )
+ throws Exception;
}
+
Added:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java?rev=1369472&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java
(added)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java
Sat Aug 4 21:28:22 2012
@@ -0,0 +1,32 @@
+package org.apache.archiva.dependency.tree.maven2;
+/*
+ * 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.
+ */
+
+/**
+ * @author Olivier Lamy
+ * @since 1.4-M3
+ */
+public class DependencyTreeBuilderException
+ extends Exception
+{
+ public DependencyTreeBuilderException( String message, Throwable t )
+ {
+ super( message, t );
+ }
+}
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/DependencyTreeBuilderException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java?rev=1369472&r1=1369471&r2=1369472&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
(original)
+++
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/dependency/tree/maven2/Maven3DependencyTreeBuilder.java
Sat Aug 4 21:28:22 2012
@@ -78,6 +78,7 @@ import java.util.Map;
*/
@Service( "dependencyTreeBuilder#maven3" )
public class Maven3DependencyTreeBuilder
+ implements DependencyTreeBuilder
{
private Logger log = LoggerFactory.getLogger( getClass() );
@@ -123,7 +124,7 @@ public class Maven3DependencyTreeBuilder
public void buildDependencyTree( List<String> repositoryIds, String
groupId, String artifactId, String version,
DependencyVisitor dependencyVisitor )
- throws Exception
+ throws DependencyTreeBuilderException
{
Artifact projectArtifact = factory.createProjectArtifact( groupId,
artifactId, version );
ManagedRepository repository = null;
@@ -134,7 +135,7 @@ public class Maven3DependencyTreeBuilder
catch ( RepositoryAdminException e )
{
// FIXME better exception
- throw new Exception( "Cannot build project dependency tree " +
e.getMessage(), e );
+ throw new DependencyTreeBuilderException( "Cannot build project
dependency tree " + e.getMessage(), e );
}
if ( repository == null )
@@ -143,29 +144,36 @@ public class Maven3DependencyTreeBuilder
return;
}
- // MRM-1411
- // TODO: this is a workaround for a lack of proxy capability in the
resolvers - replace when it can all be
- // handled there. It doesn't cache anything locally!
- List<RemoteRepository> remoteRepositories = new
ArrayList<RemoteRepository>();
- Map<String, NetworkProxy> networkProxies = new HashMap<String,
NetworkProxy>();
-
- Map<String, List<ProxyConnector>> proxyConnectorsMap =
proxyConnectorAdmin.getProxyConnectorAsMap();
- List<ProxyConnector> proxyConnectors = proxyConnectorsMap.get(
repository.getId() );
- if ( proxyConnectors != null )
+ try
{
- for ( ProxyConnector proxyConnector : proxyConnectors )
+ // MRM-1411
+ // TODO: this is a workaround for a lack of proxy capability in
the resolvers - replace when it can all be
+ // handled there. It doesn't cache anything locally!
+ List<RemoteRepository> remoteRepositories = new
ArrayList<RemoteRepository>();
+ Map<String, NetworkProxy> networkProxies = new HashMap<String,
NetworkProxy>();
+
+ Map<String, List<ProxyConnector>> proxyConnectorsMap =
proxyConnectorAdmin.getProxyConnectorAsMap();
+ List<ProxyConnector> proxyConnectors = proxyConnectorsMap.get(
repository.getId() );
+ if ( proxyConnectors != null )
{
- remoteRepositories.add(
remoteRepositoryAdmin.getRemoteRepository( proxyConnector.getTargetRepoId() ) );
+ for ( ProxyConnector proxyConnector : proxyConnectors )
+ {
+ remoteRepositories.add(
remoteRepositoryAdmin.getRemoteRepository( proxyConnector.getTargetRepoId() ) );
- NetworkProxy networkProxyConfig =
networkProxyAdmin.getNetworkProxy( proxyConnector.getProxyId() );
+ NetworkProxy networkProxyConfig =
networkProxyAdmin.getNetworkProxy( proxyConnector.getProxyId() );
- if ( networkProxyConfig != null )
- {
- // key/value: remote repo ID/proxy info
- networkProxies.put( proxyConnector.getTargetRepoId(),
networkProxyConfig );
+ if ( networkProxyConfig != null )
+ {
+ // key/value: remote repo ID/proxy info
+ networkProxies.put( proxyConnector.getTargetRepoId(),
networkProxyConfig );
+ }
}
}
}
+ catch ( RepositoryAdminException e )
+ {
+ throw new DependencyTreeBuilderException( e.getMessage(), e );
+ }
// FIXME take care of relative path
resolve( repository.getLocation(), groupId, artifactId, version,
dependencyVisitor );
@@ -174,7 +182,7 @@ public class Maven3DependencyTreeBuilder
public List<TreeEntry> buildDependencyTree( List<String> repositoryIds,
String groupId, String artifactId,
String version )
- throws Exception
+ throws DependencyTreeBuilderException
{
List<TreeEntry> treeEntries = new ArrayList<TreeEntry>();
Modified: archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1369472&r1=1369471&r2=1369472&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Sat Aug 4 21:28:22 2012
@@ -64,7 +64,6 @@
<maven.version>2.0.8</maven.version>
<aether.version>1.13.1</aether.version>
- <maven-dependency-tree.version>2.0-SNAPSHOT</maven-dependency-tree.version>
<maven-model-converter.version>2.1</maven-model-converter.version>
<maven.indexer.version>4.1.3</maven.indexer.version>
<wagon.version>2.2</wagon.version>
@@ -1425,17 +1424,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-dependency-tree</artifactId>
- <version>${maven-dependency-tree.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>net.sf.ehcache</groupId>
