You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by bz...@apache.org on 2015/04/28 23:05:32 UTC
oozie git commit: OOZIE-2199 Ooziedb.cmd and oozie-setup.ps1 are
missing jars in lib/ for classpath on Windows (venkatnrangan via bzhang)
Repository: oozie
Updated Branches:
refs/heads/master b1f5cf027 -> 9cea0e756
OOZIE-2199 Ooziedb.cmd and oozie-setup.ps1 are missing jars in lib/ for classpath on Windows (venkatnrangan via bzhang)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9cea0e75
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9cea0e75
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9cea0e75
Branch: refs/heads/master
Commit: 9cea0e7566ee79b0c7eb2a6bd9f8e8384edf3ab4
Parents: b1f5cf0
Author: Bowen Zhang <bo...@yahoo.com>
Authored: Tue Apr 28 14:03:33 2015 -0700
Committer: Bowen Zhang <bo...@yahoo.com>
Committed: Tue Apr 28 14:05:08 2015 -0700
----------------------------------------------------------------------
distro/src/main/bin/oozie-setup.ps1 | 2 +-
release-log.txt | 1 +
tools/src/main/bin/ooziedb.cmd | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/9cea0e75/distro/src/main/bin/oozie-setup.ps1
----------------------------------------------------------------------
diff --git a/distro/src/main/bin/oozie-setup.ps1 b/distro/src/main/bin/oozie-setup.ps1
index cf1f5e8..18ab973 100644
--- a/distro/src/main/bin/oozie-setup.ps1
+++ b/distro/src/main/bin/oozie-setup.ps1
@@ -88,7 +88,7 @@ if (($Command -eq "sharelib") -Or ($Command -eq "db")) {
$OOZIE_OPTS="$OOZIE_OPTS -Dderby.stream.error.file=$OOZIE_HOME\log\derby.log"
$OOZIECPPATH=""
- $OOZIECPPATH="$OOZIE_HOME\libtools\*"
+ $OOZIECPPATH="$OOZIE_HOME\libtools\*;$OOZIE_HOME\lib\*;$OOZIE_HOME\..\extra_libs\*"
$COMMAND_OPTS=[string]$args
http://git-wip-us.apache.org/repos/asf/oozie/blob/9cea0e75/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 3745283..48ac8c2 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.2.0 release (trunk - unreleased)
+OOZIE-2199 Ooziedb.cmd and oozie-setup.ps1 are missing jars in lib/ for classpath on Windows (venkatnrangan via bzhang)
OOZIE-2012 coordinator with an invalid cron frequency throws NPE after validation (bzhang)
OOZIE-2129 Duplicate child jobs per instance (jaydeepvishwakarma via shwethags)
OOZIE-2214 fix test case TestCoordRerunXCommand.testCoordRerunDateNeg (ryota)
http://git-wip-us.apache.org/repos/asf/oozie/blob/9cea0e75/tools/src/main/bin/ooziedb.cmd
----------------------------------------------------------------------
diff --git a/tools/src/main/bin/ooziedb.cmd b/tools/src/main/bin/ooziedb.cmd
index 92a7cfd..04b3bdd 100644
--- a/tools/src/main/bin/ooziedb.cmd
+++ b/tools/src/main/bin/ooziedb.cmd
@@ -55,6 +55,8 @@ set OOZIECPPATH=.
@rem Add libtools to the classpath
set OOZIECPPATH=%OOZIECPPATH%;%BASEDIR%\libtools\*
+@rem Add lib to the classpath
+set OOZIECPPATH=%OOZIECPPATH%;%BASEDIR%\lib\*
@rem Add extra_libs to the classpath
set OOZIECPPATH=%OOZIECPPATH%;%BASEDIR%\..\extra_libs\*