summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sca-cpp/trunk/configure.ac1
-rwxr-xr-xsca-cpp/trunk/modules/server/server-conf1
-rw-r--r--sca-cpp/trunk/samples/Makefile.am17
-rw-r--r--sca-cpp/trunk/samples/README3
4 files changed, 21 insertions, 1 deletions
diff --git a/sca-cpp/trunk/configure.ac b/sca-cpp/trunk/configure.ac
index ceb86d885b..32b7e055fc 100644
--- a/sca-cpp/trunk/configure.ac
+++ b/sca-cpp/trunk/configure.ac
@@ -202,6 +202,7 @@ AC_CONFIG_FILES([Makefile
components/Makefile
components/cache/Makefile
components/store/Makefile
+ samples/Makefile
test/Makefile
test/store-object/Makefile
test/store-function/Makefile
diff --git a/sca-cpp/trunk/modules/server/server-conf b/sca-cpp/trunk/modules/server/server-conf
index dfe4265bae..a55c04b7d8 100755
--- a/sca-cpp/trunk/modules/server/server-conf
+++ b/sca-cpp/trunk/modules/server/server-conf
@@ -27,6 +27,5 @@ 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
diff --git a/sca-cpp/trunk/samples/Makefile.am b/sca-cpp/trunk/samples/Makefile.am
new file mode 100644
index 0000000000..de5c2d1b1e
--- /dev/null
+++ b/sca-cpp/trunk/samples/Makefile.am
@@ -0,0 +1,17 @@
+# 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.
+
diff --git a/sca-cpp/trunk/samples/README b/sca-cpp/trunk/samples/README
new file mode 100644
index 0000000000..818a2faaf8
--- /dev/null
+++ b/sca-cpp/trunk/samples/README
@@ -0,0 +1,3 @@
+Apache Tuscany SCA Samples
+==========================
+