You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/09/13 14:12:52 UTC
svn commit: r1170135 [4/9] - in /archiva/trunk: ./
archiva-cli/src/main/java/org/apache/maven/archiva/cli/
archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/
archiva-modules/archiva-base/archiva-configuration/src...
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java (from r1170133, archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java&r1=1170133&r2=1170135&rev=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/networkproxy/NetworkProxyAdminTest.java Tue Sep 13 12:12:39 2011
@@ -18,6 +18,8 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.networkproxy.NetworkProxy;
+import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest;
import org.apache.archiva.audit.AuditEvent;
import org.junit.Test;
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java (from r1170133, archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java&r1=1170133&r2=1170135&rev=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/proxyconnector/ProxyConnectorAdminTest.java Tue Sep 13 12:12:39 2011
@@ -18,8 +18,9 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.proxyconnector.ProxyConnector;
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest;
-import org.apache.archiva.admin.repository.remote.RemoteRepository;
import org.apache.archiva.audit.AuditEvent;
import org.junit.Test;
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java (from r1170133, archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java&r1=1170133&r2=1170135&rev=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/remote/RemoteRepositoryAdminTest.java Tue Sep 13 12:12:39 2011
@@ -18,6 +18,7 @@ package org.apache.archiva.admin.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.archiva.admin.repository.AbstractRepositoryAdminTest;
import org.apache.archiva.audit.AuditEvent;
import org.junit.Test;
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/META-INF/redback/redback-core.xml (from r1170133, archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/resources/META-INF/redback/redback-core.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/META-INF/redback/redback-core.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/META-INF/redback/redback-core.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/resources/META-INF/redback/redback-core.xml&r1=1170133&r2=1170135&rev=1170135&view=diff
==============================================================================
(empty)
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml (from r1170133, archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/log4j.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/resources/log4j.xml&r1=1170133&r2=1170135&rev=1170135&view=diff
==============================================================================
(empty)
Copied: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml (from r1170133, archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/resources/spring-context.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml?p2=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml&p1=archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/src/test/resources/spring-context.xml&r1=1170133&r2=1170135&rev=1170135&view=diff
==============================================================================
(empty)
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/pom.xml Tue Sep 13 12:12:39 2011
@@ -27,170 +27,9 @@
</parent>
<artifactId>archiva-repository-admin</artifactId>
<name>Archiva Base :: Repository Admin</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-configuration</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-security-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>archiva-scheduler-repository</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>audit</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- </dependency>
- <dependency>
- <groupId>net.sf.beanlib</groupId>
- <artifactId>beanlib</artifactId>
- <exclusions>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- </dependency>
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.redback.components</groupId>
- <artifactId>spring-quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-rbac-role-manager</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-authentication-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-users-memory</artifactId>
- <scope>test</scope>
- <version>${redback.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-keys-memory</artifactId>
- <scope>test</scope>
- <version>${redback.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.redback</groupId>
- <artifactId>redback-rbac-cached</artifactId>
- <version>${redback.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.archiva</groupId>
- <artifactId>metadata-store-file</artifactId>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemPropertyVariables>
- <appserver.base>${project.build.outputDirectory}</appserver.base>
- <plexus.home>${project.build.outputDirectory}</plexus.home>
- </systemPropertyVariables>
- </configuration>
-
- </plugin>
- </plugins>
- </build>
+ <packaging>pom</packaging>
+ <modules>
+ <module>archiva-repository-admin-api</module>
+ <module>archiva-repository-admin-default</module>
+ </modules>
</project>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ManagedRepositoryContent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ManagedRepositoryContent.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ManagedRepositoryContent.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/ManagedRepositoryContent.java Tue Sep 13 12:12:39 2011
@@ -19,7 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.model.ArchivaArtifact;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.ProjectReference;
@@ -30,7 +30,7 @@ import java.io.File;
import java.util.Set;
/**
- * ManagedRepositoryContent interface for interacting with a managed repository in an abstract way,
+ * ManagedRepositoryContent interface for interacting with a managed repository in an abstract way,
* without the need for processing based on filesystem paths, or working with the database.
*
* @version $Id$
@@ -40,9 +40,9 @@ public interface ManagedRepositoryConten
/**
* Delete from the managed repository all files / directories associated with the
* provided version reference.
- *
+ *
* @param reference the version reference to delete.
- * @throws ContentNotFoundException
+ * @throws ContentNotFoundException
*/
void deleteVersion( VersionedReference reference )
throws ContentNotFoundException;
@@ -51,11 +51,11 @@ public interface ManagedRepositoryConten
* <p>
* Convenience method to get the repository id.
* </p>
- *
+ * <p/>
* <p>
* Equivalent to calling <code>.getRepository().getId()</code>
* </p>
- *
+ *
* @return the repository id.
*/
String getId();
@@ -63,18 +63,18 @@ public interface ManagedRepositoryConten
/**
* <p>
* Gather up the list of related artifacts to the ArtifactReference provided.
- * This typically inclues the pom files, and those things with
+ * This typically inclues the pom files, and those things with
* classifiers (such as doc, source code, test libs, etc...)
* </p>
- *
+ * <p/>
* <p>
* <strong>NOTE:</strong> Some layouts (such as maven 1 "legacy") are not compatible with this query.
- * </p>
- *
+ * </p>
+ *
* @param reference the reference to work off of.
* @return the set of ArtifactReferences for related artifacts.
* @throws ContentNotFoundException if the initial artifact reference does not exist within the repository.
- * @throws LayoutException
+ * @throws LayoutException
*/
Set<ArtifactReference> getRelatedArtifacts( ArtifactReference reference )
throws ContentNotFoundException;
@@ -83,11 +83,11 @@ public interface ManagedRepositoryConten
* <p>
* Convenience method to get the repository (on disk) root directory.
* </p>
- *
+ * <p/>
* <p>
* Equivalent to calling <code>.getRepository().getLocation()</code>
* </p>
- *
+ *
* @return the repository (on disk) root directory.
*/
String getRepoRoot();
@@ -95,19 +95,19 @@ public interface ManagedRepositoryConten
/**
* Get the repository configuration associated with this
* repository content.
- *
+ *
* @return the repository that is associated with this repository content.
*/
- ManagedRepositoryConfiguration getRepository();
+ ManagedRepository getRepository();
/**
* Given a specific {@link ProjectReference}, return the list of available versions for
* that project reference.
- *
+ *
* @param reference the project reference to work off of.
* @return the list of versions found for that project reference.
* @throws ContentNotFoundException if the project reference does nto exist within the repository.
- * @throws LayoutException
+ * @throws LayoutException
*/
Set<String> getVersions( ProjectReference reference )
throws ContentNotFoundException, LayoutException;
@@ -117,50 +117,50 @@ public interface ManagedRepositoryConten
* Given a specific {@link VersionedReference}, return the list of available versions for that
* versioned reference.
* </p>
- *
+ * <p/>
* <p>
* <strong>NOTE:</strong> This is really only useful when working with SNAPSHOTs.
* </p>
- *
+ *
* @param reference the versioned reference to work off of.
* @return the set of versions found.
* @throws ContentNotFoundException if the versioned reference does not exist within the repository.
- * @throws LayoutException
+ * @throws LayoutException
*/
- public Set<String> getVersions( VersionedReference reference )
+ Set<String> getVersions( VersionedReference reference )
throws ContentNotFoundException;
/**
* Determines if the artifact referenced exists in the repository.
- *
+ *
* @param reference the artifact reference to check for.
* @return true if the artifact referenced exists.
*/
- public boolean hasContent( ArtifactReference reference );
+ boolean hasContent( ArtifactReference reference );
/**
* Determines if the project referenced exists in the repository.
- *
+ *
* @param reference the project reference to check for.
* @return true it the project referenced exists.
*/
- public boolean hasContent( ProjectReference reference );
+ boolean hasContent( ProjectReference reference );
/**
* Determines if the version reference exists in the repository.
- *
+ *
* @param reference the version reference to check for.
* @return true if the version referenced exists.
*/
- public boolean hasContent( VersionedReference reference );
+ boolean hasContent( VersionedReference reference );
/**
* Set the repository configuration to associate with this
* repository content.
- *
+ *
* @param repo the repository to associate with this repository content.
*/
- public void setRepository( ManagedRepositoryConfiguration repo );
+ void setRepository( ManagedRepository repo );
/**
* Given a repository relative path to a filename, return the {@link VersionedReference} object suitable for the path.
@@ -170,7 +170,7 @@ public interface ManagedRepositoryConten
* a {@link ArtifactReference})
* @throws LayoutException if there was a problem converting the path to an artifact.
*/
- public ArtifactReference toArtifactReference( String path )
+ ArtifactReference toArtifactReference( String path )
throws LayoutException;
/**
@@ -179,33 +179,33 @@ public interface ManagedRepositoryConten
* @param reference the artifact reference to use.
* @return the relative path to the artifact.
*/
- public File toFile( ArtifactReference reference );
-
+ File toFile( ArtifactReference reference );
+
/**
* Given an {@link ArchivaArtifact}, return the file reference to the artifact.
*
* @param reference the archiva artifact to use.
* @return the relative path to the artifact.
*/
- public File toFile( ArchivaArtifact reference );
+ File toFile( ArchivaArtifact reference );
/**
* Given a {@link ProjectReference}, return the path to the metadata for
- * the project.
- *
+ * the project.
+ *
* @param reference the reference to use.
* @return the path to the metadata file, or null if no metadata is appropriate.
*/
- public String toMetadataPath( ProjectReference reference );
+ String toMetadataPath( ProjectReference reference );
/**
* Given a {@link VersionedReference}, return the path to the metadata for
- * the specific version of the project.
- *
+ * the specific version of the project.
+ *
* @param reference the reference to use.
* @return the path to the metadata file, or null if no metadata is appropriate.
*/
- public String toMetadataPath( VersionedReference reference );
+ String toMetadataPath( VersionedReference reference );
/**
* Given an {@link ArtifactReference}, return the relative path to the artifact.
@@ -213,13 +213,13 @@ public interface ManagedRepositoryConten
* @param reference the artifact reference to use.
* @return the relative path to the artifact.
*/
- public String toPath( ArtifactReference reference );
-
+ String toPath( ArtifactReference reference );
+
/**
* Given an {@link ArchivaArtifact}, return the relative path to the artifact.
*
* @param reference the archiva artifact to use.
* @return the relative path to the artifact.
*/
- public String toPath( ArchivaArtifact reference );
+ String toPath( ArchivaArtifact reference );
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RemoteRepositoryContent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RemoteRepositoryContent.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RemoteRepositoryContent.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RemoteRepositoryContent.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.RepositoryURL;
@@ -51,7 +52,7 @@ public interface RemoteRepositoryContent
*
* @return the repository that is associated with this repository content.
*/
- RemoteRepositoryConfiguration getRepository();
+ RemoteRepository getRepository();
/**
* <p>
@@ -72,7 +73,7 @@ public interface RemoteRepositoryContent
*
* @param repo the repository to associate with this repository content.
*/
- void setRepository( RemoteRepositoryConfiguration repo );
+ void setRepository( RemoteRepository repo );
/**
* Given a repository relative path to a filename, return the {@link VersionedReference} object suitable for the path.
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/RepositoryContentFactory.java Tue Sep 13 12:12:39 2011
@@ -19,10 +19,13 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
+import org.apache.archiva.admin.model.remote.RemoteRepository;
+import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.ConfigurationNames;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
import org.springframework.context.ApplicationContext;
@@ -49,6 +52,12 @@ public class RepositoryContentFactory
private ArchivaConfiguration archivaConfiguration;
@Inject
+ private ManagedRepositoryAdmin managedRepositoryAdmin;
+
+ @Inject
+ private RemoteRepositoryAdmin remoteRepositoryAdmin;
+
+ @Inject
private ApplicationContext applicationContext;
private final Map<String, ManagedRepositoryContent> managedContentMap;
@@ -73,51 +82,65 @@ public class RepositoryContentFactory
public ManagedRepositoryContent getManagedRepositoryContent( String repoId )
throws RepositoryNotFoundException, RepositoryException
{
- ManagedRepositoryContent repo = managedContentMap.get( repoId );
-
- if ( repo != null )
+ try
{
+ ManagedRepositoryContent repo = managedContentMap.get( repoId );
+
+ if ( repo != null )
+ {
+ return repo;
+ }
+
+ ManagedRepository repoConfig = managedRepositoryAdmin.getManagedRepository( repoId );
+ if ( repoConfig == null )
+ {
+ throw new RepositoryNotFoundException(
+ "Unable to find managed repository configuration for id:" + repoId );
+ }
+
+ repo = applicationContext.getBean( "managedRepositoryContent#" + repoConfig.getLayout(),
+ ManagedRepositoryContent.class );
+ repo.setRepository( repoConfig );
+ managedContentMap.put( repoId, repo );
+
return repo;
}
-
- ManagedRepositoryConfiguration repoConfig =
- archivaConfiguration.getConfiguration().findManagedRepositoryById( repoId );
- if ( repoConfig == null )
+ catch ( RepositoryAdminException e )
{
- throw new RepositoryNotFoundException( "Unable to find managed repository configuration for id:" + repoId );
+ throw new RepositoryException( e.getMessage(), e );
}
-
- repo = applicationContext.getBean( "managedRepositoryContent#" + repoConfig.getLayout(),
- ManagedRepositoryContent.class );
- repo.setRepository( repoConfig );
- managedContentMap.put( repoId, repo );
-
- return repo;
}
public RemoteRepositoryContent getRemoteRepositoryContent( String repoId )
throws RepositoryNotFoundException, RepositoryException
{
- RemoteRepositoryContent repo = remoteContentMap.get( repoId );
-
- if ( repo != null )
+ try
{
+ RemoteRepositoryContent repo = remoteContentMap.get( repoId );
+
+ if ( repo != null )
+ {
+ return repo;
+ }
+
+ RemoteRepository repoConfig = remoteRepositoryAdmin.getRemoteRepository( repoId );
+ if ( repoConfig == null )
+ {
+ throw new RepositoryNotFoundException(
+ "Unable to find remote repository configuration for id:" + repoId );
+ }
+
+ repo = applicationContext.getBean( "remoteRepositoryContent#" + repoConfig.getLayout(),
+ RemoteRepositoryContent.class );
+ repo.setRepository( repoConfig );
+ remoteContentMap.put( repoId, repo );
+
return repo;
}
-
- RemoteRepositoryConfiguration repoConfig =
- archivaConfiguration.getConfiguration().findRemoteRepositoryById( repoId );
- if ( repoConfig == null )
+ catch ( RepositoryAdminException e )
{
- throw new RepositoryNotFoundException( "Unable to find remote repository configuration for id:" + repoId );
+ throw new RepositoryException( e.getMessage(), e );
}
-
- repo = applicationContext.getBean( "remoteRepositoryContent#" + repoConfig.getLayout(),
- RemoteRepositoryContent.class );
- repo.setRepository( repoConfig );
- remoteContentMap.put( repoId, repo );
-
- return repo;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContent.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.archiva.metadata.repository.storage.maven2.DefaultArtifactMappingProvider;
import org.apache.commons.io.FileUtils;
import org.apache.maven.archiva.common.utils.PathUtil;
@@ -57,7 +58,7 @@ public class ManagedDefaultRepositoryCon
@Named(value = "fileTypes" )
private FileTypes filetypes;
- private ManagedRepositoryConfiguration repository;
+ private ManagedRepository repository;
public ManagedDefaultRepositoryContent()
{
@@ -148,7 +149,7 @@ public class ManagedDefaultRepositoryCon
return repository.getLocation();
}
- public ManagedRepositoryConfiguration getRepository()
+ public ManagedRepository getRepository()
{
return repository;
}
@@ -316,7 +317,7 @@ public class ManagedDefaultRepositoryCon
}
}
- public void setRepository( ManagedRepositoryConfiguration repository )
+ public void setRepository( ManagedRepository repository )
{
this.repository = repository;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContent.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.common.utils.PathUtil;
@@ -58,7 +59,7 @@ public class ManagedLegacyRepositoryCont
@Inject
private FileTypes filetypes;
- private ManagedRepositoryConfiguration repository;
+ private ManagedRepository repository;
public void deleteVersion( VersionedReference reference )
throws ContentNotFoundException
@@ -198,7 +199,7 @@ public class ManagedLegacyRepositoryCont
return repository.getLocation();
}
- public ManagedRepositoryConfiguration getRepository()
+ public ManagedRepository getRepository()
{
return repository;
}
@@ -315,7 +316,7 @@ public class ManagedLegacyRepositoryCont
}
}
- public void setRepository( ManagedRepositoryConfiguration repository )
+ public void setRepository( ManagedRepository repository )
{
this.repository = repository;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContent.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.RepositoryURL;
@@ -38,14 +39,14 @@ public class RemoteDefaultRepositoryCont
extends AbstractDefaultRepositoryContent
implements RemoteRepositoryContent
{
- private RemoteRepositoryConfiguration repository;
+ private RemoteRepository repository;
public String getId()
{
return repository.getId();
}
- public RemoteRepositoryConfiguration getRepository()
+ public RemoteRepository getRepository()
{
return repository;
}
@@ -55,7 +56,7 @@ public class RemoteDefaultRepositoryCont
return new RepositoryURL( repository.getUrl() );
}
- public void setRepository( RemoteRepositoryConfiguration repository )
+ public void setRepository( RemoteRepository repository )
{
this.repository = repository;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContent.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.model.RepositoryURL;
@@ -39,14 +40,14 @@ public class RemoteLegacyRepositoryConte
extends AbstractLegacyRepositoryContent
implements RemoteRepositoryContent
{
- private RemoteRepositoryConfiguration repository;
+ private RemoteRepository repository;
public String getId()
{
return repository.getId();
}
- public RemoteRepositoryConfiguration getRepository()
+ public RemoteRepository getRepository()
{
return repository;
}
@@ -56,7 +57,7 @@ public class RemoteLegacyRepositoryConte
return new RepositoryURL( repository.getUrl() );
}
- public void setRepository( RemoteRepositoryConfiguration repository )
+ public void setRepository( RemoteRepository repository )
{
this.repository = repository;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/AbstractRepositoryLayerTestCase.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,8 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.junit.Rule;
@@ -46,18 +48,18 @@ public abstract class AbstractRepository
@Inject
protected ApplicationContext applicationContext;
- protected ManagedRepositoryConfiguration createRepository( String id, String name, File location )
+ protected ManagedRepository createRepository( String id, String name, File location )
{
- ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ ManagedRepository repo = new ManagedRepository();
repo.setId( id );
repo.setName( name );
repo.setLocation( location.getAbsolutePath() );
return repo;
}
- protected RemoteRepositoryConfiguration createRemoteRepository( String id, String name, String url )
+ protected RemoteRepository createRemoteRepository( String id, String name, String url )
{
- RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ RemoteRepository repo = new RemoteRepository();
repo.setId( id );
repo.setName( name );
repo.setUrl( url );
@@ -68,7 +70,7 @@ public abstract class AbstractRepository
String layout )
throws Exception
{
- ManagedRepositoryConfiguration repo = new ManagedRepositoryConfiguration();
+ ManagedRepository repo = new ManagedRepository();
repo.setId( id );
repo.setName( name );
repo.setLocation( location.getAbsolutePath() );
@@ -84,7 +86,7 @@ public abstract class AbstractRepository
protected RemoteRepositoryContent createRemoteRepositoryContent( String id, String name, String url, String layout )
throws Exception
{
- RemoteRepositoryConfiguration repo = new RemoteRepositoryConfiguration();
+ RemoteRepository repo = new RemoteRepository();
repo.setId( id );
repo.setName( name );
repo.setUrl( url );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedDefaultRepositoryContentTest.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.common.utils.VersionComparator;
import org.apache.maven.archiva.configuration.ArchivaConfiguration;
import org.apache.maven.archiva.configuration.FileType;
@@ -67,7 +68,7 @@ public class ManagedDefaultRepositoryCon
{
File repoDir = new File( "src/test/repositories/default-repository" );
- ManagedRepositoryConfiguration repository = createRepository( "testRepo", "Unit Test Repo", repoDir );
+ ManagedRepository repository = createRepository( "testRepo", "Unit Test Repo", repoDir );
FileType fileType =
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/ManagedLegacyRepositoryContentTest.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.common.utils.VersionComparator;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
@@ -57,7 +58,7 @@ public class ManagedLegacyRepositoryCont
{
File repoDir = new File( "src/test/repositories/legacy-repository" );
- ManagedRepositoryConfiguration repository = createRepository( "testRepo", "Unit Test Repo", repoDir );
+ ManagedRepository repository = createRepository( "testRepo", "Unit Test Repo", repoDir );
repository.setLayout( "legacy" );
//repoContent = (ManagedRepositoryContent) lookup( ManagedRepositoryContent.class, "legacy" );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteDefaultRepositoryContentTest.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.RemoteRepositoryContent;
@@ -43,7 +44,7 @@ public class RemoteDefaultRepositoryCont
public void setUp()
throws Exception
{
- RemoteRepositoryConfiguration repository = createRemoteRepository( "testRemoteRepo", "Unit Test Remote Repo",
+ RemoteRepository repository = createRemoteRepository( "testRemoteRepo", "Unit Test Remote Repo",
"http://repo1.maven.org/maven2/" );
//repoContent = (RemoteRepositoryContent) lookup( RemoteRepositoryContent.class, "default" );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/content/RemoteLegacyRepositoryContentTest.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.remote.RemoteRepository;
import org.apache.maven.archiva.configuration.RemoteRepositoryConfiguration;
import org.apache.maven.archiva.model.ArtifactReference;
import org.apache.maven.archiva.repository.RemoteRepositoryContent;
@@ -44,7 +45,7 @@ public class RemoteLegacyRepositoryConte
public void setUp()
throws Exception
{
- RemoteRepositoryConfiguration repository =
+ RemoteRepository repository =
createRemoteRepository( "testRemoteLegacyRepo", "Unit Test Remote Legacy Repo",
"http://repo1.maven.org/maven/" );
repository.setLayout( "legacy" );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,7 @@ package org.apache.maven.archiva.reposit
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.archiva.common.utils.VersionComparator;
@@ -355,7 +356,7 @@ public class MetadataToolsTest
reference.setArtifactId( artifactId );
reference.setVersion( version );
- ManagedRepositoryConfiguration repo =
+ ManagedRepository repo =
createRepository( "test-repo", "Test Repository: " + name.getMethodName(), repoRootDir );
ManagedRepositoryContent repoContent =
applicationContext.getBean( "managedRepositoryContent#default", ManagedRepositoryContent.class );
@@ -583,7 +584,7 @@ public class MetadataToolsTest
repoRoot.mkdirs();
- ManagedRepositoryConfiguration repoConfig =
+ ManagedRepository repoConfig =
createRepository( "test-repo", "Test Repository: " + name.getMethodName(), repoRoot );
ManagedRepositoryContent repoContent =
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml Tue Sep 13 12:12:39 2011
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-configuration</artifactId>
+ <artifactId>archiva-repository-admin-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -46,6 +46,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-configuration</artifactId>
+ <!-- FIXME olamy : should be scope test but it depends on FileTypes
+ <scope>test</scope>
+ -->
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java Tue Sep 13 12:12:39 2011
@@ -19,28 +19,29 @@ package org.apache.archiva.repository.sc
* under the License.
*/
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.FileTypes;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.codehaus.plexus.util.DirectoryWalker;
import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import javax.inject.Inject;
/**
* DefaultRepositoryScanner
*
* @version $Id$
*/
-@Service("repositoryScanner#default")
+@Service( "repositoryScanner#default" )
public class DefaultRepositoryScanner
implements RepositoryScanner
{
@@ -58,17 +59,24 @@ public class DefaultRepositoryScanner
private Set<RepositoryScannerInstance> inProgressScans = new LinkedHashSet<RepositoryScannerInstance>();
- public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository, long changesSince )
+ public RepositoryScanStatistics scan( ManagedRepository repository, long changesSince )
throws RepositoryScannerException
{
- List<KnownRepositoryContentConsumer> knownContentConsumers = consumerUtil.getSelectedKnownConsumers();
- List<InvalidRepositoryContentConsumer> invalidContentConsumers = consumerUtil.getSelectedInvalidConsumers();
- List<String> ignoredPatterns = filetypes.getFileTypePatterns( FileTypes.IGNORED );
+ try
+ {
+ List<KnownRepositoryContentConsumer> knownContentConsumers = consumerUtil.getSelectedKnownConsumers();
+ List<InvalidRepositoryContentConsumer> invalidContentConsumers = consumerUtil.getSelectedInvalidConsumers();
+ List<String> ignoredPatterns = filetypes.getFileTypePatterns( FileTypes.IGNORED );
- return scan( repository, knownContentConsumers, invalidContentConsumers, ignoredPatterns, changesSince );
+ return scan( repository, knownContentConsumers, invalidContentConsumers, ignoredPatterns, changesSince );
+ }
+ catch ( RepositoryAdminException e )
+ {
+ throw new RepositoryScannerException( e.getMessage(), e );
+ }
}
- public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository,
+ public RepositoryScanStatistics scan( ManagedRepository repository,
List<KnownRepositoryContentConsumer> knownContentConsumers,
List<InvalidRepositoryContentConsumer> invalidContentConsumers,
List<String> ignoredContentPatterns, long changesSince )
@@ -85,14 +93,14 @@ public class DefaultRepositoryScanner
//create the repo if not existing to have an empty stats
if ( !repositoryBase.exists() && !repositoryBase.mkdirs() )
{
- throw new UnsupportedOperationException( "Unable to scan a repository, directory "
- + repositoryBase.getPath() + " does not exist." );
+ throw new UnsupportedOperationException(
+ "Unable to scan a repository, directory " + repositoryBase.getPath() + " does not exist." );
}
if ( !repositoryBase.isDirectory() )
{
- throw new UnsupportedOperationException( "Unable to scan a repository, path "
- + repositoryBase.getPath() + " is not a directory." );
+ throw new UnsupportedOperationException(
+ "Unable to scan a repository, path " + repositoryBase.getPath() + " is not a directory." );
}
// Setup Includes / Excludes.
@@ -117,8 +125,8 @@ public class DefaultRepositoryScanner
dirWalker.setExcludes( allExcludes );
// Setup the Scan Instance
- RepositoryScannerInstance scannerInstance = new RepositoryScannerInstance( repository, knownContentConsumers,
- invalidContentConsumers, changesSince );
+ RepositoryScannerInstance scannerInstance =
+ new RepositoryScannerInstance( repository, knownContentConsumers, invalidContentConsumers, changesSince );
inProgressScans.add( scannerInstance );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryContentConsumers.java Tue Sep 13 12:12:39 2011
@@ -19,6 +19,9 @@ package org.apache.archiva.repository.sc
* under the License.
*/
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.admin.ArchivaAdministration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure;
import org.apache.archiva.repository.scanner.functors.TriggerScanCompletedClosure;
@@ -26,16 +29,15 @@ import org.apache.commons.collections.Cl
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.functors.IfClosure;
import org.apache.maven.archiva.common.utils.BaseFile;
-import org.apache.maven.archiva.configuration.ArchivaConfiguration;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.maven.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Service;
+import javax.inject.Inject;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@@ -48,20 +50,24 @@ import java.util.Map;
*
* @version $Id$
*/
+@Service("repositoryContentConsumers")
public class RepositoryContentConsumers
implements ApplicationContextAware
{
+
+ @Inject
private ApplicationContext applicationContext;
- private ArchivaConfiguration archivaConfiguration;
+ private ArchivaAdministration archivaAdministration;
private List<KnownRepositoryContentConsumer> selectedKnownConsumers;
private List<InvalidRepositoryContentConsumer> selectedInvalidConsumers;
- public RepositoryContentConsumers( ArchivaConfiguration archivaConfiguration )
+ @Inject
+ public RepositoryContentConsumers( ArchivaAdministration archivaAdministration )
{
- this.archivaConfiguration = archivaConfiguration;
+ this.archivaAdministration = archivaAdministration;
}
public void setApplicationContext( ApplicationContext applicationContext )
@@ -84,9 +90,9 @@ public class RepositoryContentConsumers
* @return the list of consumer ids that have been selected by the configuration.
*/
public List<String> getSelectedKnownConsumerIds()
+ throws RepositoryAdminException
{
- RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
- return scanning.getKnownContentConsumers();
+ return archivaAdministration.getKnownContentConsumers();
}
/**
@@ -103,9 +109,9 @@ public class RepositoryContentConsumers
* @return the list of consumer ids that have been selected by the configuration.
*/
public List<String> getSelectedInvalidConsumerIds()
+ throws RepositoryAdminException
{
- RepositoryScanningConfiguration scanning = archivaConfiguration.getConfiguration().getRepositoryScanning();
- return scanning.getInvalidContentConsumers();
+ return archivaAdministration.getInvalidContentConsumers();
}
/**
@@ -115,6 +121,7 @@ public class RepositoryContentConsumers
* @return the map of String ids to {@link KnownRepositoryContentConsumer} objects.
*/
public Map<String, KnownRepositoryContentConsumer> getSelectedKnownConsumersMap()
+ throws RepositoryAdminException
{
Map<String, KnownRepositoryContentConsumer> consumerMap = new HashMap<String, KnownRepositoryContentConsumer>();
@@ -133,6 +140,7 @@ public class RepositoryContentConsumers
* @return the map of String ids to {@link InvalidRepositoryContentConsumer} objects.
*/
public Map<String, InvalidRepositoryContentConsumer> getSelectedInvalidConsumersMap()
+ throws RepositoryAdminException
{
Map<String, InvalidRepositoryContentConsumer> consumerMap =
new HashMap<String, InvalidRepositoryContentConsumer>();
@@ -153,6 +161,7 @@ public class RepositoryContentConsumers
* by the active configuration.
*/
public synchronized List<KnownRepositoryContentConsumer> getSelectedKnownConsumers()
+ throws RepositoryAdminException
{
if ( selectedKnownConsumers == null )
{
@@ -180,6 +189,7 @@ public class RepositoryContentConsumers
* by the active configuration.
*/
public synchronized List<InvalidRepositoryContentConsumer> getSelectedInvalidConsumers()
+ throws RepositoryAdminException
{
if ( selectedInvalidConsumers == null )
{
@@ -236,8 +246,8 @@ public class RepositoryContentConsumers
* @param localFile the local file to execute the consumers against.
* @param updateRelatedArtifacts TODO
*/
- public void executeConsumers( ManagedRepositoryConfiguration repository, File localFile,
- boolean updateRelatedArtifacts )
+ public void executeConsumers( ManagedRepository repository, File localFile, boolean updateRelatedArtifacts )
+ throws RepositoryAdminException
{
// Run the repository consumers
try
@@ -316,8 +326,8 @@ public class RepositoryContentConsumers
return new Date( System.currentTimeMillis() );
}
- public void setArchivaConfiguration( ArchivaConfiguration archivaConfiguration )
+ public void setArchivaAdministration( ArchivaAdministration archivaAdministration )
{
- this.archivaConfiguration = archivaConfiguration;
+ this.archivaAdministration = archivaAdministration;
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanStatistics.java Tue Sep 13 12:12:39 2011
@@ -23,6 +23,7 @@ import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Map;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.commons.collections.CollectionUtils;
import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
@@ -114,7 +115,7 @@ public class RepositoryScanStatistics
invalidConsumers = consumers;
}
- public String toDump( ManagedRepositoryConfiguration repo )
+ public String toDump( ManagedRepository repo )
{
StringBuffer buf = new StringBuffer();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScanner.java Tue Sep 13 12:12:39 2011
@@ -19,23 +19,22 @@ package org.apache.archiva.repository.sc
* under the License.
*/
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
+import java.util.List;
+import java.util.Set;
+
/**
- * RepositoryScanner
+ * RepositoryScanner
*
* @version $Id$
*/
public interface RepositoryScanner
{
/**
- * The value to pass to {@link #scan(ManagedRepositoryConfiguration, long)} to have the scan
+ * The value to pass to {@link #scan(ManagedRepository, long)} to have the scan
* operate in a fresh fashion, with no check on changes based on timestamp.
*/
public static final long FRESH_SCAN = 0;
@@ -44,68 +43,56 @@ public interface RepositoryScanner
* <p>
* Typical Ignorable Content patterns.
* </p>
- *
+ * <p/>
* <p><strong>
* NOTE: Do not use for normal webapp or task driven repository scanning.
* </strong></p>
- *
+ * <p/>
* <p>
* These patterns are only valid for archiva-cli and archiva-converter use.
* </p>
*/
- public static final String[] IGNORABLE_CONTENT = {
- "bin/**",
- "reports/**",
- ".index",
- ".reports/**",
- ".maven/**",
- "**/.svn/**",
- "**/*snapshot-version",
- "*/website/**",
- "*/licences/**",
- "**/.htaccess",
- "**/*.html",
- "**/*.txt",
- "**/README*",
- "**/CHANGELOG*",
- "**/KEYS*" };
+ public static final String[] IGNORABLE_CONTENT =
+ { "bin/**", "reports/**", ".index", ".reports/**", ".maven/**", "**/.svn/**", "**/*snapshot-version",
+ "*/website/**", "*/licences/**", "**/.htaccess", "**/*.html", "**/*.txt", "**/README*", "**/CHANGELOG*",
+ "**/KEYS*" };
/**
* Scan the repository for content changes.
- *
+ * <p/>
* Internally, this will use the as-configured known and invalid consumer lists.
- *
- * @param repository the repository to change.
+ *
+ * @param repository the repository to change.
* @param changesSince the timestamp to use as a threshold on what is considered new or changed.
* (To have all content be taken into consideration regardless of timestamp,
- * use the {@link #FRESH_SCAN} constant)
+ * use the {@link #FRESH_SCAN} constant)
* @return the statistics for this scan.
* @throws RepositoryScannerException if there was a fundamental problem with getting the discoverer started.
*/
- public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository, long changesSince )
+ RepositoryScanStatistics scan( ManagedRepository repository, long changesSince )
throws RepositoryScannerException;
/**
* Scan the repository for content changes.
- *
+ * <p/>
* Internally, this will use the as-configured known and invalid consumer lists.
- *
- * @param repository the repository to change.
- * @param knownContentConsumers the list of consumers that follow the {@link KnownRepositoryContentConsumer}
- * interface that should be used for this scan.
- * @param invalidContentConsumers the list of consumers that follow the {@link InvalidRepositoryContentConsumer}
- * interface that should be used for this scan.
- * @param ignoredContentPatterns list of patterns that should be ignored and not sent to any consumer.
- * @param changesSince the timestamp to use as a threshold on what is considered new or changed.
- * (To have all content be taken into consideration regardless of timestamp,
- * use the {@link #FRESH_SCAN} constant)
+ *
+ * @param repository the repository to change.
+ * @param knownContentConsumers the list of consumers that follow the {@link KnownRepositoryContentConsumer}
+ * interface that should be used for this scan.
+ * @param invalidContentConsumers the list of consumers that follow the {@link InvalidRepositoryContentConsumer}
+ * interface that should be used for this scan.
+ * @param ignoredContentPatterns list of patterns that should be ignored and not sent to any consumer.
+ * @param changesSince the timestamp to use as a threshold on what is considered new or changed.
+ * (To have all content be taken into consideration regardless of timestamp,
+ * use the {@link #FRESH_SCAN} constant)
* @return the statistics for this scan.
* @throws RepositoryScannerException if there was a fundamental problem with getting the discoverer started.
*/
- public RepositoryScanStatistics scan( ManagedRepositoryConfiguration repository,
- List<KnownRepositoryContentConsumer> knownContentConsumers,
- List<InvalidRepositoryContentConsumer> invalidContentConsumers,
- List<String> ignoredContentPatterns, long changesSince )
+ RepositoryScanStatistics scan( ManagedRepository repository,
+ List<KnownRepositoryContentConsumer> knownContentConsumers,
+ List<InvalidRepositoryContentConsumer> invalidContentConsumers,
+ List<String> ignoredContentPatterns, long changesSince )
throws RepositoryScannerException;
Set<RepositoryScannerInstance> getInProgressScans();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/RepositoryScannerInstance.java Tue Sep 13 12:12:39 2011
@@ -19,12 +19,7 @@ package org.apache.archiva.repository.sc
* under the License.
*/
-import java.io.File;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.archiva.repository.scanner.functors.ConsumerProcessFileClosure;
import org.apache.archiva.repository.scanner.functors.TriggerBeginScanClosure;
import org.apache.archiva.repository.scanner.functors.TriggerScanCompletedClosure;
@@ -33,13 +28,18 @@ import org.apache.commons.collections.Co
import org.apache.commons.collections.functors.IfClosure;
import org.apache.commons.lang.SystemUtils;
import org.apache.maven.archiva.common.utils.BaseFile;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.maven.archiva.consumers.functors.ConsumerWantsFilePredicate;
import org.codehaus.plexus.util.DirectoryWalkListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* RepositoryScannerInstance
*
@@ -60,7 +60,7 @@ public class RepositoryScannerInstance
*/
private List<InvalidRepositoryContentConsumer> invalidConsumers;
- private ManagedRepositoryConfiguration repository;
+ private ManagedRepository repository;
private RepositoryScanStatistics stats;
@@ -74,7 +74,7 @@ public class RepositoryScannerInstance
private Map<String, Long> consumerCounts;
- public RepositoryScannerInstance( ManagedRepositoryConfiguration repository,
+ public RepositoryScannerInstance( ManagedRepository repository,
List<KnownRepositoryContentConsumer> knownConsumerList,
List<InvalidRepositoryContentConsumer> invalidConsumerList )
{
@@ -106,7 +106,7 @@ public class RepositoryScannerInstance
}
}
- public RepositoryScannerInstance( ManagedRepositoryConfiguration repository,
+ public RepositoryScannerInstance( ManagedRepository repository,
List<KnownRepositoryContentConsumer> knownContentConsumers,
List<InvalidRepositoryContentConsumer> invalidContentConsumers, long changesSince )
{
@@ -187,7 +187,7 @@ public class RepositoryScannerInstance
log.debug( "Repository Scanner: {}", message );
}
- public ManagedRepositoryConfiguration getRepository()
+ public ManagedRepository getRepository()
{
return repository;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerBeginScanClosure.java Tue Sep 13 12:12:39 2011
@@ -19,15 +19,15 @@ package org.apache.archiva.repository.sc
* under the License.
*/
-import java.util.Date;
-
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.commons.collections.Closure;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.ConsumerException;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Date;
+
/**
* TriggerBeginScanClosure
*
@@ -38,24 +38,24 @@ public class TriggerBeginScanClosure
{
private Logger log = LoggerFactory.getLogger( TriggerBeginScanClosure.class );
- private ManagedRepositoryConfiguration repository;
+ private ManagedRepository repository;
private Date whenGathered;
private boolean executeOnEntireRepo = true;
- public TriggerBeginScanClosure( ManagedRepositoryConfiguration repository )
+ public TriggerBeginScanClosure( ManagedRepository repository )
{
this.repository = repository;
}
- public TriggerBeginScanClosure( ManagedRepositoryConfiguration repository, Date whenGathered )
+ public TriggerBeginScanClosure( ManagedRepository repository, Date whenGathered )
{
this( repository );
this.whenGathered = whenGathered;
}
- public TriggerBeginScanClosure( ManagedRepositoryConfiguration repository, Date whenGathered, boolean executeOnEntireRepo )
+ public TriggerBeginScanClosure( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
{
this( repository, whenGathered );
this.executeOnEntireRepo = executeOnEntireRepo;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/functors/TriggerScanCompletedClosure.java Tue Sep 13 12:12:39 2011
@@ -19,8 +19,8 @@ package org.apache.archiva.repository.sc
* under the License.
*/
+import org.apache.archiva.admin.model.managed.ManagedRepository;
import org.apache.commons.collections.Closure;
-import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.maven.archiva.consumers.RepositoryContentConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,16 +33,16 @@ public class TriggerScanCompletedClosure
{
private Logger log = LoggerFactory.getLogger( TriggerScanCompletedClosure.class );
- private final ManagedRepositoryConfiguration repository;
+ private final ManagedRepository repository;
private boolean executeOnEntireRepo = true;
- public TriggerScanCompletedClosure( ManagedRepositoryConfiguration repository )
+ public TriggerScanCompletedClosure( ManagedRepository repository )
{
this.repository = repository;
}
- public TriggerScanCompletedClosure( ManagedRepositoryConfiguration repository, boolean executeOnEntireRepo )
+ public TriggerScanCompletedClosure( ManagedRepository repository, boolean executeOnEntireRepo )
{
this( repository );
this.executeOnEntireRepo = executeOnEntireRepo;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml?rev=1170135&r1=1170134&r2=1170135&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/main/resources/META-INF/spring-context.xml Tue Sep 13 12:12:39 2011
@@ -31,9 +31,4 @@
<context:component-scan base-package="org.apache.archiva.repository.scanner"/>
<alias name="repositoryScanner#default" alias="repositoryScanner"/>
- <bean id="repositoryContentConsumers" class="org.apache.archiva.repository.scanner.RepositoryContentConsumers" scope="prototype">
- <constructor-arg>
- <ref bean="archivaConfiguration"/>
- </constructor-arg>
- </bean>
</beans>
Added: archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java?rev=1170135&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-scanner/src/test/java/org/apache/archiva/repository/scanner/ArchivaAdministrationStub.java Tue Sep 13 12:12:39 2011
@@ -0,0 +1,166 @@
+package org.apache.archiva.repository.scanner;
+/*
+ * 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.admin.model.AuditInformation;
+import org.apache.archiva.admin.model.RepositoryAdminException;
+import org.apache.archiva.admin.model.admin.ArchivaAdministration;
+import org.apache.archiva.admin.model.admin.FileType;
+import org.apache.archiva.admin.model.admin.LegacyArtifactPath;
+import org.apache.archiva.admin.model.admin.OrganisationInformation;
+import org.apache.maven.archiva.configuration.ArchivaConfiguration;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Olivier Lamy
+ */
+@Service
+public class ArchivaAdministrationStub
+ implements ArchivaAdministration
+{
+
+ private ArchivaConfiguration archivaConfiguration;
+
+ public ArchivaAdministrationStub()
+ {
+ // no op
+ }
+
+
+ public ArchivaAdministrationStub( ArchivaConfiguration archivaConfiguration )
+ {
+ this.archivaConfiguration = archivaConfiguration;
+ }
+
+ public List<LegacyArtifactPath> getLegacyArtifactPaths()
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public List<FileType> getFileTypes()
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public FileType getFileType( String fileTypeId )
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public void addFileType( FileType fileType, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void removeFileType( String fileTypeId, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public List<String> getKnownContentConsumers()
+ throws RepositoryAdminException
+ {
+ return archivaConfiguration.getConfiguration().getRepositoryScanning().getKnownContentConsumers();
+ }
+
+ public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public List<String> getInvalidContentConsumers()
+ throws RepositoryAdminException
+ {
+ return archivaConfiguration.getConfiguration().getRepositoryScanning().getInvalidContentConsumers();
+ }
+
+ public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+
+ public OrganisationInformation getOrganisationInformation()
+ throws RepositoryAdminException
+ {
+ return null;
+ }
+
+ public void setOrganisationInformation( OrganisationInformation organisationInformation )
+ throws RepositoryAdminException
+ {
+
+ }
+}