[MRM-1003] Repackage sources from org.apache.maven.archiva.. to org.apache.archiva...

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

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
index 2efd46b0d09e84280d76d7d28e7fb7082f6417ff..9cf6735ea89c7c9dc820aa627e8a50a1b363eca9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
@@ -26,9 +26,9 @@ import org.apache.maven.archiva.configuration.FileTypes;
 import org.apache.archiva.consumers.AbstractMonitoredConsumer;
 import org.apache.archiva.consumers.ConsumerException;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
index 244be334d522c0e7c9fcf6a69309df307fa031a4..0e4ed42826f07db2ec9a41a503a905528e6e6abc 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/AbstractRepositoryPurge.java
@@ -23,7 +23,7 @@ import org.apache.archiva.audit.AuditEvent;
 import org.apache.archiva.metadata.repository.MetadataRepository;
 import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.repository.events.RepositoryListener;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
index 00419020bcf32cac99ea34ab6970cf50366d87af..c504ad0ce215442d405263a8cc84494a1dacadc7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/CleanupReleasedSnapshotsRepositoryPurge.java
@@ -27,10 +27,10 @@ import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.repository.events.RepositoryListener;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaArtifact;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
index 549135f955c503e250bdb900c9ab616597dcc8de..7902d6852e5a673ba40d02348106e040656136e6 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/DaysOldRepositoryPurge.java
@@ -24,8 +24,8 @@ import org.apache.archiva.repository.events.RepositoryListener;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
index fb6c1281592a2d697ce210bad0190a64129010bf..8636f386a38d7d22d926bbbf810c58e2df8d4fd5 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RetentionCountRepositoryPurge.java
@@ -23,8 +23,8 @@ import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.repository.events.RepositoryListener;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;

diff --git a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
index 4569bc46f49ac512c3e42cf36970db1f15c65a54..ad83665239a4871e53ea088857399b54a77b3681 100644 (file)
--- a/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
+++ b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
@@ -27,7 +27,7 @@ import org.apache.archiva.consumers.ConsumerException;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
 import org.apache.archiva.converter.artifact.ArtifactConversionException;
 import org.apache.archiva.converter.artifact.ArtifactConverter;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.content.ManagedDefaultRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java
new file mode 100644 (file)
index 0000000..5a3fb46
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifact.java
@@ -0,0 +1,242 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.archiva.common.utils.VersionUtil;
+
+/**
+ * ArchivaArtifact - Mutable artifact object.
+ *
+ * @version $Id$
+ */
+public class ArchivaArtifact
+{
+    private ArchivaArtifactModel model;
+
+    private ArchivaArtifactPlatformDetails platformDetails;
+
+    private String baseVersion;
+
+    public ArchivaArtifact( String groupId, String artifactId, String version,
+                            String classifier, String type, String repositoryId )
+    {
+        if ( empty( groupId ) )
+        {
+            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty groupId ["
+                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
+        }
+
+        if ( empty( artifactId ) )
+        {
+            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty artifactId ["
+                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
+        }
+
+        if ( empty( version ) )
+        {
+            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty version ["
+                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
+        }
+
+        if ( empty( type ) )
+        {
+            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty type ["
+                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
+        }
+
+        if ( empty( repositoryId ) )
+        {
+            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty repositoryId ["
+                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
+        }
+
+        model = new ArchivaArtifactModel();
+
+        model.setGroupId( groupId );
+        model.setArtifactId( artifactId );
+        model.setVersion( version );
+        model.setClassifier( StringUtils.defaultString( classifier ) );
+        model.setType( type );
+        model.setSnapshot( VersionUtil.isSnapshot( version ) );
+        model.setRepositoryId(repositoryId);
+        
+        this.baseVersion = VersionUtil.getBaseVersion( version );
+    }
+
+    public ArchivaArtifact( ArchivaArtifactModel artifactModel )
+    {
+        this.model = artifactModel;
+        model.setSnapshot( VersionUtil.isSnapshot( model.getVersion() ) );
+        this.baseVersion = VersionUtil.getBaseVersion( model.getVersion() );
+    }
+    
+    public ArchivaArtifact( ArtifactReference ref, String repositoryId )
+    {
+        this( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType(), repositoryId );
+    }
+
+    public ArchivaArtifactModel getModel()
+    {
+        return model;
+    }
+
+    public String getGroupId()
+    {
+        return model.getGroupId();
+    }
+
+    public String getArtifactId()
+    {
+        return model.getArtifactId();
+    }
+
+    public String getVersion()
+    {
+        return model.getVersion();
+    }
+
+    public String getBaseVersion()
+    {
+        return baseVersion;
+    }
+
+    public boolean isSnapshot()
+    {
+        return model.isSnapshot();
+    }
+
+    public String getClassifier()
+    {
+        return model.getClassifier();
+    }
+
+    public String getType()
+    {
+        return model.getType();
+    }
+
+    public boolean hasClassifier()
+    {
+        return StringUtils.isNotEmpty( model.getClassifier() );
+    }
+
+    public String getRepositoryId()
+    {
+        return model.getRepositoryId();
+    }
+
+    @Override
+    public int hashCode()
+    {
+        final int PRIME = 31;
+        int result = 1;
+        if ( model != null )
+        {
+            result = PRIME * result + ( ( model.getGroupId() == null ) ? 0 : model.getGroupId().hashCode() );
+            result = PRIME * result + ( ( model.getArtifactId() == null ) ? 0 : model.getArtifactId().hashCode() );
+            result = PRIME * result + ( ( model.getVersion() == null ) ? 0 : model.getVersion().hashCode() );
+            result = PRIME * result + ( ( model.getClassifier() == null ) ? 0 : model.getClassifier().hashCode() );
+            result = PRIME * result + ( ( model.getType() == null ) ? 0 : model.getType().hashCode() );
+        }
+        return result;
+    }
+
+    @Override
+    public boolean equals( Object obj )
+    {
+        if ( this == obj )
+        {
+            return true;
+        }
+
+        if ( obj == null )
+        {
+            return false;
+        }
+
+        if ( getClass() != obj.getClass() )
+        {
+            return false;
+        }
+
+        final ArchivaArtifact other = (ArchivaArtifact) obj;
+
+        if ( model == null )
+        {
+            if ( other.model != null )
+            {
+                return false;
+            }
+        }
+        if ( !model.equals( other.model ) )
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuffer sb = new StringBuffer();
+        if ( model.getGroupId() != null )
+        {
+            sb.append( model.getGroupId() );
+            sb.append( ":" );
+        }
+        appendArtifactTypeClassifierString( sb );
+        sb.append( ":" );
+        if ( model.getVersion() != null )
+        {
+            sb.append( model.getVersion() );
+        }
+
+        return sb.toString();
+    }
+
+    private void appendArtifactTypeClassifierString( StringBuffer sb )
+    {
+        sb.append( model.getArtifactId() );
+        sb.append( ":" );
+        sb.append( getType() );
+        if ( hasClassifier() )
+        {
+            sb.append( ":" );
+            sb.append( getClassifier() );
+        }
+    }
+
+    private boolean empty( String value )
+    {
+        return ( value == null ) || ( value.trim().length() < 1 );
+    }
+
+    public ArchivaArtifactPlatformDetails getPlatformDetails()
+    {
+        return platformDetails;
+    }
+
+    public void setPlatformDetails( ArchivaArtifactPlatformDetails platformDetails )
+    {
+        this.platformDetails = platformDetails;
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java
new file mode 100644 (file)
index 0000000..3f33da0
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaArtifactPlatformDetails.java
@@ -0,0 +1,30 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * A tag for objects that are considered ArchivaArtifactPlatformDetails. 
+ *
+ * @version $Id$
+ */
+public interface ArchivaArtifactPlatformDetails
+{
+    public String getPlatform();
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
new file mode 100644 (file)
index 0000000..e6c011c
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
@@ -0,0 +1,143 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * Utility methods for cloning various Archiva Model objects. 
+ *
+ * @version $Id$
+ */
+public class ArchivaModelCloner
+{
+
+    public static ArtifactReference clone( ArtifactReference artifactReference )
+    {
+        if ( artifactReference == null )
+        {
+            return null;
+        }
+
+        ArtifactReference cloned = new ArtifactReference();
+
+        cloned.setGroupId( artifactReference.getGroupId() );
+        cloned.setArtifactId( artifactReference.getArtifactId() );
+        cloned.setVersion( artifactReference.getVersion() );
+        cloned.setClassifier( artifactReference.getClassifier() );
+        cloned.setType( artifactReference.getType() );
+
+        return cloned;
+    }
+
+    @SuppressWarnings("unchecked")
+    public static Properties clone( Properties properties )
+    {
+        if ( properties == null )
+        {
+            return null;
+        }
+
+        Properties cloned = new Properties();
+
+        Enumeration<String> keys = (Enumeration<String>) properties.propertyNames();
+        while ( keys.hasMoreElements() )
+        {
+            String key = (String) keys.nextElement();
+            String value = properties.getProperty( key );
+            cloned.setProperty( key, value );
+        }
+
+        return cloned;
+    }
+
+    public static SnapshotVersion clone( SnapshotVersion snapshotVersion )
+    {
+        if ( snapshotVersion == null )
+        {
+            return null;
+        }
+
+        SnapshotVersion cloned = new SnapshotVersion();
+
+        cloned.setTimestamp( snapshotVersion.getTimestamp() );
+        cloned.setBuildNumber( snapshotVersion.getBuildNumber() );
+
+        return cloned;
+    }
+
+    public static VersionedReference clone( VersionedReference versionedReference )
+    {
+        if ( versionedReference == null )
+        {
+            return null;
+        }
+
+        VersionedReference cloned = new VersionedReference();
+
+        cloned.setGroupId( versionedReference.getGroupId() );
+        cloned.setArtifactId( versionedReference.getArtifactId() );
+        cloned.setVersion( versionedReference.getVersion() );
+
+        return cloned;
+    }
+
+    public static List<ArtifactReference> cloneArtifactReferences( List<ArtifactReference> artifactReferenceList )
+    {
+        if ( artifactReferenceList == null )
+        {
+            return null;
+        }
+
+        List<ArtifactReference> ret = new ArrayList<ArtifactReference>();
+
+        for ( ArtifactReference ref : artifactReferenceList )
+        {
+            ret.add( clone( ref ) );
+        }
+
+        return ret;
+    }
+
+    private static List<String> cloneSimpleStringList( List<String> simple )
+    {
+        if ( simple == null )
+        {
+            return null;
+        }
+
+        List<String> ret = new ArrayList<String>();
+
+        for ( String txt : simple )
+        {
+            ret.add( txt );
+        }
+
+        return ret;
+    }
+
+    public static List<String> cloneAvailableVersions( List<String> availableVersions )
+    {
+        return cloneSimpleStringList( availableVersions );
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java
new file mode 100644 (file)
index 0000000..ea2ccc2
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/CompoundKey.java
@@ -0,0 +1,30 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * Tag for identifying a Compound Key 
+ *
+ * @version $Id$
+ */
+public interface CompoundKey
+{
+    public String toString();
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java
new file mode 100644 (file)
index 0000000..a39f6eb
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/Keys.java
@@ -0,0 +1,74 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.commons.lang.StringUtils;
+
+/**
+ * Keys - utility methods for converting common objects into string keys. 
+ *
+ * @version $Id$
+ */
+public class Keys
+{
+    public static String toKey( String groupId, String artifactId, String version, String classifier, String type )
+    {
+        StringBuffer key = new StringBuffer();
+
+        key.append( groupId ).append( ":" );
+        key.append( artifactId ).append( ":" );
+        key.append( version ).append( ":" );
+        key.append( StringUtils.defaultString( classifier ) ).append( ":" );
+        key.append( type );
+
+        return key.toString();
+    }
+
+    public static String toKey( ArtifactReference ref )
+    {
+        return toKey( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType() );
+    }
+
+    public static String toKey( ProjectReference ref )
+    {
+        StringBuffer key = new StringBuffer();
+
+        key.append( ref.getGroupId() ).append( ":" );
+        key.append( ref.getArtifactId() );
+
+        return key.toString();
+    }
+
+    public static String toKey( String groupId, String artifactId, String version )
+    {
+        StringBuffer key = new StringBuffer();
+
+        key.append( groupId ).append( ":" );
+        key.append( artifactId ).append( ":" );
+        key.append( version );
+
+        return key.toString();
+    }
+    
+    public static String toKey( VersionedReference ref )
+    {
+        return toKey( ref.getGroupId(), ref.getArtifactId(), ref.getVersion() );
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
new file mode 100644 (file)
index 0000000..47fd5b3
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/RepositoryURL.java
@@ -0,0 +1,169 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/**
+ * RepositoryURL - Mutable (and protocol forgiving) URL object.
+ *
+ * @version $Id$
+ */
+public class RepositoryURL
+{
+    private String url;
+
+    private String protocol;
+
+    private String host;
+
+    private String port;
+
+    private String username;
+
+    private String password;
+
+    private String path;
+
+    public RepositoryURL( String url )
+    {
+        this.url = url;
+
+        // .\ Parse the URL \.____________________________________________
+
+        int pos;
+
+        pos = url.indexOf( ":/" );
+        if ( pos == ( -1 ) )
+        {
+            throw new IllegalArgumentException( "Invalid URL, unable to parse protocol:// from " + url );
+        }
+
+        protocol = url.substring( 0, pos );
+
+        // Determine the post protocol position.
+        int postProtocolPos = protocol.length() + 1;
+        while ( url.charAt( postProtocolPos ) == '/' )
+        {
+            postProtocolPos++;
+        }
+        
+        // Handle special case with file protocol (which has no host, port, username, or password)
+        if ( "file".equals( protocol ) )
+        {
+            path = "/" + url.substring( postProtocolPos );
+
+            return;
+        }
+
+        // attempt to find the start of the 'path'
+        pos = url.indexOf( "/", postProtocolPos );
+
+        // no path specified - ex "http://localhost"
+        if ( pos == ( -1 ) )
+        {
+            // set pos to end of string. (needed for 'middle section')
+            pos = url.length();
+            // default path
+            path = "/";
+        }
+        else
+        {
+            // get actual path.
+            path = url.substring( pos );
+        }
+
+        // get the middle section ( username : password @ hostname : port )
+        String middle = url.substring( postProtocolPos, pos );
+
+        pos = middle.indexOf( '@' );
+
+        // we have an authentication section.
+        if ( pos > 0 )
+        {
+            String authentication = middle.substring( 0, pos );
+            middle = middle.substring( pos + 1 ); // lop off authentication for host:port search
+
+            pos = authentication.indexOf( ':' );
+
+            // we have a password.
+            if ( pos > 0 )
+            {
+                username = authentication.substring( 0, pos );
+                password = authentication.substring( pos + 1 );
+            }
+            else
+            {
+                username = authentication;
+            }
+        }
+
+        pos = middle.indexOf( ':' );
+
+        // we have a defined port
+        if ( pos > 0 )
+        {
+            host = middle.substring( 0, pos );
+            port = middle.substring( pos + 1 );
+        }
+        else
+        {
+            host = middle;
+        }
+    }
+
+    public String toString()
+    {
+        return url;
+    }
+
+    public String getUsername()
+    {
+        return username;
+    }
+
+    public String getPassword()
+    {
+        return password;
+    }
+
+    public String getHost()
+    {
+        return host;
+    }
+
+    public String getPath()
+    {
+        return path;
+    }
+
+    public String getPort()
+    {
+        return port;
+    }
+
+    public String getProtocol()
+    {
+        return protocol;
+    }
+
+    public String getUrl()
+    {
+        return url;
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
deleted file mode 100644 (file)
index a68490a..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.archiva.common.utils.VersionUtil;
-
-/**
- * ArchivaArtifact - Mutable artifact object.
- *
- * @version $Id$
- */
-public class ArchivaArtifact
-{
-    private ArchivaArtifactModel model;
-
-    private ArchivaArtifactPlatformDetails platformDetails;
-
-    private String baseVersion;
-
-    public ArchivaArtifact( String groupId, String artifactId, String version,
-                            String classifier, String type, String repositoryId )
-    {
-        if ( empty( groupId ) )
-        {
-            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty groupId ["
-                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
-        }
-
-        if ( empty( artifactId ) )
-        {
-            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty artifactId ["
-                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
-        }
-
-        if ( empty( version ) )
-        {
-            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty version ["
-                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
-        }
-
-        if ( empty( type ) )
-        {
-            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty type ["
-                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
-        }
-
-        if ( empty( repositoryId ) )
-        {
-            throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty repositoryId ["
-                + Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
-        }
-
-        model = new ArchivaArtifactModel();
-
-        model.setGroupId( groupId );
-        model.setArtifactId( artifactId );
-        model.setVersion( version );
-        model.setClassifier( StringUtils.defaultString( classifier ) );
-        model.setType( type );
-        model.setSnapshot( VersionUtil.isSnapshot( version ) );
-        model.setRepositoryId(repositoryId);
-        
-        this.baseVersion = VersionUtil.getBaseVersion( version );
-    }
-
-    public ArchivaArtifact( ArchivaArtifactModel artifactModel )
-    {
-        this.model = artifactModel;
-        model.setSnapshot( VersionUtil.isSnapshot( model.getVersion() ) );
-        this.baseVersion = VersionUtil.getBaseVersion( model.getVersion() );
-    }
-    
-    public ArchivaArtifact( ArtifactReference ref, String repositoryId )
-    {
-        this( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType(), repositoryId );
-    }
-
-    public ArchivaArtifactModel getModel()
-    {
-        return model;
-    }
-
-    public String getGroupId()
-    {
-        return model.getGroupId();
-    }
-
-    public String getArtifactId()
-    {
-        return model.getArtifactId();
-    }
-
-    public String getVersion()
-    {
-        return model.getVersion();
-    }
-
-    public String getBaseVersion()
-    {
-        return baseVersion;
-    }
-
-    public boolean isSnapshot()
-    {
-        return model.isSnapshot();
-    }
-
-    public String getClassifier()
-    {
-        return model.getClassifier();
-    }
-
-    public String getType()
-    {
-        return model.getType();
-    }
-
-    public boolean hasClassifier()
-    {
-        return StringUtils.isNotEmpty( model.getClassifier() );
-    }
-
-    public String getRepositoryId()
-    {
-        return model.getRepositoryId();
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int PRIME = 31;
-        int result = 1;
-        if ( model != null )
-        {
-            result = PRIME * result + ( ( model.getGroupId() == null ) ? 0 : model.getGroupId().hashCode() );
-            result = PRIME * result + ( ( model.getArtifactId() == null ) ? 0 : model.getArtifactId().hashCode() );
-            result = PRIME * result + ( ( model.getVersion() == null ) ? 0 : model.getVersion().hashCode() );
-            result = PRIME * result + ( ( model.getClassifier() == null ) ? 0 : model.getClassifier().hashCode() );
-            result = PRIME * result + ( ( model.getType() == null ) ? 0 : model.getType().hashCode() );
-        }
-        return result;
-    }
-
-    @Override
-    public boolean equals( Object obj )
-    {
-        if ( this == obj )
-        {
-            return true;
-        }
-
-        if ( obj == null )
-        {
-            return false;
-        }
-
-        if ( getClass() != obj.getClass() )
-        {
-            return false;
-        }
-
-        final ArchivaArtifact other = (ArchivaArtifact) obj;
-
-        if ( model == null )
-        {
-            if ( other.model != null )
-            {
-                return false;
-            }
-        }
-        if ( !model.equals( other.model ) )
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    @Override
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-        if ( model.getGroupId() != null )
-        {
-            sb.append( model.getGroupId() );
-            sb.append( ":" );
-        }
-        appendArtifactTypeClassifierString( sb );
-        sb.append( ":" );
-        if ( model.getVersion() != null )
-        {
-            sb.append( model.getVersion() );
-        }
-
-        return sb.toString();
-    }
-
-    private void appendArtifactTypeClassifierString( StringBuffer sb )
-    {
-        sb.append( model.getArtifactId() );
-        sb.append( ":" );
-        sb.append( getType() );
-        if ( hasClassifier() )
-        {
-            sb.append( ":" );
-            sb.append( getClassifier() );
-        }
-    }
-
-    private boolean empty( String value )
-    {
-        return ( value == null ) || ( value.trim().length() < 1 );
-    }
-
-    public ArchivaArtifactPlatformDetails getPlatformDetails()
-    {
-        return platformDetails;
-    }
-
-    public void setPlatformDetails( ArchivaArtifactPlatformDetails platformDetails )
-    {
-        this.platformDetails = platformDetails;
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifactPlatformDetails.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifactPlatformDetails.java
deleted file mode 100644 (file)
index 2fec050..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifactPlatformDetails.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * A tag for objects that are considered ArchivaArtifactPlatformDetails. 
- *
- * @version $Id$
- */
-public interface ArchivaArtifactPlatformDetails
-{
-    public String getPlatform();
-}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
deleted file mode 100644 (file)
index cffabc2..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaModelCloner.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Utility methods for cloning various Archiva Model objects. 
- *
- * @version $Id$
- */
-public class ArchivaModelCloner
-{
-
-    public static ArtifactReference clone( ArtifactReference artifactReference )
-    {
-        if ( artifactReference == null )
-        {
-            return null;
-        }
-
-        ArtifactReference cloned = new ArtifactReference();
-
-        cloned.setGroupId( artifactReference.getGroupId() );
-        cloned.setArtifactId( artifactReference.getArtifactId() );
-        cloned.setVersion( artifactReference.getVersion() );
-        cloned.setClassifier( artifactReference.getClassifier() );
-        cloned.setType( artifactReference.getType() );
-
-        return cloned;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static Properties clone( Properties properties )
-    {
-        if ( properties == null )
-        {
-            return null;
-        }
-
-        Properties cloned = new Properties();
-
-        Enumeration<String> keys = (Enumeration<String>) properties.propertyNames();
-        while ( keys.hasMoreElements() )
-        {
-            String key = (String) keys.nextElement();
-            String value = properties.getProperty( key );
-            cloned.setProperty( key, value );
-        }
-
-        return cloned;
-    }
-
-    public static SnapshotVersion clone( SnapshotVersion snapshotVersion )
-    {
-        if ( snapshotVersion == null )
-        {
-            return null;
-        }
-
-        SnapshotVersion cloned = new SnapshotVersion();
-
-        cloned.setTimestamp( snapshotVersion.getTimestamp() );
-        cloned.setBuildNumber( snapshotVersion.getBuildNumber() );
-
-        return cloned;
-    }
-
-    public static VersionedReference clone( VersionedReference versionedReference )
-    {
-        if ( versionedReference == null )
-        {
-            return null;
-        }
-
-        VersionedReference cloned = new VersionedReference();
-
-        cloned.setGroupId( versionedReference.getGroupId() );
-        cloned.setArtifactId( versionedReference.getArtifactId() );
-        cloned.setVersion( versionedReference.getVersion() );
-
-        return cloned;
-    }
-
-    public static List<ArtifactReference> cloneArtifactReferences( List<ArtifactReference> artifactReferenceList )
-    {
-        if ( artifactReferenceList == null )
-        {
-            return null;
-        }
-
-        List<ArtifactReference> ret = new ArrayList<ArtifactReference>();
-
-        for ( ArtifactReference ref : artifactReferenceList )
-        {
-            ret.add( clone( ref ) );
-        }
-
-        return ret;
-    }
-
-    private static List<String> cloneSimpleStringList( List<String> simple )
-    {
-        if ( simple == null )
-        {
-            return null;
-        }
-
-        List<String> ret = new ArrayList<String>();
-
-        for ( String txt : simple )
-        {
-            ret.add( txt );
-        }
-
-        return ret;
-    }
-
-    public static List<String> cloneAvailableVersions( List<String> availableVersions )
-    {
-        return cloneSimpleStringList( availableVersions );
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/CompoundKey.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/CompoundKey.java
deleted file mode 100644 (file)
index 986894c..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/CompoundKey.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * Tag for identifying a Compound Key 
- *
- * @version $Id$
- */
-public interface CompoundKey
-{
-    public String toString();
-}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java
deleted file mode 100644 (file)
index 0cfcebf..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.commons.lang.StringUtils;
-
-/**
- * Keys - utility methods for converting common objects into string keys. 
- *
- * @version $Id$
- */
-public class Keys
-{
-    public static String toKey( String groupId, String artifactId, String version, String classifier, String type )
-    {
-        StringBuffer key = new StringBuffer();
-
-        key.append( groupId ).append( ":" );
-        key.append( artifactId ).append( ":" );
-        key.append( version ).append( ":" );
-        key.append( StringUtils.defaultString( classifier ) ).append( ":" );
-        key.append( type );
-
-        return key.toString();
-    }
-
-    public static String toKey( ArtifactReference ref )
-    {
-        return toKey( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType() );
-    }
-
-    public static String toKey( ProjectReference ref )
-    {
-        StringBuffer key = new StringBuffer();
-
-        key.append( ref.getGroupId() ).append( ":" );
-        key.append( ref.getArtifactId() );
-
-        return key.toString();
-    }
-
-    public static String toKey( String groupId, String artifactId, String version )
-    {
-        StringBuffer key = new StringBuffer();
-
-        key.append( groupId ).append( ":" );
-        key.append( artifactId ).append( ":" );
-        key.append( version );
-
-        return key.toString();
-    }
-    
-    public static String toKey( VersionedReference ref )
-    {
-        return toKey( ref.getGroupId(), ref.getArtifactId(), ref.getVersion() );
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryURL.java b/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryURL.java
deleted file mode 100644 (file)
index 4544d05..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/RepositoryURL.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * RepositoryURL - Mutable (and protocol forgiving) URL object.
- *
- * @version $Id$
- */
-public class RepositoryURL
-{
-    private String url;
-
-    private String protocol;
-
-    private String host;
-
-    private String port;
-
-    private String username;
-
-    private String password;
-
-    private String path;
-
-    public RepositoryURL( String url )
-    {
-        this.url = url;
-
-        // .\ Parse the URL \.____________________________________________
-
-        int pos;
-
-        pos = url.indexOf( ":/" );
-        if ( pos == ( -1 ) )
-        {
-            throw new IllegalArgumentException( "Invalid URL, unable to parse protocol:// from " + url );
-        }
-
-        protocol = url.substring( 0, pos );
-
-        // Determine the post protocol position.
-        int postProtocolPos = protocol.length() + 1;
-        while ( url.charAt( postProtocolPos ) == '/' )
-        {
-            postProtocolPos++;
-        }
-        
-        // Handle special case with file protocol (which has no host, port, username, or password)
-        if ( "file".equals( protocol ) )
-        {
-            path = "/" + url.substring( postProtocolPos );
-
-            return;
-        }
-
-        // attempt to find the start of the 'path'
-        pos = url.indexOf( "/", postProtocolPos );
-
-        // no path specified - ex "http://localhost"
-        if ( pos == ( -1 ) )
-        {
-            // set pos to end of string. (needed for 'middle section')
-            pos = url.length();
-            // default path
-            path = "/";
-        }
-        else
-        {
-            // get actual path.
-            path = url.substring( pos );
-        }
-
-        // get the middle section ( username : password @ hostname : port )
-        String middle = url.substring( postProtocolPos, pos );
-
-        pos = middle.indexOf( '@' );
-
-        // we have an authentication section.
-        if ( pos > 0 )
-        {
-            String authentication = middle.substring( 0, pos );
-            middle = middle.substring( pos + 1 ); // lop off authentication for host:port search
-
-            pos = authentication.indexOf( ':' );
-
-            // we have a password.
-            if ( pos > 0 )
-            {
-                username = authentication.substring( 0, pos );
-                password = authentication.substring( pos + 1 );
-            }
-            else
-            {
-                username = authentication;
-            }
-        }
-
-        pos = middle.indexOf( ':' );
-
-        // we have a defined port
-        if ( pos > 0 )
-        {
-            host = middle.substring( 0, pos );
-            port = middle.substring( pos + 1 );
-        }
-        else
-        {
-            host = middle;
-        }
-    }
-
-    public String toString()
-    {
-        return url;
-    }
-
-    public String getUsername()
-    {
-        return username;
-    }
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public String getHost()
-    {
-        return host;
-    }
-
-    public String getPath()
-    {
-        return path;
-    }
-
-    public String getPort()
-    {
-        return port;
-    }
-
-    public String getProtocol()
-    {
-        return protocol;
-    }
-
-    public String getUrl()
-    {
-        return url;
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
index e489354868dca948b54acedda6752b70fcb46945..b949c2e83821e4e344561b0acbc4bc5f52264514 100644 (file)
--- a/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
+++ b/archiva-modules/archiva-base/archiva-model/src/main/mdo/archiva-base.xml
@@ -30,7 +30,7 @@
   <defaults>
     <default>
       <key>package</key>
-      <value>org.apache.maven.archiva.model</value>
+      <value>org.apache.archiva.model</value>
     </default>
   </defaults>
 

diff --git a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java
new file mode 100644 (file)
index 0000000..e239a17
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/archiva/model/RepositoryURLTest.java
@@ -0,0 +1,96 @@
+package org.apache.archiva.model;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import junit.framework.TestCase;
+
+/**
+ * RepositoryURLTest 
+ *
+ * @version $Id$
+ */
+public class RepositoryURLTest
+    extends TestCase
+{
+    private static final String NO_HOST = null;
+
+    private static final String NO_PORT = null;
+
+    private static final String NO_USER = null;
+
+    private static final String NO_PASS = null;
+
+    private void assertURL( String url, String expectedProtocol, String expectedHost, String expectedPort,
+                            String expectedPath, String expectedUsername, String expectedPassword )
+    {
+        RepositoryURL rurl = new RepositoryURL( url );
+        assertEquals( "Protocol", expectedProtocol, rurl.getProtocol() );
+        assertEquals( "Host", expectedHost, rurl.getHost() );
+        assertEquals( "Port", expectedPort, rurl.getPort() );
+        assertEquals( "Path", expectedPath, rurl.getPath() );
+        assertEquals( "Username", expectedUsername, rurl.getUsername() );
+        assertEquals( "Password", expectedPassword, rurl.getPassword() );
+    }
+
+    public void testFileUrlNormal()
+    {
+        assertURL( "file:///home/joakim/code/test/this/", "file", NO_HOST, NO_PORT, "/home/joakim/code/test/this/",
+                   NO_USER, NO_PASS );
+    }
+
+    public void testFileUrlShort()
+    {
+        assertURL( "file:/home/joakim/code/test/this/", "file", NO_HOST, NO_PORT, "/home/joakim/code/test/this/",
+                   NO_USER, NO_PASS );
+    }
+
+    public void testHttpUrlPathless()
+    {
+        assertURL( "http://machine", "http", "machine", NO_PORT, "/", NO_USER, NO_PASS );
+    }
+
+    public void testHttpUrlWithPort()
+    {
+        assertURL( "http://machine:8080/", "http", "machine", "8080", "/", NO_USER, NO_PASS );
+    }
+
+    public void testHttpUrlWithUsernamePassword()
+    {
+        assertURL( "http://user:pass@machine/secured/", "http", "machine", NO_PORT, "/secured/", "user", "pass" );
+    }
+
+    public void testHttpUrlWithUsernameNoPassword()
+    {
+        assertURL( "http://user@machine/secured/", "http", "machine", NO_PORT, "/secured/", "user", NO_PASS );
+    }
+
+    public void testHttpUrlWithUsernamePasswordAndPort()
+    {
+        assertURL( "http://user:pass@machine:9090/secured/", "http", "machine", "9090", "/secured/", "user", "pass" );
+    }
+
+    public void testBogusWithPath()
+    {
+        // This should not fail.  The intent of RepositoryURL is to have it support oddball protocols that
+        // are used by maven-scm and maven-wagon (unlike java.net.URL)
+        assertURL( "bogus://a.machine.name.com/path/to/resource/file.txt", "bogus", "a.machine.name.com", NO_PORT,
+                   "/path/to/resource/file.txt", NO_USER, NO_PASS );
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/RepositoryURLTest.java b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/RepositoryURLTest.java
deleted file mode 100644 (file)
index 7cfbe03..0000000
--- a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/RepositoryURLTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.apache.maven.archiva.model;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import junit.framework.TestCase;
-
-/**
- * RepositoryURLTest 
- *
- * @version $Id$
- */
-public class RepositoryURLTest
-    extends TestCase
-{
-    private static final String NO_HOST = null;
-
-    private static final String NO_PORT = null;
-
-    private static final String NO_USER = null;
-
-    private static final String NO_PASS = null;
-
-    private void assertURL( String url, String expectedProtocol, String expectedHost, String expectedPort,
-                            String expectedPath, String expectedUsername, String expectedPassword )
-    {
-        RepositoryURL rurl = new RepositoryURL( url );
-        assertEquals( "Protocol", expectedProtocol, rurl.getProtocol() );
-        assertEquals( "Host", expectedHost, rurl.getHost() );
-        assertEquals( "Port", expectedPort, rurl.getPort() );
-        assertEquals( "Path", expectedPath, rurl.getPath() );
-        assertEquals( "Username", expectedUsername, rurl.getUsername() );
-        assertEquals( "Password", expectedPassword, rurl.getPassword() );
-    }
-
-    public void testFileUrlNormal()
-    {
-        assertURL( "file:///home/joakim/code/test/this/", "file", NO_HOST, NO_PORT, "/home/joakim/code/test/this/",
-                   NO_USER, NO_PASS );
-    }
-
-    public void testFileUrlShort()
-    {
-        assertURL( "file:/home/joakim/code/test/this/", "file", NO_HOST, NO_PORT, "/home/joakim/code/test/this/",
-                   NO_USER, NO_PASS );
-    }
-
-    public void testHttpUrlPathless()
-    {
-        assertURL( "http://machine", "http", "machine", NO_PORT, "/", NO_USER, NO_PASS );
-    }
-
-    public void testHttpUrlWithPort()
-    {
-        assertURL( "http://machine:8080/", "http", "machine", "8080", "/", NO_USER, NO_PASS );
-    }
-
-    public void testHttpUrlWithUsernamePassword()
-    {
-        assertURL( "http://user:pass@machine/secured/", "http", "machine", NO_PORT, "/secured/", "user", "pass" );
-    }
-
-    public void testHttpUrlWithUsernameNoPassword()
-    {
-        assertURL( "http://user@machine/secured/", "http", "machine", NO_PORT, "/secured/", "user", NO_PASS );
-    }
-
-    public void testHttpUrlWithUsernamePasswordAndPort()
-    {
-        assertURL( "http://user:pass@machine:9090/secured/", "http", "machine", "9090", "/secured/", "user", "pass" );
-    }
-
-    public void testBogusWithPath()
-    {
-        // This should not fail.  The intent of RepositoryURL is to have it support oddball protocols that
-        // are used by maven-scm and maven-wagon (unlike java.net.URL)
-        assertURL( "bogus://a.machine.name.com/path/to/resource/file.txt", "bogus", "a.machine.name.com", NO_PORT,
-                   "/path/to/resource/file.txt", NO_USER, NO_PASS );
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
index a85e02628a90d725743d852c6d42825e41d396d4..ec969688088f8cc176c468703dc8560a01efe18a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
@@ -31,9 +31,9 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.Keys;
-import org.apache.maven.archiva.model.RepositoryURL;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.Keys;
+import org.apache.archiva.model.RepositoryURL;
 import org.apache.archiva.policies.DownloadErrorPolicy;
 import org.apache.archiva.policies.DownloadPolicy;
 import org.apache.archiva.policies.PolicyConfigurationException;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
index 89025888b9c96a463fade9332c167266b6688061..b62adf1e3512c3ae0b765475fc45895de86fb0d1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/RepositoryProxyConnectors.java
@@ -19,7 +19,7 @@ package org.apache.archiva.proxy;
  * under the License.
  */
 
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.ProxyDownloadException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
index b389734152939d8f3923b41986bc3803ef4c67c9..b2e9d9130dd880a35b59ea0af2ec4806ac374026 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/CacheFailuresTransferTest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.proxy;
  */
 
 import org.apache.archiva.common.utils.PathUtil;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
index 2a68d47cec95f3065c6c63638dc5473902964f21..5ab3733a7d08420f81c20e838252a7ded335f1ee 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ChecksumTransferTest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.proxy;
  */
 
 import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
index 6ff9c7065f5c322137ee9d76683d808943d2fc92..38e4b5e38c402bd2f943ad14791fe7227b1ae5f7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
@@ -27,7 +27,7 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.NetworkProxyConfiguration;
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
 import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.PropagateErrorsDownloadPolicy;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
index 443e1f11f42b28fbc36a5ce34c8b2ea0a421ba2c..2c5634b935ae715ee2fca11c58e442886351157a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedDefaultTransferTest.java
@@ -21,7 +21,7 @@ package org.apache.archiva.proxy;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java
index 2ab792a40cd304f868a2a3ba6b89eb7ba51161f9..59abf7e60cccb806d597624a7109d9705f2becdd 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/ManagedLegacyTransferTest.java
@@ -19,7 +19,7 @@ package org.apache.archiva.proxy;
  * under the License.
  */
 
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
index 2938424f860f8291eff8e21f73ade7abb700dfb9..32320cb6f08a04eefda072412518adce01d39265 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/MetadataTransferTest.java
@@ -22,11 +22,11 @@ package org.apache.archiva.proxy;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.VersionUtil;
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.Plugin;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.SnapshotVersion;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.Plugin;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.SnapshotVersion;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java
index 32cdc0d096e92af93911b62e6fee4be3ee7faac3..65a3aac50d50a3b5d25d0f63c550490d41d93d06 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/SnapshotTransferTest.java
@@ -19,7 +19,7 @@ package org.apache.archiva.proxy;
  * under the License.
  */
 
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
index fadac9a464bb939e146c6751357be16c2784b5e0..533381de01d1d20d6ea50bd1e65b3085dc83704f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/ManagedRepositoryContent.java
@@ -20,10 +20,10 @@ package org.apache.archiva.repository;
  */
 
 import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaArtifact;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.layout.LayoutException;
 
 import java.io.File;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java
index e19ea76b115c0577bfc118a432684a2ce7b75bf7..c5e85298b2cc5f3ea1259d3a1208ef6f4e4305f9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/RemoteRepositoryContent.java
@@ -20,8 +20,8 @@ package org.apache.archiva.repository;
  */
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.RepositoryURL;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.RepositoryURL;
 import org.apache.archiva.repository.layout.LayoutException;
 
 /**

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java
index 9e489ff607a5f764db2a81847e4403e5b981ac2f..4d323630184d1008401d05865c688ca2fd37b5ff 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContent.java
@@ -24,10 +24,10 @@ import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProv
 import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaArtifact;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.layout.LayoutException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java
index 19c41269af3adee5773b7a81bd35eb3123dfcd40..4c88dadbacd21f2baa5c3c46ef165ea08ec2651f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContent.java
@@ -20,8 +20,8 @@ package org.apache.archiva.repository.content;
  */
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArchivaArtifact;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.layout.LayoutException;
 
 import javax.inject.Inject;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java
index ac1437be256e7e8a96c6fa2a2c1952cbf72d576f..e2b3cb299c1e4b307608f7821ab739a488011247 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/DefaultPathParser.java
@@ -26,7 +26,7 @@ import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMapp
 import org.apache.archiva.metadata.repository.storage.maven2.Maven2RepositoryPathTranslator;
 import org.apache.archiva.metadata.repository.storage.maven2.MavenArtifactFacet;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.layout.LayoutException;
 import org.springframework.stereotype.Service;
 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java
index 1d6c1b5b4e5664c96dcc2b787c8e767570463bb4..7390765fd790ea06b36559296337cb71375813ac 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/LegacyPathParser.java
@@ -22,7 +22,7 @@ package org.apache.archiva.repository.content;
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.LegacyArtifactPath;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.layout.LayoutException;
 
 import java.util.Collection;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
index b00ab9a919c6be113fbf1fb172fc24d9d089cea1..229d437e1ae5e962fa063c2c3a7f8e4af4d67707 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContent.java
@@ -24,10 +24,10 @@ import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMapp
 import org.apache.commons.io.FileUtils;
 import org.apache.archiva.common.utils.PathUtil;
 import org.apache.maven.archiva.configuration.FileTypes;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaArtifact;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java
index 60347e725aa11861c151382855daf513ee068091..00c2240123d3d86c3bb465428c85a7d987e9c9a7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContent.java
@@ -24,10 +24,10 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.PathUtil;
 import org.apache.maven.archiva.configuration.FileTypes;
-import org.apache.maven.archiva.model.ArchivaArtifact;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaArtifact;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java
index a6c7a77dfa65f253a0e7aea587c67978dbeee5eb..0eebe75895517c781d3878db6542c8153744454c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/PathParser.java
@@ -19,7 +19,7 @@ package org.apache.archiva.repository.content;
  * under the License.
  */
 
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.layout.LayoutException;
 
 /**

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java
index 3fb941ce42968c11048126861da5f5385f61a802..8b58b2b0d2ddab3dfd4aedcfee042a51bc663051 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContent.java
@@ -20,8 +20,8 @@ package org.apache.archiva.repository.content;
  */
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.RepositoryURL;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.RepositoryURL;
 import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;
 import org.springframework.context.annotation.Scope;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java
index ce7efe3c87a33f8b17b5f4b96c974b9b5bb856c2..f806fb7dc1db752804914794bb503c11cc1956ee 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContent.java
@@ -20,8 +20,8 @@ package org.apache.archiva.repository.content;
  */
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.RepositoryURL;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.RepositoryURL;
 import org.apache.archiva.repository.RemoteRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;
 import org.springframework.context.annotation.Scope;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java
index 71b457857fd16725c7878fc948f94c07c24386c7..3af7b0289db0a1db8a591a79e93d0dab5b1e660c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/content/RepositoryRequest.java
@@ -20,7 +20,7 @@ package org.apache.archiva.repository.content;
  */
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.layout.LayoutException;
 import org.apache.archiva.repository.metadata.MetadataTools;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
index 762d650bea584adce7fc687c1d1fcb8d60b51bea..a534dd089e7a829aad57a57aeafefecee9d0cd73 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/MetadataTools.java
@@ -33,12 +33,12 @@ import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ConfigurationNames;
 import org.apache.maven.archiva.configuration.FileTypes;
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.Plugin;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.SnapshotVersion;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.Plugin;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.SnapshotVersion;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RemoteRepositoryContent;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
index 205a8e81e50ae112b86fb94d9ddf46172355094b..a045c9c3b7686c2691e11108d5016077cc6b39d2 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataMerge.java
@@ -23,10 +23,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArchivaModelCloner;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.Plugin;
-import org.apache.maven.archiva.model.SnapshotVersion;
+import org.apache.archiva.model.ArchivaModelCloner;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.Plugin;
+import org.apache.archiva.model.SnapshotVersion;
 
 /**
  * RepositoryMetadataMerge 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataReader.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataReader.java
index e6eec7c666d9d69a5432e6df796236f3d76ba4a4..e8a5eaa8818b706f1c6539b4a5a7c4256f45fda9 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataReader.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataReader.java
@@ -23,9 +23,9 @@ import java.io.File;
 import java.util.Date;
 
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.Plugin;
-import org.apache.maven.archiva.model.SnapshotVersion;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.Plugin;
+import org.apache.archiva.model.SnapshotVersion;
 import org.apache.archiva.xml.XMLException;
 import org.apache.archiva.xml.XMLReader;
 import org.dom4j.Element;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
index 529c05e490f578b30f1efda0ad6c4f6a16570758..38146b6c75b0c39c9f622b9a44bcabdb5805ca5f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriter.java
@@ -22,8 +22,8 @@ package org.apache.archiva.repository.metadata;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.Plugin;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.Plugin;
 import org.apache.archiva.xml.XMLException;
 import org.apache.archiva.xml.XMLWriter;
 import org.dom4j.Document;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
index 8ea661fc4498fc59c59da562c7e4a35cbfd131a5..55e10a930421bb6fdad8fbe4e4bdf43148aa0162 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/RepositoryURLTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository;
  */
 
 
-import org.apache.maven.archiva.model.RepositoryURL;
+import org.apache.archiva.model.RepositoryURL;
 
 import java.net.MalformedURLException;
 

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
index c63f77c078015ed5cfd27bb8c3b00ea7414cadda..18fbd5a46ada061b7109e7d1b67ae093e7d7d4d7 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractDefaultRepositoryContentTestCase.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository.content;
  */
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Test;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
index 3526d9e6e2fabc497e2ca1f92f53e24d33431328..0b4a10ae73bcb34eccd0deaaa968c1eb85edb6f1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/AbstractLegacyRepositoryContentTestCase.java
@@ -19,7 +19,7 @@ package org.apache.maven.archiva.repository.content;
  * under the License.
  */
 
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Test;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
index d430a61dfd60bb45728a313a1e66f85a9781314d..6f86ef225f44f0444b8a18280d6ef59d4444afdf 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/DefaultPathParserTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository.content;
  */
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Test;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
index a62ff756fd5c2d3067a703f07cc8f517eb69b2e8..6b578169ba018875369780521ec48b7c1cb94b46 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/LegacyPathParserTest.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.repository.content;
 
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.LegacyArtifactPath;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Before;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
index 4471b11b7ec8fa1ec79d7be3ae11ea9f4f79655c..f6b8b9a0b5508c96e62acf49fb3250bf45dc8fb1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
@@ -24,9 +24,9 @@ import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.FileType;
 import org.apache.maven.archiva.configuration.FileTypes;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.maven.archiva.repository.ManagedRepositoryContent;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Before;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
index 07127fcf361bec415642061344a1f39b00c1b052..99ce8ae018075d678b4bb10bb468842ac882b33c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
@@ -21,9 +21,9 @@ package org.apache.maven.archiva.repository.content;
 
 import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.common.utils.VersionComparator;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.maven.archiva.repository.ManagedRepositoryContent;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Before;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
index b75cda677232646cf5cc2873f89dfc48307b7a48..75ba208dc60b95ecd754e213aedeb78294b6a33a 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository.content;
  */
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.RemoteRepositoryContent;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Before;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
index 45f063ec0f7c3c8adcd3bf863fe1aa7f4d166be6..352c9107dbb869854035a5276b7e0ea2b10be547 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository.content;
  */
 
 import org.apache.archiva.admin.model.beans.RemoteRepository;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.RemoteRepositoryContent;
 import org.apache.maven.archiva.repository.layout.LayoutException;
 import org.junit.Before;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
index 29ce2123fb78fe81d1ed511b6b9414345604ceca..70d414a2d4f93950a94535c2598ca5a904ba3c74 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/content/RepositoryRequestTest.java
@@ -22,7 +22,7 @@ package org.apache.maven.archiva.repository.content;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.FileUtil;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.maven.archiva.repository.AbstractRepositoryLayerTestCase;
 import org.apache.maven.archiva.repository.ManagedRepositoryContent;
 import org.apache.maven.archiva.repository.layout.LayoutException;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
index 12c01dfcd2faa2d0ed155f273a4228d27d52ce1f..b53857322b75e96d16752718d3e99af4f9082f1c 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/MetadataToolsTest.java
@@ -24,8 +24,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.maven.archiva.configuration.ProxyConnectorConfiguration;
-import org.apache.maven.archiva.model.ProjectReference;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ProjectReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.policies.CachedFailuresPolicy;
 import org.apache.archiva.policies.ChecksumPolicy;
 import org.apache.archiva.policies.ReleasesPolicy;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
index 96b586719a23c4a8926763d865a91b3ba5ab76c1..b0069d1e66fa0c60b2876713dcb1c1292ff15e68 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataReaderTest.java
@@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository.metadata;
  */
 
 import junit.framework.TestCase;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
index dee2d8d54d077c3c4eb039f4bbddc4169f2696c6..0f6bc26f2cc7f767715b1e00c59757eefc00ec9d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/archiva/repository/metadata/RepositoryMetadataWriterTest.java
@@ -21,7 +21,7 @@ package org.apache.maven.archiva.repository.metadata;
 
 import junit.framework.TestCase;
 import org.apache.commons.io.FileUtils;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
 import org.custommonkey.xmlunit.XMLAssert;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
index cb4a94356df22952bad6fcea68402f558d944497..cf081033ec72ea48b7895ae2554780890647e8c0 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorTest.java
@@ -27,7 +27,7 @@ import org.apache.archiva.metadata.repository.stats.RepositoryStatistics;
 import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.codehaus.plexus.taskqueue.execution.TaskExecutor;
 import org.codehaus.plexus.util.FileUtils;
 import org.junit.After;

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
index 67811309956fb559d388cce82081ea1e0241a2cf..1c0a8fb977648250269242e1c4884af8c0cc7bb5 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/TestConsumer.java
@@ -23,7 +23,7 @@ import org.apache.archiva.admin.model.beans.ManagedRepository;
 import org.apache.archiva.consumers.AbstractMonitoredConsumer;
 import org.apache.archiva.consumers.ConsumerException;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;
 import org.apache.archiva.repository.RepositoryException;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
index 577ebfc85af654a17dfec2182403df4860e374b4..481f84eb96b6baaf49c88baee9c4a77dd85f0734 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/tags/DependencyTree.java
@@ -23,7 +23,7 @@ import com.opensymphony.xwork2.ActionContext;
 import org.apache.archiva.dependency.tree.maven2.DependencyTreeBuilder;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.ArchivaException;
-import org.apache.maven.archiva.model.Keys;
+import org.apache.archiva.model.Keys;
 import org.apache.archiva.security.ArchivaXworkUser;
 import org.apache.archiva.security.UserRepositories;
 import org.apache.maven.artifact.Artifact;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
index bf63fb69ea70649ec64f9956bc266bcde5dfcba8..56570c4b5e2effe6b94efab760613b2c822a8f6a 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/DeleteArtifactAction.java
@@ -41,8 +41,8 @@ import org.apache.archiva.security.UserRepositories;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
index 5b1cc249bd364218b02fc3cac77912ada965f806..17f7585232a7b1d8bc0b237c033f9e08f6e80b33 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/ShowArtifactAction.java
@@ -35,7 +35,7 @@ import org.apache.archiva.metadata.repository.RepositorySession;
 import org.apache.archiva.metadata.repository.storage.maven2.MavenArtifactFacet;
 import org.apache.archiva.reports.RepositoryProblemFacet;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;
 import org.apache.archiva.repository.RepositoryException;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
index bf1aa9f138b4f26dde3adc397b54e2e919a653ed..a4b8d067cc1eb37c82e3dad72d2fd1f4ca773e77 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/UploadAction.java
@@ -40,9 +40,9 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.VersionComparator;
 import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.ArtifactReference;
-import org.apache.maven.archiva.model.SnapshotVersion;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArtifactReference;
+import org.apache.archiva.model.SnapshotVersion;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;
 import org.apache.archiva.repository.RepositoryException;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
index 617f56dfe4b4841ef5feb41a8bb5f7723be22bf2..e08708f0b49c298c89fae55fee7ab412a4f7886b 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/admin/legacy/AddLegacyArtifactPathAction.java
@@ -25,7 +25,7 @@ import org.apache.archiva.admin.model.RepositoryAdminException;
 import org.apache.archiva.admin.model.admin.ArchivaAdministration;
 import org.apache.archiva.admin.model.beans.LegacyArtifactPath;
 import org.apache.commons.lang.StringUtils;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.maven.archiva.web.action.AbstractActionSupport;
 import org.springframework.context.annotation.Scope;

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
index 7778a27935a51130cb3bf4f1dc1e336f7f4a4b26..2b8544390cace5383c8da3370dde2e1d9c3281c2 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/maven/archiva/web/action/UploadActionTest.java
@@ -32,8 +32,8 @@ import org.apache.archiva.scheduler.ArchivaTaskScheduler;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.utils.FileUtil;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.SnapshotVersion;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.SnapshotVersion;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;
 import org.apache.archiva.repository.RepositoryNotFoundException;

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
index 932cb92c7537f857690b5d50422714a7322b200b..e22cdcb51553279a3b0551d2233aa42e5fb61138 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/maven/archiva/webdav/ArchivaDavResourceFactory.java
@@ -41,8 +41,8 @@ import org.apache.archiva.common.utils.PathUtil;
 import org.apache.archiva.common.utils.VersionUtil;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.policies.ProxyDownloadException;
 import org.apache.archiva.proxy.RepositoryProxyConnectors;
 import org.apache.archiva.repository.ManagedRepositoryContent;

diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
index 19f9147b4930952fd073634cb7cd7ded10495bcf..63190758a9ae135b6ce255e43299e0fae019805e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
+++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/RepositoryServletRepositoryGroupTest.java
@@ -28,7 +28,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
 import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
 import org.apache.archiva.repository.metadata.RepositoryMetadataReader;
 import org.junit.After;
 import org.junit.Before;

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
index 77638befa32a9d940d16cd02b83874bb3ac307b7..78ff181340553bb64c9015f92b4c59ee5387c7bc 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
@@ -48,7 +48,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.model.VersionedReference;
+import org.apache.archiva.model.VersionedReference;
 import org.apache.archiva.repository.ContentNotFoundException;
 import org.apache.archiva.repository.ManagedRepositoryContent;
 import org.apache.archiva.repository.RepositoryContentFactory;

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
index 36abd7a79272f7059e62a847872257647e857d46..7031a42d0e3eff47297f8f96948412d8d89b1299 100644 (file)
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/test/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImplTest.java
@@ -55,7 +55,7 @@ import org.apache.maven.archiva.configuration.RepositoryGroupConfiguration;
 import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
 import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
 import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.maven.archiva.model.ArtifactReference;
+import org.apache.archiva.model.ArtifactReference;
 import org.apache.archiva.repository.RepositoryContentFactory;
 import org.apache.archiva.repository.content.ManagedDefaultRepositoryContent;
 import org.apache.archiva.repository.content.ManagedLegacyRepositoryContent;

diff --git a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
index 6a29d1a923d586fe9dcbfec9c9e7628a2393cfc9..359d7d36f304511188367fc2601f8464d3d3b3fb 100644 (file)
--- a/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
+++ b/archiva-modules/plugins/stage-repository-merge/src/main/java/org/apache/archiva/stagerepository/merge/Maven2RepositoryMerger.java
@@ -30,7 +30,7 @@ import org.apache.archiva.common.utils.VersionUtil;
 import org.apache.maven.archiva.configuration.ArchivaConfiguration;
 import org.apache.maven.archiva.configuration.Configuration;
 import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.model.ArchivaRepositoryMetadata;
+import org.apache.archiva.model.ArchivaRepositoryMetadata;
 import org.apache.archiva.repository.RepositoryException;
 import org.apache.archiva.repository.metadata.RepositoryMetadataException;
 import org.apache.archiva.repository.metadata.RepositoryMetadataReader;