svn commit: r1179145 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src: appserver-base/conf/ test/java/org/apache/archiva/web/rss/ test/webapp/WEB-INF/

[olamy]

Author: olamy
Date: Wed Oct  5 10:24:15 2011
New Revision: 1179145

URL: http://svn.apache.org/viewvc?rev=1179145&view=rev
Log:
[MRM-1327] implement alternative or improve repository metadata storage: no 
need of this hack to fix unit tests in webapp

Removed:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/ShutdowJackrabbitServlet.java
Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml?rev=1179145&r1=1179144&r2=1179145&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
 Wed Oct  5 10:24:15 2011
@@ -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"/>

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java?rev=1179145&r1=1179144&r2=1179145&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/rss/RssFeedServletTest.java
 Wed Oct  5 10:24:15 2011
@@ -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()

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml?rev=1179145&r1=1179144&r2=1179145&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/webapp/WEB-INF/feedServletTest-web.xml
 Wed Oct  5 10:24:15 2011
@@ -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>