3 files changed, 17 insertions, 5 deletions
diff --git a/sca-cpp/trunk/components/webservice/Makefile.am b/sca-cpp/trunk/components/webservice/Makefile.am
index 1f4ece7003..accc098b79 100644
--- a/sca-cpp/trunk/components/webservice/Makefile.am
+++ b/sca-cpp/trunk/components/webservice/Makefile.am
@@ -19,24 +19,36 @@ if WANT_WEBSERVICE
 
 INCLUDES = -I${AXIS2C_INCLUDE}
 
-comp_DATA = axis2c.prefix
+comp_SCRIPTS = axis2-conf
 compdir=$(prefix)/components/webservice
+
+comp_DATA = axis2c.prefix axis2.xml services.xml module.xml
+
 axis2c.prefix: $(top_builddir)/config.status
 	echo ${AXIS2C_PREFIX} >axis2c.prefix
 
 comp_LTLIBRARIES = libwebservice-client.la libwebservice-listener.la libaxis2-dispatcher.la libaxis2-service.la
+noinst_DATA = libwebservice-client.so libwebservice-listener.so libaxis2-dispatcher.so libaxis2-service.so
 
 libwebservice_client_la_SOURCES = webservice-client.cpp
 libwebservice_client_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
+libwebservice-client.so:
+	ln -s .libs/libwebservice-client.so
 
 libwebservice_listener_la_SOURCES = webservice-listener.cpp
 libwebservice_listener_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
+libwebservice-listener.so:
+	ln -s .libs/libwebservice-listener.so
 
 libaxis2_dispatcher_la_SOURCES = axis2-dispatcher.cpp
 libaxis2_dispatcher_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
+libaxis2-dispatcher.so:
+	ln -s .libs/libaxis2-dispatcher.so
 
 libaxis2_service_la_SOURCES = axis2-service.cpp
 libaxis2_service_la_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
+libaxis2-service.so:
+	ln -s .libs/libaxis2-service.so
 
 axiom_test_SOURCES = axiom-test.cpp
 axiom_test_LDFLAGS = -lxml2 -L${AXIS2C_LIB} -R${AXIS2C_LIB} -laxis2_engine -laxis2_axiom -laxutil
diff --git a/sca-cpp/trunk/components/webservice/axis2-conf b/sca-cpp/trunk/components/webservice/axis2-conf
index c731733662..2194144ae0 100755
--- a/sca-cpp/trunk/components/webservice/axis2-conf
+++ b/sca-cpp/trunk/components/webservice/axis2-conf
@@ -33,10 +33,10 @@ mkdir -p $root/axis2c/services
 
 # Install Tuscany Axis2 module and service
 mkdir -p $root/axis2c/modules/tuscany
-ln -f -s $here/.libs/libaxis2-dispatcher.so $root/axis2c/modules/tuscany/libaxis2-dispatcher.so
+ln -f -s $here/libaxis2-dispatcher.so $root/axis2c/modules/tuscany/libaxis2-dispatcher.so
 ln -f -s $here/module.xml $root/axis2c/modules/tuscany/module.xml
 mkdir -p $root/axis2c/services/tuscany
-ln -f -s $here/.libs/libaxis2-service.so $root/axis2c/services/tuscany/libaxis2-service.so
+ln -f -s $here/libaxis2-service.so $root/axis2c/services/tuscany/libaxis2-service.so
 ln -f -s $here/services.xml $root/axis2c/services/tuscany/services.xml
 cp $here/axis2.xml $root/axis2c/axis2.xml
 
diff --git a/sca-cpp/trunk/components/webservice/webservice.composite b/sca-cpp/trunk/components/webservice/webservice.composite
index 6d4055aad3..c01c9736bd 100644
--- a/sca-cpp/trunk/components/webservice/webservice.composite
+++ b/sca-cpp/trunk/components/webservice/webservice.composite
@@ -23,7 +23,7 @@
   name="webservice-client">
         
     <component name="webservice-client">
-        <implementation.cpp path=".libs" library="libwebservice-client"/>
+        <implementation.cpp path="." library="libwebservice-client"/>
         <property name="uri">http://localhost:9090/axis2/services/echo</property>
         <service name="webservice-client">
             <t:binding.jsonrpc uri="echo-client"/>
@@ -31,7 +31,7 @@
     </component>     
 
     <component name="webservice-listener">
-        <implementation.cpp path=".libs" library="libwebservice-listener"/>
+        <implementation.cpp path="." library="libwebservice-listener"/>
         <service name="webservice-listener">
             <t:binding.http uri="echo-listener"/>
         </service>