bzr push into clusterj branch (bernhard.ocklin:140 to 141)

[Bernhard Ocklin]

  141 Bernhard Ocklin	2009-11-02
      add all services to general package

    modified:
      Makefile.am
      configure.in
  140 Bernhard Ocklin	2009-11-02
      add all services to test package

    modified:
      clusterj-test/Makefile.am
=== modified file 'Makefile.am'
--- a/Makefile.am	2009-10-30 13:26:22 +0000
+++ b/Makefile.am	2009-11-02 09:47:40 +0000
@@ -28,7 +28,7 @@ JAVAROOT=$(top_srcdir)/target/classes/
 
 clusterjdir= $(prefix)/share/mysql/java/
 
-clusterj_JAR = clusterj-@VERSION@.jar
+clusterj_JAR = mysql-cluster-connector-j-@VERSION@.jar
 
 dist_clusterj_DATA = $(clusterj_JAR) 
 EXTRA_DIST =
@@ -41,6 +41,11 @@ manifest:
 	echo "Bundle-Description: The API for ClusterJ"  >> $(JAVAROOT)/MANIFEST.MF
 
 $(clusterj_JAR) : manifest
-	rm -f $@; CLASS_DIRS=; for i in $(BASE_DIRS); do CLASS_DIRS="$$CLASS_DIRS -C $$i/target/classes com/mysql/clusterj"; done; \
+	rm -f $@; CLASS_DIRS=; for i in $(BASE_DIRS); do \
+	  CLASS_DIRS="$$CLASS_DIRS -C $$i/target/classes com/mysql/clusterj"; \
+	  if test -x $$i/src/main/resources/META-INF/services; then \
+	    CLASS_DIRS="$$CLASS_DIRS -C $$i/src/main/resources META-INF/services"; \
+	  fi; \
+	done; \
 	@JAR@ cvfm $@ $(JAVAROOT)/MANIFEST.MF; @JAR@ uvf $@ $$CLASS_DIRS
 

=== modified file 'configure.in'
--- a/configure.in	2009-10-30 12:13:19 +0000
+++ b/configure.in	2009-11-02 09:47:40 +0000
@@ -40,7 +40,7 @@ AS_IF([test "x$clusterj_openjpa_classpat
 
 AC_DEFUN([CLUSTERJ_TARGETS], [
   sub_classes="target/classes"
-  sub_jars="clusterj-api clusterj-core clusterj-tie clusterj-test clusterj-openjpa clusterj-jpatest"
+  sub_jars="./ clusterj-api clusterj-core clusterj-tie clusterj-test clusterj-openjpa clusterj-jpatest"
 
   for D in $sub_jars; do
   echo "creating $D/$sub_classes"


Attachment: [text/bzr-bundle]