Author: olamy
Date: Wed Sep 14 13:06:08 2011
New Revision: 1170591
URL: http://svn.apache.org/viewvc?rev=1170591&view=rev
Log:
get RID of org.apache.maven package
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
(contents, props changed)
- copied, changed from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
(contents, props changed)
- copied, changed from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
(contents, props changed)
- copied, changed from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
(contents, props changed)
- copied, changed from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
(contents, props changed)
- copied, changed from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/archiva/converter/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/archiva/converter/artifact/
- copied from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/artifact/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/
- copied from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/maven/archiva/converter/artifact/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
(from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java&r1=1170518&r2=1170591&rev=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConversionException.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
Wed Sep 14 13:06:08 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.converter.artifact;
+package org.apache.archiva.converter.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
(from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java&r1=1170518&r2=1170591&rev=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/ArtifactConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
Wed Sep 14 13:06:08 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.converter.artifact;
+package org.apache.archiva.converter.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
(from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java&r1=1170518&r2=1170591&rev=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyRepositoryLayout.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
Wed Sep 14 13:06:08 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.converter.artifact;
+package org.apache.archiva.converter.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
(from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java&r1=1170518&r2=1170591&rev=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
Wed Sep 14 13:06:08 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.converter.artifact;
+package org.apache.archiva.converter.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
(from r1170518,
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java&r1=1170518&r2=1170591&rev=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/Messages.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
Wed Sep 14 13:06:08 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.converter.artifact;
+package org.apache.archiva.converter.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@ import java.util.ResourceBundle;
*/
public class Messages
{
- private static final String BUNDLE_NAME =
"org.apache.maven.archiva.converter.artifact.messages"; //$NON-NLS-1$
+ private static final String BUNDLE_NAME =
"org.apache.archiva.converter.artifact.messages"; //$NON-NLS-1$
private static final ResourceBundle RESOURCE_BUNDLE =
ResourceBundle.getBundle( BUNDLE_NAME );
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml?rev=1170591&r1=1170590&r2=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml
Wed Sep 14 13:06:08 2011
@@ -28,6 +28,6 @@
default-lazy-init="true">
<context:annotation-config/>
- <context:component-scan
base-package="org.apache.maven.archiva.converter.artifact"/>
+ <context:component-scan
base-package="org.apache.archiva.converter.artifact"/>
</beans>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java?rev=1170591&r1=1170518&r2=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
Wed Sep 14 13:06:08 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.converter.artifact;
+package org.apache.archiva.converter.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml?rev=1170591&r1=1170590&r2=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml
Wed Sep 14 13:06:08 2011
@@ -26,12 +26,12 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
- <bean name="artifactConverter#force-repository-converter"
class="org.apache.maven.archiva.converter.artifact.LegacyToDefaultConverter">
+ <bean name="artifactConverter#force-repository-converter"
class="org.apache.archiva.converter.artifact.LegacyToDefaultConverter">
<property name="force" value="true"/>
<property name="dryrun" value="false"/>
</bean>
- <bean name="artifactConverter#dryrun-repository-converter"
class="org.apache.maven.archiva.converter.artifact.LegacyToDefaultConverter">
+ <bean name="artifactConverter#dryrun-repository-converter"
class="org.apache.archiva.converter.artifact.LegacyToDefaultConverter">
<property name="force" value="false"/>
<property name="dryrun" value="true"/>
</bean>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=1170591&r1=1170590&r2=1170591&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/maven/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
Wed Sep 14 13:06:08 2011
@@ -25,8 +25,8 @@ import org.apache.archiva.common.plexusb
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.converter.artifact.ArtifactConversionException;
-import org.apache.maven.archiva.converter.artifact.ArtifactConverter;
+import org.apache.archiva.converter.artifact.ArtifactConversionException;
+import org.apache.archiva.converter.artifact.ArtifactConverter;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
import
org.apache.maven.archiva.repository.content.ManagedDefaultRepositoryContent;
