svn commit: r1528416 - in /hama/trunk: c++/src/CMakeLists.txt c++/src/main/native/pipes/impl/HamaPipes.cc core/src/main/java/org/apache/hama/pipes/PipesApplication.java

[millecker]

Author: millecker
Date: Wed Oct  2 10:41:15 2013
New Revision: 1528416

URL: http://svn.apache.org/r1528416
Log:
Hama Pipes - Remove OpenSSL dependency (jenkins build failure)

Modified:
    hama/trunk/c++/src/CMakeLists.txt
    hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc
    hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java

Modified: hama/trunk/c++/src/CMakeLists.txt
URL: 
http://svn.apache.org/viewvc/hama/trunk/c%2B%2B/src/CMakeLists.txt?rev=1528416&r1=1528415&r2=1528416&view=diff
==============================================================================
--- hama/trunk/c++/src/CMakeLists.txt (original)
+++ hama/trunk/c++/src/CMakeLists.txt Wed Oct  2 10:41:15 2013
@@ -17,10 +17,10 @@
 #
 
 cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
-find_package(OpenSSL REQUIRED)
+#find_package(OpenSSL REQUIRED)
 
-message(">>>>> OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
-message(">>>>> OpenSSL libraries: ${OPENSSL_LIBRARIES}")
+#message(">>>>> OpenSSL include dir: ${OPENSSL_INCLUDE_DIR}")
+#message(">>>>> OpenSSL libraries: ${OPENSSL_LIBRARIES}")
 
 set(CMAKE_BUILD_TYPE, Release)
 
@@ -44,7 +44,7 @@ include_directories(
     main/native/utils/api
     main/native/pipes/api
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${OPENSSL_INCLUDE_DIR}
+#    ${OPENSSL_INCLUDE_DIR}
 )
 
 # Example programs
@@ -75,6 +75,6 @@ add_library(hamapipes STATIC
 )
 
 target_link_libraries(hamapipes
-    #${OPENSSL_LIBRARIES}
-    #pthread
+#    ${OPENSSL_LIBRARIES}
+    pthread
 )

Modified: hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc
URL: 
http://svn.apache.org/viewvc/hama/trunk/c%2B%2B/src/main/native/pipes/impl/HamaPipes.cc?rev=1528416&r1=1528415&r2=1528416&view=diff
==============================================================================
--- hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc (original)
+++ hama/trunk/c++/src/main/native/pipes/impl/HamaPipes.cc Wed Oct  2 10:41:15 
2013
@@ -36,9 +36,6 @@
 #include <iostream>
 #include <fstream>
 
-#include <openssl/hmac.h>
-#include <openssl/buffer.h>
-
 #define stringify( name ) # name
 
 using std::map;

Modified: 
hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java
URL: 
http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java?rev=1528416&r1=1528415&r2=1528416&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java 
(original)
+++ hama/trunk/core/src/main/java/org/apache/hama/pipes/PipesApplication.java 
Wed Oct  2 10:41:15 2013
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/** MODIFIED FOR GPGPU Usage! **/
 
 package org.apache.hama.pipes;