[MRM-1327] implement alternative or improve repository metadata storage: no need...

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1179145 13f79535-47bb-0310-9956-ffa450edef68

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
index 0be86ebbda71dd73e2a7fbd4ade5149c25924833..4cf264f3e10e4c726881977b00d39eb8ef23ab38 100644 (file)
--- 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
@@ -21,10 +21,9 @@
     "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">
+  <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
     <param name="path" value="${rep.home}/repository"/>
-</FileSystem>  -->
+  </FileSystem>
   <Security appName="Jackrabbit">
     <SecurityManager class="org.apache.jackrabbit.core.security.simple.SimpleSecurityManager" workspaceName="security"/>
     <AccessManager class="org.apache.jackrabbit.core.security.simple.SimpleAccessManager"/>

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 d4058f8f4aaa422da3d657f4f26aff7859f62b05..87e52e54eec9111da4891813c48f3a8460fd70e3 100644 (file)
--- 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
@@ -73,7 +73,6 @@ public class RssFeedServletTest
         RssFeedServlet servlet = (RssFeedServlet) client.newInvocation(
             "http://localhost/feeds/test-repo" ).getServlet();
         assertNotNull( servlet );
-        //client.newInvocation( "http://localhost/shutdown/foo" );
     }
 
     public void testRequestNewArtifactsInRepo()
@@ -95,7 +94,6 @@ public class RssFeedServletTest
         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()
@@ -116,7 +114,6 @@ 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
deleted file mode 100644 (file)
index 1e1051d..0000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/ShutdowJackrabbitServlet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-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/webapp/WEB-INF/feedServletTest-web.xml b/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
index 97c83eeccc5e003fb1adc29ec18d79ba58c11939..ad7386b1542a831f40693c09953e67ac8d83b80f 100644 (file)
--- 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,19 +43,6 @@
     <url-pattern>/feeds/*</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>ShutdownServlet</servlet-name>
-    <servlet-class>org.apache.archiva.web.rss.ShutdowJackrabbitServlet</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>ShutdownServlet</servlet-name>
-    <url-pattern>/shutdown/*</url-pattern>
-  </servlet-mapping>
-
-
-
-
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>