Author: jsdelfino
Date: Thu Oct  5 23:13:41 2006
New Revision: 453505

URL: http://svn.apache.org/viewvc?view=rev&rev=453505
Log:
Simplified the structure of the deployed samples, and made it compatible with 
the source development folder structure. This will allow people to run the 
samples directly from the source development folder structure.

Removed:
    incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.accountmanagement/
Modified:
    incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am
    incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am
    incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/Makefile.am
    
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
    
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
    incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am
    
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
    
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
    
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
    incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/Makefile.am
    incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/Makefile.am
    
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
    
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
    
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am

Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am 
(original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.account/Makefile.am Thu 
Oct  5 23:13:41 2006
@@ -1,6 +1,5 @@
 deploydir=$(prefix)/samples/BigBank/deploy
 compositedir=$(deploydir)/bigbank.account
-prgbindir=$(deploydir)/bin
 
 BUILT_SOURCES = AccountDataServiceImpl_AccountDataService_Proxy.cpp \
 AccountDataServiceImpl_AccountDataService_Wrapper.cpp \
@@ -14,7 +13,7 @@
 
 noinst_HEADERS = *.h
 
-prgbin_SCRIPTS = runwsserver.sh
+composite_SCRIPTS = runwsserver.sh
 
 ${BUILT_SOURCES}: bigbank.account.composite
        java -jar $(TUSCANY_SCACPP)/bin/scagen.jar -dir . -output .

Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am 
(original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.client/Makefile.am Thu 
Oct  5 23:13:41 2006
@@ -1,8 +1,8 @@
 deploydir=$(prefix)/samples/BigBank/deploy
-prgbindir=$(deploydir)/bin
+clientdir=$(deploydir)/bigbank.client
 
-prgbin_PROGRAMS = account_client
-prgbin_SCRIPTS = runclient.sh
+client_PROGRAMS = account_client
+client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh
 
 AM_CPPFLAGS = $(CPPFLAGS)

Modified: incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/Makefile.am 
(original)
+++ incubator/tuscany/cpp/sca/samples/BigBank/bigbank.wsclient/Makefile.am Thu 
Oct  5 23:13:41 2006
@@ -1,8 +1,8 @@
 deploydir=$(prefix)/samples/BigBank/deploy
-prgbindir=$(deploydir)/bin
+wsclientdir=$(deploydir)/bigbank.wsclient
 
-prgbin_PROGRAMS = account_wsclient
-prgbin_SCRIPTS = runwsclient.sh
+wsclient_PROGRAMS = account_wsclient
+wsclient_SCRIPTS = runwsclient.sh
 EXTRA_DIST = runwsclient.sh
 
 AM_CPPFLAGS = $(CPPFLAGS)

Modified: 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.client/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,8 +1,8 @@
 deploydir=$(prefix)/samples/Calculator/deploy
-prgbindir=$(deploydir)/bin
+clientdir=$(deploydir)/sample.calculator.client
 
-prgbin_PROGRAMS = calculator_client
-prgbin_SCRIPTS = runclient.sh
+client_PROGRAMS = calculator_client
+client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh
 
 AM_CPPFLAGS = $(CPPFLAGS)

Modified: 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator.wsclient/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,8 +1,8 @@
 deploydir=$(prefix)/samples/Calculator/deploy
-prgbindir=$(deploydir)/bin
+wsclientdir=$(deploydir)/sample.calculator.wsclient
 
-prgbin_PROGRAMS = calculator_wsclient
-prgbin_SCRIPTS = runwsclient.sh
+wsclient_PROGRAMS = calculator_wsclient
+wsclient_SCRIPTS = runwsclient.sh
 EXTRA_DIST = runwsclient.sh
 
 AM_CPPFLAGS = $(CPPFLAGS)

Modified: 
incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am 
(original)
+++ incubator/tuscany/cpp/sca/samples/Calculator/sample.calculator/Makefile.am 
Thu Oct  5 23:13:41 2006
@@ -1,6 +1,5 @@
 deploydir=$(prefix)/samples/Calculator/deploy
 compositedir=$(deploydir)/sample.calculator
-prgbindir=$(deploydir)/bin
 
 BUILT_SOURCES = CalculatorImpl_CalculatorService_Proxy.cpp \
 CalculatorImpl_CalculatorService_Wrapper.cpp \
@@ -13,7 +12,7 @@
 ${BUILT_SOURCES}: sample.calculator.composite
        java -jar $(TUSCANY_SCACPP)/bin/scagen.jar -dir . -output .
 
-prgbin_SCRIPTS = runwsserver.sh
+composite_SCRIPTS = runwsserver.sh
 
 composite_LTLIBRARIES = libCalculator.la
 composite_DATA = *.composite *.componentType *.wsdl

Modified: 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.client/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,7 +1,6 @@
 deploydir=$(prefix)/samples/PythonCalculator/deploy
 clientdir=$(deploydir)/sample.calculator.client
-prgbindir=$(deploydir)/bin
 
 client_DATA = *.py
-prgbin_SCRIPTS = runclient.sh
+client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh *.py

Modified: 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator.wsclient/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,7 +1,6 @@
 deploydir=$(prefix)/samples/PythonCalculator/deploy
 wsclientdir=$(deploydir)/sample.calculator.wsclient
-prgbindir=$(deploydir)/bin
 
 wsclient_DATA = *.py *.wsdl *.composite
-prgbin_SCRIPTS = runwsclient.sh
+wsclient_SCRIPTS = runwsclient.sh
 EXTRA_DIST = runwsclient.sh *.py *.wsdl *.composite

Modified: 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/PythonCalculator/sample.calculator/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,8 +1,7 @@
 deploydir=$(prefix)/samples/PythonCalculator/deploy
 compositedir=$(deploydir)/sample.calculator
-prgbindir=$(deploydir)/bin
 
 composite_DATA = *.composite *.componentType *.wsdl *.py
-prgbin_SCRIPTS = runwsserver.sh
+composite_SCRIPTS = runwsserver.sh
 EXTRA_DIST = *.composite *.componentType *.wsdl *.py runwsserver.sh
 

Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/Makefile.am 
(original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.account/Makefile.am Thu 
Oct  5 23:13:41 2006
@@ -1,8 +1,7 @@
 deploydir=$(prefix)/samples/RubyBank/deploy
 compositedir=$(deploydir)/bigbank.account
-prgbindir=$(deploydir)/bin
 
-prgbin_SCRIPTS = runwsserver.sh
+composite_SCRIPTS = runwsserver.sh
 
 composite_DATA = *.composite *.wsdl *.xsd *.rb
 EXTRA_DIST = *.composite *.wsdl *.xsd runwsserver.sh *.rb

Modified: incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/Makefile.am 
(original)
+++ incubator/tuscany/cpp/sca/samples/RubyBank/bigbank.client/Makefile.am Thu 
Oct  5 23:13:41 2006
@@ -1,7 +1,6 @@
 deploydir=$(prefix)/samples/RubyBank/deploy
 clientdir=$(deploydir)/bigbank.client
-prgbindir=$(deploydir)/bin
 
 client_DATA = *.rb
-prgbin_SCRIPTS = runclient.sh
+client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh *.rb

Modified: 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.client/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,7 +1,6 @@
 deploydir=$(prefix)/samples/RubyCalculator/deploy
 clientdir=$(deploydir)/sample.calculator.client
-prgbindir=$(deploydir)/bin
 
 client_DATA = *.rb
-prgbin_SCRIPTS = runclient.sh
+client_SCRIPTS = runclient.sh
 EXTRA_DIST = runclient.sh *.rb

Modified: 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
 (original)
+++ 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator.wsclient/Makefile.am
 Thu Oct  5 23:13:41 2006
@@ -1,7 +1,6 @@
 deploydir=$(prefix)/samples/RubyCalculator/deploy
 wsclientdir=$(deploydir)/sample.calculator.wsclient
-prgbindir=$(deploydir)/bin
 
 wsclient_DATA = *.rb *.wsdl *.composite
-prgbin_SCRIPTS = runwsclient.sh
+wsclient_SCRIPTS = runwsclient.sh
 EXTRA_DIST = runwsclient.sh *.rb *.wsdl *.composite

Modified: 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am?view=diff&rev=453505&r1=453504&r2=453505
==============================================================================
--- 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am 
(original)
+++ 
incubator/tuscany/cpp/sca/samples/RubyCalculator/sample.calculator/Makefile.am 
Thu Oct  5 23:13:41 2006
@@ -1,8 +1,7 @@
 deploydir=$(prefix)/samples/RubyCalculator/deploy
 compositedir=$(deploydir)/sample.calculator
-prgbindir=$(deploydir)/bin
 
-prgbin_SCRIPTS = runwsserver.sh
+composite_SCRIPTS = runwsserver.sh
 
 composite_DATA = *.composite *.wsdl *.rb
 EXTRA_DIST = *.composite *.wsdl *.rb runwsserver.sh



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to