You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2013/01/29 13:27:47 UTC
svn commit: r1439855 - in /qpid/proton/branches/jni-binding: ./
cmake/Modules/ proton-c/ proton-c/bindings/java/
proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/
proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni...
Author: kwall
Date: Tue Jan 29 12:27:46 2013
New Revision: 1439855
URL: http://svn.apache.org/viewvc?rev=1439855&view=rev
Log:
PROTON-194: CMake now builds proton-j-impl. Re-root jni thunking source code from bindings/java/jni/src to bindings/java/src. Various refactorings with the CMakeLists.txt including the extract function rebuild_jar which is shared between proton-jni and proton-j-impl.
Added:
qpid/proton/branches/jni-binding/cmake/Modules/UseProtonJava.cmake
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIException.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIException.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory
- copied, changed from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory
qpid/proton/branches/jni-binding/proton-j/proton/CMakeLists.txt
Removed:
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIException.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory
qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory
Modified:
qpid/proton/branches/jni-binding/CMakeLists.txt
qpid/proton/branches/jni-binding/cmake/Modules/README
qpid/proton/branches/jni-binding/cmake/Modules/UseJava.cmake
qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt
qpid/proton/branches/jni-binding/proton-c/bindings/java/CMakeLists.txt
qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt
Modified: qpid/proton/branches/jni-binding/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/CMakeLists.txt?rev=1439855&r1=1439854&r2=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/CMakeLists.txt Tue Jan 29 12:27:46 2013
@@ -27,6 +27,9 @@ set (PN_VERSION_MAJOR 0)
set (PN_VERSION_MINOR 3)
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
+# Location of proton-api jar created by the build; used by proton-jni and proton-j-impl
+set (PROTON_API_TARGET_JAR ${CMAKE_BINARY_DIR}/proton-j/proton-api/proton-api-${PN_VERSION}.jar)
+
# Used to allow the building of the Java bindings when CMAKE_VERSION < 2.6.8
if ( ${CMAKE_VERSION} VERSION_LESS "2.8.6" )
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
@@ -35,12 +38,12 @@ endif ()
find_package( Java )
if (JAVA_FOUND)
message("Java version: ${Java_VERSION}. javac is at: ${Java_JAVAC_EXECUTABLE}")
-endif()
-
-add_subdirectory(proton-c)
+ include(UseJava)
+ include(UseProtonJava)
-if (JAVA_FOUND)
add_subdirectory(proton-j/proton-api)
-endif ()
+ add_subdirectory(proton-j/proton)
+endif()
+add_subdirectory(proton-c)
Modified: qpid/proton/branches/jni-binding/cmake/Modules/README
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/cmake/Modules/README?rev=1439855&r1=1439854&r2=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/cmake/Modules/README (original)
+++ qpid/proton/branches/jni-binding/cmake/Modules/README Tue Jan 29 12:27:46 2013
@@ -1,4 +1,15 @@
-This is Andreas Schneider's CMake Java Support. We have our own local copy merely
+CMake Modules
+=============
+
+Contents:
+
+UseJava, UseJavaSymLinks, UseJavaClassFilelist:
+
+These are Andreas Schneider's CMake Java Support. We have our own local copy merely
to allow us to build the Java bindings with older versions of cmake (<2.8.6). Local modifications
are commented with "Apache Qpid Proton...".
If cmake 2.8.6 is in use, these files will not be used.
+
+UseProtonJava:
+
+Custom support functions for the Proton Java modules
Modified: qpid/proton/branches/jni-binding/cmake/Modules/UseJava.cmake
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/cmake/Modules/UseJava.cmake?rev=1439855&r1=1439854&r2=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/cmake/Modules/UseJava.cmake (original)
+++ qpid/proton/branches/jni-binding/cmake/Modules/UseJava.cmake Tue Jan 29 12:27:46 2013
@@ -190,6 +190,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+message("Loading Proton's UseJava module")
+
function (__java_copy_file src dest comment)
add_custom_command(
OUTPUT ${dest}
Copied: qpid/proton/branches/jni-binding/cmake/Modules/UseProtonJava.cmake (from r1439419, qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/cmake/Modules/UseProtonJava.cmake?p2=qpid/proton/branches/jni-binding/cmake/Modules/UseProtonJava.cmake&p1=qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/cmake/Modules/UseProtonJava.cmake Tue Jan 29 12:27:46 2013
@@ -16,14 +16,15 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.6)
-include(UseJava)
+# Adds a custom command to rebuild the JAR to include META-INF resources and the
+# directory entries that are missed by add_jar()
-project (Proton-API Java)
+function (rebuild_jar upstream_target jar_name)
+ add_custom_command(TARGET ${upstream_target} POST_BUILD
+ COMMAND ${Java_JAR_EXECUTABLE} cf ${jar_name}
+ -C ${CMAKE_CURRENT_SOURCE_DIR}/src/main/resources META-INF
+ -C ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${upstream_target}.dir/ org
+ COMMENT "Rebuilding ${jar_name} to include missing resources")
+endfunction ()
-set(CMAKE_JAVA_TARGET_VERSION ${PN_VERSION})
-
-file(GLOB_RECURSE SOURCES_ABS "src/main/java/*.java")
-
-add_jar(proton-api ${SOURCES_ABS})
Modified: qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt?rev=1439855&r1=1439854&r2=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/proton-c/CMakeLists.txt Tue Jan 29 12:27:46 2013
@@ -16,13 +16,11 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.6)
include(CheckLibraryExists)
include(CheckSymbolExists)
-project (Proton C)
-
+# PHTODO remove verion numbers
set (PN_VERSION_MAJOR 0)
set (PN_VERSION_MINOR 3)
set (PN_VERSION "${PN_VERSION_MAJOR}.${PN_VERSION_MINOR}")
Modified: qpid/proton/branches/jni-binding/proton-c/bindings/java/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/CMakeLists.txt?rev=1439855&r1=1439854&r2=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/bindings/java/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/proton-c/bindings/java/CMakeLists.txt Tue Jan 29 12:27:46 2013
@@ -16,14 +16,9 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.6)
-
-include(UseJava)
-
-project (Proton-JNI Java)
SET(CMAKE_SWIG_FLAGS -package org.apache.qpid.proton.jni)
-SET(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/jni/src/main/java/org/apache/qpid/proton/jni)
+SET(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR}/src/main/java/org/apache/qpid/proton/jni)
message( "PHDEBUG JNI_LIBRARIES: ${JNI_LIBRARIES}" )
@@ -42,22 +37,14 @@ add_dependencies(proton-swig protonjniou
set(CMAKE_JAVA_TARGET_VERSION ${PN_VERSION})
-file(GLOB_RECURSE THUNKING_SOURCES_ABS "jni/src/main/java/*.java")
-
-# TODO: Why do we need to explicitly set the classpath? Why is the fact that we depend on
-# proton-api not sufficient?
-set(CMAKE_JAVA_INCLUDE_PATH ${CMAKE_BINARY_DIR}/proton-j/proton-api/proton-api-${PN_VERSION}.jar)
+file(GLOB_RECURSE THUNKING_SOURCES_ABS "src/main/java/*.java")
+set(CMAKE_JAVA_INCLUDE_PATH ${PROTON_API_TARGET_JAR})
-# TODO: We are relying on shell expansion to find the swig generated sources. Surely there is a better way?
+# PHTODO: We are relying on shell expansion to find the swig generated sources. Surely there is a better way?
add_jar(proton-jni ${CMAKE_SWIG_OUTDIR}/*.java ${THUNKING_SOURCES_ABS})
-# We need to rebuild the JAR to a) include the resources b) include the 'structural' directory entries that are
-# excluded by Cmake's add_jar command. The latter is required by Google Reflections.
-add_custom_command(TARGET proton-jni POST_BUILD
- COMMAND ${Java_JAR_EXECUTABLE} cf proton-jni-${PN_VERSION}.jar
- -C ${PROJECT_SOURCE_DIR}/jni/src/main/resources META-INF
- -C ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/proton-jni.dir/ org
- COMMENT "Rebuilding JAR to include missing resources")
+include(UseProtonJava)
+rebuild_jar(proton-jni proton-jni-${PN_VERSION}.jar)
add_dependencies(proton-jni proton-api proton-swig)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/ProtonCEquivalent.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIConnection.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java (original)
+++ qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIDelivery.java Tue Jan 29 12:27:46 2013
@@ -185,7 +185,7 @@ public class JNIDelivery implements Deli
Proton.pn_delivery_set_context(_impl, null);
// Proton.pn_delivery_free(_impl);
_impl = null;
- }
+ }
}
@Override
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIEngineFactory.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java (original)
+++ qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNILink.java Tue Jan 29 12:27:46 2013
@@ -417,14 +417,14 @@ abstract class JNILink implements Link
@ProtonCEquivalent("pn_link_state")
public EndpointState getLocalState()
{
- return StateConverter.getLocalState(Proton.pn_link_state(_impl));
+ return StateConverter.getLocalState(Proton.pn_link_state(_impl));
}
@Override
@ProtonCEquivalent("pn_link_state")
public EndpointState getRemoteState()
{
- return StateConverter.getRemoteState(Proton.pn_link_state(_impl));
+ return StateConverter.getRemoteState(Proton.pn_link_state(_impl));
}
@Override
@@ -449,7 +449,7 @@ abstract class JNILink implements Link
Proton.pn_link_free(_impl);
_impl = null;
}
-
+
}
@Override
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNIReceiver.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISasl.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISender.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISession.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISsl.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNISslDomain.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java (original)
+++ qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java Tue Jan 29 12:27:46 2013
@@ -51,7 +51,7 @@ public class JNITransport implements Tra
{
JNIConnection jniConn = (JNIConnection)connection;
SWIGTYPE_p_pn_connection_t connImpl = jniConn.getImpl();
- Proton.pn_transport_bind(_impl, connImpl);
+ Proton.pn_transport_bind(_impl, connImpl);
}
@Override
@@ -106,7 +106,7 @@ public class JNITransport implements Tra
{
sessionId = sslPeerDetails.getHostname() + ":" + sslPeerDetails.getPort();
}
-
+
SWIGTYPE_p_pn_ssl_t pn_ssl = Proton.pn_ssl( _impl );
_ssl = new JNISsl( pn_ssl);
Proton.pn_ssl_init(pn_ssl, ((JNISslDomain)sslDomain).getImpl(), sessionId);
@@ -164,7 +164,7 @@ public class JNITransport implements Tra
@Override
public void setContext(Object o)
{
- _context = o;
+ _context = o;
}
@Override
@@ -177,7 +177,7 @@ public class JNITransport implements Tra
protected void finalize() throws Throwable
{
free();
- super.finalize();
+ super.finalize();
}
// PHTODO delete main/pump
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/engine/jni/StateConverter.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/ExceptionHelper.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIException.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIException.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIException.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIException.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIException.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/jni/JNIFactory.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java (original)
+++ qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessage.java Tue Jan 29 12:27:46 2013
@@ -142,11 +142,11 @@ public class JNIMessage implements Messa
private pn_atom_t convertToAtom(Object o)
{
pn_atom_t atom = new pn_atom_t();
-
+
//PN_NULL
if(o == null)
{
- atom.setType(pn_type_t.PN_NULL);
+ atom.setType(pn_type_t.PN_NULL);
}
//PN_BOOL
else if(o instanceof Boolean)
@@ -283,7 +283,7 @@ public class JNIMessage implements Messa
return atom;
}
-
+
private Object convert(pn_atom_t atom)
{
if(atom != null)
@@ -825,7 +825,7 @@ public class JNIMessage implements Messa
throw new UnsupportedOperationException();
}
- public void setApplicationProperties(ApplicationProperties applicationProperties)
+ public void setApplicationProperties(ApplicationProperties applicationProperties)
{
//TODO
throw new UnsupportedOperationException();
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/message/jni/JNIMessageFactory.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/java/org/apache/qpid/proton/messenger/jni/JNIMessengerFactory.java&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.engine.EngineFactory&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.message.MessageFactory&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Copied: qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory (from r1439419, qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory?p2=qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory&p1=qpid/proton/branches/jni-binding/proton-c/bindings/java/jni/src/main/resources/META-INF/services/org.apache.qpid.proton.messenger.MessengerFactory&r1=1439419&r2=1439855&rev=1439855&view=diff
==============================================================================
(empty)
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt?rev=1439855&r1=1439854&r2=1439855&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/CMakeLists.txt Tue Jan 29 12:27:46 2013
@@ -16,11 +16,6 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.6)
-
-include(UseJava)
-
-project (Proton-API Java)
set(CMAKE_JAVA_TARGET_VERSION ${PN_VERSION})
Added: qpid/proton/branches/jni-binding/proton-j/proton/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton/CMakeLists.txt?rev=1439855&view=auto
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton/CMakeLists.txt (added)
+++ qpid/proton/branches/jni-binding/proton-j/proton/CMakeLists.txt Tue Jan 29 12:27:46 2013
@@ -0,0 +1,59 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+set(BOUNCYCASTLE_VERSION 1.47)
+find_jar(BOUNCYCASTLE_BCPKIX_JAR
+ NAMES bcpkix-jdk15on
+ PATHS $ENV{PROTON_JAR_DEPEND_DIR}
+ VERSIONS ${BOUNCYCASTLE_VERSION}
+ DOC "Full path to Bouncycastle PKIX jar")
+find_jar(BOUNCYCASTLE_BCPROV_JAR
+ NAMES bcprov-jdk15on
+ PATHS $ENV{PROTON_JAR_DEPEND_DIR}
+ VERSIONS ${BOUNCYCASTLE_VERSION}
+ DOC "Full path to Bouncycastle Provider jar")
+
+if (${BOUNCYCASTLE_BCPKIX_JAR} MATCHES "^.*-NOTFOUND$" OR ${BOUNCYCASTLE_BCPROV_JAR} MATCHES "^.*-NOTFOUND$")
+ set(BOUNCYCASTLE_FOUND FALSE)
+else()
+ set(BOUNCYCASTLE_FOUND TRUE)
+endif()
+
+message("Locations of Bouncycastle ${BOUNCYCASTLE_VERSION} jars: "
+ "${BOUNCYCASTLE_BCPROV_JAR} ${BOUNCYCASTLE_BCPKIX_JAR}")
+
+if (BOUNCYCASTLE_FOUND)
+ message("Will build proton-j-impl")
+ set(CMAKE_JAVA_TARGET_VERSION ${PN_VERSION})
+
+ file(GLOB_RECURSE SOURCES_ABS "src/main/java/*.java")
+
+ set(CMAKE_JAVA_INCLUDE_PATH
+ ${PROTON_API_TARGET_JAR}
+ ${BOUNCYCASTLE_BCPROV_JAR}
+ ${BOUNCYCASTLE_BCPKIX_JAR})
+
+ add_jar(proton-j-impl ${SOURCES_ABS})
+
+ rebuild_jar(proton-j-impl proton-j-impl-${PN_VERSION}.jar)
+
+ add_dependencies(proton-j-impl proton-api)
+else()
+ message("Won't build proton-j-impl because one or more Bouncycastle jars were not found")
+endif()
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org