Author: rajith
Date: Tue May 29 14:27:51 2012
New Revision: 1343747
URL: http://svn.apache.org/viewvc?rev=1343747&view=rev
Log:
QPID-4027 Experimental cpp binding. Adding the swig and support files.
Adding a connection factor class that loads various implementaitons.
Added:
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/.gitignore
- copied, changed from r1339264,
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/CMakeLists.txt
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/LICENSE
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.cpp
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.h
qpid/branches/address-refactor2/qpid/cpp/bindings/swig_java_typemaps.i
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionFactory.java
Modified:
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt
qpid/branches/address-refactor2/qpid/cpp/include/qpid/messaging/Message.h
qpid/branches/address-refactor2/qpid/cpp/src/qpid/messaging/Message.cpp
qpid/branches/address-refactor2/qpid/java/build.deps
Modified: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt?rev=1343747&r1=1343746&r2=1343747&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt
(original)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt Tue
May 29 14:27:51 2012
@@ -23,6 +23,8 @@ include(UseSWIG)
include(FindRuby)
include(FindPythonLibs)
include(FindPerlLibs)
+include(FindJava)
+include(FindJNI)
if (SWIG_FOUND)
set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503")
@@ -38,4 +40,8 @@ if (SWIG_FOUND)
if (PERLLIBS_FOUND)
add_subdirectory(perl)
endif (PERLLIBS_FOUND)
+
+ if (JAVA_FOUND AND JNI_FOUND)
+ add_subdirectory(java)
+ endif (JAVA_FOUND AND JNI_FOUND)
endif (SWIG_FOUND)
Copied: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/.gitignore
(from r1339264,
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt)
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/.gitignore?p2=qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/.gitignore&p1=qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt&r1=1339264&r2=1343747&rev=1343747&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/CMakeLists.txt
(original)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/.gitignore Tue
May 29 14:27:51 2012
@@ -17,25 +17,5 @@
# under the License.
#
-
-include(FindSWIG)
-include(UseSWIG)
-include(FindRuby)
-include(FindPythonLibs)
-include(FindPerlLibs)
-
-if (SWIG_FOUND)
- set(CMAKE_SWIG_FLAGS "-w361,362,401,467,503")
-
- if (PYTHONLIBS_FOUND)
- add_subdirectory(python)
- endif (PYTHONLIBS_FOUND)
-
- if (RUBY_FOUND)
- add_subdirectory(ruby)
- endif (RUBY_FOUND)
-
- if (PERLLIBS_FOUND)
- add_subdirectory(perl)
- endif (PERLLIBS_FOUND)
-endif (SWIG_FOUND)
+pkg
+html
Added:
qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/CMakeLists.txt?rev=1343747&view=auto
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/CMakeLists.txt
(added)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/CMakeLists.txt
Tue May 29 14:27:51 2012
@@ -0,0 +1,51 @@
+#
+# 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.
+#
+
+##--------------------------------------------------
+## Properties used for generating the Java bindings.
+##--------------------------------------------------
+set(JAVA_PACKAGE_NAME org.apache.qpid.messaging.cpp.jni)
+set(JAVA_PACKAGE_DIR org/apache/qpid/messaging/cpp/jni)
+set(CMAKE_SWIG_FLAGS -package ${JAVA_PACKAGE_NAME})
+
+##------------------------------------------------------
+## Use Swig to generate a literal binding to the C++ API
+##------------------------------------------------------
+
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/java.i PROPERTIES
CPLUSPLUS ON)
+set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/java.i PROPERTIES
SWIG_FLAGS "-I${qpid-cpp_SOURCE_DIR}/include")
+
+swig_add_module(cqpid_java java ${CMAKE_CURRENT_SOURCE_DIR}/java.i)
+swig_link_libraries(cqpid_java qpidmessaging qpidtypes ${JNI_LIBRARIES})
+
+set_source_files_properties(${swig_generated_file_fullname} PROPERTIES
COMPILE_FLAGS "-fno-strict-aliasing -I${JAVA_INCLUDE_PATH}
-I${JAVA_INCLUDE_PATH2} -I${qpid-cpp_SOURCE_DIR}/include
-I${CMAKE_CURRENT_SOURCE_DIR}")
+
+##------------------------------------------------------
+## Copy the jar file to java/lib dir
+## TODO: need to add the qpid release version to the jar file
+##------------------------------------------------------
+
+add_custom_command(TARGET cqpid_java
+ POST_BUILD
+ COMMAND cmake -E echo "Compiling Java files..."
+ COMMAND cmake -E make_directory ${JAVA_PACKAGE_DIR}
+ COMMAND ${Java_JAVAC_EXECUTABLE} *.java -d ./
+ COMMAND cmake -E echo "Creating jar file..."
+ COMMAND ${Java_JAR_EXECUTABLE} cvf qpid_cpp_jni.jar org
+ )
Added: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/LICENSE
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/LICENSE?rev=1343747&view=auto
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/LICENSE (added)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/LICENSE Tue May
29 14:27:51 2012
@@ -0,0 +1,234 @@
+=========================================================================
+== Apache License ==
+=========================================================================
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+=========================================================================
+== Boost License ==
+=========================================================================
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
Added: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i?rev=1343747&view=auto
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i (added)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/java.i Tue May
29 14:27:51 2012
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+%{
+#include "jmap.h"
+#include <qpid/sys/IntegerTypes.h>
+%}
+
+%module cqpid
+%include "std_string.i"
+%include "../../swig_java_typemaps.i"
+
+%include "jmap.h"
+
+%include "../qpid.i"
+
Added: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.cpp?rev=1343747&view=auto
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.cpp (added)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.cpp Tue
May 29 14:27:51 2012
@@ -0,0 +1,92 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/types/Variant.h"
+#include "jni.h"
+
+#include <string>
+
+jmap::jmap(JNIEnv*& jniEnv, qpid::types::Variant::Map*& map): env(jniEnv),
varMap(map)
+{
+}
+
+jmap::jobject get(const std::string key) const
+{
+ jobject result;
+ qpid::types::Variant v = varMap[key];
+ try {
+ switch (v->getType()) {
+ case qpid::types::VAR_VOID: {
+ result = NULL;
+ break;
+ }
+ case qpid::types::VAR_BOOL : {
+ result = v->asBool() ? JNI_TRUE : JNI_FALSE;
+ break;
+ }
+ case qpid::types::VAR_UINT8 :
+ case qpid::types::VAR_UINT16 :
+ case qpid::types::VAR_UINT32 : {
+ result = (jnit) v->asUint32();
+ break;
+ }
+ case qpid::types::VAR_UINT64 : {
+ result = (jlong) v->asUint64();
+ break;
+ }
+ case qpid::types::VAR_INT8 :
+ case qpid::types::VAR_INT16 :
+ case qpid::types::VAR_INT32 : {
+ result = (jnit) v->asUint32();
+ break;
+ }
+ case qpid::types::VAR_INT64 : {
+ result = (jlong) v->asUint64();
+ break;
+ }
+ case qpid::types::VAR_FLOAT : {
+ result = (jfloat) v->asFloat();
+ break;
+ }
+ case qpid::types::VAR_DOUBLE : {
+ result = (jdouble) v->asDouble();
+ break;
+ }
+ case qpid::types::VAR_STRING : {
+ const std::string val(v->asString());
+ result = env->NewStringUTF(val.data());
+ break;
+ }
+ }
+ } catch (qpid::types::Exception& ex) {
+ result = NULL; // need to throw exception
+ }
+
+ return result;
+}
+
+jmap::void put (const jstring key, jobject object)
+{
+
+}
+
+
+
Added: qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.h
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.h?rev=1343747&view=auto
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.h (added)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/qpid/java/jmap.h Tue May
29 14:27:51 2012
@@ -0,0 +1,40 @@
+/*
+ *
+ * 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.
+ *
+ */
+
+#include "qpid/types/Variant.h"
+#include "jni.h"
+
+#include <string>
+
+class jmap {
+
+ public:
+ jmap(JNIEnv*& jniEnv, qpid::types::Variant::Map*& map);
+ jobject get(const std::string key) const;
+ void put (const jstring key, jobject object);
+
+ private:
+ qpid::types::Variant::Map varMap;
+ JNIEnv env;
+};
+
+
+
Added: qpid/branches/address-refactor2/qpid/cpp/bindings/swig_java_typemaps.i
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/bindings/swig_java_typemaps.i?rev=1343747&view=auto
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/bindings/swig_java_typemaps.i
(added)
+++ qpid/branches/address-refactor2/qpid/cpp/bindings/swig_java_typemaps.i Tue
May 29 14:27:51 2012
@@ -0,0 +1,85 @@
+/*
+ * 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.
+ */
+
+/* These 3 typemaps tell SWIG what JNI and Java types to use */
+%typemap(jni) qpid::messaging::Message::BYTE_BUFFER "jobject"
+%typemap(jtype) qpid::messaging::Message::BYTE_BUFFER "java.nio.ByteBuffer"
+%typemap(jstype) qpid::messaging::Message::BYTE_BUFFER "java.nio.ByteBuffer"
+
+%typemap(in) (qpid::messaging::Message::BYTE_BUFFER) {
+ void* start = jenv->GetDirectBufferAddress($input);
+ long size = (long)(jenv->GetDirectBufferCapacity($input));
+ $1 = qpid::messaging::Message::BYTE_BUFFER(start,size);
+}
+
+%typemap(javain) (qpid::messaging::Message::BYTE_BUFFER)
"$module.isBufferDirect($javainput)"
+
+%pragma(java) modulecode=%{
+ /** Checks if the buffer passed is a direct buffer
+ * This method could also convert a non direct buffer into a direct buffer.
+ * However the extra copying deafeats the purpose of the binding.
+ */
+ static protected java.nio.ByteBuffer isBufferDirect(java.nio.ByteBuffer
buff) {
+ if (buff.isDirect())
+ {
+ return buff;
+ }
+ else
+ {
+ throw new RuntimeException("The ByteBuffer passed is not allocated
direct");
+ }
+ }
+%}
+
+%typemap(out) qpid::messaging::Message::BYTE_BUFFER {
+ jresult = jenv->NewDirectByteBuffer($1.getStart(), $1.getSize());
+}
+
+%typemap(javaout) qpid::messaging::Message::BYTE_BUFFER {
+ return $jnicall;
+}
+
+%typemap(jni) qpid::types::Variant::Map& "jobject"
+%typemap(jtype) qpid::types::Variant::Map& "jmap"
+%typemap(jstype) qpid::types::Variant::Map& "jmap"
+
+%typemap(out) qpid::types::Variant::Map& {
+ *(jmap **)&jresult = new jmap(jenv,$1);
+}
+
+%typemap(javaout) qpid::types::Variant::Map& {
+ return $jnicall;
+}
+
+%typemap(in) (qpid::types::Variant::Map&){
+ $1 = NULL;
+}
+
+%pragma(java) modulecode=%{
+ /** temp hack to get the code compiling.
+ * We are currently not using any of the methods
+ * That require us to set a map.
+ */
+ static protected jmap convertToJMap(Object map) {
+ return null;
+ }
+%}
+
+%typemap(javain) (qpid::types::Variant::Map&)
"$module.convertToJMap($javainput)"
+
Modified:
qpid/branches/address-refactor2/qpid/cpp/include/qpid/messaging/Message.h
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/include/qpid/messaging/Message.h?rev=1343747&r1=1343746&r2=1343747&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/include/qpid/messaging/Message.h
(original)
+++ qpid/branches/address-refactor2/qpid/cpp/include/qpid/messaging/Message.h
Tue May 29 14:27:51 2012
@@ -42,6 +42,17 @@ struct MessageImpl;
class QPID_MESSAGING_CLASS_EXTERN Message
{
public:
+ struct QPID_MESSAGING_CLASS_EXTERN BYTE_BUFFER
+ {
+ public :
+ QPID_MESSAGING_EXTERN BYTE_BUFFER(): start(0), size(0) {}
+ QPID_MESSAGING_EXTERN BYTE_BUFFER(void* p, long s) : start(p),
size(s) {}
+ QPID_MESSAGING_EXTERN void* getStart() const { return start; }
+ QPID_MESSAGING_EXTERN long getSize() const { return size; }
+ private:
+ void* start;
+ long size;
+ };
QPID_MESSAGING_EXTERN Message(const std::string& bytes = std::string());
QPID_MESSAGING_EXTERN Message(const char*, size_t);
QPID_MESSAGING_EXTERN Message(const Message&);
@@ -175,6 +186,38 @@ class QPID_MESSAGING_CLASS_EXTERN Messag
QPID_MESSAGING_EXTERN size_t getContentSize() const;
QPID_MESSAGING_EXTERN void setProperty(const std::string&, const
qpid::types::Variant&);
+
+ /**
+ * Aimed at devlopers creating bindings over the c++ client.
+ * Copy count bytes from the region pointed
+ * to by BYTE_BUFFER.start and BYTE_BUFFER.size
+ */
+ QPID_MESSAGING_EXTERN void setContentAsByteBuffer(const BYTE_BUFFER buf);
+
+ /**
+ * Aimed at devlopers creating bindings over the c++ client.
+ * BYTE_BUFFER.start points to the start of the content data.
+ * BYTE_BUFFER.size indicates how much data there is.
+ */
+ QPID_MESSAGING_EXTERN const BYTE_BUFFER getContentAsByteBuffer() const;
+
+ /**
+ * Aimed at devlopers creating bindings over the c++ client.
+ * The data contains the encoded message properties.
+ * The method copy count bytes from the region pointed
+ * to by BYTE_BUFFER.start and BYTE_BUFFER.size
+ */
+ QPID_MESSAGING_EXTERN void setPropertiesAsByteBuffer(const BYTE_BUFFER
buf);
+
+ /**
+ * Aimed at devlopers creating bindings over the c++ client.
+ * The data contains raw message properties.
+ * The calling application needs to decode the headers.
+ * BYTE_BUFFER.start points to the start of the content data.
+ * BYTE_BUFFER.size indicates how much data there is.
+ */
+ QPID_MESSAGING_EXTERN const BYTE_BUFFER getPropertiesAsByteBuffer() const;
+
private:
MessageImpl* impl;
friend struct MessageImplAccess;
Modified:
qpid/branches/address-refactor2/qpid/cpp/src/qpid/messaging/Message.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/cpp/src/qpid/messaging/Message.cpp?rev=1343747&r1=1343746&r2=1343747&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/cpp/src/qpid/messaging/Message.cpp
(original)
+++ qpid/branches/address-refactor2/qpid/cpp/src/qpid/messaging/Message.cpp Tue
May 29 14:27:51 2012
@@ -85,6 +85,16 @@ size_t Message::getContentSize() const
return impl->getBytes().size();
}
+void Message::setContentAsByteBuffer(const Message::BYTE_BUFFER buf)
+{
+ impl->setBytes(reinterpret_cast<char*>(buf.getStart()), buf.getSize());
+}
+
+const Message::BYTE_BUFFER Message::getContentAsByteBuffer() const
+{
+ return
Message::BYTE_BUFFER(static_cast<void*>(const_cast<char*>(impl->getBytes().data())),impl->getBytes().size());
+}
+
EncodingException::EncodingException(const std::string& msg) :
qpid::types::Exception(msg) {}
const std::string BAD_ENCODING("Unsupported encoding: %1% (only %2% is
supported at present).");
Modified: qpid/branches/address-refactor2/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/build.deps?rev=1343747&r1=1343746&r2=1343747&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/build.deps (original)
+++ qpid/branches/address-refactor2/qpid/java/build.deps Tue May 29 14:27:51
2012
@@ -50,6 +50,9 @@ servlet-api=lib/servlet-api.jar
felix-main=lib/org.apache.felix.main-2.0.5.jar
+jython=lib/jython-2.5.0.jar
+qpid-cpp-jni=lib/qpid_cpp_jni.jar
+
felix.libs=${felix-main}
commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
@@ -147,5 +150,5 @@ bdb-je=lib/bdbstore/je-5.0.34.jar
bdbstore.libs=${bdb-je}
bdbstore.test.libs=${test.libs}
-client-api.libs=${slf4j-api}
+client-api.libs=${slf4j-api} ${jython} ${qpid-cpp-jni}
client-jms.libs=${geronimo-jms}
Added:
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionFactory.java?rev=1343747&view=auto
==============================================================================
---
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionFactory.java
(added)
+++
qpid/branches/address-refactor2/qpid/java/client-api/src/main/java/org/apache/qpid/messaging/ConnectionFactory.java
Tue May 29 14:27:51 2012
@@ -0,0 +1,52 @@
+/* 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.
+ */
+package org.apache.qpid.messaging;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Acts as the factory that loads a particular API implementation.
+ */
+public abstract class ConnectionFactory
+{
+ private final static ConnectionFactory _instance;
+ private static final Logger _logger =
LoggerFactory.getLogger(ConnectionFactory.class);
+
+ static
+ {
+ String className = System.getProperty("qpid.connection-factory",
+ "org.apache.qpid.messaging.cpp.CppConnectionFactory"); // will
default to java
+ try
+ {
+ _instance = (ConnectionFactory)
Class.forName(className).newInstance();
+ }
+ catch (Exception e)
+ {
+ _logger.error("Error loading connection factory class",e);
+ throw new Error("Error loading connection factory class",e);
+ }
+ }
+
+ public static ConnectionFactory get()
+ {
+ return _instance;
+ }
+
+ public abstract Connection createConnection(String url);
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
