From 16f96409b9ad2a1451c88b4e0074b57686f02269 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 16 Aug 2010 06:15:24 +0000
Subject: Test Postgresql hot standby + replication and integrated Postgresql
 database in store-cluster sample. Add a front cache component which can be
 used to wire a cache component and a database component.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@985799 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/http/httpd-conf      | 1 +
 sca-cpp/trunk/modules/java/eval.hpp        | 9 ++-------
 sca-cpp/trunk/modules/scheme/primitive.hpp | 8 +-------
 3 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'sca-cpp/trunk/modules')

diff --git a/sca-cpp/trunk/modules/http/httpd-conf b/sca-cpp/trunk/modules/http/httpd-conf
index 09d78351ff..9f698688b1 100755
--- a/sca-cpp/trunk/modules/http/httpd-conf
+++ b/sca-cpp/trunk/modules/http/httpd-conf
@@ -76,6 +76,7 @@ LoadModule setenvif_module ${modules_prefix}/modules/mod_setenvif.so
 LoadModule log_config_module ${modules_prefix}/modules/mod_log_config.so
 </IfModule>
 LoadModule vhost_alias_module ${modules_prefix}/modules/mod_vhost_alias.so
+LoadModule cgi_module ${modules_prefix}/modules/mod_cgi.so
 
 LoadModule mod_tuscany_ssltunnel $here/libmod_tuscany_ssltunnel.so
 
diff --git a/sca-cpp/trunk/modules/java/eval.hpp b/sca-cpp/trunk/modules/java/eval.hpp
index a1cf6ae576..daf30d891b 100644
--- a/sca-cpp/trunk/modules/java/eval.hpp
+++ b/sca-cpp/trunk/modules/java/eval.hpp
@@ -26,7 +26,6 @@
  * Java component implementation evaluation logic.
  */
 #include <jni.h>
-#include <apr_uuid.h>
 
 #include "list.hpp"
 #include "value.hpp"
@@ -292,12 +291,8 @@ jobject JNICALL nativeInvoke(JNIEnv* env, jobject self, unused jobject proxy, jo
  * of this function as java.util.UUID seems to behave differently with different JDKs.
  */
 jobject JNICALL nativeUUID(JNIEnv* env) {
-    apr_uuid_t uuid;
-    apr_uuid_get(&uuid);
-    char buf[APR_UUID_FORMATTED_LENGTH];
-    apr_uuid_format(buf, &uuid);
-    string s(buf, APR_UUID_FORMATTED_LENGTH);
-    return env->NewStringUTF(c_str(s));
+    const value uuid = mkuuid();
+    return env->NewStringUTF(c_str(uuid));
 }
 
 /**
diff --git a/sca-cpp/trunk/modules/scheme/primitive.hpp b/sca-cpp/trunk/modules/scheme/primitive.hpp
index fd5f3e9755..6f3f71f4cd 100644
--- a/sca-cpp/trunk/modules/scheme/primitive.hpp
+++ b/sca-cpp/trunk/modules/scheme/primitive.hpp
@@ -26,8 +26,6 @@
  * Script evaluator primitive functions.
  */
 
-#include <apr_general.h>
-#include <apr_uuid.h>
 #include "stream.hpp"
 #include "function.hpp"
 #include "list.hpp"
@@ -144,11 +142,7 @@ const value logProc(const list<value>& args) {
 }
 
 const value uuidProc(unused const list<value>& args) {
-    apr_uuid_t uuid;
-    apr_uuid_get(&uuid);
-    char buf[APR_UUID_FORMATTED_LENGTH];
-    apr_uuid_format(buf, &uuid);
-    return string(buf, APR_UUID_FORMATTED_LENGTH);
+    return mkuuid();
 }
 
 const value cadrProc(unused const list<value>& args) {
-- 
cgit v1.2.3