You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by fp...@apache.org on 2016/06/03 21:27:36 UTC
[09/23] incubator-omid git commit: [OMID-29] Fix missing updates to
omid package names in assembly and script files
[OMID-29] Fix missing updates to omid package names in assembly and script files
The first patch on this issue didn't include these updates, so when
unpacking the tar.gz file and running the TSO server not all the
required jars where found.
Change-Id: Iebb0f9acab40e9d4753874facf91cdc60067364b
Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/5193038c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/5193038c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/5193038c
Branch: refs/heads/master
Commit: 5193038c268f669d8f9cbe1f0870b392abe8615d
Parents: 5d5864e
Author: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Authored: Fri May 20 11:34:38 2016 -0700
Committer: Francisco Perez-Sorrosal <fp...@yahoo-inc.com>
Committed: Fri May 20 11:37:05 2016 -0700
----------------------------------------------------------------------
tso-server/bin/omid.sh | 4 ++--
tso-server/maven/assembly/bin.xml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5193038c/tso-server/bin/omid.sh
----------------------------------------------------------------------
diff --git a/tso-server/bin/omid.sh b/tso-server/bin/omid.sh
index 66382d7..a798b9d 100755
--- a/tso-server/bin/omid.sh
+++ b/tso-server/bin/omid.sh
@@ -7,12 +7,12 @@ CLASSPATH=../conf
. ../conf/omid-env.sh
# for source release
-for j in ../target/tso*.jar; do
+for j in ../target/omid-tso*.jar; do
CLASSPATH=$CLASSPATH:$j
done
# for binary release
-for j in ../tso*.jar; do
+for j in ../omid-tso*.jar; do
CLASSPATH=$CLASSPATH:$j
done
for j in ../lib/*.jar; do
http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/5193038c/tso-server/maven/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/tso-server/maven/assembly/bin.xml b/tso-server/maven/assembly/bin.xml
index 7fe4c22..f1afc28 100644
--- a/tso-server/maven/assembly/bin.xml
+++ b/tso-server/maven/assembly/bin.xml
@@ -17,9 +17,9 @@
<useAllReactorProjects>true</useAllReactorProjects>
<!-- Now, select which projects to include in this module-set. -->
<includes>
- <include>org.apache.omid:hbase-commit-table</include>
- <include>org.apache.omid:codahale-metrics</include>
- <include>org.apache.omid:hbase-tools</include>
+ <include>org.apache.omid:omid-hbase-commit-table</include>
+ <include>org.apache.omid:omid-codahale-metrics</include>
+ <include>org.apache.omid:omid-hbase-tools</include>
</includes>
<binaries>
<outputDirectory>/lib</outputDirectory>