Cleanup of pom multimodule heirarchy after directory moves.

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@521491 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 87 insertions, 13 deletions

diff --git a/archiva-web/archiva-applet/pom.xml b/archiva-web/archiva-applet/pom.xml
index d48ebf7a8..e16baaacd 100644
--- a/archiva-web/archiva-applet/pom.xml
+++ b/archiva-web/archiva-applet/pom.xml
@@ -23,11 +23,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-applet</artifactId>
-  <name>Archiva Applet</name>
+  <name>Archiva Web :: Applet</name>
   <description>
     Applet for performing local operations on files such as creating a checksum of an artifact
     before uploading it.
diff --git a/archiva-web/archiva-security/pom.xml b/archiva-web/archiva-security/pom.xml
index c00645553..78e14a42d 100644
--- a/archiva-web/archiva-security/pom.xml
+++ b/archiva-web/archiva-security/pom.xml
@@ -21,13 +21,13 @@
 <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.maven.archiva</groupId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-security</artifactId>
-  <name>Archiva Security Configuration</name>
+  <name>Archiva Web :: Security Configuration</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus.security</groupId>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
index 29e01dd28..1e0cd3bdf 100644
--- a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
@@ -21,14 +21,14 @@
 <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.maven.archiva</groupId>
+    <artifactId>archiva-web-standalone</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-application</artifactId>
   <packaging>plexus-application</packaging>
-  <name>Archiva Plexus Application</name>
+  <name>Archiva Web :: Plexus Application</name>
   <build>
     <plugins>
       <plugin>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
index 3e93c782d..937a5ab4f 100644
--- a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
+++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
@@ -22,12 +22,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web-standalone</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>archiva-plexus-runtime</artifactId>
-  <name>Archiva Runtime Generator</name>
+  <name>Archiva Web :: Runtime Generator</name>
   <dependencies>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
diff --git a/archiva-web/archiva-standalone/pom.xml b/archiva-web/archiva-standalone/pom.xml
new file mode 100644
index 000000000..412f55bc8
--- /dev/null
+++ b/archiva-web/archiva-standalone/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-web</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-web-standalone</artifactId>
+  <name>Archiva Web :: Standalone</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-plexus-application</module>
+    <module>archiva-plexus-runtime</module>
+  </modules>
+</project>
diff --git a/archiva-web/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
index 264f6eff3..bfaf14816 100644
--- a/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-web/archiva-webapp-test/pom.xml
@@ -23,12 +23,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp-test</artifactId>
   <packaging>pom</packaging>
-  <name>Archiva Web Application Tests</name>
+  <name>Archiva Web :: Application Tests</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.archiva</groupId>
@@ -238,4 +238,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index ac94a47e9..ed13c3fb5 100644
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -23,12 +23,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
+    <artifactId>archiva-web</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-webapp</artifactId>
   <packaging>war</packaging>
-  <name>Archiva Web Application</name>
+  <name>Archiva Web :: Application</name>
   <dependencies>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/archiva-web/pom.xml b/archiva-web/pom.xml
new file mode 100644
index 000000000..7d2e825d6
--- /dev/null
+++ b/archiva-web/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2005-2006 The Apache Software Foundation.
+  ~
+  ~ Licensed 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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva-parent</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>archiva-web</artifactId>
+  <name>Archiva Web</name>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>archiva-applet</module>
+    <module>archiva-security</module>
+    <module>archiva-webapp</module>
+    <module>archiva-standalone</module>
+  </modules>
+</project>