You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@curator.apache.org by ra...@apache.org on 2014/06/07 20:19:07 UTC
[09/50] [abbrv] git commit: consolidation and removal of old unused
lines
consolidation and removal of old unused lines
Project: http://git-wip-us.apache.org/repos/asf/curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/48d3e31e
Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/48d3e31e
Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/48d3e31e
Branch: refs/heads/master
Commit: 48d3e31e1355ff193eecff713c2e2b3278882800
Parents: 0e76121
Author: randgalt <ra...@apache.org>
Authored: Fri May 30 10:58:17 2014 -0500
Committer: randgalt <ra...@apache.org>
Committed: Fri May 30 10:58:17 2014 -0500
----------------------------------------------------------------------
curator-x-rpc/src/main/scripts/generate.sh | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/curator/blob/48d3e31e/curator-x-rpc/src/main/scripts/generate.sh
----------------------------------------------------------------------
diff --git a/curator-x-rpc/src/main/scripts/generate.sh b/curator-x-rpc/src/main/scripts/generate.sh
index 5fab478..15f6546 100755
--- a/curator-x-rpc/src/main/scripts/generate.sh
+++ b/curator-x-rpc/src/main/scripts/generate.sh
@@ -31,22 +31,12 @@ RPC_PATH="$BASE_DIR/curator-x-rpc/target/classes"
CLASSES=""
-PROJECTION_CLASSES=""
-for f in `ls -m1 $RPC_PATH/org/apache/curator/x/rpc/idl/projection/*.class | xargs -n 1 basename | sed s/\.[^\.]*$//`;
- do
+for p in projection event; do
+ for f in `ls -m1 $RPC_PATH/org/apache/curator/x/rpc/idl/$p/*.class | xargs -n 1 basename | sed s/\.[^\.]*$//`; do
if [[ $f != *[\$]* ]]; then
- PROJECTION_CLASSES="$PROJECTION_CLASSES $f";
- CLASSES="$CLASSES org.apache.curator.x.rpc.idl.projection.$f";
- fi;
-done;
-
-EVENT_CLASSES=""
-for f in `ls -m1 $RPC_PATH/org/apache/curator/x/rpc/idl/event/*.class | xargs -n 1 basename | sed s/\.[^\.]*$//`;
- do
- if [[ $f != *[\$]* ]]; then
- EVENT_CLASSES="$EVENT_CLASSES $f";
- CLASSES="$CLASSES org.apache.curator.x.rpc.idl.event.$f";
+ CLASSES="$CLASSES org.apache.curator.x.rpc.idl.$p.$f";
fi;
+ done;
done;
THRIFT_DIR="$BASE_DIR/curator-x-rpc/src/main/thrift"
@@ -57,10 +47,6 @@ PATHS="$PATHS:$BASE_DIR/curator-framework/target/classes"
PATHS="$PATHS:$BASE_DIR/curator-recipes/target/classes"
PATHS="$PATHS:$RPC_PATH"
-PACKAGE="org.apache.curator.x.rpc.idl"
-PROJECTION_PACKAGE="org.apache.curator.x.rpc.idl.projection"
-EVENT_PACKAGE="org.apache.curator.x.rpc.idl.event"
-
java -cp $PATHS com.facebook.swift.generator.swift2thrift.Main \
-allow_multiple_packages org.apache.curator \
-namespace cpp org.apache.curator.generated \