Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-20 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@542560 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-05-29 15:13:29 +00:00
parent ebbda9b5d7
commit d43baefa76
23 changed files with 66 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
archiva-base/archiva-artifact-converter/pom.xml
View File

@ -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>

2
archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConversionException.java → archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
View File

@ -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

2
archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/ArtifactConverter.java → archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
View File

@ -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

2
archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/AsciiFileUtil.java → archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/AsciiFileUtil.java
View File

@ -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

8
archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/LegacyToDefaultConverter.java → archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
View File

@ -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: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

4
archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/artifact/converter/Messages.java → archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
View File

@ -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 );

0
archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/artifact/converter/messages.properties → archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/artifact/messages.properties
View File

6
archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.java → archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java
View File

@ -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;

8
archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/artifact/converter/LegacyToDefaultConverterTest.xml → archiva-base/archiva-artifact-converter/src/test/resources/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.xml
View File

@ -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>

4
archiva-base/archiva-converter/pom.xml
View File

@ -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>

5
archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
View File

@ -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;

13
archiva-base/archiva-transaction/pom.xml
View File

@ -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>

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/AbstractTransactionEvent.java → archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/AbstractTransactionEvent.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/CopyFileEvent.java → archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CopyFileEvent.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/CreateFileEvent.java → archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/CreateFileEvent.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/FileTransaction.java → archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/FileTransaction.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/TransactionEvent.java → archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionEvent.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-base/archiva-transaction/src/main/java/org/apache/maven/transaction/TransactionException.java → archiva-base/archiva-transaction/src/main/java/org/apache/maven/archiva/transaction/TransactionException.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

2
archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/AbstractFileEventTest.java → archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/AbstractFileEventTest.java
View File

@ -1,4 +1,4 @@
package org.apache.maven.transaction;
package org.apache.maven.archiva.transaction;
/*
* Licensed to the Apache Software Foundation (ASF) under one

3
archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/CopyFileEventTest.java → archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CopyFileEventTest.java
View File

@ -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;

4
archiva-base/archiva-transaction/src/test/java/org/apache/maven/transaction/CreateFileEventTest.java → archiva-base/archiva-transaction/src/test/java/org/apache/maven/archiva/transaction/CreateFileEventTest.java
View File

@ -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;

2
archiva-base/pom.xml
View File

@ -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>

28
pom.xml
View File

@ -48,44 +48,44 @@
<subscribe>archiva-users-subscribe@maven.apache.org</subscribe>
<unsubscribe>
archiva-users-unsubscribe@maven.apache.org
</unsubscribe>
</unsubscribe>
<post>archiva-users@maven.apache.org</post>
<archive>
http://mail-archives.apache.org/mod_mbox/maven-archiva-users
</archive>
</archive>
</mailingList>
<mailingList>
<name>Maven Archiva Developer List</name>
<subscribe>archiva-dev-subscribe@maven.apache.org</subscribe>
<unsubscribe>
archiva-dev-unsubscribe@maven.apache.org
</unsubscribe>
</unsubscribe>
<post>archiva-dev@maven.apache.org</post>
<archive>
http://mail-archives.apache.org/mod_mbox/maven-archiva-dev
</archive>
</archive>
</mailingList>
<mailingList>
<name>Maven Archiva Commits List</name>
<subscribe>
archiva-commits-subscribe@maven.apache.org
</subscribe>
</subscribe>
<unsubscribe>
archiva-commits-unsubscribe@maven.apache.org
</unsubscribe>
</unsubscribe>
<post>archiva-commits@maven.apache.org</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>
@ -216,6 +216,11 @@
<artifactId>archiva-applet</artifactId>
<version>${archiva.version}</version>
</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>
@ -317,6 +322,11 @@
<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>
<groupId>org.apache.maven.archiva</groupId>
<artifactId>archiva-webapp</artifactId>