maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r828793 - in /maven/maven-3/trunk: ./ maven-artifact/ maven-artifact/src/ maven-artifact/src/main/ maven-artifact/src/main/java/ maven-artifact/src/main/java/org/ maven-artifact/src/main/java/org/apache/ maven-artifact/src/main/java/org/apa...
Date Thu, 22 Oct 2009 17:34:22 GMT
Author: bentmann
Date: Thu Oct 22 17:34:20 2009
New Revision: 828793

URL: http://svn.apache.org/viewvc?rev=828793&view=rev
Log:
o Moved Artifact and its class closure to a dedicated module

Added:
    maven/maven-3/trunk/maven-artifact/   (with props)
    maven/maven-3/trunk/maven-artifact/pom.xml   (with props)
    maven/maven-3/trunk/maven-artifact/src/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/   (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
      - copied, changed from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/  
(with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ 
 (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/
  (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/Authentication.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/Authentication.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/
  (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/
  (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ 
 (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
      - copied, changed from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/
  (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/
  (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/   (with
props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/Proxy.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/Proxy.java
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/ 
 (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/
  (with props)
    maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
      - copied unchanged from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
    maven/maven-3/trunk/maven-artifact/src/main/resources/   (with props)
    maven/maven-3/trunk/maven-artifact/src/test/   (with props)
    maven/maven-3/trunk/maven-artifact/src/test/java/   (with props)
    maven/maven-3/trunk/maven-artifact/src/test/resources/   (with props)
Removed:
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/ArtifactUtils.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/DefaultArtifact.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidArtifactRTException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/handler/ArtifactHandler.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/metadata/ArtifactMetadata.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepository.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/ArtifactRepositoryPolicy.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/Authentication.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/layout/ArtifactRepositoryLayout.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataStoreException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/AbstractArtifactResolutionException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactNotFoundException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/CyclicDependencyException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/MultipleArtifactsNotFoundException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/filter/ArtifactFilter.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/Restriction.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/Proxy.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/metadata/ArtifactMetadata.java
    maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/security/
Modified:
    maven/maven-3/trunk/maven-compat/pom.xml
    maven/maven-3/trunk/maven-plugin-api/pom.xml
    maven/maven-3/trunk/pom.xml

Propchange: maven/maven-3/trunk/maven-artifact/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 22 17:34:20 2009
@@ -0,0 +1,8 @@
+.settings
+target
+.classpath
+.project
+*.iml
+*.ipr
+*.iws
+bin

Added: maven/maven-3/trunk/maven-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/pom.xml?rev=828793&view=auto
==============================================================================
--- maven/maven-3/trunk/maven-artifact/pom.xml (added)
+++ maven/maven-3/trunk/maven-artifact/pom.xml Thu Oct 22 17:34:20 2009
@@ -0,0 +1,80 @@
+<?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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven</artifactId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>maven-artifact</artifactId>
+  <name>Maven Artifact</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model-builder</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-file</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-http-lightweight</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>1.2_Java1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+   
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-component-metadata</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: maven/maven-3/trunk/maven-artifact/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-3/trunk/maven-artifact/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: maven/maven-3/trunk/maven-artifact/src/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Copied: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
(from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java?p2=maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java&p1=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java&r1=828696&r2=828793&rev=828793&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
(original)
+++ maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/Artifact.java
Thu Oct 22 17:34:20 2009
@@ -46,19 +46,19 @@
 
     // TODO: into artifactScope handler
 
-    String SCOPE_COMPILE = ArtifactScopeEnum.compile.toString();
+    String SCOPE_COMPILE = "compile";
 
     String SCOPE_COMPILE_PLUS_RUNTIME = "compile+runtime";
 
-    String SCOPE_TEST = ArtifactScopeEnum.test.toString();
+    String SCOPE_TEST = "test";
 
-    String SCOPE_RUNTIME = ArtifactScopeEnum.runtime.toString();
+    String SCOPE_RUNTIME = "runtime";
 
-    String SCOPE_RUNTIME_PLUS_SYSTEM = ArtifactScopeEnum.runtime_plus_system.toString();
+    String SCOPE_RUNTIME_PLUS_SYSTEM = "runtime+system";
 
-    String SCOPE_PROVIDED = ArtifactScopeEnum.provided.toString();
+    String SCOPE_PROVIDED = "provided";
 
-    String SCOPE_SYSTEM = ArtifactScopeEnum.system.toString();
+    String SCOPE_SYSTEM = "system";
 
     String SCOPE_IMPORT = "import";   // Used to import dependencyManagement dependencies
 

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/handler/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/metadata/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Copied: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
(from r828696, maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?p2=maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java&p1=maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java&r1=828696&r2=828793&rev=828793&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
(original)
+++ maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java
Thu Oct 22 17:34:20 2009
@@ -15,14 +15,10 @@
  * the License.
  */
 
-import java.io.IOException;
 import java.util.List;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException;
-import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
-import org.apache.maven.wagon.TransferFailedException;
 
 /**
  * @author Jason van Zyl
@@ -53,40 +49,14 @@
         super( message, artifact, remoteRepositories );
     }
 
-    public ArtifactResolutionException( String message, Artifact artifact, ArtifactMetadataRetrievalException
cause )
-    {
-        super( message, artifact, null, cause );
-    }
-
-    @Deprecated
     public ArtifactResolutionException( String message, Artifact artifact, Throwable cause
)
     {
         super( message, artifact, null, cause );
     }
 
-    public ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository>
remoteRepositories, ArtifactMetadataRetrievalException cause )
-    {
-        super( message, artifact, remoteRepositories, cause );
-    }
-
-    @Deprecated
-    protected ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository>
remoteRepositories, Throwable cause )
+    public ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository>
remoteRepositories, Throwable cause )
     {
         super( message, artifact, remoteRepositories, cause );
     }
 
-    protected ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository>
remoteRepositories, TransferFailedException cause )
-    {
-        super( message, artifact, remoteRepositories, cause );
-    }
-
-    protected ArtifactResolutionException( String message, Artifact artifact, List<ArtifactRepository>
remoteRepositories, IOException cause )
-    {
-        super( message, artifact, remoteRepositories, cause );
-    }
-
-    public ArtifactResolutionException( String message, Artifact artifact, RepositoryMetadataResolutionException
cause )
-    {
-        super( message, artifact, null, cause );
-    }
 }

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/filter/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/versioning/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/java/org/apache/maven/repository/legacy/metadata/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/main/resources/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/test/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/test/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/test/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/test/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/test/java/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/test/java/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/test/java/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/test/java/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/test/resources/
------------------------------------------------------------------------------
    bugtraq:label = Enter issue ID:

Propchange: maven/maven-3/trunk/maven-artifact/src/test/resources/
------------------------------------------------------------------------------
    bugtraq:message = Issue id: %BUGID%

Propchange: maven/maven-3/trunk/maven-artifact/src/test/resources/
------------------------------------------------------------------------------
    bugtraq:number = false

Propchange: maven/maven-3/trunk/maven-artifact/src/test/resources/
------------------------------------------------------------------------------
    bugtraq:url = http://jira.codehaus.org/browse/%BUGID%

Modified: maven/maven-3/trunk/maven-compat/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/pom.xml?rev=828793&r1=828792&r2=828793&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/pom.xml (original)
+++ maven/maven-3/trunk/maven-compat/pom.xml Thu Oct 22 17:34:20 2009
@@ -32,6 +32,10 @@
       <artifactId>maven-model-builder</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
@@ -59,11 +63,6 @@
       <version>1.2_Java1.3</version>
       <scope>test</scope>
     </dependency>
-    <!--    
-    <dependency>
-      <groupId>org.jsecurity</groupId>
-      <artifactId>jsecurity</artifactId>
-    </dependency>    
    -->
   </dependencies>
    
   <build>

Modified: maven/maven-3/trunk/maven-plugin-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-plugin-api/pom.xml?rev=828793&r1=828792&r2=828793&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-plugin-api/pom.xml (original)
+++ maven/maven-3/trunk/maven-plugin-api/pom.xml Thu Oct 22 17:34:20 2009
@@ -33,15 +33,14 @@
   <name>Maven Plugin API</name>
 
   <dependencies>
-    <!--  Maven Artifact live in the compat module now. -->
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-compat</artifactId>
+      <artifactId>maven-artifact</artifactId>
       <exclusions>
-      	<exclusion>
-      		<artifactId>wagon-provider-api</artifactId>
-      		<groupId>org.apache.maven.wagon</groupId>
-      	</exclusion>
+        <exclusion>
+          <artifactId>wagon-provider-api</artifactId>
+          <groupId>org.apache.maven.wagon</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>

Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=828793&r1=828792&r2=828793&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Thu Oct 22 17:34:20 2009
@@ -132,6 +132,7 @@
     <module>maven-core</module>
     <module>apache-maven</module>
     <module>maven-model</module>
+    <module>maven-artifact</module>
     <module>maven-plugin-api</module>
     <module>maven-model-builder</module>
     <module>maven-embedder</module>
@@ -234,6 +235,11 @@
         <artifactId>maven-compat</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <!--bootstrap-end-comment-->
       <!--  Plexus -->
       <dependency>



Mime
View raw message