From 2cb3cf55b2515e3def806858f0e3f9a51ae1a8f6 Mon Sep 17 00:00:00 2001
From: jmoore <jmoore@05709c45-44f0-0310-885b-81a1db45b4a6>
Date: Sat, 17 Oct 2009 22:04:24 +0000
Subject: [PATCH] OmeroGrid : Cleaning up older configuration in blitz/etc

git-svn-id: file:///home/svn/omero/trunk@5501 05709c45-44f0-0310-885b-81a1db45b4a6
---
 components/blitz/build.xml              | 5 -----
 components/blitz/etc/external.cfg       | 1 -
 {components/blitz/etc => etc}/node1.cfg | 0
 {components/blitz/etc => etc}/node2.cfg | 0
 4 files changed, 6 deletions(-)
 delete mode 100644 components/blitz/etc/external.cfg
 rename {components/blitz/etc => etc}/node1.cfg (100%)
 rename {components/blitz/etc => etc}/node2.cfg (100%)

diff --git a/components/blitz/build.xml b/components/blitz/build.xml
index 2969f197ca7..7ffd9841c63 100644
--- a/components/blitz/build.xml
+++ b/components/blitz/build.xml
@@ -206,11 +206,6 @@
 	</target>
 
 	<target name="dist" depends="package,install" unless="skip.compile"><!-- install for standalone -->
-	  <copy todir="${dist.dir}/etc">
-            <fileset dir="${basedir}/etc" includes="**/*"/>
-	    <fileset dir="${resrc.dir}" includes="*.config"/>
-	    <flattenmapper/>
-	  </copy>
 	  <copy todir="${dist.dir}/include">
 	    <fileset dir="${resrc.dir}"  includes="**/*.ice,**/*.h"/>
 	    <fileset dir="${resrc.dest}" includes="**/*.ice,**/*.h"/>
diff --git a/components/blitz/etc/external.cfg b/components/blitz/etc/external.cfg
deleted file mode 100644
index 8de06cbd4c9..00000000000
--- a/components/blitz/etc/external.cfg
+++ /dev/null
@@ -1 +0,0 @@
-Ice.Default.Router=OMERO.Glacier2/router:tcp -p 8000 -h 10.0.1.198
diff --git a/components/blitz/etc/node1.cfg b/etc/node1.cfg
similarity index 100%
rename from components/blitz/etc/node1.cfg
rename to etc/node1.cfg
diff --git a/components/blitz/etc/node2.cfg b/etc/node2.cfg
similarity index 100%
rename from components/blitz/etc/node2.cfg
rename to etc/node2.cfg