git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1212198 13f79535-47bb-0310-9956-ffa450edef68tags/archiva-1.4-M2
@@ -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> |
@@ -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 |
@@ -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 |
@@ -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 | |||
* |
@@ -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; |
@@ -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> |
@@ -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> | |||
@@ -359,6 +358,11 @@ | |||
<scope>provided</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-webapp-common</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.archiva</groupId> | |||
<artifactId>archiva-webdav</artifactId> |
@@ -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" /> | |||
@@ -539,6 +539,10 @@ | |||
<groupId>org.apache.archiva</groupId> | |||
<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> |
@@ -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> |
@@ -404,6 +404,11 @@ | |||
<artifactId>archiva-webdav</artifactId> | |||
<version>${project.version}</version> | |||
</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> |