From patchwork Wed Oct 10 22:00:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Watkins X-Patchwork-Id: 1575861 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9896ADFB34 for ; Wed, 10 Oct 2012 22:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756023Ab2JJWAX (ORCPT ); Wed, 10 Oct 2012 18:00:23 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:65359 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755199Ab2JJWAW (ORCPT ); Wed, 10 Oct 2012 18:00:22 -0400 Received: by mail-pb0-f46.google.com with SMTP id rr4so1163738pbb.19 for ; Wed, 10 Oct 2012 15:00:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ucsc.edu; s=ucsc-google; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=igE6OMZc7sr49C13gUp6Ci+1pTwIhHMjBrZTO+g7xYg=; b=ok8QJlI8FtUgqZSSIoiN0GKPnXEVLUI15ofMuR0kDEwQK5dGpbNBH7RAcgy+Vx931n 2EHVKU13vdqLeeRzQWoJx3Hyq4IeJdCt+CD9xuTPCFMWVeTmgFBnVNyvL4ZsxtliMsNU MjTb+B2oz7EFE2q92zlcphRUh6hQ1+qXlMHBA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=igE6OMZc7sr49C13gUp6Ci+1pTwIhHMjBrZTO+g7xYg=; b=L9VzYjNl7151DNEOcjbDIN19BiBB5vEYgAeYAjlYh4QnsmcophgSDLYKqsWdbtV+Ck IfwzUhtIywyS5iKOTrjIFvBNZ+BPBLE/fGoIG4pt3zDnrg+u6km04OQAoIlhuMz37d7M ARAZfFVpN5ablYNzIKV8KC6h0hCFS1rY+pYR0Zk+cG6L+f0KwCDNLbkJDyUm/Aud3Awy VyGtt7UgMOFv9mmlpu3xHQzoEk6F6Hhx5IPqQqOoFTGe5w/g88I67B4qiWIwW7PWT1UQ M/IlyxOSDJlszVP3uvk9r40+yu5OAUovypjI+ReUzVrs5LZDbWEhMQocrji4t1AxN8Ss l+1g== Received: by 10.68.227.162 with SMTP id sb2mr78999156pbc.4.1349906421512; Wed, 10 Oct 2012 15:00:21 -0700 (PDT) Received: from martini.local (soenat3.cse.ucsc.edu. [128.114.60.41]) by mx.google.com with ESMTPS id d9sm1423343paw.35.2012.10.10.15.00.20 (version=SSLv3 cipher=OTHER); Wed, 10 Oct 2012 15:00:21 -0700 (PDT) Message-ID: <5075EFF3.9000106@cs.ucsc.edu> Date: Wed, 10 Oct 2012 15:00:19 -0700 From: Noah Watkins User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:11.0) Gecko/20120327 Thunderbird/11.0.1 MIME-Version: 1.0 To: "Laszlo Boszormenyi (GCS)" CC: James Page , Sage Weil , Joe Buck , ceph-devel Subject: Re: [GIT PULL v5] java: add libcephfs Java bindings References: <506DF09B.20505@ubuntu.com> <1349388042.11633.161.camel@julia> In-Reply-To: X-Gm-Message-State: ALoCoQlWidLQCitfZ5GOKlwC1ROKeGYdBWuKv6Yj4uTBhdQtBJVdoos7tjw+MsJWoltVT3wynszf Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Laszlo, James: Changes based on your previous feedback are ready for review. I pushed the changes here: git://github.com/noahdesu/ceph.git wip-java-cephfs Thanks! - Noah From 0d8c4dc39f9b8f2e264bb2503c053418ad72b705 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Wed, 10 Oct 2012 13:57:03 -0700 Subject: [PATCH] java: update deb bits from ceph-devel feedback Signed-off-by: Noah Watkins --- debian/.gitignore | 3 ++- debian/control | 10 ++++++++-- debian/libceph-java.jlibs | 1 + debian/libceph-jni.install | 1 + debian/libceph1-java.install | 2 -- debian/rules | 1 + src/java/.gitignore | 2 +- src/java/Makefile.am | 8 ++++---- src/java/README | 2 +- src/java/build.xml | 6 +++--- 10 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 debian/libceph-java.jlibs create mode 100644 debian/libceph-jni.install delete mode 100644 debian/libceph1-java.install -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/debian/.gitignore b/debian/.gitignore index c5b73ce..2fd5a05 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -30,5 +30,6 @@ /rest-bench-dbg /rest-bench /python-ceph -/libceph1-java +/libceph-java +/libceph-jni /tmp diff --git a/debian/control b/debian/control index 579855f..62c85d9 100644 --- a/debian/control +++ b/debian/control @@ -319,8 +319,14 @@ Description: Python libraries for the Ceph distributed filesystem This package contains Python libraries for interacting with Ceph's RADOS object storage, and RBD (RADOS block device). -Package: libceph1-java +Package: libceph-java Section: java +Architecture: all +Depends: libceph-jni, ${java:Depends}, ${misc:Depends} +Description: Java libraries for the Ceph File System. + +Package: libceph-jni Architecture: linux-any +Section: libs Depends: libcephfs1, ${shlibs:Depends}, ${java:Depends}, ${misc:Depends} -Description: Java libraries for the Ceph File System +Description: Java Native Interface library for CephFS Java bindings. diff --git a/debian/libceph-java.jlibs b/debian/libceph-java.jlibs new file mode 100644 index 0000000..952a190 --- /dev/null +++ b/debian/libceph-java.jlibs @@ -0,0 +1 @@ +src/java/ceph.jar diff --git a/debian/libceph-jni.install b/debian/libceph-jni.install new file mode 100644 index 0000000..072b990 --- /dev/null +++ b/debian/libceph-jni.install @@ -0,0 +1 @@ +usr/lib/libcephfs_jni.so* usr/lib/jni diff --git a/debian/libceph1-java.install b/debian/libceph1-java.install deleted file mode 100644 index 98133e4..0000000 --- a/debian/libceph1-java.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libcephfs_jni.so* usr/lib/jni -usr/lib/libcephfs.jar usr/share/java diff --git a/debian/rules b/debian/rules index b848ddc..6d61385 100755 --- a/debian/rules +++ b/debian/rules @@ -93,6 +93,7 @@ install: build # Add here commands to install the package into debian/testpack. # Build architecture-independent files here. binary-indep: build install + jh_installlibs -v -i # We have nothing to do by default. # Build architecture-dependent files here. diff --git a/src/java/.gitignore b/src/java/.gitignore index 8208e2b..b8eb0e9 100644 --- a/src/java/.gitignore +++ b/src/java/.gitignore @@ -1,4 +1,4 @@ *.class -libcephfs.jar +ceph.jar native/com_ceph_fs_CephMount.h TEST-*.txt diff --git a/src/java/Makefile.am b/src/java/Makefile.am index 5c54f36..87d763d 100644 --- a/src/java/Makefile.am +++ b/src/java/Makefile.am @@ -24,20 +24,20 @@ CEPH_PROXY=java/com/ceph/fs/CephMount.class $(CEPH_PROXY): $(JAVA_SRC) export CLASSPATH=java/ ; - $(JAVAC) java/com/ceph/fs/*.java + $(JAVAC) -source 1.5 -target 1.5 java/com/ceph/fs/*.java $(JAVA_H): $(CEPH_PROXY) export CLASSPATH=java/ ; \ $(JAVAH) -jni -o $@ com.ceph.fs.CephMount -libcephfs.jar: $(CEPH_PROXY) +ceph.jar: $(CEPH_PROXY) $(JAR) cf $@ $(JAVA_CLASSES:%=-C java %) # $(ESCAPED_JAVA_CLASSES:%=-C java %) javadir = $(libdir) -java_DATA = libcephfs.jar +java_DATA = ceph.jar BUILT_SOURCES = $(JAVA_H) -CLEANFILES = -rf java/com/ceph/fs/*.class $(JAVA_H) libcephfs.jar +CLEANFILES = -rf java/com/ceph/fs/*.class $(JAVA_H) ceph.jar endif diff --git a/src/java/README b/src/java/README index ca39a44..d58ab8a 100644 --- a/src/java/README +++ b/src/java/README @@ -33,7 +33,7 @@ Ant is used to run the unit test (apt-get install ant). For example: 1. The tests depend on the compiled wrappers. If the wrappers are installed as part of a package (e.g. Debian package) then this should 'just work'. Ant will -also look in the current directory for 'libcephfs.jar' and in ../.libs for the +also look in the current directory for 'ceph.jar' and in ../.libs for the JNI library. If all else fails, set the environment variables CEPHFS_JAR, and CEPHFS_JNI_LIB accordingly. diff --git a/src/java/build.xml b/src/java/build.xml index f846ca4..203ffc0 100644 --- a/src/java/build.xml +++ b/src/java/build.xml @@ -31,10 +31,10 @@ + includeantruntime="false" source="1.5" target="1.5"> - + @@ -51,7 +51,7 @@ - +