From 31398eb2e4c6133f8213f06890163d7224f2ac69 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Sat, 20 Mar 2010 14:28:44 +0100
Subject: [PATCH] Merge branch 'json-client-cleanup'

Conflicts:
	archetypes/json-client-archetype/src/main/resources/archetype-resources/pom.xml
---
 .../classes/archetype-resources/pom.xml       | 79 -------------------
 1 file changed, 79 deletions(-)
 delete mode 100644 archetypes/json-client-archetype/target/classes/archetype-resources/pom.xml

diff --git a/archetypes/json-client-archetype/target/classes/archetype-resources/pom.xml b/archetypes/json-client-archetype/target/classes/archetype-resources/pom.xml
deleted file mode 100644
index b4c1c6b367..0000000000
--- a/archetypes/json-client-archetype/target/classes/archetype-resources/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-#set( $lcaseClientName = ${clientName.toLowerCase()} )
-#set( $symbol_dollar = '$' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   ${symbol_dollar}HeadURL${symbol_dollar}
-   ${symbol_dollar}Revision${symbol_dollar}
-   ${symbol_dollar}Date${symbol_dollar}
-
-   Copyright (C) 2009 Cloud Conscious, LLC <info@cloudconscious.com>
-
-   ====================================================================
-   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.html 
-
-   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>
-        <groupId>org.jclouds</groupId>
-        <artifactId>jclouds-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../project/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>jclouds-${artifactId}</artifactId>
-    <name>jclouds ${clientName} core</name>
-    <packaging>jar</packaging>
-    <description>jclouds components to access ${clientName}</description>
-
-    <scm>
-        <connection>scm:svn:http://jclouds.googlecode.com/svn/trunk/${lcaseClientName}</connection>
-        <developerConnection>scm:svn:https://jclouds.googlecode.com/svn/trunk/${lcaseClientName}</developerConnection>
-        <url>http://jclouds.googlecode.com/svn/trunk/${lcaseClientName}</url>
-    </scm>
-    <properties>
-        <jclouds.test.user>${clientUser}</jclouds.test.user>
-        <jclouds.test.key>${clientPassword}</jclouds.test.key>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>${symbol_dollar}{project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${symbol_dollar}{project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${symbol_dollar}{project.groupId}</groupId>
-            <artifactId>jclouds-core</artifactId>
-            <version>${symbol_dollar}{project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${symbol_dollar}{project.groupId}</groupId>
-            <artifactId>jclouds-log4j</artifactId>
-            <version>${symbol_dollar}{project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>