diff options
8 files changed, 5 insertions, 591 deletions
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml index 99378af66..4aa0b6fc2 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-database-consumers/pom.xml @@ -36,10 +36,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-artifact-reports</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>archiva-configuration</artifactId> </dependency> <dependency> diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml deleted file mode 100755 index 18614a27a..000000000 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-reporting</artifactId> - <version>1.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>archiva-metadata-reports</artifactId> - <name>Archiva Reporting :: Metadata Reports</name> - <dependencies> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-report-manager</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-database</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-layer</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - </dependencies> - <build> - </build> -</project> diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java b/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java deleted file mode 100644 index 27db5dfaa..000000000 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataReport.java +++ /dev/null @@ -1,81 +0,0 @@ -package org.apache.maven.archiva.reporting.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.maven.archiva.database.ArchivaDAO; -import org.apache.maven.archiva.database.ArchivaDatabaseException; -import org.apache.maven.archiva.database.Constraint; -import org.apache.maven.archiva.database.ObjectNotFoundException; -import org.apache.maven.archiva.database.constraints.RepositoryProblemByTypeConstraint; -import org.apache.maven.archiva.model.RepositoryProblem; -import org.apache.maven.archiva.reporting.DataLimits; -import org.apache.maven.archiva.reporting.DynamicReportSource; - -import java.util.List; - -/** - * MetadataReport - * - * @version $Id$ - * - * @plexus.component role="org.apache.maven.archiva.reporting.DynamicReportSource" - * role-hint="metadata" - */ -public class MetadataReport - implements DynamicReportSource<RepositoryProblem> -{ - public static final String PROBLEM_TYPE_METADATA = "metadata"; - - /** - * @plexus.configuration default-value="Metadata Report" - */ - private String name; - - /** - * @plexus.requirement role-hint="jdo" - */ - private ArchivaDAO dao; - - private Constraint constraint; - - public MetadataReport() - { - constraint = new RepositoryProblemByTypeConstraint( PROBLEM_TYPE_METADATA ); - } - - public List<RepositoryProblem> getData() - throws ObjectNotFoundException, ArchivaDatabaseException - { - return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); - } - - public List<RepositoryProblem> getData( DataLimits limits ) - throws ObjectNotFoundException, ArchivaDatabaseException - { - // TODO: implement limits. - return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); - } - - public String getName() - { - return name; - } - -} diff --git a/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java b/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java deleted file mode 100644 index 8bae6cab8..000000000 --- a/archiva-modules/archiva-reporting/archiva-metadata-reports/src/main/java/org/apache/maven/archiva/reporting/metadata/MetadataValidateConsumer.java +++ /dev/null @@ -1,307 +0,0 @@ -package org.apache.maven.archiva.reporting.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. - */ - - -/** - * MetadataValidateConsumer - * - * @version $Id$ - * - * TODO: whoops, how do we consumer metadata? - */ -public class MetadataValidateConsumer -{ - -// /** -// * Process the metadata encountered in the repository and report all errors found, if any. -// * -// * @param metadata the metadata to be processed. -// * @param repository the repository where the metadata was encountered -// * @param reporter the ReportingDatabase to receive processing results -// */ -// public void processMetadata( RepositoryMetadata metadata, ArtifactRepository repository ) -// { -// if ( metadata.storedInGroupDirectory() ) -// { -// try -// { -// checkPluginMetadata( metadata, repository ); -// } -// catch ( IOException e ) -// { -// addWarning( metadata, null, "Error getting plugin artifact directories versions: " + e ); -// } -// } -// else -// { -// Versioning versioning = metadata.getMetadata().getVersioning(); -// boolean found = false; -// if ( versioning != null ) -// { -// String lastUpdated = versioning.getLastUpdated(); -// if ( lastUpdated != null && lastUpdated.length() != 0 ) -// { -// found = true; -// } -// } -// if ( !found ) -// { -// addFailure( metadata, "missing-last-updated", "Missing lastUpdated element inside the metadata." ); -// } -// -// if ( metadata.storedInArtifactVersionDirectory() ) -// { -// checkSnapshotMetadata( metadata, repository ); -// } -// else -// { -// checkMetadataVersions( metadata, repository ); -// -// try -// { -// checkRepositoryVersions( metadata, repository ); -// } -// catch ( IOException e ) -// { -// String reason = "Error getting plugin artifact directories versions: " + e; -// addWarning( metadata, null, reason ); -// } -// } -// } -// } -// -// private void addWarning( RepositoryMetadata metadata, String problem, String reason ) -// { -// // TODO: reason could be an i18n key derived from the processor and the problem ID and the -// database.addWarning( metadata, ROLE_HINT, problem, reason ); -// } -// -// /** -// * Method for processing a GroupRepositoryMetadata -// * -// * @param metadata the metadata to be processed. -// * @param repository the repository where the metadata was encountered -// * @param reporter the ReportingDatabase to receive processing results -// */ -// private void checkPluginMetadata( RepositoryMetadata metadata, ArtifactRepository repository ) -// throws IOException -// { -// File metadataDir = new File( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( metadata ) ) -// .getParentFile(); -// List pluginDirs = getArtifactIdFiles( metadataDir ); -// -// Map prefixes = new HashMap(); -// for ( Iterator plugins = metadata.getMetadata().getPlugins().iterator(); plugins.hasNext(); ) -// { -// Plugin plugin = (Plugin) plugins.next(); -// -// String artifactId = plugin.getArtifactId(); -// if ( artifactId == null || artifactId.length() == 0 ) -// { -// addFailure( metadata, "missing-artifact-id:" + plugin.getPrefix(), -// "Missing or empty artifactId in group metadata for plugin " + plugin.getPrefix() ); -// } -// -// String prefix = plugin.getPrefix(); -// if ( prefix == null || prefix.length() == 0 ) -// { -// addFailure( metadata, "missing-plugin-prefix:" + artifactId, -// "Missing or empty plugin prefix for artifactId " + artifactId + "." ); -// } -// else -// { -// if ( prefixes.containsKey( prefix ) ) -// { -// addFailure( metadata, "duplicate-plugin-prefix:" + prefix, "Duplicate plugin prefix found: " -// + prefix + "." ); -// } -// else -// { -// prefixes.put( prefix, plugin ); -// } -// } -// -// if ( artifactId != null && artifactId.length() > 0 ) -// { -// File pluginDir = new File( metadataDir, artifactId ); -// if ( !pluginDirs.contains( pluginDir ) ) -// { -// addFailure( metadata, "missing-plugin-from-repository:" + artifactId, "Metadata plugin " -// + artifactId + " not found in the repository" ); -// } -// else -// { -// pluginDirs.remove( pluginDir ); -// } -// } -// } -// -// if ( pluginDirs.size() > 0 ) -// { -// for ( Iterator plugins = pluginDirs.iterator(); plugins.hasNext(); ) -// { -// File plugin = (File) plugins.next(); -// addFailure( metadata, "missing-plugin-from-metadata:" + plugin.getName(), "Plugin " + plugin.getName() -// + " is present in the repository but " + "missing in the metadata." ); -// } -// } -// } -// -// /** -// * Method for processing a SnapshotArtifactRepository -// * -// * @param metadata the metadata to be processed. -// * @param repository the repository where the metadata was encountered -// * @param reporter the ReportingDatabase to receive processing results -// */ -// private void checkSnapshotMetadata( RepositoryMetadata metadata, ArtifactRepository repository ) -// { -// RepositoryQueryLayer repositoryQueryLayer = repositoryQueryLayerFactory.createRepositoryQueryLayer( repository ); -// -// Versioning versioning = metadata.getMetadata().getVersioning(); -// if ( versioning != null ) -// { -// Snapshot snapshot = versioning.getSnapshot(); -// -// String version = StringUtils.replace( metadata.getBaseVersion(), Artifact.SNAPSHOT_VERSION, snapshot -// .getTimestamp() -// + "-" + snapshot.getBuildNumber() ); -// Artifact artifact = artifactFactory.createProjectArtifact( metadata.getGroupId(), metadata.getArtifactId(), -// version ); -// artifact.isSnapshot(); // trigger baseVersion correction -// -// if ( !repositoryQueryLayer.containsArtifact( artifact ) ) -// { -// addFailure( metadata, "missing-snapshot-artifact-from-repository:" + version, "Snapshot artifact " -// + version + " does not exist." ); -// } -// } -// } -// -// /** -// * Method for validating the versions declared inside an ArtifactRepositoryMetadata -// * -// * @param metadata the metadata to be processed. -// * @param repository the repository where the metadata was encountered -// * @param reporter the ReportingDatabase to receive processing results -// */ -// private void checkMetadataVersions( RepositoryMetadata metadata, ArtifactRepository repository ) -// { -// RepositoryQueryLayer repositoryQueryLayer = repositoryQueryLayerFactory.createRepositoryQueryLayer( repository ); -// -// Versioning versioning = metadata.getMetadata().getVersioning(); -// if ( versioning != null ) -// { -// for ( Iterator versions = versioning.getVersions().iterator(); versions.hasNext(); ) -// { -// String version = (String) versions.next(); -// -// Artifact artifact = artifactFactory.createProjectArtifact( metadata.getGroupId(), metadata -// .getArtifactId(), version ); -// -// if ( !repositoryQueryLayer.containsArtifact( artifact ) ) -// { -// addFailure( metadata, "missing-artifact-from-repository:" + version, "Artifact version " + version -// + " is present in metadata but " + "missing in the repository." ); -// } -// } -// } -// } -// -// /** -// * Searches the artifact repository directory for all versions and verifies that all of them are listed in the -// * ArtifactRepositoryMetadata -// * -// * @param metadata the metadata to be processed. -// * @param repository the repository where the metadata was encountered -// * @param reporter the ReportingDatabase to receive processing results -// * @throws java.io.IOException if there is a problem reading from the file system -// */ -// private void checkRepositoryVersions( RepositoryMetadata metadata, ArtifactRepository repository ) -// throws IOException -// { -// Versioning versioning = metadata.getMetadata().getVersioning(); -// List metadataVersions = versioning != null ? versioning.getVersions() : Collections.EMPTY_LIST; -// File versionsDir = new File( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( metadata ) ) -// .getParentFile(); -// -// // TODO: I don't know how this condition can happen, but it was seen on the main repository. -// // Avoid hard failure -// if ( versionsDir.exists() ) -// { -// List versions = FileUtils.getFileNames( versionsDir, "*/*.pom", null, false ); -// for ( Iterator i = versions.iterator(); i.hasNext(); ) -// { -// File path = new File( (String) i.next() ); -// String version = path.getParentFile().getName(); -// if ( !metadataVersions.contains( version ) ) -// { -// addFailure( metadata, "missing-artifact-from-metadata:" + version, "Artifact version " + version -// + " found in the repository but " + "missing in the metadata." ); -// } -// } -// } -// else -// { -// addFailure( metadata, null, "Metadata's directory did not exist: " + versionsDir ); -// } -// } -// -// /** -// * Used to gather artifactIds from a groupId directory. -// * -// * @param groupIdDir the directory of the group -// * @return the list of artifact ID File objects for each directory -// * @throws IOException if there was a failure to read the directories -// */ -// private List getArtifactIdFiles( File groupIdDir ) -// throws IOException -// { -// List artifactIdFiles = new ArrayList(); -// -// File[] files = groupIdDir.listFiles(); -// if ( files != null ) -// { -// for ( Iterator i = Arrays.asList( files ).iterator(); i.hasNext(); ) -// { -// File artifactDir = (File) i.next(); -// -// if ( artifactDir.isDirectory() ) -// { -// List versions = FileUtils.getFileNames( artifactDir, "*/*.pom", null, false ); -// if ( versions.size() > 0 ) -// { -// artifactIdFiles.add( artifactDir ); -// } -// } -// } -// } -// -// return artifactIdFiles; -// } -// -// private void addFailure( RepositoryMetadata metadata, String problem, String reason ) -// { -// // TODO: reason could be an i18n key derived from the processor and the problem ID and the -// database.addFailure( metadata, ROLE_HINT, problem, reason ); -// } - -} diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml deleted file mode 100755 index 3b79d4b54..000000000 --- a/archiva-modules/archiva-reporting/archiva-project-reports/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-reporting</artifactId> - <version>1.3-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>archiva-project-reports</artifactId> - <name>Archiva Reporting :: Project Reports</name> - <dependencies> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-report-manager</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-database</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-repository-layer</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - </dependencies> - <build> - </build> -</project> diff --git a/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java b/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java deleted file mode 100644 index 585b1a1dd..000000000 --- a/archiva-modules/archiva-reporting/archiva-project-reports/src/main/java/org/apache/maven/archiva/reporting/project/MissingDependenciesReport.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.apache.maven.archiva.reporting.project; - -/* - * 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.maven.archiva.database.ArchivaDAO; -import org.apache.maven.archiva.database.ArchivaDatabaseException; -import org.apache.maven.archiva.database.Constraint; -import org.apache.maven.archiva.database.ObjectNotFoundException; -import org.apache.maven.archiva.database.constraints.RepositoryProblemByTypeConstraint; -import org.apache.maven.archiva.model.RepositoryProblem; -import org.apache.maven.archiva.reporting.DataLimits; -import org.apache.maven.archiva.reporting.DynamicReportSource; - -import java.util.List; - -/** - * MissingDependenciesReport - * - * @version $Id$ - * - * @plexus.component role="org.apache.maven.archiva.reporting.DynamicReportSource" - * role-hint="missing-dependencies" - */ -public class MissingDependenciesReport - implements DynamicReportSource<RepositoryProblem> -{ - public static final String PROBLEM_TYPE_MISSING_DEPENDENCY = "missing-dependency"; - - /** - * @plexus.configuration default-value="Missing Dependencies Report" - */ - private String name; - - /** - * @plexus.requirement role-hint="jdo" - */ - private ArchivaDAO dao; - - private Constraint constraint; - - public MissingDependenciesReport() - { - constraint = new RepositoryProblemByTypeConstraint( PROBLEM_TYPE_MISSING_DEPENDENCY ); - } - - public List<RepositoryProblem> getData() - throws ObjectNotFoundException, ArchivaDatabaseException - { - return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); - } - - public List<RepositoryProblem> getData( DataLimits limits ) - throws ObjectNotFoundException, ArchivaDatabaseException - { - // TODO: implement limits. - return dao.getRepositoryProblemDAO().queryRepositoryProblems( constraint ); - } - - public String getName() - { - return name; - } -} diff --git a/archiva-modules/archiva-reporting/pom.xml b/archiva-modules/archiva-reporting/pom.xml index 5ef3e9cad..c07df5287 100644 --- a/archiva-modules/archiva-reporting/pom.xml +++ b/archiva-modules/archiva-reporting/pom.xml @@ -29,9 +29,6 @@ <modules> <module>archiva-report-manager</module> - <!-- TODO: some reports not currently used --> <module>archiva-artifact-reports</module> - <module>archiva-metadata-reports</module> - <module>archiva-project-reports</module> </modules> </project> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 06fd7df9a..d91a1e947 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -39,6 +39,11 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> + <artifactId>archiva-artifact-reports</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.archiva</groupId> <artifactId>archiva-scheduler-repository</artifactId> </dependency> <dependency> |