You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2008/03/29 04:09:24 UTC
svn commit: r642497 - in /archiva/trunk: ./ archiva-base/ archiva-database/
archiva-jetty/ archiva-modules/ archiva-modules/archiva-base/
archiva-modules/archiva-database/ archiva-modules/archiva-reporting/
archiva-modules/archiva-scheduled/ archiva-mo...
Author: brett
Date: Fri Mar 28 20:09:22 2008
New Revision: 642497
URL: http://svn.apache.org/viewvc?rev=642497&view=rev
Log:
restructure according to discussion on the dev list
Added:
archiva/trunk/archiva-jetty/
- copied from r642486, archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/
archiva/trunk/archiva-modules/ (with props)
archiva/trunk/archiva-modules/archiva-base/
- copied from r642486, archiva/trunk/archiva-base/
archiva/trunk/archiva-modules/archiva-database/
- copied from r642486, archiva/trunk/archiva-database/
archiva/trunk/archiva-modules/archiva-reporting/
- copied from r642486, archiva/trunk/archiva-reporting/
archiva/trunk/archiva-modules/archiva-scheduled/
- copied from r642486, archiva/trunk/archiva-scheduled/
archiva/trunk/archiva-modules/archiva-web/
- copied from r642486, archiva/trunk/archiva-web/
archiva/trunk/archiva-modules/pom.xml (with props)
Removed:
archiva/trunk/archiva-base/
archiva/trunk/archiva-database/
archiva/trunk/archiva-modules/archiva-web/archiva-standalone/
archiva/trunk/archiva-reporting/
archiva/trunk/archiva-scheduled/
archiva/trunk/archiva-web/
archiva/trunk/tools/
Modified:
archiva/trunk/archiva-jetty/pom.xml
archiva/trunk/archiva-modules/archiva-base/pom.xml
archiva/trunk/archiva-modules/archiva-database/pom.xml
archiva/trunk/archiva-modules/archiva-reporting/pom.xml
archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
archiva/trunk/archiva-modules/archiva-web/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-jetty/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-jetty/pom.xml?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-jetty/pom.xml (original)
+++ archiva/trunk/archiva-jetty/pom.xml Fri Mar 28 20:09:22 2008
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva-web-standalone</artifactId>
+ <artifactId>archiva</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
<artifactId>archiva-jetty</artifactId>
Propchange: archiva/trunk/archiva-modules/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar 28 20:09:22 2008
@@ -0,0 +1 @@
+target
Modified: archiva/trunk/archiva-modules/archiva-base/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/pom.xml?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/pom.xml Fri Mar 28 20:09:22 2008
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva</artifactId>
+ <artifactId>archiva-modules</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
Modified: archiva/trunk/archiva-modules/archiva-database/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-database/pom.xml?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-database/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-database/pom.xml Fri Mar 28 20:09:22 2008
@@ -21,7 +21,7 @@
<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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva</artifactId>
+ <artifactId>archiva-modules</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: archiva/trunk/archiva-modules/archiva-reporting/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-reporting/pom.xml?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-reporting/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-reporting/pom.xml Fri Mar 28 20:09:22 2008
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva</artifactId>
+ <artifactId>archiva-modules</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -31,6 +31,7 @@
<modules>
<module>archiva-report-manager</module>
+ <!-- TODO: some reports not currently used -->
<module>archiva-artifact-reports</module>
<module>archiva-metadata-reports</module>
<module>archiva-project-reports</module>
Modified: archiva/trunk/archiva-modules/archiva-scheduled/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-scheduled/pom.xml?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-scheduled/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-scheduled/pom.xml Fri Mar 28 20:09:22 2008
@@ -21,7 +21,7 @@
<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/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva</artifactId>
+ <artifactId>archiva-modules</artifactId>
<version>1.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/startup/ArchivaVersion.java Fri Mar 28 20:09:22 2008
@@ -48,6 +48,7 @@
}
/* This is the search order of modules to find the version.
+ @todo is this really necessary? Just use webapp?
*/
String[] modules = new String[] {
"archiva-common",
Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=642497&r1=642486&r2=642497&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Fri Mar 28 20:09:22 2008
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.archiva</groupId>
- <artifactId>archiva</artifactId>
+ <artifactId>archiva-modules</artifactId>
<version>1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,7 +34,6 @@
<module>archiva-security</module>
<module>archiva-webapp</module>
<module>archiva-webdav</module>
- <module>archiva-standalone</module>
</modules>
<profiles>
Added: archiva/trunk/archiva-modules/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/pom.xml?rev=642497&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/pom.xml (added)
+++ archiva/trunk/archiva-modules/pom.xml Fri Mar 28 20:09:22 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ 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.
+ -->
+
+<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/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>archiva</artifactId>
+ <groupId>org.apache.archiva</groupId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>archiva-modules</artifactId>
+ <packaging>pom</packaging>
+ <name>Archiva :: Modules</name>
+ <modules>
+ <module>archiva-base</module>
+ <module>archiva-database</module>
+ <module>archiva-reporting</module>
+ <module>archiva-scheduled</module>
+ <module>archiva-web</module>
+ </modules>
+</project>
Propchange: archiva/trunk/archiva-modules/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=642497&r1=642496&r2=642497&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Fri Mar 28 20:09:22 2008
@@ -168,15 +168,12 @@
-->
</build>
<modules>
- <module>archiva-base</module>
- <module>archiva-database</module>
- <module>archiva-reporting</module>
- <module>archiva-scheduled</module>
- <module>archiva-web</module>
<module>archiva-cli</module>
- <!-- Causes Build Loop :-(
+ <!--
<module>archiva-docs</module>
- -->
+ -->
+ <module>archiva-jetty</module>
+ <module>archiva-modules</module>
</modules>
<dependencies>
<dependency>