Author: ogusakov
Date: Tue Mar 31 20:30:29 2009
New Revision: 760594
URL: http://svn.apache.org/viewvc?rev=760594&view=rev
Log:
added tree-based resolution objects
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
(with props)
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
(with props)
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
(with props)
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataTreeNode.java
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java?rev=760594&r1=760593&r2=760594&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
Tue Mar 31 20:30:29 2009
@@ -59,7 +59,7 @@
/**
* @author Jason van Zyl
*/
-...@component(role = RepositorySystem.class, hint = "default" )
+...@component( role = RepositorySystem.class, hint = "default" )
public class LegacyRepositorySystem
implements RepositorySystem
{
@@ -451,4 +451,9 @@
{
return mirrorBuilder.getMirrors( repositories );
}
+
+ public MetadataResolutionResult resolveMetadata( MetadataResolutionRequest
request )
+ {
+ return null;
+ }
}
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java?rev=760594&view=auto
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
(added)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
Tue Mar 31 20:30:29 2009
@@ -0,0 +1,110 @@
+/*
+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;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MavenArtifactMetadata
+{
+ String groupId;
+ String artifactId;
+ String version;
+ String classifier;
+ String type;
+ String scope;
+
+ transient Object datum;
+
+ public String getGroupId()
+ {
+ return groupId;
+ }
+
+ public void setGroupId( String groupId )
+ {
+ this.groupId = groupId;
+ }
+
+ public String getArtifactId()
+ {
+ return artifactId;
+ }
+
+ public void setArtifactId( String artifactId )
+ {
+ this.artifactId = artifactId;
+ }
+
+ public String getVersion()
+ {
+ return version;
+ }
+
+ public void setVersion( String version )
+ {
+ this.version = version;
+ }
+
+ public String getClassifier()
+ {
+ return classifier;
+ }
+
+ public void setClassifier( String classifier )
+ {
+ this.classifier = classifier;
+ }
+
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType( String type )
+ {
+ this.type = type;
+ }
+
+ public Object getDatum()
+ {
+ return datum;
+ }
+
+ public void setDatum( Object datum )
+ {
+ this.datum = datum;
+ }
+
+ public String getScope()
+ {
+ return scope;
+ }
+
+ public void setScope( String scope )
+ {
+ this.scope = scope;
+ }
+
+}
Propchange:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MavenArtifactMetadata.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java?rev=760594&view=auto
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
(added)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
Tue Mar 31 20:30:29 2009
@@ -0,0 +1,32 @@
+/*
+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;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MetadataGraph
+{
+
+}
Propchange:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraph.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java?rev=760594&view=auto
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
(added)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
Tue Mar 31 20:30:29 2009
@@ -0,0 +1,36 @@
+/*
+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.util.List;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MetadataGraphNode
+{
+ MavenArtifactMetadata metadata;
+ List<MetadataGraphNode> inNodes;
+ List<MetadataGraphNode> exNodes;
+}
Propchange:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataGraphNode.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataTreeNode.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataTreeNode.java?rev=760594&r1=760593&r2=760594&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataTreeNode.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MetadataTreeNode.java
Tue Mar 31 20:30:29 2009
@@ -38,7 +38,7 @@
/**
* this node's artifact MD
*/
- private Artifact metadata;
+ private MavenArtifactMetadata metadata;
/**
* is there a real artifact behind this node, or it's just a helper ?
@@ -88,7 +88,7 @@
}
// ------------------------------------------------------------------------
- public MetadataTreeNode( Artifact md, MetadataTreeNode parent )
+ public MetadataTreeNode( MavenArtifactMetadata md, MetadataTreeNode parent
)
{
this.metadata = md;
@@ -131,7 +131,7 @@
}
// ------------------------------------------------------------------------
- public Artifact getMetadata()
+ public MavenArtifactMetadata getMetadata()
{
return metadata;
}
Modified:
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java?rev=760594&r1=760593&r2=760594&view=diff
==============================================================================
---
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
(original)
+++
maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
Tue Mar 31 20:30:29 2009
@@ -66,7 +66,7 @@
ArtifactResolutionResult resolve( ArtifactResolutionRequest request );
- //MetadataResolutionResult resolveMetadata( MetadataResolutionRequest
request );
+ MetadataResolutionResult resolveMetadata( MetadataResolutionRequest
request );
//REMOVE
// Network enablement: this needs to go as we will know at a higher level
from the embedder if the system is offline or not, we should not have to
