From 9b3de58ceab44525f69cf8bfd889d7deded06372 Mon Sep 17 00:00:00 2001
From: "sharedocs1@gmail.com"
 <sharedocs1@gmail.com@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Mon, 14 Dec 2009 13:26:45 +0000
Subject: [PATCH] Ensured work dirs are not created under version-controlled
 directories (mvn clean package works for me - sorry if it breaks for someone
 else!)

git-svn-id: http://jclouds.googlecode.com/svn/trunk@2416 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 tools/vfs/pom.xml                      | 27 +++++++-------
 tools/vfs/src/test/resources/log4j.xml | 49 +++++++++++++-------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/tools/vfs/pom.xml b/tools/vfs/pom.xml
index e44a1dd4ae..f5a359f7a9 100644
--- a/tools/vfs/pom.xml
+++ b/tools/vfs/pom.xml
@@ -90,11 +90,11 @@
                     <systemProperties>
                         <property>
                             <name>test.basedir</name>
-                            <value>src/test/resources/test-data</value>
+                            <value>target/test-data</value>
                         </property>
                         <property>
                             <name>test.basedir.res</name>
-                            <value>test-data</value>
+                            <value>target/test-data</value>
                         </property>
                     </systemProperties>
                 </configuration>
@@ -111,23 +111,22 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.jclouds.vfs.tools.blobstore.BlobStoreShell</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
+                        <configuration>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.jclouds.vfs.tools.blobstore.BlobStoreShell</mainClass>
+                                </manifest>
+                            </archive>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -145,7 +144,7 @@
                             <systemProperties>
                                 <property>
                                     <name>test.basedir</name>
-                                    <value>src/test/resources/test-data</value>
+                                    <value>target/test-data</value>
                                 </property>
                                 <property>
                                     <name>test.blobstore.uri</name>
diff --git a/tools/vfs/src/test/resources/log4j.xml b/tools/vfs/src/test/resources/log4j.xml
index 8a56dec6f6..fc2111d22a 100755
--- a/tools/vfs/src/test/resources/log4j.xml
+++ b/tools/vfs/src/test/resources/log4j.xml
@@ -1,29 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <!--
-
-
-        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 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.
-        ====================================================================
-    -->
+<!--
+    $HeadURL$
+    $Revision$
+    $Date$
+    
+    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 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.
+    ====================================================================
+-->
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
     <!--
         For more configuration infromation and examples see the Apache
         Log4j website: http://logging.apache.org/log4j/