Author: brett
Date: Mon Dec 1 05:47:06 2008
New Revision: 722073
URL: http://svn.apache.org/viewvc?rev=722073&view=rev
Log:
[MRM-1025] separate metadata consumer so that it can be run from the CLI
without a database
Added:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/
(with props)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
(with props)
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
(contents, props changed)
- copied, changed from r722010,
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArchivaMetadataCreationConsumer.java
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/test/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/test/java/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/test/java/org/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/test/java/org/apache/
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/test/java/org/apache/archiva/
Removed:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArchivaMetadataCreationConsumer.java
Modified:
archiva/branches/MRM-1025/archiva-cli/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
Modified: archiva/branches/MRM-1025/archiva-cli/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-cli/pom.xml?rev=722073&r1=722072&r2=722073&view=diff
==============================================================================
--- archiva/branches/MRM-1025/archiva-cli/pom.xml (original)
+++ archiva/branches/MRM-1025/archiva-cli/pom.xml Mon Dec 1 05:47:06 2008
@@ -40,6 +40,12 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-metadata-consumer</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-xml-tools</artifactId>
</dependency>
<dependency>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml?rev=722073&r1=722072&r2=722073&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
Mon Dec 1 05:47:06 2008
@@ -52,21 +52,6 @@
<artifactId>plexus-spring</artifactId>
<scope>test</scope>
</dependency>
- <dependency> <!-- TODO: version into parent -->
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-model</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- <dependency> <!-- TODO: version into parent -->
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-repository-api</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
- <dependency> <!-- TODO: version into parent, temporary coupling to file
based repo -->
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-repository-file</artifactId>
- <version>1.2-SNAPSHOT</version>
- </dependency>
<!-- test dependencies -->
<dependency>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml?rev=722073&r1=722072&r2=722073&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml
Mon Dec 1 05:47:06 2008
@@ -1,3 +1,23 @@
+<?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";>
<modelVersion>4.0.0</modelVersion>
<parent>
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 1 05:47:06 2008
@@ -0,0 +1,4 @@
+target
+.classpath
+.settings
+.project
Added:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml?rev=722073&view=auto
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
(added)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
Mon Dec 1 05:47:06 2008
@@ -0,0 +1,55 @@
+<?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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>archiva-consumers</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <version>1.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>archiva-metadata-consumer</artifactId>
+ <name>Archiva Metadata Consumer</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-consumer-api</artifactId>
+ </dependency>
+ <dependency> <!-- TODO: version into parent -->
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-model</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ <dependency> <!-- TODO: version into parent -->
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-repository-api</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ <dependency> <!-- TODO: version into parent, temporary coupling to file
based repo -->
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-repository-file</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-repository-layer</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
(from r722010,
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArchivaMetadataCreationConsumer.java)
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java?p2=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java&p1=archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArchivaMetadataCreationConsumer.java&r1=722010&r2=722073&rev=722073&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/maven/archiva/consumers/core/ArchivaMetadataCreationConsumer.java
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
Mon Dec 1 05:47:06 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.archiva.consumers.core;
+package org.apache.archiva.consumers.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -38,8 +38,6 @@
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.ManagedRepositoryContent;
-import org.apache.maven.archiva.repository.RepositoryContentFactory;
-import org.apache.maven.archiva.repository.RepositoryException;
import org.apache.maven.archiva.repository.layout.LayoutException;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
import
org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
@@ -47,7 +45,7 @@
import org.codehaus.plexus.registry.RegistryListener;
/**
- * ArtifactUpdateDatabaseConsumer - Take an artifact off of disk and put it
into the repository.
+ * Take an artifact off of disk and put it into the metadata repository.
*
* @version $Id: ArtifactUpdateDatabaseConsumer.java 718864 2008-11-19
06:33:35Z brett $
* @plexus.component
role="org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer"
@@ -77,13 +75,11 @@
*/
private FileTypes filetypes;
+ private Date whenGathered;
+
/**
* @plexus.requirement
*/
- private RepositoryContentFactory repositoryFactory;
-
- private Date whenGathered;
-
private ManagedRepositoryContent repository;
private List<String> includes = new ArrayList<String>();
@@ -118,16 +114,9 @@
public void beginScan( ManagedRepositoryConfiguration repo, Date
whenGathered )
throws ConsumerException
{
- try
- {
- this.repository = repositoryFactory.getManagedRepositoryContent(
repo.getId() );
- this.metadataRepository = new FileMetadataRepository( new File(
repository.getRepoRoot(), ".metadata" ) );
- this.whenGathered = whenGathered;
- }
- catch ( RepositoryException e )
- {
- throw new ConsumerException( "Unable to start
ArtifactUpdateDatabaseConsumer: " + e.getMessage(), e );
- }
+ this.repository.setRepository( repo );
+ this.metadataRepository = new FileMetadataRepository( new File(
repository.getRepoRoot(), ".metadata" ) );
+ this.whenGathered = whenGathered;
}
public void processFile( String path )
@@ -145,7 +134,7 @@
{
throw new ConsumerException( e.getMessage(), e );
}
-
+
File file = new File( repository.getRepoRoot(), path );
// TODO: needed in a more central place, but trying to isolate impact
to start with
@@ -166,7 +155,7 @@
project.addBuild( build );
// TODO: store "whenGathered"
-
+
// read the metadata and update it if it is newer or doesn't exist
metadataRepository.update( project );
}
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml?rev=722073&r1=722072&r2=722073&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-base/archiva-consumers/pom.xml
Mon Dec 1 05:47:06 2008
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Copyright 2005-2006 The Apache Software Foundation.
+ ~ 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
~
- ~ Licensed 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
~
- ~ 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.
+ ~ 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";>
@@ -35,6 +38,7 @@
<module>archiva-lucene-consumers</module>
<module>archiva-signature-consumers</module>
<module>archiva-dependency-tree-consumer</module>
+ <module>archiva-metadata-consumer</module>
</modules>
<build>
Modified:
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=722073&r1=722072&r2=722073&view=diff
==============================================================================
---
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
(original)
+++
archiva/branches/MRM-1025/archiva-modules/archiva-web/archiva-webapp/pom.xml
Mon Dec 1 05:47:06 2008
@@ -72,6 +72,12 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-metadata-consumer</artifactId>
+ <version>1.2-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-lucene-consumers</artifactId>
</dependency>
<dependency>
