diff options
author | Olivier Lamy <olamy@apache.org> | 2012-09-13 11:34:33 +0000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2012-09-13 11:34:33 +0000 |
commit | 8d6a0c0a714ddc61ce5a3121a1ccbb8149c5b17c (patch) | |
tree | 937679d79e081d9bdb3acae52fed440bcaf37752 | |
parent | 67ff1763005f256ccd47177f5d284d9ea4c940d9 (diff) | |
download | archiva-8d6a0c0a714ddc61ce5a3121a1ccbb8149c5b17c.tar.gz archiva-8d6a0c0a714ddc61ce5a3121a1ccbb8149c5b17c.zip |
better place for those tests which are not specific to the ui implementation (not sure we will change soon again but that's better :-))
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384280 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/pom.xml | 84 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/AbstractDownloadTest.java (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/AbstractDownloadTest.java) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/DownloadArtifactsTest.java) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/junit-4.9.jar | bin | 0 -> 248994 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar) | bin | 2518 -> 2518 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar) | bin | 2518 -> 2518 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar) | bin | 2518 -> 2518 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar) | bin | 2471 -> 2471 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar) | bin | 2494 -> 2494 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war) | bin | 4169 -> 4169 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar) | bin | 168279 -> 168279 bytes | |||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/repository.xml | 49 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/resources/META-INF/spring-context.xml | 87 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/spring-context-artifacts-download.xml) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml (renamed from archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/spring-context-merge-index-download.xml) | 0 | ||||
-rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-js/pom.xml | 18 |
23 files changed, 220 insertions, 18 deletions
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml index ac2288a69..c6d269acd 100644 --- a/archiva-modules/archiva-web/archiva-web-common/pom.xml +++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml @@ -172,6 +172,77 @@ <artifactId>wagon-http-lightweight</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-plus</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-compress</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rest-services</artifactId> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.archiva.redback</groupId> + <artifactId>redback-rest-services</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-rest-services</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-webdav</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>archiva-repository-admin-default</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.archiva</groupId> + <artifactId>metadata-store-jcr</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.jackrabbit</groupId> + <artifactId>jackrabbit-core</artifactId> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> <build> @@ -184,6 +255,19 @@ <filtering>true</filtering> </resource> </resources> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <configuration> + <excludes> + <exclude>src/test/repositories/test-repo/**</exclude> + </excludes> + </configuration> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.felix</groupId> diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/AbstractDownloadTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/AbstractDownloadTest.java index fdf51e81b..fdf51e81b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/AbstractDownloadTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/AbstractDownloadTest.java diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/DownloadArtifactsTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java index ff1c7322e..ff1c7322e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/DownloadArtifactsTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadArtifactsTest.java diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java index 118ff0dc8..118ff0dc8 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/java/org/apache/archiva/DownloadMergedIndexTest.java diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/junit-4.9.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/junit-4.9.jar Binary files differnew file mode 100644 index 000000000..142081561 --- /dev/null +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/junit-4.9.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar Binary files differindex 9c16c3ced..9c16c3ced 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-patch1.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar Binary files differindex 9c16c3ced..9c16c3ced 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0-sources.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar Binary files differindex 9c16c3ced..9c16c3ced 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom index b0d983fde..b0d983fde 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-search/1.0/archiva-search-1.0.pom diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar Binary files differindex 843ee45bc..843ee45bc 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom index 0b037a3a5..0b037a3a5 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/1.0/archiva-test-1.0.pom diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar Binary files differindex e904a17c4..e904a17c4 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom index 04fdb4859..04fdb4859 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-test/2.0/archiva-test-2.0.pom diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom index ca28dc132..ca28dc132 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.pom diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war index e69de29bb..e69de29bb 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/archiva-webapp/1.0/archiva-webapp-1.0.war diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war Binary files differindex 5559103fd..5559103fd 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/archiva/test-webapp/1.0-SNAPSHOT/test-webapp-1.0-SNAPSHOT.war diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar Binary files differindex 218330e3f..218330e3f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.jar diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom index 19831eefa..19831eefa 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repositories/test-repo/org/apache/felix/org.apache.felix.bundlerepository/1.6.6/org.apache.felix.bundlerepository-1.6.6.pom diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/repository.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/repository.xml new file mode 100644 index 000000000..0be86ebbd --- /dev/null +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/repository.xml @@ -0,0 +1,49 @@ +<!-- + ~ 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. + --> + +<!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.6//EN" + "http://jackrabbit.apache.org/dtd/repository-1.6.dtd"> + +<Repository> + <FileSystem class="org.apache.jackrabbit.core.fs.mem.MemoryFileSystem"/> + <!--<FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem"> + <param name="path" value="${rep.home}/repository"/> +</FileSystem> --> + <Security appName="Jackrabbit"> + <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security"/> + <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/> + <LoginModule class="org.apache.jackrabbit.core.security.simple.SimpleLoginModule"/> + </Security> + <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/> + <Workspace name="${wsp.name}"> + <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem"> + <param name="path" value="${wsp.home}"/> + </FileSystem> + <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/> + <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex"> + <param name="path" value="${wsp.home}/index"/> + </SearchIndex> + </Workspace> + <Versioning rootPath="${rep.home}/version"> + <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem"> + <param name="path" value="${rep.home}/version"/> + </FileSystem> + <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.BundleFsPersistenceManager"/> + </Versioning> +</Repository> diff --git a/archiva-modules/archiva-web/archiva-web-common/src/test/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/META-INF/spring-context.xml new file mode 100644 index 000000000..4478e93dc --- /dev/null +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/META-INF/spring-context.xml @@ -0,0 +1,87 @@ +<?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" + xmlns:jaxrs="http://cxf.apache.org/jaxrs" + 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://cxf.apache.org/jaxrs + http://cxf.apache.org/schemas/jaxrs.xsd" default-lazy-init="true"> + + <context:annotation-config/> + <context:component-scan + base-package="org.apache.archiva.rest.services.utils"/> + + <bean name="scheduler" class="org.apache.archiva.redback.components.scheduler.DefaultScheduler"> + <property name="properties"> + <props> + <prop key="org.quartz.scheduler.instanceName">scheduler1</prop> + <prop key="org.quartz.threadPool.class">org.quartz.simpl.SimpleThreadPool</prop> + <prop key="org.quartz.threadPool.threadCount">2</prop> + <prop key="org.quartz.threadPool.threadPriority">4</prop> + <prop key="org.quartz.jobStore.class">org.quartz.simpl.RAMJobStore</prop> + </props> + </property> + </bean> + + <!-- wire up more basic configuration so it doesn't overwrite any config files --> + <bean name="archivaConfiguration#default" class="org.apache.archiva.configuration.DefaultArchivaConfiguration"> + <property name="registry" ref="registry#default"/> + </bean> + + <alias name="archivaConfiguration#default" alias="archivaConfiguration"/> + + <bean name="registry#default" class="org.apache.archiva.redback.components.registry.commons.CommonsConfigurationRegistry"> + <property name="properties"> + <value> + <![CDATA[ + <configuration> + <system/> + <xml fileName="${appserver.base}/conf/archiva.xml" config-forceCreate="true" + config-optional="true" + config-name="org.apache.archiva.base" config-at="org.apache.archiva"/> + </configuration> + ]]> + </value> + </property> + </bean> + + <bean name="taskQueueExecutor#repository-scanning" + class="org.apache.archiva.redback.components.taskqueue.execution.ThreadedTaskQueueExecutor" lazy-init="false"> + <property name="name" value="repository-scanning"/> + <property name="executor" ref="taskExecutor#repository-scanning"/> + <property name="queue" ref="taskQueue#repository-scanning"/> + </bean> + + <bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown"> + <constructor-arg ref="config"/> + </bean> + <bean id="config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create"> + <constructor-arg value="${basedir}/src/test/repository.xml"/> + <constructor-arg value="${appserver.base}/jcr"/> + </bean> + + <alias name="repositorySessionFactory#jcr" alias="repositorySessionFactory"/> + +</beans>
\ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/spring-context-artifacts-download.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml index 2ade48455..2ade48455 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/spring-context-artifacts-download.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-artifacts-download.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/spring-context-merge-index-download.xml b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml index 16b37542d..16b37542d 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/test/resources/spring-context-merge-index-download.xml +++ b/archiva-modules/archiva-web/archiva-web-common/src/test/resources/spring-context-merge-index-download.xml diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml index 23d091491..84ed45085 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml @@ -797,24 +797,6 @@ </exclusions> </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-plus</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-web-common</artifactId> - <classifier>tests</classifier> - <scope>test</scope> - <version>${project.version}</version> - </dependency> </dependencies> |