You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/12/09 01:31:01 UTC
svn commit: r1212198 - in /archiva/trunk: ./ archiva-modules/archiva-web/
archiva-modules/archiva-web/archiva-webapp-common/
archiva-modules/archiva-web/archiva-webapp-common/src/
archiva-modules/archiva-web/archiva-webapp-common/src/main/ archiva-modu...
Author: olamy
Date: Fri Dec 9 00:31:00 2011
New Revision: 1212198
URL: http://svn.apache.org/viewvc?rev=1212198&view=rev
Log:
move common webapp classes to a new module archiva-webapp-common
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml (with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java (contents, props changed)
- copied, changed from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java (contents, props changed)
- copied, changed from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java (contents, props changed)
- copied, changed from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java (contents, props changed)
- copied, changed from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml
- copied, changed from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/pom.xml
archiva/trunk/pom.xml
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml?rev=1212198&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml Fri Dec 9 00:31:00 2011
@@ -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>
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java (from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java&r1=1212197&r2=1212198&rev=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/spring/RepositoryListenerFactoryBean.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java Fri Dec 9 00:31:00 2011
@@ -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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/spring/RepositoryListenerFactoryBean.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java (from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java&r1=1212197&r2=1212198&rev=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/ArchivaStartup.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java Fri Dec 9 00:31:00 2011
@@ -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
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/ArchivaStartup.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java (from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java&r1=1212197&r2=1212198&rev=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/Banner.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java Fri Dec 9 00:31:00 2011
@@ -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
*
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/Banner.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java (from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java&r1=1212197&r2=1212198&rev=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/java/org/apache/archiva/web/startup/SecuritySynchronization.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java Fri Dec 9 00:31:00 2011
@@ -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;
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/java/org/apache/archiva/webapp/startup/SecuritySynchronization.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml (from r1212197, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml&r1=1212197&r2=1212198&rev=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-common/src/main/resources/META-INF/spring-context.xml Fri Dec 9 00:31:00 2011
@@ -31,18 +31,6 @@
default-lazy-init="true">
<context:annotation-config/>
- <context:component-scan base-package="org.apache.archiva.web"/>
-
- <util:properties id="archivaRuntimeProperties" location="classpath:application.properties" />
-
- <bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
- <constructor-arg ref="jcr-config"/>
- </bean>
-
- <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create">
- <constructor-arg value="${appserver.base}/conf/repository.xml"/>
- <constructor-arg value="${appserver.base}/data/jcr"/>
- </bean>
-
+ <context:component-scan base-package="org.apache.archiva.web.spring, org.apache.archiva.web.startup"/>
</beans>
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1212198&r1=1212197&r2=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Fri Dec 9 00:31:00 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml?rev=1212198&r1=1212197&r2=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/resources/META-INF/spring-context.xml Fri Dec 9 00:31:00 2011
@@ -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" />
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1212198&r1=1212197&r2=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Fri Dec 9 00:31:00 2011
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1212198&r1=1212197&r2=1212198&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Fri Dec 9 00:31:00 2011
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1212198&r1=1212197&r2=1212198&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Dec 9 00:31:00 2011
@@ -406,6 +406,11 @@
</dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
+ <artifactId>archiva-webapp-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
<artifactId>archiva-rss</artifactId>
<version>${project.version}</version>
</dependency>