From: Martin Stockhammer Date: Sun, 8 Mar 2020 15:01:50 +0000 (+0100) Subject: Refactoring package names for maven metadata X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=65e4acd8bdf9d5249dde39d86be8e3c349e76d53;p=archiva.git Refactoring package names for maven metadata --- 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 2e04e667a..e94b613bf 100644 --- 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 @@ -22,7 +22,7 @@ package org.apache.archiva.consumers.core.repository; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.facets.AuditEvent; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.*; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.ContentNotFoundException; diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java index 66ab810ad..d1ce70567 100644 --- a/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/mock/ManagedRepositoryContentMock.java @@ -22,7 +22,7 @@ package org.apache.archiva.repository.scanner.mock; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.model.ArchivaArtifact; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.ProjectReference; diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java deleted file mode 100644 index 05daa177a..000000000 --- a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/maven2/metadata/MavenMetadataReader.java +++ /dev/null @@ -1,197 +0,0 @@ -package org.apache.archiva.maven2.metadata; -/* - * 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.archiva.model.ArchivaRepositoryMetadata; -import org.apache.archiva.model.Plugin; -import org.apache.archiva.model.SnapshotVersion; -import org.apache.archiva.repository.RepositoryType; -import org.apache.archiva.repository.metadata.MetadataReader; -import org.apache.archiva.repository.metadata.RepositoryMetadataException; -import org.apache.archiva.repository.storage.StorageAsset; -import org.apache.archiva.xml.XMLException; -import org.apache.archiva.xml.XMLReader; -import org.apache.archiva.xml.XmlUtil; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.math.NumberUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.Instant; -import java.util.Date; - -/** - * @author Olivier Lamy - * @since 1.4-M3 - */ -@Service("metadataReader#maven") -public class MavenMetadataReader implements MetadataReader -{ - public static final String MAVEN_METADATA = "maven-metadata.xml"; - - - /* - - - org.apache.archiva - archiva - 1.4-M3-SNAPSHOT - - - 20120310.230917 - 2 - - 20120310230917 - - - pom - 1.4-M3-20120310.230917-2 - 20120310230917 - - - - - */ - - private static final Logger log = LoggerFactory.getLogger( MavenMetadataReader.class ); - - - /** - * Read and return the {@link org.apache.archiva.model.ArchivaRepositoryMetadata} object from the provided xml file. - * - * @param metadataFile the maven-metadata.xml file to read. - * @return the archiva repository metadata object that represents the provided file contents. - * @throws RepositoryMetadataException if the file cannot be read - */ - public ArchivaRepositoryMetadata read( StorageAsset metadataFile ) - throws RepositoryMetadataException { - - XMLReader xml; - try - { - xml = new XMLReader( "metadata", metadataFile ); - } - catch ( XMLException e ) - { - throw new RepositoryMetadataException( "Could not open XML metadata file " + metadataFile, e ); - } - return read( xml, metadataFile.getModificationTime(), metadataFile.getSize() ); - - } - - public ArchivaRepositoryMetadata read( Path metadataFile ) - throws RepositoryMetadataException { - - XMLReader xml; - try - { - xml = new XMLReader( "metadata", metadataFile ); - } - catch ( XMLException e ) - { - log.error( "XML error while reading metadata file {}: {}", metadataFile, e.getMessage(), e ); - throw new RepositoryMetadataException( "Could not open XML metadata file " + metadataFile, e ); - } - try - { - return read( xml, Files.getLastModifiedTime( metadataFile ).toInstant(), Files.size( metadataFile ) ); - } - catch ( IOException e ) - { - log.error( "IO Error while reading metadata file {}: {}", metadataFile, e.getMessage(), e ); - throw new RepositoryMetadataException( "Could not open XML metadata file " + metadataFile, e ); - } - - } - - private ArchivaRepositoryMetadata read( XMLReader xml, Instant modTime, long fileSize) throws RepositoryMetadataException - { - // invoke this to remove namespaces, see MRM-1136 - xml.removeNamespaces(); - - ArchivaRepositoryMetadata metadata = new ArchivaRepositoryMetadata(); - - try - { - metadata.setGroupId( xml.getElementText( "//metadata/groupId" ) ); - metadata.setArtifactId( xml.getElementText( "//metadata/artifactId" ) ); - metadata.setVersion( xml.getElementText( "//metadata/version" ) ); - metadata.setFileLastModified( Date.from(modTime) ); - metadata.setFileSize( fileSize ); - metadata.setLastUpdated( xml.getElementText( "//metadata/versioning/lastUpdated" ) ); - metadata.setLatestVersion( xml.getElementText( "//metadata/versioning/latest" ) ); - metadata.setReleasedVersion( xml.getElementText( "//metadata/versioning/release" ) ); - metadata.setAvailableVersions( xml.getElementListText( "//metadata/versioning/versions/version" ) ); - - Element snapshotElem = xml.getElement( "//metadata/versioning/snapshot" ); - if ( snapshotElem != null ) - { - SnapshotVersion snapshot = new SnapshotVersion( ); - snapshot.setTimestamp( XmlUtil.getChildText( snapshotElem, "timestamp" ) ); - String buildNumber = XmlUtil.getChildText( snapshotElem, "buildNumber" ); - if ( NumberUtils.isCreatable( buildNumber ) ) - { - snapshot.setBuildNumber( NumberUtils.toInt( buildNumber ) ); - } - metadata.setSnapshotVersion( snapshot ); - } - - for ( Node node : xml.getElementList( "//metadata/plugins/plugin" ) ) - { - if ( node instanceof Element ) - { - Element plugin = (Element) node; - Plugin p = new Plugin( ); - String prefix = plugin.getElementsByTagName( "prefix" ).item( 0 ).getTextContent( ).trim( ); - p.setPrefix( prefix ); - String artifactId = plugin.getElementsByTagName( "artifactId" ).item( 0 ).getTextContent( ).trim( ); - p.setArtifactId( artifactId ); - String name = plugin.getElementsByTagName( "name" ).item( 0 ).getTextContent( ).trim( ); - p.setName( name ); - metadata.addPlugin( p ); - } - } - } catch ( XMLException e) { - throw new RepositoryMetadataException( "XML Error while reading metadata file : " + e.getMessage( ), e ); - } - return metadata; - } - - @Override - public boolean isValidMetadataPath( String path ) - { - if ( StringUtils.isNotEmpty( path ) ) { - return path.endsWith( MAVEN_METADATA ); - } else { - return false; - } - } - - @Override - public boolean isValidForType( RepositoryType repositoryType ) - { - return RepositoryType.MAVEN.equals( repositoryType ); - } -} diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/maven/MavenMetadataReader.java b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/maven/MavenMetadataReader.java new file mode 100644 index 000000000..8f04ff17c --- /dev/null +++ b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/maven/MavenMetadataReader.java @@ -0,0 +1,196 @@ +package org.apache.archiva.metadata.maven; +/* + * 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.archiva.model.ArchivaRepositoryMetadata; +import org.apache.archiva.model.Plugin; +import org.apache.archiva.model.SnapshotVersion; +import org.apache.archiva.repository.RepositoryType; +import org.apache.archiva.repository.metadata.MetadataReader; +import org.apache.archiva.repository.metadata.RepositoryMetadataException; +import org.apache.archiva.repository.storage.StorageAsset; +import org.apache.archiva.xml.XMLException; +import org.apache.archiva.xml.XMLReader; +import org.apache.archiva.xml.XmlUtil; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Instant; +import java.util.Date; + +/** + * @author Olivier Lamy + * @since 1.4-M3 + */ +@Service("metadataReader#maven") +public class MavenMetadataReader implements MetadataReader +{ + public static final String MAVEN_METADATA = "maven-metadata.xml"; + + + /* + + + org.apache.archiva + archiva + 1.4-M3-SNAPSHOT + + + 20120310.230917 + 2 + + 20120310230917 + + + pom + 1.4-M3-20120310.230917-2 + 20120310230917 + + + + + */ + + private static final Logger log = LoggerFactory.getLogger( MavenMetadataReader.class ); + + + /** + * Read and return the {@link org.apache.archiva.model.ArchivaRepositoryMetadata} object from the provided xml file. + * + * @param metadataFile the maven-metadata.xml file to read. + * @return the archiva repository metadata object that represents the provided file contents. + * @throws RepositoryMetadataException if the file cannot be read + */ + public ArchivaRepositoryMetadata read( StorageAsset metadataFile ) + throws RepositoryMetadataException { + + XMLReader xml; + try + { + xml = new XMLReader( "metadata", metadataFile ); + } + catch ( XMLException e ) + { + throw new RepositoryMetadataException( "Could not open XML metadata file " + metadataFile, e ); + } + return read( xml, metadataFile.getModificationTime(), metadataFile.getSize() ); + + } + + public ArchivaRepositoryMetadata read( Path metadataFile ) + throws RepositoryMetadataException { + + XMLReader xml; + try + { + xml = new XMLReader( "metadata", metadataFile ); + } + catch ( XMLException e ) + { + log.error( "XML error while reading metadata file {}: {}", metadataFile, e.getMessage(), e ); + throw new RepositoryMetadataException( "Could not open XML metadata file " + metadataFile, e ); + } + try + { + return read( xml, Files.getLastModifiedTime( metadataFile ).toInstant(), Files.size( metadataFile ) ); + } + catch ( IOException e ) + { + log.error( "IO Error while reading metadata file {}: {}", metadataFile, e.getMessage(), e ); + throw new RepositoryMetadataException( "Could not open XML metadata file " + metadataFile, e ); + } + + } + + private ArchivaRepositoryMetadata read( XMLReader xml, Instant modTime, long fileSize) throws RepositoryMetadataException + { + // invoke this to remove namespaces, see MRM-1136 + xml.removeNamespaces(); + + ArchivaRepositoryMetadata metadata = new ArchivaRepositoryMetadata(); + + try + { + metadata.setGroupId( xml.getElementText( "//metadata/groupId" ) ); + metadata.setArtifactId( xml.getElementText( "//metadata/artifactId" ) ); + metadata.setVersion( xml.getElementText( "//metadata/version" ) ); + metadata.setFileLastModified( Date.from(modTime) ); + metadata.setFileSize( fileSize ); + metadata.setLastUpdated( xml.getElementText( "//metadata/versioning/lastUpdated" ) ); + metadata.setLatestVersion( xml.getElementText( "//metadata/versioning/latest" ) ); + metadata.setReleasedVersion( xml.getElementText( "//metadata/versioning/release" ) ); + metadata.setAvailableVersions( xml.getElementListText( "//metadata/versioning/versions/version" ) ); + + Element snapshotElem = xml.getElement( "//metadata/versioning/snapshot" ); + if ( snapshotElem != null ) + { + SnapshotVersion snapshot = new SnapshotVersion( ); + snapshot.setTimestamp( XmlUtil.getChildText( snapshotElem, "timestamp" ) ); + String buildNumber = XmlUtil.getChildText( snapshotElem, "buildNumber" ); + if ( NumberUtils.isCreatable( buildNumber ) ) + { + snapshot.setBuildNumber( NumberUtils.toInt( buildNumber ) ); + } + metadata.setSnapshotVersion( snapshot ); + } + + for ( Node node : xml.getElementList( "//metadata/plugins/plugin" ) ) + { + if ( node instanceof Element ) + { + Element plugin = (Element) node; + Plugin p = new Plugin( ); + String prefix = plugin.getElementsByTagName( "prefix" ).item( 0 ).getTextContent( ).trim( ); + p.setPrefix( prefix ); + String artifactId = plugin.getElementsByTagName( "artifactId" ).item( 0 ).getTextContent( ).trim( ); + p.setArtifactId( artifactId ); + String name = plugin.getElementsByTagName( "name" ).item( 0 ).getTextContent( ).trim( ); + p.setName( name ); + metadata.addPlugin( p ); + } + } + } catch ( XMLException e) { + throw new RepositoryMetadataException( "XML Error while reading metadata file : " + e.getMessage( ), e ); + } + return metadata; + } + + @Override + public boolean isValidMetadataPath( String path ) + { + if ( StringUtils.isNotEmpty( path ) ) { + return path.endsWith( MAVEN_METADATA ); + } else { + return false; + } + } + + @Override + public boolean isValidForType( RepositoryType repositoryType ) + { + return RepositoryType.MAVEN.equals( repositoryType ); + } +} diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/maven/model/MavenArtifactFacet.java b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/maven/model/MavenArtifactFacet.java new file mode 100644 index 000000000..6d0f8df3e --- /dev/null +++ b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/maven/model/MavenArtifactFacet.java @@ -0,0 +1,143 @@ +package org.apache.archiva.metadata.maven.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.archiva.metadata.model.MetadataFacet; +import org.apache.commons.lang3.StringUtils; + +import java.util.HashMap; +import java.util.Map; + +public class MavenArtifactFacet + implements MetadataFacet +{ + private String classifier; + + private String type; + + private String timestamp; + + private int buildNumber; + + public static final String FACET_ID = "org.apache.archiva.metadata.repository.storage.maven2.artifact"; + + public String getClassifier() + { + return classifier; + } + + public void setClassifier( String classifier ) + { + this.classifier = classifier; + } + + public String getType() + { + return type; + } + + public void setType( String type ) + { + this.type = type; + } + + public String getTimestamp() + { + return timestamp; + } + + public void setTimestamp( String timestamp ) + { + this.timestamp = timestamp; + } + + public int getBuildNumber() + { + return buildNumber; + } + + public void setBuildNumber( int buildNumber ) + { + this.buildNumber = buildNumber; + } + + @Override + public String getFacetId() + { + return FACET_ID; + } + + @Override + public String getName() + { + // TODO: not needed, perhaps artifact/version metadata facet should be separate interface? + return null; + } + + @Override + public Map toProperties() + { + Map properties = new HashMap<>(); + properties.put( "type", type ); + if ( classifier != null ) + { + properties.put( "classifier", classifier ); + } + if ( timestamp != null ) + { + properties.put( "timestamp", timestamp ); + } + if ( buildNumber > 0 ) + { + properties.put( "buildNumber", Integer.toString( buildNumber ) ); + } + return properties; + } + + @Override + public void fromProperties( Map properties ) + { + type = properties.get( "type" ); + classifier = properties.get( "classifier" ); + timestamp = properties.get( "timestamp" ); + String buildNumber = properties.get( "buildNumber" ); + if ( buildNumber != null ) + { + this.buildNumber = Integer.parseInt( buildNumber ); + } + } + + @Override + public boolean equals( Object o ) + { + if ( this == o ) + { + return true; + } + if ( !( o instanceof MavenArtifactFacet ) ) + { + return false; + } + + MavenArtifactFacet that = (MavenArtifactFacet) o; + + return StringUtils.equals( that.getClassifier(), this.classifier ); + } + +} diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java deleted file mode 100644 index 8c65aac70..000000000 --- a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/java/org/apache/archiva/metadata/model/maven2/MavenArtifactFacet.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.apache.archiva.metadata.model.maven2; - -/* - * 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.archiva.metadata.model.MetadataFacet; -import org.apache.commons.lang3.StringUtils; - -import java.util.HashMap; -import java.util.Map; - -public class MavenArtifactFacet - implements MetadataFacet -{ - private String classifier; - - private String type; - - private String timestamp; - - private int buildNumber; - - public static final String FACET_ID = "org.apache.archiva.metadata.repository.storage.maven2.artifact"; - - public String getClassifier() - { - return classifier; - } - - public void setClassifier( String classifier ) - { - this.classifier = classifier; - } - - public String getType() - { - return type; - } - - public void setType( String type ) - { - this.type = type; - } - - public String getTimestamp() - { - return timestamp; - } - - public void setTimestamp( String timestamp ) - { - this.timestamp = timestamp; - } - - public int getBuildNumber() - { - return buildNumber; - } - - public void setBuildNumber( int buildNumber ) - { - this.buildNumber = buildNumber; - } - - @Override - public String getFacetId() - { - return FACET_ID; - } - - @Override - public String getName() - { - // TODO: not needed, perhaps artifact/version metadata facet should be separate interface? - return null; - } - - @Override - public Map toProperties() - { - Map properties = new HashMap<>(); - properties.put( "type", type ); - if ( classifier != null ) - { - properties.put( "classifier", classifier ); - } - if ( timestamp != null ) - { - properties.put( "timestamp", timestamp ); - } - if ( buildNumber > 0 ) - { - properties.put( "buildNumber", Integer.toString( buildNumber ) ); - } - return properties; - } - - @Override - public void fromProperties( Map properties ) - { - type = properties.get( "type" ); - classifier = properties.get( "classifier" ); - timestamp = properties.get( "timestamp" ); - String buildNumber = properties.get( "buildNumber" ); - if ( buildNumber != null ) - { - this.buildNumber = Integer.parseInt( buildNumber ); - } - } - - @Override - public boolean equals( Object o ) - { - if ( this == o ) - { - return true; - } - if ( !( o instanceof MavenArtifactFacet ) ) - { - return false; - } - - MavenArtifactFacet that = (MavenArtifactFacet) o; - - return StringUtils.equals( that.getClassifier(), this.classifier ); - } - -} diff --git a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/resources/META-INF/spring-context.xml index f95430808..4163a1460 100644 --- a/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-maven/archiva-maven-metadata/src/main/resources/META-INF/spring-context.xml @@ -28,6 +28,6 @@ default-lazy-init="true"> - + \ No newline at end of file diff --git a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java index d06ccd205..87db3d806 100644 --- a/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java +++ b/archiva-modules/archiva-maven/archiva-maven-proxy/src/test/java/org/apache/archiva/repository/mock/ManagedRepositoryContentMock.java @@ -22,7 +22,7 @@ package org.apache.archiva.repository.mock; import org.apache.archiva.common.filelock.DefaultFileLockManager; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.model.ArchivaArtifact; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.model.ProjectReference; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/DefaultPathParser.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/DefaultPathParser.java index d637911d0..4754f1360 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/DefaultPathParser.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/DefaultPathParser.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.content; */ import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java index dfc0f04d5..417dab7d2 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/ManagedDefaultRepositoryContent.java @@ -22,7 +22,7 @@ import org.apache.archiva.common.filelock.FileLockManager; import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.configuration.FileTypes; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.repository.maven.metadata.storage.DefaultArtifactMappingProvider; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java index 1a807a0e4..84192a5e7 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/content/MavenContentHelper.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.content; */ import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.SnapshotVersion; import org.apache.archiva.repository.content.ItemSelector; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java index 696afd784..d41c05f5a 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/dependency/tree/Maven3DependencyTreeBuilder.java @@ -26,7 +26,7 @@ import org.apache.archiva.admin.model.proxyconnector.ProxyConnectorAdmin; import org.apache.archiva.common.plexusbridge.PlexusSisuBridge; import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException; import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.maven2.model.TreeEntry; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.model.ArchivaRepositoryMetadata; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java index 322415687..c4ac9b602 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/merge/Maven2RepositoryMerger.java @@ -24,7 +24,7 @@ import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java index d09b6f36d..eeb200042 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryPathTranslator.java @@ -20,7 +20,7 @@ package org.apache.archiva.repository.maven.metadata.storage; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.storage.StorageAsset; import org.apache.commons.lang3.StringUtils; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java index 00e8e0740..0e60a1b11 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java @@ -23,7 +23,7 @@ import org.apache.archiva.checksum.ChecksummedFile; import org.apache.archiva.common.Try; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.filter.Filter; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.ProjectMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java index fc7316117..4a21a0ec4 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/MavenArtifactFacetFactory.java @@ -18,9 +18,8 @@ package org.apache.archiva.repository.maven.metadata.storage; * under the License. */ -import org.apache.archiva.metadata.model.MetadataFacetFactory; import org.apache.archiva.metadata.model.facets.AbstractMetadataFacetFactory; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.springframework.stereotype.Service; /** diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java index a8647ac0f..c8f0ebef1 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/RepositoryModelResolver.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.metadata.storage; */ import org.apache.archiva.common.utils.VersionUtil; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.SnapshotVersion; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java index 631fb1e5c..ba62afc1d 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/ArtifactExtensionMappingTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.content; */ import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.storage.RepositoryPathTranslator; import org.apache.archiva.repository.maven.metadata.storage.ArtifactMappingProvider; import org.apache.archiva.repository.maven.metadata.storage.Maven2RepositoryPathTranslator; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java index 6db54b81a..5466bac31 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/content/MavenContentHelperTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.content; */ import org.apache.archiva.common.filelock.DefaultFileLockManager; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.repository.content.ItemSelector; import org.apache.archiva.repository.content.base.ArchivaItemSelector; import org.apache.archiva.repository.storage.StorageAsset; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java index b2642bac2..3d04c907e 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/RepositoryMetadataReaderTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.metadata; */ import junit.framework.TestCase; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.repository.metadata.RepositoryMetadataException; import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java index 29b882a5f..f8e28c2b0 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryMetadataResolverTest.java @@ -30,7 +30,7 @@ import org.apache.archiva.metadata.model.Dependency; import org.apache.archiva.metadata.model.License; import org.apache.archiva.metadata.model.MailingList; import org.apache.archiva.metadata.model.ProjectVersionMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.filter.AllFilter; import org.apache.archiva.filter.ExcludesFilter; import org.apache.archiva.filter.Filter; diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java index 993d957e6..07ee62ea5 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/test/java/org/apache/archiva/repository/maven/metadata/storage/MavenRepositoryMetadataReaderTest.java @@ -19,7 +19,7 @@ package org.apache.archiva.repository.maven.metadata.storage; */ import junit.framework.TestCase; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.Plugin; import org.apache.archiva.repository.metadata.RepositoryMetadataException; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java index 5c72d42ae..23b8d6fb6 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoriesService.java @@ -28,7 +28,7 @@ import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.maven2.model.Artifact; import org.apache.archiva.metadata.model.ArtifactMetadata; import org.apache.archiva.metadata.model.facets.AuditEvent; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.*; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.ArtifactReference; diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactBuilder.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactBuilder.java index 76d3292a8..3a9c75051 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactBuilder.java +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/utils/ArtifactBuilder.java @@ -20,7 +20,7 @@ package org.apache.archiva.rest.services.utils; import org.apache.archiva.maven2.model.Artifact; import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.model.ArtifactReference; import org.apache.archiva.repository.ManagedRepositoryContent; import org.apache.archiva.repository.storage.StorageAsset; diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java index 3b3fe4ed2..881d0d8f0 100644 --- a/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/main/java/org/apache/archiva/web/api/DefaultFileUploadService.java @@ -30,7 +30,6 @@ import org.apache.archiva.checksum.ChecksummedFile; import org.apache.archiva.common.utils.VersionComparator; import org.apache.archiva.common.utils.VersionUtil; import org.apache.archiva.configuration.ArchivaConfiguration; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; import org.apache.archiva.metadata.model.facets.AuditEvent; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.archiva.model.ArtifactReference; @@ -52,7 +51,6 @@ import org.apache.archiva.rest.services.AbstractRestService; import org.apache.archiva.scheduler.ArchivaTaskScheduler; import org.apache.archiva.scheduler.repository.model.RepositoryTask; import org.apache.archiva.web.model.FileMetadata; -import org.apache.archiva.xml.XMLException; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java index ed44abf47..a3d0b6772 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/webdav/RepositoryServletRepositoryGroupTest.java @@ -26,7 +26,7 @@ import org.apache.archiva.common.utils.FileUtils; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.RepositoryGroupConfiguration; -import org.apache.archiva.maven2.metadata.MavenMetadataReader; +import org.apache.archiva.metadata.maven.MavenMetadataReader; import org.apache.archiva.model.ArchivaRepositoryMetadata; import org.apache.commons.lang3.StringUtils; import org.junit.After; diff --git a/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java b/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java index 4f06928c0..788afb895 100644 --- a/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java +++ b/archiva-modules/metadata/metadata-statistics-api/src/main/java/org/apache/archiva/metadata/repository/stats/model/RepositoryWalkingStatisticsProvider.java @@ -20,7 +20,7 @@ package org.apache.archiva.metadata.repository.stats.model; */ import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.MetadataRepositoryException; import org.apache.archiva.metadata.repository.MetadataResolutionException; diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java index 2e09bbf37..fb171f3b0 100644 --- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java +++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java @@ -23,12 +23,11 @@ import com.google.common.collect.ImmutableMap; import org.apache.archiva.checksum.ChecksumAlgorithm; import org.apache.archiva.metadata.QueryParameter; import org.apache.archiva.metadata.model.*; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.*; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatistics; import org.apache.archiva.metadata.repository.stats.model.RepositoryStatisticsProvider; import org.apache.commons.lang3.StringUtils; -import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.JcrUtils; import org.apache.jackrabbit.commons.cnd.CndImporter; import org.apache.jackrabbit.commons.cnd.ParseException; diff --git a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java index 8d7f92e1b..ac3f1ebda 100644 --- a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java +++ b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/RepositoryStatisticsManagerTest.java @@ -21,7 +21,7 @@ package org.apache.archiva.metadata.repository.stats; import junit.framework.TestCase; import org.apache.archiva.metadata.model.ArtifactMetadata; -import org.apache.archiva.metadata.model.maven2.MavenArtifactFacet; +import org.apache.archiva.metadata.maven.model.MavenArtifactFacet; import org.apache.archiva.metadata.repository.MetadataRepository; import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySessionFactory;