From 1b60574b75b8ac3bd64704f34645221e902d7cff Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Tue, 30 Mar 2010 10:11:13 +0200
Subject: [PATCH] Cleaned up archetype POMs.

---
 archetypes/compute-service-archetype/pom.xml  | 16 -----------
 .../resources/archetype-resources/pom.xml     | 16 +++++++++++
 archetypes/json-client-archetype/pom.xml      | 27 ++++---------------
 .../resources/archetype-resources/pom.xml     | 16 +++++++++++
 project/pom.xml                               | 14 ++++------
 5 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/archetypes/compute-service-archetype/pom.xml b/archetypes/compute-service-archetype/pom.xml
index 35ff7637b8..250308b516 100644
--- a/archetypes/compute-service-archetype/pom.xml
+++ b/archetypes/compute-service-archetype/pom.xml
@@ -55,20 +55,4 @@
       </extension>
     </extensions>   
   </build>
-  <distributionManagement>
-    <repository>
-      <uniqueVersion>false</uniqueVersion>
-      <id>jclouds-googlecode-deploy</id>
-      <url>svn:https://jclouds.googlecode.com/svn/repo</url>
-    </repository>
-    <snapshotRepository>
-      <id>jclouds-rimu-snapshots</id>
-      <url>dav:http://jclouds.rimuhosting.com/maven2/snapshots/</url>
-    </snapshotRepository>
-    <site>
-      <id>website</id>
-      <name>website</name>
-      <url>file://${basedir}/target/dist/site/jclouds-testing/</url>
-    </site>
-  </distributionManagement>
 </project>
diff --git a/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml
index 565a6a195a..023961bafb 100644
--- a/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/compute-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -45,6 +45,22 @@
         <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/${lcaseProviderName}</developerConnection>
         <url>http://jclouds.googlecode.com/svn/trunk/${lcaseProviderName}</url>
     </scm>
+    
+    <!-- bootstrapping: need to fetch the project POM -->
+    <repositories>
+        <repository>
+            <id>jclouds-googlecode-deploy</id>
+            <url>http://jclouds.googlecode.com/svn/repo</url>
+        </repository>
+        <repository>
+            <id>jclouds-rimu-snapshots-nexus</id>
+            <url>http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>    
+    </repositories>
+    
     <properties>
         <jclouds.test.user>${providerUser}</jclouds.test.user>
         <jclouds.test.key>${providerPassword}</jclouds.test.key>
diff --git a/archetypes/json-client-archetype/pom.xml b/archetypes/json-client-archetype/pom.xml
index 1a489aa865..acb471a0b4 100644
--- a/archetypes/json-client-archetype/pom.xml
+++ b/archetypes/json-client-archetype/pom.xml
@@ -22,13 +22,12 @@
 
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <parent>
-    <artifactId>jclouds-archetypes</artifactId>
-    <groupId>org.jclouds</groupId>
-    <version>1.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jclouds</groupId>
+    <artifactId>jclouds-archetypes</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
   <artifactId>jclouds-json-client-archetype</artifactId>
   <name>jclouds JSON client archetype</name>
   <description>Maven archetype for a client of a JSON-speaking service</description>
@@ -56,20 +55,4 @@
       </extension>
     </extensions>   
   </build>
-  <distributionManagement>
-    <repository>
-      <uniqueVersion>false</uniqueVersion>
-      <id>jclouds-googlecode-deploy</id>
-      <url>svn:https://jclouds.googlecode.com/svn/repo</url>
-    </repository>
-    <snapshotRepository>
-      <id>jclouds-rimu-snapshots</id>
-      <url>dav:http://jclouds.rimuhosting.com/maven2/snapshots/</url>
-    </snapshotRepository>
-    <site>
-      <id>website</id>
-      <name>website</name>
-      <url>file://${basedir}/target/dist/site/jclouds-testing/</url>
-    </site>
-  </distributionManagement>
 </project>
diff --git a/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml
index 23f43f1ff9..88bcab4a79 100644
--- a/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml
@@ -45,6 +45,22 @@
         <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/${lcaseClientName}</developerConnection>
         <url>http://jclouds.googlecode.com/svn/trunk/${lcaseClientName}</url>
     </scm>
+    
+    <!-- bootstrapping: need to fetch the project POM -->
+    <repositories>
+        <repository>
+            <id>jclouds-googlecode-deploy</id>
+            <url>http://jclouds.googlecode.com/svn/repo</url>
+        </repository>
+        <repository>
+            <id>jclouds-rimu-snapshots-nexus</id>
+            <url>http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>    
+    </repositories>
+    
     <properties>
         <jclouds.test.user>${clientUser}</jclouds.test.user>
         <jclouds.test.key>${clientPassword}</jclouds.test.key>
diff --git a/project/pom.xml b/project/pom.xml
index 1f85eac32b..074b0599b2 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -73,14 +73,14 @@
 
     <repositories>
         <repository>
-            <id>jclouds-googlecode</id>
+            <id>jclouds-googlecode-deploy</id>
             <url>http://jclouds.googlecode.com/svn/repo</url>
         </repository>
         <repository>
-            <id>jclouds-rimu</id>
-            <url>http://jclouds.rimuhosting.com/maven2/snapshots</url>
+            <id>jclouds-rimu-snapshots-nexus</id>
+            <url>http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots</url>
             <snapshots>
-               <enabled>true</enabled>
+                <enabled>true</enabled>
             </snapshots>
         </repository>
         <repository>
@@ -107,10 +107,6 @@
             <url>dav:https://jclouds.googlecode.com/svn/repo</url>
             <uniqueVersion>false</uniqueVersion>            
         </repository>
-        <!--snapshotRepository>
-      	    <id>jclouds-rimu-snapshots</id>
-            <url>dav:http://jclouds.rimuhosting.com/maven2/snapshots/</url>
-        </snapshotRepository-->
         <snapshotRepository>
       	    <id>jclouds-rimu-snapshots-nexus</id>
             <url>http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots</url>
@@ -130,7 +126,7 @@
             </snapshots>
         </pluginRepository>
         <pluginRepository>
-            <id>jclouds-googlecode</id>
+            <id>jclouds-googlecode-deploy</id>
             <url>http://jclouds.googlecode.com/svn/repo</url>
         </pluginRepository>
     </pluginRepositories>