3 files changed, 16 insertions, 10 deletions
diff --git a/strata/zookeeper-client.morph b/strata/zookeeper-client.morph
index 6194b587..135b2fc5 100644
--- a/strata/zookeeper-client.morph
+++ b/strata/zookeeper-client.morph
@@ -1,6 +1,13 @@
-name: zookeeper
+name: zookeeper-client
 kind: stratum
-description: a first pass attempt at creating a zookeeper stratum for baserock.
+description: |
+  This stratum installs zookeeper and its dependencies.
+  It then installs a small demonstration program for the
+  client side of ZooKeeper. The program can take up to two
+  arguments:
+   (1) The IP address of the ZooKeeper server to connect to
+   (2) The type of client that this will be (default client
+       types are typeOneNode & typeTwoNode)
 build-depends:
 - morph: strata/core.morph
 chunks:
@@ -14,7 +21,7 @@ chunks:
   ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
   unpetrify-ref: master
   build-depends: []
-- name: java/ant
+- name: java-ant
   morph: strata/zookeeper/java-ant.morph
   repo: upstream:java/ant
   ref: master
@@ -27,10 +34,10 @@ chunks:
   ref: baserock/mikesmith/zookeeper
   unpetrify-ref: trunk
   build-depends:
-  - java/ant
+  - java-ant
 - name: zookeeper-client
   morph: strata/zookeeper/zookeeper-client.morph
-  repo: https://github.com/MichaelPSmith/ZookeeperExperiments
+  repo: baserock:tests/zookeeper-test
   ref: master
   build-depends:
   - zookeeper
diff --git a/strata/zookeeper-server.morph b/strata/zookeeper-server.morph
index 1394d489..de627d39 100644
--- a/strata/zookeeper-server.morph
+++ b/strata/zookeeper-server.morph
@@ -1,4 +1,4 @@
-name: zookeeper
+name: zookeeper-server
 kind: stratum
 description: a first pass attempt at creating a zookeeper stratum for baserock.
 build-depends:
@@ -14,7 +14,7 @@ chunks:
   ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
   unpetrify-ref: master
   build-depends: []
-- name: java/ant
+- name: java-ant
   morph: strata/zookeeper/java-ant.morph
   repo: upstream:java/ant
   ref: master
@@ -27,10 +27,10 @@ chunks:
   ref: baserock/mikesmith/zookeeper
   unpetrify-ref: trunk
   build-depends:
-  - java/ant
+  - java-ant
 - name: zookeeper-server
   morph: strata/zookeeper/zookeeper-server.morph
-  repo: https://github.com/MichaelPSmith/ZookeeperExperiments
+  repo: baserock:tests/zookeeper-test
   ref: master
   build-depends:
   - zookeeper
diff --git a/strata/zookeeper/java-ant.morph b/strata/zookeeper/java-ant.morph
index 7b403c78..37d402b0 100644
--- a/strata/zookeeper/java-ant.morph
+++ b/strata/zookeeper/java-ant.morph
@@ -3,7 +3,6 @@ kind: chunk
 build-commands:
 - |
   export JAVA_HOME=/usr/lib/jdk1.8.0_20
-  mkdir "$DESTDIR"/urs/lib/ant
   sh build.sh -Ddist.dir="$DESTDIR/usr/lib/ant" dist
 - mkdir -p "${DESTDIR}${PREFIX}/bin"
 - ln -sf "${PREFIX}/lib/ant/bin/ant" "${DESTDIR}${PREFIX}/bin/ant"