summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/samples
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-cpp/trunk/samples/Makefile.am3
-rw-r--r--sca-cpp/trunk/samples/store-cpp/Makefile.am7
-rw-r--r--sca-cpp/trunk/samples/store-cpp/store.composite8
-rw-r--r--sca-cpp/trunk/samples/store-gae/Makefile.am6
-rw-r--r--sca-cpp/trunk/samples/store-java/Makefile.am7
-rw-r--r--sca-cpp/trunk/samples/store-java/store.composite2
-rw-r--r--sca-cpp/trunk/samples/store-nosql/Makefile.am8
-rw-r--r--sca-cpp/trunk/samples/store-nosql/store.composite2
-rw-r--r--sca-cpp/trunk/samples/store-python/Makefile.am5
-rw-r--r--sca-cpp/trunk/samples/store-python/store.composite2
-rw-r--r--sca-cpp/trunk/samples/store-scheme/Makefile.am6
-rw-r--r--sca-cpp/trunk/samples/store-scheme/store.composite2
-rw-r--r--sca-cpp/trunk/samples/store-sql/Makefile.am8
-rw-r--r--sca-cpp/trunk/samples/store-sql/store.composite2
14 files changed, 54 insertions, 14 deletions
diff --git a/sca-cpp/trunk/samples/Makefile.am b/sca-cpp/trunk/samples/Makefile.am
index a3e0cfa6b8..e2b74075f8 100644
--- a/sca-cpp/trunk/samples/Makefile.am
+++ b/sca-cpp/trunk/samples/Makefile.am
@@ -17,3 +17,6 @@
SUBDIRS = store-scheme store-cpp store-python store-java store-gae store-sql store-nosql
+sample_DATA = README
+sampledir=$(prefix)/samples
+
diff --git a/sca-cpp/trunk/samples/store-cpp/Makefile.am b/sca-cpp/trunk/samples/store-cpp/Makefile.am
index f429166519..c86d5a5ebc 100644
--- a/sca-cpp/trunk/samples/store-cpp/Makefile.am
+++ b/sca-cpp/trunk/samples/store-cpp/Makefile.am
@@ -15,9 +15,14 @@
# specific language governing permissions and limitations
# under the License.
-sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
+
+sample_SCRIPTS = start stop ssl-start
sampledir = $(prefix)/samples/store-cpp
+nobase_sample_DATA = currency-converter.cpp fruits-catalog.cpp shopping-cart.cpp store.composite htdocs/*
+
+sample_LTLIBRARIES = libcurrency-converter.la libfruits-catalog.la libshopping-cart.la
+
libcurrency_converter_la_SOURCES = currency-converter.cpp
libfruits_catalog_la_SOURCES = fruits-catalog.cpp
diff --git a/sca-cpp/trunk/samples/store-cpp/store.composite b/sca-cpp/trunk/samples/store-cpp/store.composite
index 056f7b4c68..abb38add02 100644
--- a/sca-cpp/trunk/samples/store-cpp/store.composite
+++ b/sca-cpp/trunk/samples/store-cpp/store.composite
@@ -23,7 +23,7 @@
name="store">
<component name="Catalog">
- <implementation.cpp path=".libs" library="libfruits-catalog"/>
+ <implementation.cpp path="." library="libfruits-catalog"/>
<property name="currencyCode">USD</property>
<service name="Catalog">
<t:binding.jsonrpc uri="catalog"/>
@@ -32,7 +32,7 @@
</component>
<component name="ShoppingCart">
- <implementation.cpp path=".libs" library="libshopping-cart"/>
+ <implementation.cpp path="." library="libshopping-cart"/>
<service name="ShoppingCart">
<t:binding.atom uri="shoppingCart"/>
</service>
@@ -43,14 +43,14 @@
</component>
<component name="CurrencyConverter">
- <implementation.cpp path=".libs" library="libcurrency-converter"/>
+ <implementation.cpp path="." library="libcurrency-converter"/>
<service name="CurrencyConverter">
<t:binding.jsonrpc uri="currencyConverter"/>
</service>
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
+ <implementation.cpp path="../../components/cache" library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
diff --git a/sca-cpp/trunk/samples/store-gae/Makefile.am b/sca-cpp/trunk/samples/store-gae/Makefile.am
index bb39293d21..ab014a0b7d 100644
--- a/sca-cpp/trunk/samples/store-gae/Makefile.am
+++ b/sca-cpp/trunk/samples/store-gae/Makefile.am
@@ -18,8 +18,10 @@
if WANT_PYTHON
if WANT_GAE
-noinst_DATA = target.stamp
+sample_SCRIPTS = start stop
+sampledir = $(prefix)/samples/store-gae
+BUILT_SOURCES = target.stamp
target.stamp: app.yaml *.py *.composite $(top_builddir)/modules/wsgi/*.py htdocs/*
mkdir -p target
cp app.yaml *.py *.composite `ls $(top_builddir)/modules/wsgi/*.py | grep -v "\-test"` target
@@ -29,6 +31,8 @@ target.stamp: app.yaml *.py *.composite $(top_builddir)/modules/wsgi/*.py htdocs
clean-local:
rm -rf target.stamp target
+nobase_sample_DATA = target/app.yaml target/*.py target/*.composite target/htdocs/*
+
TESTS = server-test
endif
diff --git a/sca-cpp/trunk/samples/store-java/Makefile.am b/sca-cpp/trunk/samples/store-java/Makefile.am
index d80aaabf0b..db05a48662 100644
--- a/sca-cpp/trunk/samples/store-java/Makefile.am
+++ b/sca-cpp/trunk/samples/store-java/Makefile.am
@@ -19,11 +19,14 @@ JAVAROOT = ${top_builddir}/samples/store-java
if WANT_JAVA
-AM_JAVACFLAGS = -cp ${top_builddir}/modules/java/libmod-tuscany-java-${PACKAGE_VERSION}.jar:${JAVAROOT}
+sample_SCRIPTS = start stop ssl-start
+sampledir=$(prefix)/samples/store-java
+AM_JAVACFLAGS = -cp ${top_builddir}/modules/java/libmod-tuscany-java-${PACKAGE_VERSION}.jar:${JAVAROOT}
noinst_JAVA = store/*.java
+CLEANFILES = classnoinst.stamp store/*.class
-CLEANFILES = store/*.class
+nobase_sample_DATA = store.composite htdocs/* store/*
TESTS = server-test
diff --git a/sca-cpp/trunk/samples/store-java/store.composite b/sca-cpp/trunk/samples/store-java/store.composite
index 8d733db134..242da7b00d 100644
--- a/sca-cpp/trunk/samples/store-java/store.composite
+++ b/sca-cpp/trunk/samples/store-java/store.composite
@@ -50,7 +50,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
+ <implementation.cpp path="../../components/cache" library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
diff --git a/sca-cpp/trunk/samples/store-nosql/Makefile.am b/sca-cpp/trunk/samples/store-nosql/Makefile.am
index 345e58d544..fffb15ca56 100644
--- a/sca-cpp/trunk/samples/store-nosql/Makefile.am
+++ b/sca-cpp/trunk/samples/store-nosql/Makefile.am
@@ -15,5 +15,13 @@
# specific language governing permissions and limitations
# under the License.
+if WANT_NOSQLDB
+
+sample_SCRIPTS = start stop ssl-start
+sampledir = $(prefix)/samples/store-nosql
+
+nobase_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*
+
TESTS = server-test
+endif
diff --git a/sca-cpp/trunk/samples/store-nosql/store.composite b/sca-cpp/trunk/samples/store-nosql/store.composite
index 1912f3a3a1..85a6e278d4 100644
--- a/sca-cpp/trunk/samples/store-nosql/store.composite
+++ b/sca-cpp/trunk/samples/store-nosql/store.composite
@@ -60,7 +60,7 @@
</component>
<component name="NoSqldb">
- <implementation.cpp path="../../components/nosqldb/.libs" library="libnosqldb"/>
+ <implementation.cpp path="../../components/nosqldb" library="libnosqldb"/>
<property name="dbname">tmp/store.cdb</property>
<service name="NoSqldb">
<t:binding.atom uri="nosqldb"/>
diff --git a/sca-cpp/trunk/samples/store-python/Makefile.am b/sca-cpp/trunk/samples/store-python/Makefile.am
index 2bdd776e10..0a7a5c3ac7 100644
--- a/sca-cpp/trunk/samples/store-python/Makefile.am
+++ b/sca-cpp/trunk/samples/store-python/Makefile.am
@@ -17,6 +17,11 @@
if WANT_PYTHON
+sample_SCRIPTS = start stop ssl-start
+sampledir = $(prefix)/samples/store-python
+
+nobase_sample_DATA = currency-converter.py fruits-catalog.py shopping-cart.py store.py store.composite htdocs/*
+
TESTS = server-test
endif
diff --git a/sca-cpp/trunk/samples/store-python/store.composite b/sca-cpp/trunk/samples/store-python/store.composite
index 889f514624..045ebe6ec5 100644
--- a/sca-cpp/trunk/samples/store-python/store.composite
+++ b/sca-cpp/trunk/samples/store-python/store.composite
@@ -60,7 +60,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
+ <implementation.cpp path="../../components/cache" library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
diff --git a/sca-cpp/trunk/samples/store-scheme/Makefile.am b/sca-cpp/trunk/samples/store-scheme/Makefile.am
index 77cceb8352..2f09025c58 100644
--- a/sca-cpp/trunk/samples/store-scheme/Makefile.am
+++ b/sca-cpp/trunk/samples/store-scheme/Makefile.am
@@ -15,8 +15,12 @@
# specific language governing permissions and limitations
# under the License.
-noinst_PROGRAMS = script-test
+sample_SCRIPTS = start stop ssl-start
+sampledir = $(prefix)/samples/store-scheme
+
+nobase_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*
+noinst_PROGRAMS = script-test
script_test_SOURCES = script-test.cpp
script_test_LDFLAGS = -lxml2 -lmozjs
diff --git a/sca-cpp/trunk/samples/store-scheme/store.composite b/sca-cpp/trunk/samples/store-scheme/store.composite
index 36b155b595..08aeb6601d 100644
--- a/sca-cpp/trunk/samples/store-scheme/store.composite
+++ b/sca-cpp/trunk/samples/store-scheme/store.composite
@@ -60,7 +60,7 @@
</component>
<component name="Cache">
- <implementation.cpp path="../../components/cache/.libs" library="libmemcache"/>
+ <implementation.cpp path="../../components/cache" library="libmemcache"/>
<service name="Cache">
<t:binding.atom uri="cache"/>
</service>
diff --git a/sca-cpp/trunk/samples/store-sql/Makefile.am b/sca-cpp/trunk/samples/store-sql/Makefile.am
index 345e58d544..9276a575da 100644
--- a/sca-cpp/trunk/samples/store-sql/Makefile.am
+++ b/sca-cpp/trunk/samples/store-sql/Makefile.am
@@ -15,5 +15,13 @@
# specific language governing permissions and limitations
# under the License.
+if WANT_SQLDB
+
+sample_SCRIPTS = start stop ssl-start
+sampledir = $(prefix)/samples/store-sql
+
+nobase_sample_DATA = currency-converter.scm fruits-catalog.scm shopping-cart.scm store.scm store.composite htdocs/*
+
TESTS = server-test
+endif
diff --git a/sca-cpp/trunk/samples/store-sql/store.composite b/sca-cpp/trunk/samples/store-sql/store.composite
index 58c2741a5e..e19cf66fd1 100644
--- a/sca-cpp/trunk/samples/store-sql/store.composite
+++ b/sca-cpp/trunk/samples/store-sql/store.composite
@@ -60,7 +60,7 @@
</component>
<component name="Sqldb">
- <implementation.cpp path="../../components/sqldb/.libs" library="libsqldb"/>
+ <implementation.cpp path="../../components/sqldb" library="libsqldb"/>
<property name="conninfo">dbname=db</property>
<property name="table">store</property>
<service name="Sqldb">
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 00:48:27 +0000