[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 8bba46869f7056b0d9a68beb7b1f7c5dae9ebed8

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_3 has been updated
       via  8bba46869f7056b0d9a68beb7b1f7c5dae9ebed8 (commit)
       via  d710795be44bd9cadb0191434d7ba42b6bd12fc3 (commit)
      from  99978c63b5f267cad91cfe8e3743d7a8cb30862b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8bba46869f7056b0d9a68beb7b1f7c5dae9ebed8
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Oct 31 13:25:04 2012 -0400

    Fix OSRF_HOME and EXT in Open-ILs/src/java/Makefil.am.
    
    Change the paths so that they work.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/java/Makefile.am b/Open-ILS/src/java/Makefile.am
index ee4607c..5b9dc24 100644
--- a/Open-ILS/src/java/Makefile.am
+++ b/Open-ILS/src/java/Makefile.am
@@ -1,9 +1,9 @@
 JAVA_LIBDIR = .lib
 JAVAC = javac -J-Xmx256m
 JAVA = java -Xmx256m 
-OSRF_HOME = ../../../../../OpenSRF/trunk/src/java
+OSRF_HOME = ../../../../OpenSRF/src/java
 OSRFJAVA = $(OSRF_HOME)/opensrf.jar
-EXT = $(OSRF_HOME)/ext
+EXT = $(OSRF_HOME)/deps
 JAVA_LIBS = .:$(JAVA_LIBDIR):$(OSRFJAVA):$(EXT)/json.jar:$(EXT)/java_memcached-release_2.0.1.jar
 JAVA_SRC = \
 	org/open_ils/*.java\

commit d710795be44bd9cadb0191434d7ba42b6bd12fc3
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Oct 30 17:10:42 2012 -0400

    Update Java dependencies.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/java/Makefile.am b/Open-ILS/src/java/Makefile.am
index 98a975e..ee4607c 100644
--- a/Open-ILS/src/java/Makefile.am
+++ b/Open-ILS/src/java/Makefile.am
@@ -4,7 +4,7 @@ JAVA = java -Xmx256m
 OSRF_HOME = ../../../../../OpenSRF/trunk/src/java
 OSRFJAVA = $(OSRF_HOME)/opensrf.jar
 EXT = $(OSRF_HOME)/ext
-JAVA_LIBS = .:$(JAVA_LIBDIR):$(OSRFJAVA):$(EXT)/json-jdk1.5-2007-05-01.jar:$(EXT)/wstx-lgpl-3.2.1.jar:$(EXT)/stax-api-1.0.1.jar:$(EXT)/java_memcached-release_1.5.1.jar
+JAVA_LIBS = .:$(JAVA_LIBDIR):$(OSRFJAVA):$(EXT)/json.jar:$(EXT)/java_memcached-release_2.0.1.jar
 JAVA_SRC = \
 	org/open_ils/*.java\
 	org/open_ils/idl/*.java\
@@ -45,6 +45,5 @@ docs:
 
 clean:
 	rm -r $(JAVA_LIBDIR)
-	
 
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/java/Makefile.am |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS