Author: jsdelfino
Date: Mon Nov 23 05:59:08 2009
New Revision: 883256
URL: http://svn.apache.org/viewvc?rev=883256&view=rev
Log:
Fixed build break. Added missing dir and fix server configuration script.
Added:
tuscany/sca-cpp/trunk/samples/
tuscany/sca-cpp/trunk/samples/Makefile.am (contents, props changed)
- copied, changed from r883254,
tuscany/sca-cpp/trunk/modules/server/server-conf
tuscany/sca-cpp/trunk/samples/README
Modified:
tuscany/sca-cpp/trunk/configure.ac
tuscany/sca-cpp/trunk/modules/server/server-conf
Modified: tuscany/sca-cpp/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/configure.ac?rev=883256&r1=883255&r2=883256&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/configure.ac (original)
+++ tuscany/sca-cpp/trunk/configure.ac Mon Nov 23 05:59:08 2009
@@ -202,6 +202,7 @@
components/Makefile
components/cache/Makefile
components/store/Makefile
+ samples/Makefile
test/Makefile
test/store-object/Makefile
test/store-function/Makefile
Modified: tuscany/sca-cpp/trunk/modules/server/server-conf
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/server-conf?rev=883256&r1=883255&r2=883256&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/modules/server/server-conf Mon Nov 23 05:59:08 2009
@@ -27,6 +27,5 @@
cat >>$root/conf/httpd.conf <<EOF
LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_eval.so
LoadModule mod_tuscany_wiring $here/.libs/libmod_tuscany_wiring.so
-LoadModule mod_tuscany_cache $here/.libs/libmod_tuscany_cache.so
EOF
Copied: tuscany/sca-cpp/trunk/samples/Makefile.am (from r883254,
tuscany/sca-cpp/trunk/modules/server/server-conf)
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/Makefile.am?p2=tuscany/sca-cpp/trunk/samples/Makefile.am&p1=tuscany/sca-cpp/trunk/modules/server/server-conf&r1=883254&r2=883256&rev=883256&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/server-conf (original)
+++ tuscany/sca-cpp/trunk/samples/Makefile.am Mon Nov 23 05:59:08 2009
@@ -1,5 +1,3 @@
-#!/bin/sh
-
# 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
@@ -17,16 +15,3 @@
# specific language governing permissions and limitations
# under the License.
-# Generate a server conf
-here=`readlink -f $0`; here=`dirname $here`
-root=`readlink -f $1`
-
-mkdir -p $root
-mkdir -p $root/logs
-mkdir -p $root/conf
-cat >>$root/conf/httpd.conf <<EOF
-LoadModule mod_tuscany_eval $here/.libs/libmod_tuscany_eval.so
-LoadModule mod_tuscany_wiring $here/.libs/libmod_tuscany_wiring.so
-LoadModule mod_tuscany_cache $here/.libs/libmod_tuscany_cache.so
-EOF
-
Added: tuscany/sca-cpp/trunk/samples/README
URL:
http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/samples/README?rev=883256&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/samples/README (added)
+++ tuscany/sca-cpp/trunk/samples/README Mon Nov 23 05:59:08 2009
@@ -0,0 +1,3 @@
+Apache Tuscany SCA Samples
+==========================
+
