Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/definitions.xml Tue Oct 23 21:30:02 2007 @@ -102,51 +102,76 @@ </tuscany:wsConfigParam> </sca:policySet> - <sca:policySet name="wsIntegrityPolicy" + <!-- A policyset that uses WS Policy --> + <sca:policySet name="wsSecurityPolicyForIntegrity" provides="integrity" appliesTo="sca:binding.ws"> - <tuscany:wsConfigParam> - <parameter name="InflowSecurity"> - <action> - <items>Timestamp Signature</items> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - </action> - </parameter> - <parameter name="OutflowSecurity"> - <action> - <items>Timestamp Signature</items> - <user>TuscanyWsUser</user> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass>" + - <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier> - </action> - </parameter> - </tuscany:wsConfigParam> - </sca:policySet> - - <sca:policySet name="wsConfidentialityPolicy" - provides="confidentiality" - appliesTo="sca:binding.ws"> - <tuscany:wsConfigParam> - <parameter name="InflowSecurity"> - <action> - <items>Timestamp Signature Encrypt</items> - <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - </action> - </parameter> - <parameter name="OutflowSecurity"> - <action> - <items>Timestamp Signature Encrypt</items> - <user>TuscanyWsUser</user> - <encryptionUser>TuscanyWsUser</encryptionUser> - <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier> - <encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier> - </action> - </parameter> - </tuscany:wsConfigParam> + <wsp:Policy wsu:Id="SignOnly" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:TripleDesRsa15/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> + <sp:Body/> + </sp:SignedParts> + + <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy";> + <ramp:user>TuscanyWsUser</ramp:user> + <ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser> + <ramp:passwordCallbackClass>helloworld.ClientPWCBHandler</ramp:passwordCallbackClass> + + <ramp:signatureCrypto> + <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin"> + <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property> + <ramp:property name="org.apache.ws.security.crypto.merlin.file">helloworldKeys.jks</ramp:property> + <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property> + </ramp:crypto> + </ramp:signatureCrypto> + </ramp:RampartConfig> + + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> </sca:policySet> </sca:definitions>
Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/helloworldwsclient.composite Tue Oct 23 21:30:02 2007 @@ -37,9 +37,21 @@ <implementation.java class="helloworld.HelloWorldServiceComponent"/> </component> - <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService" requires="wsAuthentication"> + <!-- A component with a reference promoted as a composite reference with a ws policy --> + <component name="HelloWorldWsPolicyServiceComponent"> + <implementation.java class="helloworld.HelloWorldServiceComponent"/> + </component> + + <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService" + requires="wsAuthentication"> <interface.java interface="helloworld.HelloWorldService" /> <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/> + </reference> + + <reference name="HelloWorldWsPolicyService" promote="HelloWorldWsPolicyServiceComponent/helloWorldService" + policySets="wsSecurityPolicyForIntegrity"> + <interface.java interface="helloworld.HelloWorldService" /> + <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldWsPolicyService/HelloWorldSoapPort)"/> </reference> </composite> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference-secure/src/main/resources/wsdl/helloworld.wsdl Tue Oct 23 21:30:02 2007 @@ -75,5 +75,11 @@ <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/> </wsdl:port> </wsdl:service> + + <wsdl:service name="HelloWorldWsPolicyService"> + <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> + <wsdlsoap:address location="http://localhost:8085/HelloWorldWsPolicyService"/> + </wsdl:port> + </wsdl:service> </wsdl:definitions> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/pom.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/pom.xml Tue Oct 23 21:30:02 2007 @@ -69,7 +69,7 @@ <version>4.2</version> <scope>test</scope> </dependency> - + </dependencies> <build> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-reference/src/main/resources/wsdl/helloworld.wsdl Tue Oct 23 21:30:02 2007 @@ -70,6 +70,19 @@ </wsdl:operation> </wsdl:binding> + <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld"> + <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/> + <wsdl:operation name="getGreetings"> + <wsdlsoap:operation soapAction=""/> + <wsdl:input name="getGreetingsRequest"> + <wsdlsoap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getGreetingsResponse"> + <wsdlsoap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloWorldService"> <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> <wsdlsoap:address location="http://localhost:8085/HelloWorldService"/> Propchange: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Tue Oct 23 21:30:02 2007 @@ -1,13 +1,14 @@ -target -*.iws -*.ipr -*.iml -.project -.classpath -maven.log -velocity.log* -junit*.properties -.settings -.deployables -.wtpmodules -work +target +*.iws +*.ipr +*.iml +.project +.classpath +maven.log +velocity.log* +junit*.properties +.settings +.deployables +.wtpmodules +work +activemq-data Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/README URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/README?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/README (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/README Tue Oct 23 21:30:02 2007 @@ -48,7 +48,13 @@ deploys the helloworldws .composite and then waits for the service to be called via web services - ServerPWCBHandler.java - callback handler to authenticate client userid and password + ServerPWCBHandler.java - callback handler to authenticate client userid and password. + The handle(Callback[] callbacks) method of this class typically contains + code for accessing user registries and retrieving passwords + for user identifiers sent by the client and verifying them + against the password sent by the client. For example + here is where one could access LDAP registries to obtain or + compare user identities and passwords. resources/ wsdl/ helloworld.wsdl - the service description that describes Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/java/helloworld/ServerPWCBHandler.java Tue Oct 23 21:30:02 2007 @@ -34,9 +34,21 @@ public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException { for (int i = 0; i < callbacks.length; i++) { - System.out.println("*** Calling Server User/Passwd Handler...."); - WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i]; - pwcb.setPassword("TuscanyWsUserPasswd"); + System.out.println("*** Calling Server User/Passwd Handler...."); + WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i]; + System.out.println("User Id = " + pwcb.getIdentifer()); + System.out.println("Password = " + pwcb.getPassword()); + + if ( pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN ) { + if ( pwcb.getIdentifer().equals("TuscanyWsUser") && + pwcb.getPassword().equals("TuscanyWsUserPasswd") ){ + return; + } else { + throw new UnsupportedCallbackException(pwcb, "Authentication Failed : UserId - Password mismatch"); + } + } else if ( pwcb.getUsage() == WSPasswordCallback.SIGNATURE ) { + pwcb.setPassword("TuscanyWsUserPasswd"); + } } } Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/definitions.xml Tue Oct 23 21:30:02 2007 @@ -102,51 +102,76 @@ </tuscany:wsConfigParam> </sca:policySet> - <sca:policySet name="wsIntegrityPolicy" + <!-- A policyset that uses WS Policy --> + <sca:policySet name="wsSecurityPolicyForIntegrity" provides="integrity" appliesTo="sca:binding.ws"> - <tuscany:wsConfigParam> - <parameter name="InflowSecurity"> - <action> - <items>Timestamp Signature</items> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - </action> - </parameter> - <parameter name="OutflowSecurity"> - <action> - <items>Timestamp Signature</items> - <user>TuscanyWsUser</user> - <signaturePropFile>security.properties</signaturePropFile> - <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass>" + - <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier> - </action> - </parameter> - </tuscany:wsConfigParam> - </sca:policySet> - - <sca:policySet name="wsConfidentialityPolicy" - provides="confidentiality" - appliesTo="sca:binding.ws"> - <tuscany:wsConfigParam> - <parameter name="InflowSecurity"> - <action> - <items>Timestamp Signature Encrypt</items> - <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - </action> - </parameter> - <parameter name="OutflowSecurity"> - <action> - <items>Timestamp Signature Encrypt</items> - <user>TuscanyWsUser</user> - <encryptionUser>TuscanyWsUser</encryptionUser> - <passwordCallbackClass>org.apache.tuscany.sca.binding.ws.axis2.itests.policy.IntegrityPWCBHandler</passwordCallbackClass> - <signaturePropFile>org/apache/tuscany/sca/binding/ws/axis2/itests/policy/security.properties</signaturePropFile> - <signatureKeyIdentifier>DirectReference</signatureKeyIdentifier> - <encryptionKeyIdentifier>SKIKeyIdentifier</encryptionKeyIdentifier> - </action> - </parameter> - </tuscany:wsConfigParam> + <wsp:Policy wsu:Id="SignOnly" + xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"; + xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";> + <wsp:ExactlyOne> + <wsp:All> + <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> + <wsp:Policy> + <sp:InitiatorToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:InitiatorToken> + <sp:RecipientToken> + <wsp:Policy> + <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";> + <wsp:Policy> + <sp:WssX509V3Token10/> + </wsp:Policy> + </sp:X509Token> + </wsp:Policy> + </sp:RecipientToken> + <sp:AlgorithmSuite> + <wsp:Policy> + <sp:TripleDesRsa15/> + </wsp:Policy> + </sp:AlgorithmSuite> + <sp:Layout> + <wsp:Policy> + <sp:Strict/> + </wsp:Policy> + </sp:Layout> + <sp:IncludeTimestamp/> + <sp:OnlySignEntireHeadersAndBody/> + </wsp:Policy> + </sp:AsymmetricBinding> + <sp:Wss10 xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> + <wsp:Policy> + <sp:MustSupportRefKeyIdentifier/> + <sp:MustSupportRefIssuerSerial/> + </wsp:Policy> + </sp:Wss10> + <sp:SignedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";> + <sp:Body/> + </sp:SignedParts> + + <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy";> + <ramp:user>TuscanyWsUser</ramp:user> + <ramp:encryptionUser>TuscanyWsUser</ramp:encryptionUser> + <ramp:passwordCallbackClass>helloworld.ServerPWCBHandler</ramp:passwordCallbackClass> + + <ramp:signatureCrypto> + <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin"> + <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property> + <ramp:property name="org.apache.ws.security.crypto.merlin.file">helloworldKeys.jks</ramp:property> + <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">TuscanyWsUserPasswd</ramp:property> + </ramp:crypto> + </ramp:signatureCrypto> + </ramp:RampartConfig> + + </wsp:All> + </wsp:ExactlyOne> + </wsp:Policy> </sca:policySet> </sca:definitions> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service-secure/src/main/resources/helloworldws.composite Tue Oct 23 21:30:02 2007 @@ -22,12 +22,19 @@ xmlns:hw="http://helloworld"; name="helloworldws"> + <service name="HelloWorldService" requires="authentication" promote="HelloWorldServiceComponent/HelloWorldService"> + <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> + <binding.ws uri="http://localhost:8085/HelloWorldService"/> + </service> + + <service name="HelloWorldWsPolicyService" promote="HelloWorldServiceComponent/HelloWorldService" + policySets="wsSecurityPolicyForIntegrity"> + <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> + <binding.ws uri="http://localhost:8085/HelloWorldWsPolicyService"/> + </service> + <component name="HelloWorldServiceComponent"> <implementation.java class="helloworld.HelloWorldImpl" /> - <service name="HelloWorldService" requires="authentication"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService"/> - </service> </component> </composite> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/helloworld-ws-service.png URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/helloworld-ws-service.png?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== Binary files - no diff available. Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/helloworld-ws-service.svg URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/helloworld-ws-service.svg?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/helloworld-ws-service.svg (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/helloworld-ws-service.svg Tue Oct 23 21:30:02 2007 @@ -30,13 +30,14 @@ height="744.09448" id="svg2" sodipodi:version="0.32" - inkscape:version="0.44" - sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service" + inkscape:version="0.45.1" + sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service" sodipodi:docname="helloworld-ws-service.svg" version="1.0" - inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.png" + inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png" inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84"> + inkscape:export-ydpi="52.84" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> <defs id="defs4" /> <sodipodi:namedview Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/pom.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/pom.xml Tue Oct 23 21:30:02 2007 @@ -37,11 +37,19 @@ <dependencies> <dependency> + <groupId>org.apache.activemq</groupId> + <artifactId>apache-activemq</artifactId> + <version>4.1.1</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-embedded</artifactId> <version>1.0.1-incubating-SNAPSHOT</version> + <scope>compile</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> @@ -61,7 +69,7 @@ <artifactId>tuscany-host-tomcat</artifactId> <version>1.0.1-incubating-SNAPSHOT</version> <scope>runtime</scope> - </dependency> + </dependency> <dependency> <groupId>junit</groupId> @@ -69,7 +77,7 @@ <version>4.2</version> <scope>test</scope> </dependency> - + </dependencies> <build> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/helloworld-ws-service/src/main/resources/wsdl/helloworld.wsdl Tue Oct 23 21:30:02 2007 @@ -70,6 +70,19 @@ </wsdl:operation> </wsdl:binding> + <wsdl:binding name="HelloWorldSoapJmsBinding" type="tns:HelloWorld"> + <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/jms"/> + <wsdl:operation name="getGreetings"> + <wsdlsoap:operation soapAction=""/> + <wsdl:input name="getGreetingsRequest"> + <wsdlsoap:body use="literal"/> + </wsdl:input> + <wsdl:output name="getGreetingsResponse"> + <wsdlsoap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="HelloWorldService"> <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> <wsdlsoap:address location="http://localhost:8085/HelloWorldServiceComponent"/> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-composite/pom.xml Tue Oct 23 21:30:02 2007 @@ -59,7 +59,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-embedded</artifactId> - <version>1.1-incubating-SNAPSHOT</version> + <version>1.0.1-incubating-SNAPSHOT</version> </dependency> <dependency> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-pojo-extension/pom.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-pojo-extension/pom.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-pojo-extension/pom.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/implementation-pojo-extension/pom.xml Tue Oct 23 21:30:02 2007 @@ -44,7 +44,7 @@ <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-interface-java</artifactId> + <artifactId>tuscany-interface-java-xml</artifactId> <version>1.0.1-incubating-SNAPSHOT</version> </dependency> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/build.xml URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/build.xml?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/build.xml (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/build.xml Tue Oct 23 21:30:02 2007 @@ -37,11 +37,6 @@ <copy todir="target/classes"> <fileset dir="src/main/resources"/> </copy> - <jar destfile="target/${test.jar}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${test.class}" /> - </manifest> - </jar> <jar jarfile="target/classes/Customer.jar" manifest="target/classes/osgi/Customer.mf" > <fileset dir="target/classes" includes="supplychain/customer/Customer.class \ @@ -69,6 +64,39 @@ supplychain/OSGiBundleImpl.class \ supplychain/shipper/OSGiShipperImpl.class" /> + </jar> + <jar jarfile="target/classes/DSCustomer.jar" manifest="target/classes/osgi/ds/Customer.mf" > + <fileset dir="target/classes" + includes="supplychain/customer/Customer.class \ + osgi/ds/Customer.xml \ + supplychain/customer/OSGiCustomerComponentImpl.class" + /> + </jar> + <jar jarfile="target/classes/DSRetailer.jar" manifest="target/classes/osgi/ds/Retailer.mf" > + <fileset dir="target/classes" + includes="supplychain/retailer/Retailer.class \ + Vosgi/ds/Retailer.xml \ + supplychain/retailer/OSGiRetailerComponentImpl.class" + /> + </jar> + <jar jarfile="target/classes/DSWarehouse.jar" manifest="target/classes/osgi/ds/Warehouse.mf" > + <fileset dir="target/classes" + includes="supplychain/warehouse/Warehouse.class \ + osgi/ds/Warehouse.xml \ + supplychain/warehouse/OSGiWarehouseComponentImpl.class" + /> + </jar> + <jar jarfile="target/classes/DSShipper.jar" manifest="target/classes/osgi/ds/Shipper.mf" > + <fileset dir="target/classes" + includes="supplychain/shipper/Shipper.class \ + osgi/ds/Shipper.xml \ + supplychain/shipper/OSGiShipperComponentImpl.class" + /> + </jar> + <jar destfile="target/${test.jar}" basedir="target/classes"> + <manifest> + <attribute name="Main-Class" value="${test.class}" /> + </manifest> </jar> </target> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.composite?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.composite (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.composite Tue Oct 23 21:30:02 2007 @@ -26,7 +26,6 @@ <component name="CustomerComponent"> <tuscany:implementation.osgi - bundle="Customer" bundleSymbolicName="supplychain.customer.Customer" /> @@ -37,7 +36,6 @@ <component name="RetailerComponent"> <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" /> <!--implementation.osgi - bundle="Retailer" bundleSymbolicName="supplychain.retailer.Retailer" /--> <reference name="warehouse" target="WarehouseComponent"/> @@ -46,7 +44,6 @@ <component name="WarehouseComponent"> <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" /> <!--implementation.osgi - bundle="Warehouse" bundleSymbolicName="supplychain.warehouse.Warehouse" /--> <reference name="shipper" target="ShipperComponent" /> @@ -54,7 +51,6 @@ <component name="ShipperComponent"> <tuscany:implementation.osgi - bundle="Shipper" bundleSymbolicName="supplychain.shipper.Shipper" /> <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /--> Modified: incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite?rev=587778&r1=587777&r2=587778&view=diff ============================================================================== --- incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite (original) +++ incubator/tuscany/branches/sca-java-1.0.1/samples/osgi-supplychain/src/main/resources/supplychain.ds.composite Tue Oct 23 21:30:02 2007 @@ -26,7 +26,6 @@ <component name="CustomerComponent"> <tuscany:implementation.osgi - bundle="Customer" bundleSymbolicName="ds.supplychain.customer.Customer" /> @@ -37,7 +36,6 @@ <component name="RetailerComponent"> <implementation.java class="supplychain.retailer.JavaRetailerComponentImpl" /> <!--tuscany:implementation.osgi - bundle="Retailer" bundleSymbolicName="ds.supplychain.retailer.Retailer" /--> <reference name="warehouse" target="WarehouseComponent"/> @@ -46,7 +44,6 @@ <component name="WarehouseComponent"> <implementation.java class="supplychain.warehouse.JavaWarehouseComponentImpl" /> <!--implementation.osgi - bundle="Warehouse" bundleSymbolicName="ds.supplychain.warehouse.Warehouse" /--> <reference name="shipper" target="ShipperComponent" /> @@ -54,7 +51,6 @@ <component name="ShipperComponent"> <tuscany:implementation.osgi - bundle="Shipper" bundleSymbolicName="ds.supplychain.shipper.Shipper" /> <!--implementation.java class="supplychain.shipper.JavaShipperComponentImpl" /--> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
