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 2015/10/01 09:42:17 UTC
[01/10] archiva git commit: add a new module with mock for test
Repository: archiva
Updated Branches:
refs/heads/master be86b55e5 -> 4ad5e63c6
add a new module with mock for test
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/e62d96a1
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/e62d96a1
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/e62d96a1
Branch: refs/heads/master
Commit: e62d96a1fa22bc477ef1e3cbfdc8404e07864cad
Parents: be86b55
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 14:51:45 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 14:51:45 2015 +1000
----------------------------------------------------------------------
.../archiva-base/archiva-mock/pom.xml | 55 ++++++++++++++++++
.../mock/MockRepositorySessionFactory.java | 61 ++++++++++++++++++++
.../main/resources/META-INF/spring-context.xml | 33 +++++++++++
.../archiva-repository-admin-default/pom.xml | 6 ++
.../mock/MockRepositorySessionFactory.java | 58 -------------------
archiva-modules/archiva-base/pom.xml | 1 +
pom.xml | 5 ++
7 files changed, 161 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/archiva-modules/archiva-base/archiva-mock/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-mock/pom.xml b/archiva-modules/archiva-base/archiva-mock/pom.xml
new file mode 100644
index 0000000..bbe2e8c
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-mock/pom.xml
@@ -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">
+ <parent>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-base</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>archiva-mock</artifactId>
+ <packaging>jar</packaging>
+ <name>Archiva Base :: Mocks</name>
+ <dependencies>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-repository-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
new file mode 100644
index 0000000..303d2e0
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
@@ -0,0 +1,61 @@
+package org.apache.archiva.mock;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import org.apache.archiva.metadata.repository.AbstractMetadataRepository;
+import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Olivier Lamy
+ */
+@Service( "repositorySessionFactory#mock" )
+public class MockRepositorySessionFactory
+ implements RepositorySessionFactory
+{
+ @Override
+ public RepositorySession createSession()
+ {
+ return new RepositorySession( null, null )
+ {
+ @Override
+ public void close()
+ {
+ return;
+ }
+
+ @Override
+ public void save()
+ {
+ // no op
+ }
+
+ @Override
+ public MetadataRepository getRepository()
+ {
+ return new AbstractMetadataRepository()
+ {
+ };
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/archiva-modules/archiva-base/archiva-mock/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-mock/src/main/resources/META-INF/spring-context.xml
new file mode 100644
index 0000000..2c9156d
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-mock/src/main/resources/META-INF/spring-context.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<!--
+ ~ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd" default-lazy-init="true">
+
+
+ <context:annotation-config />
+ <context:component-scan base-package="org.apache.archiva.mock"/>
+
+</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 9927f88..f91ed77 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -229,6 +229,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
deleted file mode 100644
index d26a704..0000000
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MockRepositorySessionFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.archiva.admin.mock;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.metadata.repository.AbstractMetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Olivier Lamy
- */
-@Service( "repositorySessionFactory#mock" )
-public class MockRepositorySessionFactory
- implements RepositorySessionFactory
-{
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( null, null )
- {
- @Override
- public void close()
- {
- return;
- }
-
- @Override
- public void save()
- {
- // no op
- }
-
- @Override
- public MetadataRepository getRepository()
- {
- return new AbstractMetadataRepository() {};
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/archiva-modules/archiva-base/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml
index cf2c25f..3a5da0d 100644
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -32,6 +32,7 @@
<modules>
<module>archiva-test-utils</module>
<module>archiva-common</module>
+ <module>archiva-mock</module>
<module>archiva-filelock</module>
<module>archiva-model</module>
<module>archiva-configuration</module>
http://git-wip-us.apache.org/repos/asf/archiva/blob/e62d96a1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d58f71..692b5fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -287,6 +287,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-filelock</artifactId>
<version>${project.version}</version>
</dependency>
[02/10] archiva git commit: use mock in consumer archetype
Posted by ol...@apache.org.
use mock in consumer archetype
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1127e2af
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1127e2af
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1127e2af
Branch: refs/heads/master
Commit: 1127e2afcef2b2a927d484c7f7277de7032d85ce
Parents: e62d96a
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 14:53:41 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 14:53:41 2015 +1000
----------------------------------------------------------------------
.../archetype-resources/src/test/resources/spring-context.xml | 3 +--
.../src/main/resourcesstatic/archetype-resources/pom.xml | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/1127e2af/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
index f17d5b4..8a12f3a 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
@@ -28,7 +28,6 @@
<mockito:mock id="mockManagedRepositoryAdmin" class="org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin" />
<mockito:mock id="mockRemoteRepositoryAdmin" class="org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin" />
- <mockito:mock id="mockRepositorySessionFactory" class="org.apache.archiva.metadata.repository.RepositorySessionFactory" />
- <alias alias="repositorySessionFactory#jcr" name="mockRepositorySessionFactory" />
+ <alias alias="repositorySessionFactory#jcr" name="repositorySessionFactory#mock" />
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/1127e2af/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
index 6c2c9b3..6acfc76 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resourcesstatic/archetype-resources/pom.xml
@@ -73,6 +73,12 @@
<version>${archiva.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <version>${archiva.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.redback.components.registry</groupId>
<artifactId>spring-registry-api</artifactId>
<version>${redback.registry.version}</version>
[06/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/be4c847d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/be4c847d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/be4c847d
Branch: refs/heads/master
Commit: be4c847d961cc65fdf95a85bbd8049bb879a44f2
Parents: 87ff9f5
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 15:50:35 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 15:50:35 2015 +1000
----------------------------------------------------------------------
.../archiva-scheduler-repository/pom.xml | 9 +++-
.../TestRepositorySessionFactory.java | 46 --------------------
...ositoryScanningTaskExecutorAbstractTest.java | 14 +++---
3 files changed, 13 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/be4c847d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index e305eb0..c501e3e 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -110,7 +110,12 @@
<artifactId>archiva-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
@@ -176,7 +181,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
- <archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
+ <archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/be4c847d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
deleted file mode 100644
index def73a1..0000000
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.apache.archiva.metadata.repository;
-
-import org.springframework.stereotype.Service;
-
-/*
-* 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.
-*/
-@Service("repositorySessionFactory#test")
-public class TestRepositorySessionFactory
- implements RepositorySessionFactory
-{
- private MetadataRepository repository;
-
- private MetadataResolver resolver;
-
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( repository, resolver );
- }
-
- public void setRepository( MetadataRepository repository )
- {
- this.repository = repository;
- }
-
- public void setResolver( MetadataResolver resolver )
- {
- this.resolver = resolver;
- }
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/be4c847d/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
index 554287c..1698f07 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
@@ -23,13 +23,15 @@ import junit.framework.TestCase;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.TestRepositorySessionFactory;
import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
+import org.apache.archiva.mock.MockRepositorySessionFactory;
import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.codehaus.plexus.util.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
+import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import javax.inject.Inject;
@@ -37,19 +39,15 @@ import javax.inject.Named;
import java.io.File;
import java.util.Calendar;
import java.util.List;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import static org.mockito.Mockito.mock;
-import org.springframework.test.annotation.DirtiesContext;
/**
* ArchivaRepositoryScanningTaskExecutorPhase1Test
- *
- *
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
-@DirtiesContext( classMode= DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
+@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
public abstract class ArchivaRepositoryScanningTaskExecutorAbstractTest
extends TestCase
{
@@ -70,8 +68,8 @@ public abstract class ArchivaRepositoryScanningTaskExecutorAbstractTest
protected TestConsumer testConsumer;
@Inject
- @Named( value = "repositorySessionFactory#test" )
- private TestRepositorySessionFactory factory;
+ @Named( value = "repositorySessionFactory#mock" )
+ private MockRepositorySessionFactory factory;
protected File repoDir;
[04/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/56f8b575
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/56f8b575
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/56f8b575
Branch: refs/heads/master
Commit: 56f8b575d44045d6be9960e8608946a05eaea98b
Parents: d13adfd
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 15:07:38 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 15:07:38 2015 +1000
----------------------------------------------------------------------
.../archiva-base/archiva-indexer/pom.xml | 5 ++
.../mock/MockRepositorySessionFactory.java | 58 --------------------
.../src/test/resources/spring-context.xml | 6 +-
3 files changed, 6 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/56f8b575/archiva-modules/archiva-base/archiva-indexer/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index f0ef811..cd4cbf1 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -109,6 +109,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-configuration</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/archiva/blob/56f8b575/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
deleted file mode 100644
index c816296..0000000
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/mock/MockRepositorySessionFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.archiva.indexer.search.mock;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.metadata.repository.AbstractMetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Olivier Lamy
- */
-@Service( "repositorySessionFactory#mock" )
-public class MockRepositorySessionFactory
- implements RepositorySessionFactory
-{
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( null, null )
- {
- @Override
- public void close()
- {
- return;
- }
-
- @Override
- public void save()
- {
- // no op
- }
-
- @Override
- public MetadataRepository getRepository()
- {
- return new AbstractMetadataRepository() {};
- }
- };
- }
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/56f8b575/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml
index 698a00e..df44656 100644
--- a/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/src/test/resources/spring-context.xml
@@ -21,17 +21,13 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:task="http://www.springframework.org/schema/task"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/task
- http://www.springframework.org/schema/task/spring-task-3.0.xsd"
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="false">
<context:annotation-config/>
- <context:component-scan base-package="org.apache.archiva.indexer.search.mock"/>
<bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler">
<property name="properties">
[09/10] archiva git commit: fix issue when using proxy
Posted by ol...@apache.org.
fix issue when using proxy
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4ce3140d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4ce3140d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4ce3140d
Branch: refs/heads/master
Commit: 4ce3140da9230710007669765f9579f0bd76cd82
Parents: da1216f
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 16:13:29 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 16:13:29 2015 +1000
----------------------------------------------------------------------
archiva-modules/archiva-base/archiva-proxy/pom.xml | 7 +++++++
.../org/apache/archiva/proxy/HttpProxyTransferTest.java | 9 +++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/4ce3140d/archiva-modules/archiva-base/archiva-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 83e0ce0..7abec48 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -204,6 +204,11 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -260,6 +265,8 @@
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
+ <http.proxyHost></http.proxyHost>
+ <http.proxyPort></http.proxyPort>
</systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/4ce3140d/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
index b96a261..f0ca4f5 100644
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
+++ b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/proxy/HttpProxyTransferTest.java
@@ -36,6 +36,7 @@ import org.apache.archiva.policies.PropagateErrorsOnUpdateDownloadPolicy;
import org.apache.archiva.policies.ReleasesPolicy;
import org.apache.archiva.policies.SnapshotsPolicy;
import org.apache.archiva.repository.ManagedRepositoryContent;
+import org.assertj.core.api.Assertions;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
@@ -199,8 +200,8 @@ public class HttpProxyTransferTest
public void testGetOverHttpProxy()
throws Exception
{
- assertNull( System.getProperty( "http.proxyHost" ) );
- assertNull( System.getProperty( "http.proxyPort" ) );
+ Assertions.assertThat( System.getProperty( "http.proxyHost" ) ).isEmpty();
+ Assertions.assertThat( System.getProperty( "http.proxyPort" ) ).isEmpty();
String path = "org/apache/maven/test/get-default-layout/1.0/get-default-layout-1.0.jar";
@@ -226,8 +227,8 @@ public class HttpProxyTransferTest
String actualContents = FileUtils.readFileToString( downloadedFile, Charset.defaultCharset() );
assertEquals( "Check file contents.", expectedContents, actualContents );
- assertNull( System.getProperty( "http.proxyHost" ) );
- assertNull( System.getProperty( "http.proxyPort" ) );
+ Assertions.assertThat( System.getProperty( "http.proxyHost" ) ).isEmpty();
+ Assertions.assertThat( System.getProperty( "http.proxyPort" ) ).isEmpty();
}
private void addConnector()
[03/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/d13adfd5
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/d13adfd5
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/d13adfd5
Branch: refs/heads/master
Commit: d13adfd5edba9875e18d1ebd55846f991da137bf
Parents: 1127e2a
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 15:02:46 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 15:02:46 2015 +1000
----------------------------------------------------------------------
.../archiva-scheduler-indexing/pom.xml | 6 ++
.../mock/MockRepositorySessionFactory.java | 58 --------------------
2 files changed, 6 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/d13adfd5/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index cc9c842..2c988df 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -119,6 +119,12 @@
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository</artifactId>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/archiva/blob/d13adfd5/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
deleted file mode 100644
index 693853a..0000000
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/java/org/apache/archiva/scheduler/indexing/mock/MockRepositorySessionFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.apache.archiva.scheduler.indexing.mock;
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import org.apache.archiva.metadata.repository.AbstractMetadataRepository;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.springframework.stereotype.Service;
-
-/**
- * @author Olivier Lamy
- */
-@Service( "repositorySessionFactory#mock" )
-public class MockRepositorySessionFactory
- implements RepositorySessionFactory
-{
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( null, null )
- {
- @Override
- public void close()
- {
- return;
- }
-
- @Override
- public void save()
- {
- // no op
- }
-
- @Override
- public MetadataRepository getRepository()
- {
- return new AbstractMetadataRepository() {};
- }
- };
- }
-}
[10/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4ad5e63c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4ad5e63c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4ad5e63c
Branch: refs/heads/master
Commit: 4ad5e63c6410661733068fd23472e76cd4bc929d
Parents: 4ce3140
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 16:21:14 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 16:21:14 2015 +1000
----------------------------------------------------------------------
.../mock/MockRepositorySessionFactory.java | 10 ++++-
.../archiva-web/archiva-webdav/pom.xml | 7 +++-
.../TestRepositorySessionFactory.java | 40 --------------------
3 files changed, 15 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/4ad5e63c/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
index 319942b..a1a27dc 100644
--- a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
+++ b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
@@ -21,6 +21,7 @@ package org.apache.archiva.mock;
import org.apache.archiva.metadata.repository.AbstractMetadataRepository;
import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.MetadataResolver;
import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.springframework.stereotype.Service;
@@ -36,15 +37,22 @@ public class MockRepositorySessionFactory
{
};
+ private MetadataResolver resolver;
+
public void setRepository( MetadataRepository repository )
{
this.repository = repository;
}
+ public void setResolver( MetadataResolver resolver )
+ {
+ this.resolver = resolver;
+ }
+
@Override
public RepositorySession createSession()
{
- return new RepositorySession( repository, null )
+ return new RepositorySession( repository, resolver )
{
@Override
public void close()
http://git-wip-us.apache.org/repos/asf/archiva/blob/4ad5e63c/archiva-modules/archiva-web/archiva-webdav/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 3568ca1..de1b5be 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -233,6 +233,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-common-test-resources</artifactId>
<scope>test</scope>
@@ -308,7 +313,7 @@
<archiva.user.configFileName>${project.build.testOutputDirectory}/repository-archiva.xml</archiva.user.configFileName>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
- <archiva.repositorySessionFactory.id>beer</archiva.repositorySessionFactory.id>
+ <archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
<forkMode>${webdav.forkMode}</forkMode>
</configuration>
http://git-wip-us.apache.org/repos/asf/archiva/blob/4ad5e63c/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
deleted file mode 100644
index d8df702..0000000
--- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.apache.archiva.metadata.repository;
-
-/*
- * 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.springframework.stereotype.Service;
-
-@Service("repositorySessionFactory#beer")
-public class TestRepositorySessionFactory
- implements RepositorySessionFactory
-{
- private MetadataResolver resolver;
-
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( new AbstractMetadataRepository() {}, resolver );
- }
-
- public void setResolver( MetadataResolver resolver )
- {
- this.resolver = resolver;
- }
-}
[08/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/da1216f7
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/da1216f7
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/da1216f7
Branch: refs/heads/master
Commit: da1216f7346d74c4b45c1b7f042a2fabb0251baa
Parents: 418042a
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 16:02:49 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 16:02:49 2015 +1000
----------------------------------------------------------------------
.../archiva-base/archiva-proxy/pom.xml | 7 +++-
.../TestRepositorySessionFactory.java | 43 --------------------
2 files changed, 6 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/da1216f7/archiva-modules/archiva-base/archiva-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 09ab294..83e0ce0 100644
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -176,6 +176,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva.redback</groupId>
<artifactId>redback-rbac-cached</artifactId>
<scope>test</scope>
@@ -254,7 +259,7 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
- <archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
+ <archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/da1216f7/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
deleted file mode 100644
index 5d2e820..0000000
--- a/archiva-modules/archiva-base/archiva-proxy/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.archiva.metadata.repository;
-
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Configurable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Startable;
-import org.springframework.stereotype.Service;
-
-/*
-* 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.
-*/
-@Service("repositorySessionFactory#test")
-public class TestRepositorySessionFactory
- implements RepositorySessionFactory
-{
- private MetadataResolver resolver;
-
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( new AbstractMetadataRepository() {}, resolver );
- }
-
- public void setResolver( MetadataResolver resolver )
- {
- Configurable configurable;
- Startable startable;
- this.resolver = resolver;
- }
-}
[05/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/87ff9f5d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/87ff9f5d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/87ff9f5d
Branch: refs/heads/master
Commit: 87ff9f5d3dc1ca0b921764a9412dcbdc8776f466
Parents: 56f8b57
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 15:39:41 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 15:39:41 2015 +1000
----------------------------------------------------------------------
.../archiva-core-consumers/pom.xml | 7 ++-
.../repository/RepositoryPurgeConsumerTest.java | 4 +-
.../TestRepositorySessionFactory.java | 53 --------------------
.../mock/MockRepositorySessionFactory.java | 15 ++++--
.../RepositorySessionFactoryBean.java | 6 +--
5 files changed, 22 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/87ff9f5d/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index 8c12f3f..44ac0a5 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -150,6 +150,11 @@
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<pluginManagement>
@@ -165,7 +170,7 @@
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
<archiva.user.configFileName>${project.build.directory}/archiva.xml</archiva.user.configFileName>
- <archiva.repositorySessionFactory.id>test</archiva.repositorySessionFactory.id>
+ <archiva.repositorySessionFactory.id>mock</archiva.repositorySessionFactory.id>
</systemPropertyVariables>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/87ff9f5d/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
index 30f4df9..74e4631 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumerTest.java
@@ -30,7 +30,7 @@ import org.apache.archiva.configuration.FileType;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.consumers.functors.ConsumerWantsFilePredicate;
-import org.apache.archiva.metadata.repository.TestRepositorySessionFactory;
+import org.apache.archiva.mock.MockRepositorySessionFactory;
import org.apache.commons.io.FileUtils;
import org.custommonkey.xmlunit.XMLAssert;
import org.junit.After;
@@ -58,7 +58,7 @@ public class RepositoryPurgeConsumerTest
{
super.setUp();
- TestRepositorySessionFactory factory = applicationContext.getBean( TestRepositorySessionFactory.class );
+ MockRepositorySessionFactory factory = applicationContext.getBean( MockRepositorySessionFactory.class );
factory.setRepository( metadataRepository );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/87ff9f5d/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
deleted file mode 100644
index 95abe0f..0000000
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.apache.archiva.metadata.repository;
-
-import org.springframework.stereotype.Service;
-
-/*
-* 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.
-*/
-@Service( "repositorySessionFactory#test" )
-public class TestRepositorySessionFactory
- implements RepositorySessionFactory
-{
- private MetadataRepository repository = new AbstractMetadataRepository() {};
-
- private MetadataResolver resolver;
-
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( repository, resolver )
- {
- @Override
- public void close()
- {
- return;
- }
- };
- }
-
- public void setRepository( MetadataRepository repository )
- {
- this.repository = repository;
- }
-
- public void setResolver( MetadataResolver resolver )
- {
- this.resolver = resolver;
- }
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/87ff9f5d/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
index 303d2e0..319942b 100644
--- a/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
+++ b/archiva-modules/archiva-base/archiva-mock/src/main/java/org/apache/archiva/mock/MockRepositorySessionFactory.java
@@ -32,10 +32,19 @@ import org.springframework.stereotype.Service;
public class MockRepositorySessionFactory
implements RepositorySessionFactory
{
+ private MetadataRepository repository = new AbstractMetadataRepository()
+ {
+ };
+
+ public void setRepository( MetadataRepository repository )
+ {
+ this.repository = repository;
+ }
+
@Override
public RepositorySession createSession()
{
- return new RepositorySession( null, null )
+ return new RepositorySession( repository, null )
{
@Override
public void close()
@@ -52,9 +61,7 @@ public class MockRepositorySessionFactory
@Override
public MetadataRepository getRepository()
{
- return new AbstractMetadataRepository()
- {
- };
+ return repository;
}
};
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/87ff9f5d/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
----------------------------------------------------------------------
diff --git a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
index 5a5c485..3312a3c 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/main/java/org/apache/archiva/metadata/repository/RepositorySessionFactoryBean.java
@@ -22,7 +22,6 @@ package org.apache.archiva.metadata.repository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.stereotype.Service;
import java.util.Properties;
@@ -30,7 +29,6 @@ import java.util.Properties;
* @author Olivier Lamy
* @since 2.0.2
*/
-//@Service("repositorySessionFactoryBean#default")
public class RepositorySessionFactoryBean
extends AbstractFactoryBean<RepositorySessionFactory>
{
@@ -67,7 +65,9 @@ public class RepositorySessionFactoryBean
{
RepositorySessionFactory repositorySessionFactory =
getBeanFactory().getBean( "repositorySessionFactory#" + id, RepositorySessionFactory.class );
- logger.info( "create RepositorySessionFactory instance of {}", repositorySessionFactory.getClass().getName() );
+ logger.info( "create RepositorySessionFactory with id {} instance of {}", //
+ id, //
+ repositorySessionFactory.getClass().getName() );
return repositorySessionFactory;
}
[07/10] archiva git commit: more usage of MockRepositorySessionFactory
Posted by ol...@apache.org.
more usage of MockRepositorySessionFactory
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/418042ac
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/418042ac
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/418042ac
Branch: refs/heads/master
Commit: 418042acabded2a1c6698793068d3a976e7dc5ac
Parents: be4c847
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Oct 1 15:53:41 2015 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Oct 1 15:53:41 2015 +1000
----------------------------------------------------------------------
.../plugins/maven2-repository/pom.xml | 5 +++
.../TestRepositorySessionFactory.java | 41 --------------------
2 files changed, 5 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/418042ac/archiva-modules/plugins/maven2-repository/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index 0905f64..81e84fc 100644
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -163,6 +163,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/archiva/blob/418042ac/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
deleted file mode 100644
index ff15625..0000000
--- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/TestRepositorySessionFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.apache.archiva.metadata.repository;
-
-import org.springframework.stereotype.Service;
-
-/*
-* 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.
-*/
-@Service
-public class TestRepositorySessionFactory
- implements RepositorySessionFactory
-{
- private MetadataRepository metadataRepository = new AbstractMetadataRepository() {};
-
- private MetadataResolver resolver = new TestMetadataResolver();
-
- @Override
- public RepositorySession createSession()
- {
- return new RepositorySession( metadataRepository, resolver );
- }
-
- public void setMetadataRepository( MetadataRepository metadataRepository )
- {
- this.metadataRepository = metadataRepository;
- }
-}