move common webapp classes to a new module archiva-webapp-common

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

10 files changed, 150 insertions, 13 deletions

diff --git a/archiva-modules/archiva-web/archiva-webapp-common/pom.xml b/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
new file mode 100644
index 000000000..d60fceec8
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+  <modelVersion>4.0.0</modelVersion>

+  <parent>

+    <groupId>org.apache.archiva</groupId>

+    <artifactId>archiva-web</artifactId>

+    <version>1.4-M2-SNAPSHOT</version>

+  </parent>

+

+  <artifactId>archiva-webapp-common</artifactId>

+

+  <name>archiva-webapp-common</name>

+

+  <dependencies>

+    <dependency>

+      <groupId>org.apache.archiva</groupId>

+      <artifactId>metadata-repository-api</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.archiva</groupId>

+      <artifactId>archiva-configuration</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.archiva</groupId>

+      <artifactId>archiva-security-common</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.archiva</groupId>

+      <artifactId>archiva-plexus-bridge</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.apache.archiva</groupId>

+      <artifactId>archiva-scheduler-repository</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.codehaus.redback</groupId>

+      <artifactId>redback-rbac-model</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.codehaus.redback</groupId>

+      <artifactId>redback-rbac-role-manager</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.codehaus.redback</groupId>

+      <artifactId>redback-system</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>javax.servlet</groupId>

+      <artifactId>servlet-api</artifactId>

+      <scope>provided</scope>

+    </dependency>

+    <dependency>

+      <groupId>org.codehaus.redback.components</groupId>

+      <artifactId>spring-taskqueue</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.codehaus.redback.components</groupId>

+      <artifactId>spring-quartz</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.quartz-scheduler</groupId>

+      <artifactId>quartz</artifactId>

+      <exclusions>

+        <exclusion>

+          <groupId>c3p0</groupId>

+          <artifactId>c3p0</artifactId>

+        </exclusion>

+        <exclusion>

+          <groupId>javax.transaction</groupId>

+          <artifactId>jta</artifactId>

+        </exclusion>

+      </exclusions>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-core</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-beans</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-context-support</artifactId>

+    </dependency>

+    <dependency>

+      <groupId>org.springframework</groupId>

+      <artifactId>spring-web</artifactId>

+    </dependency>

+  </dependencies>

+

+</project>

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java
index 582290284..14e167294 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java
+++ b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.spring;
+package org.apache.archiva.webapp.spring;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java
index 46aca0bb7..3ad800e95 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
+++ b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.startup;
+package org.apache.archiva.webapp.startup;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java
index e9272c808..27cf88dc7 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java
+++ b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.startup;
+package org.apache.archiva.webapp.startup;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,12 +19,12 @@ package org.apache.archiva.web.startup;
  * under the License.
  */
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.LoggerFactory;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 /**
  * Banner 
  *
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java
index a49ea5a2a..1a8a797c7 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
+++ b/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java
@@ -1,4 +1,4 @@
-package org.apache.archiva.web.startup;
+package org.apache.archiva.webapp.startup;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,13 +19,13 @@ package org.apache.archiva.web.startup;
  * under the License.
  */
 
-import org.apache.archiva.security.common.ArchivaRoleConstants;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.archiva.common.ArchivaException;
 import org.apache.archiva.configuration.ArchivaConfiguration;
 import org.apache.archiva.configuration.ConfigurationNames;
 import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.security.common.ArchivaRoleConstants;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.codehaus.plexus.redback.rbac.RBACManager;
 import org.codehaus.plexus.redback.rbac.RbacManagerException;
 import org.codehaus.plexus.redback.rbac.UserAssignment;
diff --git a/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml
new file mode 100755
index 000000000..c44c99a08
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml
@@ -0,0 +1,36 @@
+<?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:util="http://www.springframework.org/schema/util"
+       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://www.springframework.org/schema/util
+           http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+       default-lazy-init="true">
+
+  <context:annotation-config/>
+  <context:component-scan base-package="org.apache.archiva.web.spring, org.apache.archiva.web.startup"/>
+
+</beans>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 7a0e557d5..5fecdaae5 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -23,7 +23,6 @@
     <version>1.4-M2-SNAPSHOT</version>

   </parent>

   <artifactId>archiva-webapp-js</artifactId>

-  <version>1.4-M2-SNAPSHOT</version>

   <packaging>war</packaging>

 

   <name>Archiva Web :: Javascript Application</name>

@@ -361,6 +360,11 @@
 

     <dependency>

       <groupId>org.apache.archiva</groupId>

+      <artifactId>archiva-webapp-common</artifactId>

+    </dependency>

+

+    <dependency>

+      <groupId>org.apache.archiva</groupId>

       <artifactId>archiva-webdav</artifactId>

     </dependency>

 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml
index fb14d761a..7bbafb370 100755
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml
@@ -31,7 +31,7 @@
        default-lazy-init="true">
 
   <context:annotation-config/>
-  <context:component-scan base-package="org.apache.archiva.web"/>
+
 
   <util:properties id="archivaRuntimeProperties" location="classpath:application.properties" />
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index f66cc7a02..37fa07932 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -540,6 +540,10 @@
       <artifactId>archiva-webdav</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.apache.archiva</groupId>
+      <artifactId>archiva-webapp-common</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.apache.struts</groupId>
       <artifactId>struts2-spring-plugin</artifactId>
       <scope>runtime</scope>
diff --git a/archiva-modules/archiva-web/pom.xml b/archiva-modules/archiva-web/pom.xml
index 8185f80f0..05358c2b3 100644
--- a/archiva-modules/archiva-web/pom.xml
+++ b/archiva-modules/archiva-web/pom.xml
@@ -29,11 +29,12 @@
   <modules>
     <module>archiva-applet</module>
     <module>archiva-security</module>
-    <module>archiva-webapp</module>
     <module>archiva-webdav</module>
     <module>archiva-rss</module>
     <module>archiva-xmlrpc</module>
     <module>archiva-rest</module>
+    <module>archiva-webapp-common</module>
+    <module>archiva-webapp</module>
   </modules>
 
   <build>