Author: joakime
Date: Tue May 29 08:13:29 2007
New Revision: 542560
URL: http://svn.apache.org/viewvc?view=rev&rev=542560
Log:
[MRM-384] Move maven-artifact-converter and maven-transaction to archiva.
Added:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/
- copied from r542527,
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/artifact/
- copied from r542527,
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/
- copied from r542527,
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/artifact/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/
- copied from r542527,
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/artifact/converter/
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/
- copied from r542527,
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/
- copied from r542527,
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/
Removed:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/artifact/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/artifact/
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/artifact/
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/ (props
changed)
maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
maven/archiva/trunk/archiva-base/archiva-converter/pom.xml
maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
maven/archiva/trunk/archiva-base/archiva-transaction/ (props changed)
maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
maven/archiva/trunk/archiva-base/pom.xml
maven/archiva/trunk/pom.xml
Propchange: maven/archiva/trunk/archiva-base/archiva-artifact-converter/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 29 08:13:29 2007
@@ -1,9 +1,15 @@
target
*~
+.*.swp
*.log
-.classpath
-.project
+*.patch
+*.diff
*.ipr
*.iws
*.iml
+.classpath
+.project
+.m2eclipse
.settings
+.wtpmodules
+cobertura.ser
Modified: maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml?view=diff&rev=542560&r1=542559&r2=542560
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml
(original)
+++ maven/archiva/trunk/archiva-base/archiva-artifact-converter/pom.xml Tue May
29 08:13:29 2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
Tue May 29 08:13:29 2007
@@ -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
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
Tue May 29 08:13:29 2007
@@ -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
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
Tue May 29 08:13:29 2007
@@ -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
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
Tue May 29 08:13:29 2007
@@ -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 @@
* 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.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 @@
* @author <a href="mailto:[EMAIL PROTECTED]">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
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
Tue May 29 08:13:29 2007
@@ -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 @@
*/
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 );
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
Tue May 29 08:13:29 2007
@@ -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 @@
* 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;
Modified:
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
(original)
+++
maven/archiva/trunk/archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
Tue May 29 08:13:29 2007
@@ -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>
Modified: maven/archiva/trunk/archiva-base/archiva-converter/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-converter/pom.xml?view=diff&rev=542560&r1=542559&r2=542560
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-converter/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-converter/pom.xml Tue May 29
08:13:29 2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?view=diff&rev=542560&r1=542559&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
Tue May 29 08:13:29 2007
@@ -22,14 +22,13 @@
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;
Propchange: maven/archiva/trunk/archiva-base/archiva-transaction/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue May 29 08:13:29 2007
@@ -1,9 +1,15 @@
target
*~
+.*.swp
*.log
-.classpath
-.project
+*.patch
+*.diff
*.ipr
*.iws
*.iml
+.classpath
+.project
+.m2eclipse
.settings
+.wtpmodules
+cobertura.ser
Modified: maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml?view=diff&rev=542560&r1=542559&r2=542560
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/archiva-transaction/pom.xml Tue May 29
08:13:29 2007
@@ -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>
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
Tue May 29 08:13:29 2007
@@ -1,4 +1,4 @@
-package org.apache.maven.transaction;
+package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
Tue May 29 08:13:29 2007
@@ -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 @@
* under the License.
*/
+import org.apache.maven.archiva.transaction.CopyFileEvent;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
Modified:
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java?view=diff&rev=542560&r1=542527&r2=542560
==============================================================================
---
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
(original)
+++
maven/archiva/trunk/archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
Tue May 29 08:13:29 2007
@@ -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 @@
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;
Modified: maven/archiva/trunk/archiva-base/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/pom.xml?view=diff&rev=542560&r1=542559&r2=542560
==============================================================================
--- maven/archiva/trunk/archiva-base/pom.xml (original)
+++ maven/archiva/trunk/archiva-base/pom.xml Tue May 29 08:13:29 2007
@@ -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>
Modified: maven/archiva/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/pom.xml?view=diff&rev=542560&r1=542559&r2=542560
==============================================================================
--- maven/archiva/trunk/pom.xml (original)
+++ maven/archiva/trunk/pom.xml Tue May 29 08:13:29 2007
@@ -48,44 +48,44 @@
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>
[EMAIL PROTECTED]
- </unsubscribe>
+ </unsubscribe>
<post>[EMAIL PROTECTED]</post>
<archive>
http://mail-archives.apache.org/mod_mbox/maven-archiva-users
- </archive>
+ </archive>
</mailingList>
<mailingList>
<name>Maven Archiva Developer List</name>
<subscribe>[EMAIL PROTECTED]</subscribe>
<unsubscribe>
[EMAIL PROTECTED]
- </unsubscribe>
+ </unsubscribe>
<post>[EMAIL PROTECTED]</post>
<archive>
http://mail-archives.apache.org/mod_mbox/maven-archiva-dev
- </archive>
+ </archive>
</mailingList>
<mailingList>
<name>Maven Archiva Commits List</name>
<subscribe>
[EMAIL PROTECTED]
- </subscribe>
+ </subscribe>
<unsubscribe>
[EMAIL PROTECTED]
- </unsubscribe>
+ </unsubscribe>
<post>[email protected]</post>
<archive>
http://mail-archives.apache.org/mod_mbox/maven-archiva-commits
- </archive>
+ </archive>
</mailingList>
</mailingLists>
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/maven/archiva/trunk
- </connection>
+ </connection>
<developerConnection>
scm:svn:https://svn.apache.org/repos/asf/maven/archiva/trunk
- </developerConnection>
+ </developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/maven/archiva/trunk</url>
</scm>
<distributionManagement>
@@ -218,6 +218,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-artifact-converter</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-artifact-reports</artifactId>
<version>${archiva.version}</version>
</dependency>
@@ -315,6 +320,11 @@
<dependency>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-signature-consumers</artifactId>
+ <version>${archiva.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.archiva</groupId>
+ <artifactId>archiva-transaction</artifactId>
<version>${archiva.version}</version>
</dependency>
<dependency>
