[MRM-384] Move maven-artifact-converter and maven-transaction to archiva.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@542560 13f79535-47bb-0310-9956-ffa450edef68

22 files changed, 47 insertions, 48 deletions

diff --git a/archiva-base/archiva-artifact-converter/pom.xml b/archiva-base/archiva-artifact-converter/pom.xml
index 8f8f102c9..a7abd533e 100644
--- a/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-base/archiva-artifact-converter/pom.xml
@@ -20,13 +20,12 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.shared</groupId>
-    <artifactId>maven-shared-components</artifactId>
-    <version>6</version>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
-  <artifactId>maven-artifact-converter</artifactId>
-  <version>2.1-alpha-2-SNAPSHOT</version>
-  <name>Maven Artifact Converter</name>
+  <artifactId>archiva-artifact-converter</artifactId>
+  <name>Archiva Artifact Converter</name>
   <description>Converts between Legacy and Modern Layout Artifacts.</description>
   <dependencies>
     <dependency>
@@ -40,9 +39,8 @@
       <version>2.0.4</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-transaction</artifactId>
-      <version>1.0-alpha-1</version>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-transaction</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
@@ -52,12 +50,10 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-9</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
index e6fbad62d..88a7208c5 100644
--- a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java
+++ b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.converter;
+package org.apache.maven.archiva.converter.artifact;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
index d3d4592eb..cf4823aff 100644
--- a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java
+++ b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.converter;
+package org.apache.maven.archiva.converter.artifact;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
index c400a83ab..706d332f0 100644
--- a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java
+++ b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.converter;
+package org.apache.maven.archiva.converter.artifact;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
index 16c2c0d52..224c320de 100644
--- a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java
+++ b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.converter;
+package org.apache.maven.archiva.converter.artifact;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,8 @@ package org.apache.maven.artifact.converter;
  * under the License.
  */
 
+import org.apache.maven.archiva.transaction.FileTransaction;
+import org.apache.maven.archiva.transaction.TransactionException;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -37,8 +39,6 @@ import org.apache.maven.model.Relocation;
 import org.apache.maven.model.converter.ModelConverter;
 import org.apache.maven.model.converter.PomTranslationException;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.transaction.FileTransaction;
-import org.apache.maven.transaction.TransactionException;
 import org.codehaus.plexus.digest.Digester;
 import org.codehaus.plexus.digest.DigesterException;
 import org.codehaus.plexus.util.FileUtils;
@@ -65,7 +65,7 @@ import java.util.regex.Matcher;
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
  * @version $Id$
  * 
- * @plexus.component role="org.apache.maven.artifact.converter.ArtifactConverter" 
+ * @plexus.component role="org.apache.maven.archiva.converter.artifact.ArtifactConverter" 
  *      role-hint="legacy-to-default"
  */
 public class LegacyToDefaultConverter
diff --git a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
index 917c95816..08077a852 100644
--- a/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java
+++ b/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.converter;
+package org.apache.maven.archiva.converter.artifact;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -31,7 +31,7 @@ import java.util.ResourceBundle;
  */
 public class Messages
 {
-    private static final String BUNDLE_NAME = "org.apache.maven.artifact.converter.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.apache.maven.archiva.converter.artifact.messages"; //$NON-NLS-1$
 
     private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
 
diff --git a/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties b/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/artifact/messages.properties
index 5e5bc6dd3..5e5bc6dd3 100644
--- a/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties
+++ b/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/artifact/messages.properties
diff --git a/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.java b/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
index c98a41043..123f5c5ac 100644
--- a/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.java
+++ b/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.converter;
+package org.apache.maven.archiva.converter.artifact;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,10 @@ package org.apache.maven.artifact.converter;
  * under the License.
  */
 
+import org.apache.maven.archiva.converter.artifact.ArtifactConversionException;
+import org.apache.maven.archiva.converter.artifact.ArtifactConverter;
+import org.apache.maven.archiva.converter.artifact.AsciiFileUtil;
+import org.apache.maven.archiva.converter.artifact.Messages;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadata;
diff --git a/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.xml b/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
index f3dea3955..1a3d5913e 100644
--- a/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.xml
+++ b/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
@@ -22,9 +22,9 @@
   <components>
     
     <component>
-      <role>org.apache.maven.artifact.converter.ArtifactConverter</role>
+      <role>org.apache.maven.archiva.converter.artifact.ArtifactConverter</role>
       <role-hint>force-repository-converter</role-hint>
-      <implementation>org.apache.maven.artifact.converter.LegacyToDefaultConverter</implementation>
+      <implementation>org.apache.maven.archiva.converter.artifact.LegacyToDefaultConverter</implementation>
       <description>LegacyToDefaultConverter</description>
       <requirements>
         <requirement>
@@ -51,9 +51,9 @@
     </component>
     
     <component>
-      <role>org.apache.maven.artifact.converter.ArtifactConverter</role>
+      <role>org.apache.maven.archiva.converter.artifact.ArtifactConverter</role>
       <role-hint>dryrun-repository-converter</role-hint>
-      <implementation>org.apache.maven.artifact.converter.LegacyToDefaultConverter</implementation>
+      <implementation>org.apache.maven.archiva.converter.artifact.LegacyToDefaultConverter</implementation>
       <description>LegacyToDefaultConverter</description>
       <requirements>
         <requirement>
diff --git a/archiva-base/archiva-converter/pom.xml b/archiva-base/archiva-converter/pom.xml
index a089cde97..03b2870ee 100644
--- a/archiva-base/archiva-converter/pom.xml
+++ b/archiva-base/archiva-converter/pom.xml
@@ -38,8 +38,8 @@
       <artifactId>archiva-repository-layer</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-artifact-converter</artifactId>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-artifact-converter</artifactId>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index 2e0e6fb25..3aa8aa675 100644
--- a/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -22,14 +22,13 @@ package org.apache.maven.archiva.converter.legacy;
 import org.apache.maven.archiva.consumers.AbstractMonitoredConsumer;
 import org.apache.maven.archiva.consumers.ConsumerException;
 import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
+import org.apache.maven.archiva.converter.artifact.ArtifactConversionException;
+import org.apache.maven.archiva.converter.artifact.ArtifactConverter;
 import org.apache.maven.archiva.model.ArchivaRepository;
 import org.apache.maven.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.layout.BidirectionalRepositoryLayout;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.converter.ArtifactConversionException;
-import org.apache.maven.artifact.converter.ArtifactConverter;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 
diff --git a/archiva-base/archiva-transaction/pom.xml b/archiva-base/archiva-transaction/pom.xml
index 31cde74f1..ffe405d7c 100644
--- a/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-base/archiva-transaction/pom.xml
@@ -20,13 +20,12 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.apache.maven.shared</groupId>
-    <artifactId>maven-shared-components</artifactId>
-    <version>6</version>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-base</artifactId>
+    <version>1.0-alpha-1-SNAPSHOT</version>
   </parent>
-  <artifactId>maven-transaction</artifactId>
-  <version>1.0-alpha-2-SNAPSHOT</version>
-  <name>Maven Transactions</name>
+  <artifactId>archiva-transaction</artifactId>
+  <name>Archiva Transactions</name>
   <description>API for managing transaction.</description>
   <dependencies>
     <dependency>
@@ -37,12 +36,10 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-utils</artifactId>
-      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-9</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/AbstractTransactionEvent.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
index e9d1409ed..35cbe1456 100644
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/AbstractTransactionEvent.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/CopyFileEvent.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
index c04b5e16f..52b72f0ed 100644
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/CopyFileEvent.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/CreateFileEvent.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
index c28b4cf32..5af7dc3f8 100644
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/CreateFileEvent.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/FileTransaction.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
index ffe73059c..0f275572f 100644
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/FileTransaction.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/TransactionEvent.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
index 5be7f1e03..94d3cb011 100644
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/TransactionEvent.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/TransactionException.java b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
index 381a6ff42..b4f81108c 100644
--- a/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/TransactionException.java
+++ b/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/AbstractFileEventTest.java b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
index 479471818..d30d83917 100644
--- a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/AbstractFileEventTest.java
+++ b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/CopyFileEventTest.java b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
index 1bfc37ad9..ac30a3514 100644
--- a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/CopyFileEventTest.java
+++ b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +19,7 @@ package org.apache.maven.transaction;
  * under the License.
  */
 
+import org.apache.maven.archiva.transaction.CopyFileEvent;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
diff --git a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/CreateFileEventTest.java b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
index 22a200639..14a1df4cb 100644
--- a/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/CreateFileEventTest.java
+++ b/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.transaction;
 
 import java.io.File;
 
-import org.apache.maven.transaction.CreateFileEvent;
+import org.apache.maven.archiva.transaction.CreateFileEvent;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.util.FileUtils;
 
diff --git a/archiva-base/pom.xml b/archiva-base/pom.xml
index e4fc94f6f..145c7d537 100644
--- a/archiva-base/pom.xml
+++ b/archiva-base/pom.xml
@@ -39,6 +39,8 @@
     <module>archiva-repository-layer</module>
     <module>archiva-xml-tools</module>
     <module>archiva-proxy</module>
+    <module>archiva-transaction</module>
+    <module>archiva-artifact-converter</module>
     <module>archiva-converter</module>
   </modules>
 </project>