incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject git commit: Making the thrift generated code script work when projects are empty.
Date Fri, 27 Jun 2014 13:49:18 GMT
Repository: incubator-blur
Updated Branches:
  refs/heads/apache-blur-0.2 70ce3b5d5 -> a75506c24


Making the thrift generated code script work when projects are empty.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/a75506c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/a75506c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/a75506c2

Branch: refs/heads/apache-blur-0.2
Commit: a75506c24ba4fb0bd47f75e955226355e296fc7c
Parents: 70ce3b5
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Fri Jun 27 09:49:43 2014 -0400
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Fri Jun 27 09:49:43 2014 -0400

----------------------------------------------------------------------
 .../thrift/generated/SafeClientGen.java.base    | 63 ++++++++++++++++++++
 .../src/main/scripts/interface/genAndReplace.sh | 20 ++++++-
 2 files changed, 81 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a75506c2/blur-thrift/src/main/resources/org/apache/blur/thrift/generated/SafeClientGen.java.base
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/resources/org/apache/blur/thrift/generated/SafeClientGen.java.base
b/blur-thrift/src/main/resources/org/apache/blur/thrift/generated/SafeClientGen.java.base
new file mode 100644
index 0000000..5f2bbb4
--- /dev/null
+++ b/blur-thrift/src/main/resources/org/apache/blur/thrift/generated/SafeClientGen.java.base
@@ -0,0 +1,63 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.0)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.blur.thrift.generated;
+
+/**
+ * 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.
+ */
+
+
+
+import org.apache.blur.thirdparty.thrift_0_9_0.scheme.IScheme;
+import org.apache.blur.thirdparty.thrift_0_9_0.scheme.SchemeFactory;
+import org.apache.blur.thirdparty.thrift_0_9_0.scheme.StandardScheme;
+import org.apache.blur.thirdparty.thrift_0_9_0.scheme.TupleScheme;
+import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol;
+import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TTupleProtocol;
+import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolException;
+import org.apache.blur.thirdparty.thrift_0_9_0.EncodingUtils;
+import org.apache.blur.thirdparty.thrift_0_9_0.TException;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+
+public class SafeClientGen extends org.apache.blur.thrift.generated.Blur.Client {
+
+  public SafeClientGen(TProtocol iprot, TProtocol oprot) {
+    super(iprot, oprot);
+  }
+
+  public SafeClientGen(TProtocol prot) {
+    super(prot);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a75506c2/distribution/src/main/scripts/interface/genAndReplace.sh
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/genAndReplace.sh b/distribution/src/main/scripts/interface/genAndReplace.sh
index 99504b3..8729561 100755
--- a/distribution/src/main/scripts/interface/genAndReplace.sh
+++ b/distribution/src/main/scripts/interface/genAndReplace.sh
@@ -18,6 +18,8 @@
 cdir=`dirname "$0"`
 cdir=`cd "$cdir"; pwd`
 
+HADOOP_VERSION=hadoop1
+
 cd $cdir
 rm ../../../../../blur-thrift/src/main/java/org/apache/blur/thrift/generated/*
 rm -r gen-java/ gen-perl/ gen-rb/ gen-html/
@@ -33,9 +35,23 @@ done
 GEN_HTML=$cdir/gen-html/Blur.html
 OUTPUT_HTML=$cdir/../../../../../docs/Blur.html
 cd ../../../../../blur-util
-mvn exec:java -Dexec.mainClass="org.apache.blur.doc.CreateBlurApiHtmlPage" -Dexec.args="$GEN_HTML
$OUTPUT_HTML"
+mvn clean install -D${HADOOP_VERSION} -DskipTests
+mvn exec:java -D${HADOOP_VERSION} -Dexec.mainClass="org.apache.blur.doc.CreateBlurApiHtmlPage"
-Dexec.args="$GEN_HTML $OUTPUT_HTML"
+mvn clean -D${HADOOP_VERSION} -DskipTests
 cd $cdir
 cp -r gen-java/* ../../../../../blur-thrift/src/main/java/
 cd ../../../../../blur-thrift
-mvn exec:java -Dexec.mainClass="org.apache.blur.thrift.util.GenerateSafeClient" -Dhadoop1
+cp src/main/resources/org/apache/blur/thrift/generated/SafeClientGen.java.base src/main/java/org/apache/blur/thrift/generated/SafeClientGen.java
+mvn clean install -D${HADOOP_VERSION} -DskipTests
+mvn exec:java -D${HADOOP_VERSION} -Dexec.mainClass="org.apache.blur.thrift.util.GenerateSafeClient"
-Dhadoop1
+mvn clean -D${HADOOP_VERSION} -DskipTests
 cd $cdir
+echo "-----------------------------------------------"
+echo "-----------------------------------------------"
+echo "-----------------------------------------------"
+echo "-----------------------------------------------"
+echo "You will need to run 'mvn install -DskipTests'."
+echo "-----------------------------------------------"
+echo "-----------------------------------------------"
+echo "-----------------------------------------------"
+echo "-----------------------------------------------"


Mime
View raw message