From f260414f76029b20ff79b4ea1b62a1d63772ddc5 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 5 Oct 2011 10:23:09 +0000 Subject: [PATCH] [MRM-1327] implement alternative or improve repository metadata storage: jcr is now default storage mode. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1179142 13f79535-47bb-0310-9956-ffa450edef68 --- .../archiva-repository-admin-default/pom.xml | 15 ++- .../src/test/repository.xml | 51 +++++++++ .../src/test/resources/spring-context.xml | 8 ++ .../archiva-scheduler-indexing/pom.xml | 15 ++- .../src/test/repository.xml | 49 ++++++++ .../src/test/resources/spring-context.xml | 8 ++ .../archiva-rest-services/pom.xml | 14 ++- .../src/test/repository.xml | 49 ++++++++ .../META-INF/spring-context-test.xml | 9 ++ .../archiva-web/archiva-webapp/pom.xml | 27 ++++- .../src/appserver-base/conf/repository.xml | 49 ++++++++ .../resources/META-INF/spring-context.xml | 8 ++ .../web/action/AbstractActionTestCase.java | 105 ++++++++++-------- .../archiva/web/rss/RssFeedServletTest.java | 7 ++ .../web/rss/ShutdowJackrabbitServlet.java | 46 ++++++++ .../spring-context-DependencyTreeTest.xml | 5 + .../spring-context-artifacts-download.xml | 4 + .../resources/spring-context-rss-servlet.xml | 5 + .../src/test/resources/spring-context.xml | 6 + .../webapp/WEB-INF/feedServletTest-web.xml | 14 ++- .../plugins/stage-repository-merge/pom.xml | 2 +- 21 files changed, 441 insertions(+), 55 deletions(-) create mode 100644 archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/repository.xml create mode 100644 archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/repository.xml create mode 100644 archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repository.xml create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml create mode 100644 archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/ShutdowJackrabbitServlet.java 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 2c114c196..a48d3fe67 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 @@ -196,10 +196,22 @@ org.apache.archiva - metadata-store-file + metadata-store-jcr test + + org.apache.jackrabbit + jackrabbit-core + test + + + commons-logging + commons-logging + + + + @@ -209,6 +221,7 @@ maven-surefire-plugin + ${basedir} ${project.build.directory}/appserver-base ${project.build.directory}/appserver-base ${project.build.directory}/appserver-base diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/repository.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/repository.xml new file mode 100644 index 000000000..625570e92 --- /dev/null +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/repository.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml index 6eebfe03f..a7401b046 100644 --- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/resources/spring-context.xml @@ -56,4 +56,12 @@ + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml index 400bfdee4..2ef9af764 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml @@ -104,10 +104,22 @@ org.apache.archiva - metadata-store-file + metadata-store-jcr test + + org.apache.jackrabbit + jackrabbit-core + test + + + commons-logging + commons-logging + + + + org.codehaus.redback redback-rbac-cached @@ -151,6 +163,7 @@ ${project.build.directory}/appserver-base ${project.build.directory}/appserver-base ${project.build.directory}/appserver-base + ${basedir} diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/repository.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/repository.xml new file mode 100644 index 000000000..0be86ebbd --- /dev/null +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/repository.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml index 57165c11b..7bb21cd65 100644 --- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/test/resources/spring-context.xml @@ -58,5 +58,13 @@ + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml index 9bb9fcba5..90f06a75b 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml @@ -226,10 +226,22 @@ org.apache.archiva - metadata-store-file + metadata-store-jcr test + + org.apache.jackrabbit + jackrabbit-core + test + + + commons-logging + commons-logging + + + + org.apache.archiva archiva-repository-admin-default diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repository.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repository.xml new file mode 100644 index 000000000..0be86ebbd --- /dev/null +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/repository.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml index fe0be3d31..c96d355c2 100644 --- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml +++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/test/resources/META-INF/spring-context-test.xml @@ -62,4 +62,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 1ff34b4f6..bb1650e85 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -459,9 +459,20 @@ org.apache.archiva - metadata-store-file + metadata-store-jcr runtime + + org.apache.jackrabbit + jackrabbit-core + runtime + + + commons-logging + commons-logging + + + org.apache.velocity velocity-tools @@ -554,6 +565,7 @@ ${archiva.baseRestUrl} ${rest.admin.pwd} ${basedir}/target/archiva.xml + ${basedir} @@ -904,8 +916,19 @@ org.apache.archiva - metadata-store-file + metadata-store-jcr + compile + + + org.apache.jackrabbit + jackrabbit-core compile + + + commons-logging + commons-logging + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml b/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml new file mode 100644 index 000000000..0be86ebbd --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml index acce3d04e..034abf343 100755 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml @@ -35,4 +35,12 @@ + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java index ce330cb26..136be1905 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/action/AbstractActionTestCase.java @@ -33,10 +33,11 @@ import org.apache.archiva.metadata.model.License; import org.apache.archiva.metadata.model.Organization; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.Scm; -import org.apache.archiva.webtest.memory.TestMetadataResolver; import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectFacet; import org.apache.archiva.metadata.repository.storage.maven2.MavenProjectParent; import org.apache.archiva.security.UserRepositoriesStub; +import org.apache.archiva.webtest.memory.TestMetadataResolver; +import org.apache.jackrabbit.api.JackrabbitRepository; import org.apache.struts2.StrutsSpringTestCase; import java.util.HashMap; @@ -99,7 +100,7 @@ public abstract class AbstractActionTestCase protected static final String TEST_GENERIC_METADATA_PROPERTY_VALUE = "5 stars"; @Override - protected String[] getContextLocations() + protected String[] getContextLocations( ) { return new String[]{ "classpath*:/META-INF/spring-context.xml", "classpath*:/spring-context.xml" }; } @@ -117,34 +118,34 @@ public abstract class AbstractActionTestCase protected void assertDefaultModel( ProjectVersionMetadata model, String groupId, String artifactId, String version ) { - assertEquals( version, model.getVersion() ); - assertEquals( TEST_URL, model.getUrl() ); - assertEquals( TEST_NAME, model.getName() ); - assertEquals( TEST_DESCRIPTION, model.getDescription() ); - assertEquals( TEST_ORGANIZATION_NAME, model.getOrganization().getName() ); - assertEquals( TEST_ORGANIZATION_URL, model.getOrganization().getUrl() ); - assertEquals( 2, model.getLicenses().size() ); - License l = model.getLicenses().get( 0 ); - assertEquals( TEST_LICENSE_NAME, l.getName() ); - assertEquals( TEST_LICENSE_URL, l.getUrl() ); - l = model.getLicenses().get( 1 ); - assertEquals( TEST_LICENSE_NAME_2, l.getName() ); - assertEquals( TEST_LICENSE_URL_2, l.getUrl() ); - assertEquals( TEST_ISSUE_SYSTEM, model.getIssueManagement().getSystem() ); - assertEquals( TEST_ISSUE_URL, model.getIssueManagement().getUrl() ); - assertEquals( TEST_CI_SYSTEM, model.getCiManagement().getSystem() ); - assertEquals( TEST_CI_URL, model.getCiManagement().getUrl() ); - assertEquals( TEST_SCM_CONNECTION, model.getScm().getConnection() ); - assertEquals( TEST_SCM_DEV_CONNECTION, model.getScm().getDeveloperConnection() ); - assertEquals( TEST_SCM_URL, model.getScm().getUrl() ); + assertEquals( version, model.getVersion( ) ); + assertEquals( TEST_URL, model.getUrl( ) ); + assertEquals( TEST_NAME, model.getName( ) ); + assertEquals( TEST_DESCRIPTION, model.getDescription( ) ); + assertEquals( TEST_ORGANIZATION_NAME, model.getOrganization( ).getName( ) ); + assertEquals( TEST_ORGANIZATION_URL, model.getOrganization( ).getUrl( ) ); + assertEquals( 2, model.getLicenses( ).size( ) ); + License l = model.getLicenses( ).get( 0 ); + assertEquals( TEST_LICENSE_NAME, l.getName( ) ); + assertEquals( TEST_LICENSE_URL, l.getUrl( ) ); + l = model.getLicenses( ).get( 1 ); + assertEquals( TEST_LICENSE_NAME_2, l.getName( ) ); + assertEquals( TEST_LICENSE_URL_2, l.getUrl( ) ); + assertEquals( TEST_ISSUE_SYSTEM, model.getIssueManagement( ).getSystem( ) ); + assertEquals( TEST_ISSUE_URL, model.getIssueManagement( ).getUrl( ) ); + assertEquals( TEST_CI_SYSTEM, model.getCiManagement( ).getSystem( ) ); + assertEquals( TEST_CI_URL, model.getCiManagement( ).getUrl( ) ); + assertEquals( TEST_SCM_CONNECTION, model.getScm( ).getConnection( ) ); + assertEquals( TEST_SCM_DEV_CONNECTION, model.getScm( ).getDeveloperConnection( ) ); + assertEquals( TEST_SCM_URL, model.getScm( ).getUrl( ) ); MavenProjectFacet mavenFacet = (MavenProjectFacet) model.getFacet( MavenProjectFacet.FACET_ID ); - assertEquals( groupId, mavenFacet.getGroupId() ); - assertEquals( artifactId, mavenFacet.getArtifactId() ); - assertEquals( TEST_PACKAGING, mavenFacet.getPackaging() ); - assertEquals( TEST_PARENT_GROUP_ID, mavenFacet.getParent().getGroupId() ); - assertEquals( TEST_PARENT_ARTIFACT_ID, mavenFacet.getParent().getArtifactId() ); - assertEquals( TEST_PARENT_VERSION, mavenFacet.getParent().getVersion() ); + assertEquals( groupId, mavenFacet.getGroupId( ) ); + assertEquals( artifactId, mavenFacet.getArtifactId( ) ); + assertEquals( TEST_PACKAGING, mavenFacet.getPackaging( ) ); + assertEquals( TEST_PARENT_GROUP_ID, mavenFacet.getParent( ).getGroupId( ) ); + assertEquals( TEST_PARENT_ARTIFACT_ID, mavenFacet.getParent( ).getArtifactId( ) ); + assertEquals( TEST_PARENT_VERSION, mavenFacet.getParent( ).getVersion( ) ); } protected ProjectVersionMetadata createProjectModel( String version ) @@ -154,50 +155,50 @@ public abstract class AbstractActionTestCase protected ProjectVersionMetadata createProjectModel( String groupId, String artifactId, String version ) { - ProjectVersionMetadata model = new ProjectVersionMetadata(); + ProjectVersionMetadata model = new ProjectVersionMetadata( ); model.setId( version ); model.setUrl( TEST_URL ); model.setName( TEST_NAME ); model.setDescription( TEST_DESCRIPTION ); - CiManagement ci = new CiManagement(); + CiManagement ci = new CiManagement( ); ci.setSystem( TEST_CI_SYSTEM ); ci.setUrl( TEST_CI_URL ); model.setCiManagement( ci ); - IssueManagement issue = new IssueManagement(); + IssueManagement issue = new IssueManagement( ); issue.setSystem( TEST_ISSUE_SYSTEM ); issue.setUrl( TEST_ISSUE_URL ); model.setIssueManagement( issue ); - Organization organization = new Organization(); + Organization organization = new Organization( ); organization.setName( TEST_ORGANIZATION_NAME ); organization.setUrl( TEST_ORGANIZATION_URL ); model.setOrganization( organization ); - License l = new License(); + License l = new License( ); l.setName( TEST_LICENSE_NAME ); l.setUrl( TEST_LICENSE_URL ); model.addLicense( l ); - l = new License(); + l = new License( ); l.setName( TEST_LICENSE_NAME_2 ); l.setUrl( TEST_LICENSE_URL_2 ); model.addLicense( l ); - Scm scm = new Scm(); + Scm scm = new Scm( ); scm.setConnection( TEST_SCM_CONNECTION ); scm.setDeveloperConnection( TEST_SCM_DEV_CONNECTION ); scm.setUrl( TEST_SCM_URL ); model.setScm( scm ); - MavenProjectFacet mavenProjectFacet = new MavenProjectFacet(); + MavenProjectFacet mavenProjectFacet = new MavenProjectFacet( ); mavenProjectFacet.setGroupId( groupId ); mavenProjectFacet.setArtifactId( artifactId ); mavenProjectFacet.setPackaging( TEST_PACKAGING ); - MavenProjectParent parent = new MavenProjectParent(); + MavenProjectParent parent = new MavenProjectParent( ); parent.setGroupId( TEST_PARENT_GROUP_ID ); parent.setArtifactId( TEST_PARENT_ARTIFACT_ID ); parent.setVersion( TEST_PARENT_VERSION ); mavenProjectFacet.setParent( parent ); model.addFacet( mavenProjectFacet ); - GenericMetadataFacet genericMetadataFacet = new GenericMetadataFacet(); - Map props = new HashMap(); + GenericMetadataFacet genericMetadataFacet = new GenericMetadataFacet( ); + Map props = new HashMap( ); props.put( TEST_GENERIC_METADATA_PROPERTY_NAME, TEST_GENERIC_METADATA_PROPERTY_VALUE ); genericMetadataFacet.setAdditionalProperties( props ); model.addFacet( genericMetadataFacet ); @@ -206,18 +207,26 @@ public abstract class AbstractActionTestCase } @Override - protected void setUp() + protected void setUp( ) throws Exception { - super.setUp(); + super.setUp( ); - ConfigurationManager configurationManager = new ConfigurationManager(); - configurationManager.addContainerProvider( new XWorkConfigurationProvider() ); - Configuration config = configurationManager.getConfiguration(); - Container container = config.getContainer(); + ConfigurationManager configurationManager = new ConfigurationManager( ); + configurationManager.addContainerProvider( new XWorkConfigurationProvider( ) ); + Configuration config = configurationManager.getConfiguration( ); + Container container = config.getContainer( ); + + ValueStack stack = container.getInstance( ValueStackFactory.class ).createValueStack( ); + stack.getContext( ).put( ActionContext.CONTAINER, container ); + ActionContext.setContext( new ActionContext( stack.getContext( ) ) ); + } - ValueStack stack = container.getInstance( ValueStackFactory.class ).createValueStack(); - stack.getContext().put( ActionContext.CONTAINER, container ); - ActionContext.setContext( new ActionContext( stack.getContext() ) ); + @Override + protected void tearDown( ) + throws Exception + { + super.tearDown( ); + applicationContext.getBean( JackrabbitRepository.class ).shutdown( ); } } diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java index d44687168..d4058f8f4 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java @@ -28,6 +28,8 @@ import com.meterware.servletunit.ServletUnitClient; import junit.framework.TestCase; import org.apache.commons.codec.Encoder; import org.apache.commons.codec.binary.Base64; +import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.jackrabbit.core.util.RepositoryLock; import java.io.File; @@ -67,9 +69,11 @@ public class RssFeedServletTest public void testRetrieveServlet() throws Exception { + RssFeedServlet servlet = (RssFeedServlet) client.newInvocation( "http://localhost/feeds/test-repo" ).getServlet(); assertNotNull( servlet ); + //client.newInvocation( "http://localhost/shutdown/foo" ); } public void testRequestNewArtifactsInRepo() @@ -90,6 +94,8 @@ public class RssFeedServletTest assertEquals( RssFeedServlet.MIME_TYPE, response.getHeaderField( "CONTENT-TYPE" ) ); assertNotNull( "Should have recieved a response", response ); assertEquals( "Should have been an OK response code.", HttpServletResponse.SC_OK, response.getResponseCode() ); + + //client.newInvocation( "http://localhost/shutdown/foo" ); } public void testRequestNewVersionsOfArtifact() @@ -110,6 +116,7 @@ public class RssFeedServletTest assertEquals( RssFeedServlet.MIME_TYPE, response.getHeaderField( "CONTENT-TYPE" ) ); assertNotNull( "Should have recieved a response", response ); assertEquals( "Should have been an OK response code.", HttpServletResponse.SC_OK, response.getResponseCode() ); + //client.newInvocation( "http://localhost/shutdown/foo" ); } public void XXX_testInvalidRequest() diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/ShutdowJackrabbitServlet.java b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/ShutdowJackrabbitServlet.java new file mode 100644 index 000000000..1e1051d5f --- /dev/null +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/ShutdowJackrabbitServlet.java @@ -0,0 +1,46 @@ +package org.apache.archiva.web.rss; +/* + * 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.jackrabbit.api.JackrabbitRepository; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * @author Olivier Lamy + */ +public class ShutdowJackrabbitServlet + extends HttpServlet +{ + @Override + protected void doGet( HttpServletRequest req, HttpServletResponse resp ) + throws ServletException, IOException + { + WebApplicationContext applicationContext = + WebApplicationContextUtils.getWebApplicationContext( getServletContext( ) ); + applicationContext.getBean( JackrabbitRepository.class ).shutdown( ); + } +} + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml index 9144b0745..73bd682be 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-DependencyTreeTest.xml @@ -34,4 +34,9 @@ + + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml index 2f4c5d5cc..fab8a2930 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-artifacts-download.xml @@ -51,5 +51,9 @@ + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml index 7860e21a1..8a628b1b6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context-rss-servlet.xml @@ -43,4 +43,9 @@ + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml index fe6cbae76..f4de2d66f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/spring-context.xml @@ -40,4 +40,10 @@ + + + + + + diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml index 8b8b624a9..97c83eecc 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml +++ b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml @@ -43,12 +43,24 @@ /feeds/* + + ShutdownServlet + org.apache.archiva.web.rss.ShutdowJackrabbitServlet + + + + ShutdownServlet + /shutdown/* + + + + contextConfigLocation - classpath*:/spring-context-rss-servlet.xml classpath*:/META-INF/spring-context.xml + classpath*:/spring-context-rss-servlet.xml diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml index 7fe086355..f374ca235 100644 --- a/archiva-modules/plugins/stage-repository-merge/pom.xml +++ b/archiva-modules/plugins/stage-repository-merge/pom.xml @@ -54,7 +54,7 @@ org.apache.archiva - metadata-store-file + metadata-store-jcr org.mockito -- 2.39.5