From d85c1890d7396288719de1e4fb0ee9314f8e1193 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Thu, 18 Aug 2011 09:49:20 +0000
Subject: [PATCH] [MRM-1490] Expose archiva services trough rest add the
 configuration in webapp module to expose it

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1159120 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva-web/archiva-webapp/pom.xml        | 50 ++++++++++++++++-
 .../src/main/webapp/WEB-INF/decorators.xml    |  1 +
 .../src/main/webapp/WEB-INF/web.xml           | 53 +++++++++++--------
 pom.xml                                       | 19 ++++---
 4 files changed, 94 insertions(+), 29 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 377bfdf98..64ec0fdd5 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -114,6 +114,10 @@
       <groupId>org.apache.archiva</groupId>
       <artifactId>archiva-xmlrpc-security</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-rest-services</artifactId>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
@@ -161,6 +165,28 @@
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.cxf</groupId>
+      <artifactId>cxf-bundle-jaxrs</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.eclipse.jetty</groupId>
+          <artifactId>jetty-server</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.geronimo.specs</groupId>
+          <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>ognl</groupId>
       <artifactId>ognl</artifactId>
@@ -211,7 +237,7 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- Plexus Security Dependencies -->
+    <!-- Redback Dependencies -->
     <dependency>
       <groupId>org.codehaus.redback</groupId>
       <artifactId>redback-struts2-content</artifactId>
@@ -236,6 +262,28 @@
       <artifactId>redback-xmlrpc-security</artifactId>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.redback</groupId>
+      <artifactId>redback-keys-memory</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.codehaus.redback</groupId>
+      <artifactId>redback-rest-services</artifactId>
+      <scope>runtime</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <!-- Other dependencies -->
     <dependency>
       <groupId>org.apache.archiva</groupId>
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
index acb6a423a..0148875d6 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/decorators.xml
@@ -22,6 +22,7 @@
   <excludes>
     <pattern>/repository/*</pattern>
     <pattern>/components/*</pattern>
+    <pattern>/restServices/*</pattern>
   </excludes>
 
   <decorator name="default" page="default.jsp">
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index 7d24f88c0..f2cceebe4 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -119,25 +119,25 @@
 		  <param-name>enabledForExtensions</param-name>
 		  <param-value>true</param-value>
 		</init-param>
-		<load-on-startup>1</load-on-startup>
+		<load-on-startup>2</load-on-startup>
 	</servlet>
 
-        <servlet>
-          <servlet-name>RedbackXmlRpcServlet</servlet-name>
-          <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
-          <init-param>
-            <param-name>serviceListBeanName</param-name>
-            <param-value>redbackXmlrpcServicesList</param-value>
-          </init-param>
-          <init-param>
-            <param-name>authHandlerBeanName</param-name>
-            <param-value>redbackXmlRpcAuthenticator</param-value>
-          </init-param>
-          <init-param>
-            <param-name>enabledForExtensions</param-name>
-            <param-value>true</param-value>
-          </init-param>
-        </servlet>
+  <servlet>
+    <servlet-name>RedbackXmlRpcServlet</servlet-name>
+    <servlet-class>com.atlassian.xmlrpc.spring.BinderSpringXmlRpcServlet</servlet-class>
+    <init-param>
+      <param-name>serviceListBeanName</param-name>
+      <param-value>redbackXmlrpcServicesList</param-value>
+    </init-param>
+    <init-param>
+      <param-name>authHandlerBeanName</param-name>
+      <param-value>redbackXmlRpcAuthenticator</param-value>
+    </init-param>
+    <init-param>
+      <param-name>enabledForExtensions</param-name>
+      <param-value>true</param-value>
+    </init-param>
+  </servlet>
 
 	<servlet>
 		<servlet-name>RssFeedServlet</servlet-name>
@@ -161,10 +161,10 @@
 		<url-pattern>/xmlrpc</url-pattern>
 	</servlet-mapping>
 
-        <servlet-mapping>
-          <servlet-name>RedbackXmlRpcServlet</servlet-name>
-          <url-pattern>/redback-xmlrpc</url-pattern>
-        </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>RedbackXmlRpcServlet</servlet-name>
+    <url-pattern>/redback-xmlrpc</url-pattern>
+  </servlet-mapping>
 
 	<resource-ref>
 		<res-ref-name>jdbc/users</res-ref-name>
@@ -179,4 +179,15 @@
 		<res-sharing-scope>Shareable</res-sharing-scope>
 	</resource-ref>
 
+  <servlet>
+    <servlet-name>CXFServlet</servlet-name>
+    <servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>CXFServlet</servlet-name>
+    <url-pattern>/restServices/*</url-pattern>
+  </servlet-mapping>
+
 </web-app>
diff --git a/pom.xml b/pom.xml
index dbceb1479..76e4d704f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -761,7 +761,6 @@
         <groupId>org.codehaus.redback</groupId>
         <artifactId>redback-keys-memory</artifactId>
         <version>${redback.version}</version>
-        <scope>test</scope>
         <exclusions>
           <exclusion>
             <groupId>commons-logging</groupId>
@@ -884,6 +883,12 @@
         <groupId>org.codehaus.redback</groupId>
         <artifactId>redback-rest-services</artifactId>
         <version>${redback.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.codehaus.redback</groupId>
@@ -895,12 +900,12 @@
         <groupId>org.codehaus.redback</groupId>
         <artifactId>redback-authentication-api</artifactId>
         <version>${redback.version}</version>
-          <exclusions>
-            <exclusion>
-              <groupId>commons-logging</groupId>
-              <artifactId>commons-logging</artifactId>
-            </exclusion>
-          </exclusions>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
 
       <!-- redback components -->