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/31 15:08:46 UTC
svn commit: r1440964 - in /qpid/proton/branches/jni-binding:
proton-c/bindings/java/
proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/
proton-c/docs/api/
proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/
proton-j/pr...
Author: kwall
Date: Thu Jan 31 14:08:45 2013
New Revision: 1440964
URL: http://svn.apache.org/viewvc?rev=1440964&view=rev
Log:
PROTON-194: Tidied up TODOs
Modified:
qpid/proton/branches/jni-binding/proton-c/bindings/java/CMakeLists.txt
qpid/proton/branches/jni-binding/proton-c/bindings/java/src/main/java/org/apache/qpid/proton/engine/jni/JNITransport.java
qpid/proton/branches/jni-binding/proton-c/docs/api/user.doxygen.in
qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java
qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/resources/proton.py
qpid/proton/branches/jni-binding/tests/java/org/apache/qpid/proton/JythonTest.java
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=1440964&r1=1440963&r2=1440964&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 Thu Jan 31 14:08:45 2013
@@ -20,8 +20,7 @@
SET(CMAKE_SWIG_FLAGS -package 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}" )
-
+message( "Using JNI libraries: ${JNI_LIBRARIES}" )
swig_add_module(proton-swig java java.i)
include_directories(${JNI_INCLUDE_DIRS})
@@ -41,7 +40,6 @@ file(GLOB_RECURSE THUNKING_SOURCES_ABS "
set(CMAKE_JAVA_INCLUDE_PATH ${PROTON_API_TARGET_JAR})
-# 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})
include(UseProtonJava)
Modified: qpid/proton/branches/jni-binding/proton-c/bindings/java/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?rev=1440964&r1=1440963&r2=1440964&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/bindings/java/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 Thu Jan 31 14:08:45 2013
@@ -179,39 +179,4 @@ public class JNITransport implements Tra
free();
super.finalize();
}
-
- // PHTODO delete main/pump
- public static void main(String args[])
- {
- System.loadLibrary("protonjni");
- JNITransport t1 = new JNITransport();
- JNITransport t2 = new JNITransport();
- JNIConnection conn1 = new JNIConnection();
- JNIConnection conn2 = new JNIConnection();
- t1.bind(conn1);
- t2.bind(conn2);
- conn1.open();
- conn2.open();
-
- pump(t1, t2);
-
-
-
- }
-
- private static void pump(JNITransport t1, JNITransport t2)
- {
- int len = 0;
- int len2 = 0;
- byte[] buf = new byte[10240];
- do
- {
- len = t1.output(buf,0,10240);
- if(len>0) t2.input(buf,0,len);
- len2 = t2.output(buf,0,10240);
- if(len2>0) t1.input(buf,0,len2);
- }
- while(len != 0 || len2 != 0);
- }
-
}
Modified: qpid/proton/branches/jni-binding/proton-c/docs/api/user.doxygen.in
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-c/docs/api/user.doxygen.in?rev=1440964&r1=1440963&r2=1440964&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-c/docs/api/user.doxygen.in (original)
+++ qpid/proton/branches/jni-binding/proton-c/docs/api/user.doxygen.in Thu Jan 31 14:08:45 2013
@@ -648,7 +648,6 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-# PHTODO avoid relative path
INPUT = @CMAKE_SOURCE_DIR@/proton-c/include
# This tag can be used to specify the character encoding of the source files
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java?rev=1440964&r1=1440963&r2=1440964&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/EngineFactory.java Thu Jan 31 14:08:45 2013
@@ -23,9 +23,5 @@ public interface EngineFactory
Connection createConnection();
Transport createTransport();
SslDomain createSslDomain();
- /**
- * PHTODO consider overloading createSslPeerDetails(sessionId)
- * for better fit with the C world
- */
SslPeerDetails createSslPeerDetails(String hostname, int port);
}
Modified: qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/resources/proton.py
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/resources/proton.py?rev=1440964&r1=1440963&r2=1440964&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/resources/proton.py (original)
+++ qpid/proton/branches/jni-binding/proton-j/proton-api/src/main/resources/proton.py Thu Jan 31 14:08:45 2013
@@ -851,14 +851,13 @@ class SSLDomain(object):
self._domain.setTrustedCaDb(certificate_db)
def set_peer_authentication(self, verify_mode, trusted_CAs=None):
- # PHTODO the method calls (setTrustedCaDb/setPeerAuthentication) have to occur in
+ # TODO the method calls (setTrustedCaDb/setPeerAuthentication) have to occur in
# that order otherwise tests fail with proton-jni. It is not clear yet why.
if trusted_CAs is not None:
self._domain.setTrustedCaDb(trusted_CAs)
try:
self._domain.setPeerAuthentication(verify_mode)
except ProtonUnsupportedOperationException:
- # PHTODO: Move logic to skip on encountering an ProtonUnsupportedOperationException to common location
raise Skipped()
def allow_unsecured_client(self, allow_unsecured = True):
@@ -893,7 +892,6 @@ class SSL(object):
try:
self._ssl.setPeerHostname(hostname)
except ProtonUnsupportedOperationException:
- # PHTODO: Move logic to skip on encountering an ProtonUnsupportedOperationException to common location
raise Skipped()
def _get_peer_hostname(self):
Modified: qpid/proton/branches/jni-binding/tests/java/org/apache/qpid/proton/JythonTest.java
URL: http://svn.apache.org/viewvc/qpid/proton/branches/jni-binding/tests/java/org/apache/qpid/proton/JythonTest.java?rev=1440964&r1=1440963&r2=1440964&view=diff
==============================================================================
--- qpid/proton/branches/jni-binding/tests/java/org/apache/qpid/proton/JythonTest.java (original)
+++ qpid/proton/branches/jni-binding/tests/java/org/apache/qpid/proton/JythonTest.java Thu Jan 31 14:08:45 2013
@@ -43,14 +43,11 @@ public class JythonTest
private static final Logger LOGGER = Logger.getLogger(JythonTest.class.getName());
private static final String TEST_PATTERN_SYSTEM_PROPERTY = "proton.pythontest.pattern";
- private static final String PROTON_TEST_SCRIPT_CLASSPATH_LOCATION = "/proton-test"; // PHTODO rename script??
+ private static final String PROTON_TEST_SCRIPT_CLASSPATH_LOCATION = "/proton-test";
@Test
public void test() throws Exception
{
- // PHTODO check whether we still need jproton-test and if so, does it need refactoring?
- // ditto config.sh
-
File protonScriptFile = getPythonTestScript();
String parentDirectory = protonScriptFile.getParent();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org