From commitscervantesmichelle@example.net Mon Sep 01 07:11:44 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 61762 invoked from network); 1 Sep 2008 07:11:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 07:11:44 -0000 Received: (qmail 22160 invoked by uid 500); 1 Sep 2008 07:11:42 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 22137 invoked by uid 500); 1 Sep 2008 07:11:42 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 22128 invoked by uid 99); 1 Sep 2008 07:11:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 00:11:42 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 07:10:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 022DB2388876; Mon, 1 Sep 2008 00:10:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690869 - /tuscany/java/sca/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/ Date: Mon, 01 Sep 2008 07:10:53 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Mon Sep 1 00:10:53 2008 New Revision: 690869 URL: http://svn.apache.org/viewvc?rev=690869&view=rev Log: set svn ignores for these jars Modified: tuscany/java/sca/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/ (props changed) Propchange: tuscany/java/sca/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Sep 1 00:10:53 2008 @@ -0,0 +1 @@ +*.jar From commitscervantesmichelle@example.net Mon Sep 01 07:13:08 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 61940 invoked from network); 1 Sep 2008 07:13:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 07:13:08 -0000 Received: (qmail 22341 invoked by uid 500); 1 Sep 2008 07:13:06 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 22318 invoked by uid 500); 1 Sep 2008 07:13:06 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 22309 invoked by uid 99); 1 Sep 2008 07:13:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 00:13:06 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 07:12:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F04112388878; Mon, 1 Sep 2008 00:12:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690871 - /tuscany/java/sca/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/ Date: Mon, 01 Sep 2008 07:12:17 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Mon Sep 1 00:12:17 2008 New Revision: 690871 URL: http://svn.apache.org/viewvc?rev=690871&view=rev Log: set svn ignores for these jars Modified: tuscany/java/sca/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/ (props changed) Propchange: tuscany/java/sca/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Sep 1 00:12:17 2008 @@ -0,0 +1 @@ +*.jar From commitscervantesmichelle@example.net Mon Sep 01 08:37:49 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 6745 invoked from network); 1 Sep 2008 08:37:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 08:37:49 -0000 Received: (qmail 16590 invoked by uid 500); 1 Sep 2008 08:37:47 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 16516 invoked by uid 500); 1 Sep 2008 08:37:47 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 16507 invoked by uid 99); 1 Sep 2008 08:37:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 01:37:47 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 08:36:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 749CC238889E; Mon, 1 Sep 2008 01:36:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690908 - /tuscany/java/sca/itest/jms-definitions/src/main/resources/jndi.properties Date: Mon, 01 Sep 2008 08:36:57 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Mon Sep 1 01:36:57 2008 New Revision: 690908 URL: http://svn.apache.org/viewvc?rev=690908&view=rev Log: Correct typo in jms definitions Modified: tuscany/java/sca/itest/jms-definitions/src/main/resources/jndi.properties Modified: tuscany/java/sca/itest/jms-definitions/src/main/resources/jndi.properties URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms-definitions/src/main/resources/jndi.properties?rev=690908&r1=690907&r2=690908&view=diff ============================================================================== --- tuscany/java/sca/itest/jms-definitions/src/main/resources/jndi.properties (original) +++ tuscany/java/sca/itest/jms-definitions/src/main/resources/jndi.properties Mon Sep 1 01:36:57 2008 @@ -29,7 +29,7 @@ # register some queues in JNDI using the form # queue.[jndiName] = [physicalName] -queue.ServiceQueue = MyServiceQueue +queue.MyServiceQueue= MyServiceQueue # register some topics in JNDI using the form # topic.[jndiName] = [physicalName] From commitscervantesmichelle@example.net Mon Sep 01 09:03:38 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 21919 invoked from network); 1 Sep 2008 09:03:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 09:03:38 -0000 Received: (qmail 38407 invoked by uid 500); 1 Sep 2008 09:03:36 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 38389 invoked by uid 500); 1 Sep 2008 09:03:36 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 38380 invoked by uid 99); 1 Sep 2008 09:03:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 02:03:36 -0700 X-ASF-Spam-Status: No, hits=-1998.5 required=10.0 tests=ALL_TRUSTED,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 09:02:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4C46C238896B; Mon, 1 Sep 2008 02:03:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690913 - in /tuscany/java/sca: itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/ itest/validation/src/test/java/binding/wsxml/ modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/ modules/bi... Date: Mon, 01 Sep 2008 09:03:05 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: antelder Date: Mon Sep 1 02:03:03 2008 New Revision: 690913 URL: http://svn.apache.org/viewvc?rev=690913&view=rev Log: TUSCANY-2242: Apply patch from Ramkumar Ramalingam for Incorrent port name in wsdlElement leads to NPE Added: tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/ tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite tuscany/java/sca/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java Modified: tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java tuscany/java/sca/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties Added: tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl?rev=690913&view=auto ============================================================================== --- tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl (added) +++ tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl Mon Sep 1 02:03:03 2008 @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + name="helloworld"> + + <wsdl:types> + <schema elementFormDefault="qualified" targetNamespace="http://helloworld" xmlns="http://www.w3.org/2001/XMLSchema"> + + <element name="getGreetings"> + <complexType> + <sequence> + <element name="name" type="xsd:string"/> + </sequence> + </complexType> + </element> + + <element name="getGreetingsResponse"> + <complexType> + <sequence> + <element name="getGreetingsReturn" type="xsd:string"/> + </sequence> + </complexType> + </element> + + </schema> + </wsdl:types> + + <wsdl:message name="getGreetingsRequest"> + <wsdl:part element="tns:getGreetings" name="parameters"/> + </wsdl:message> + + <wsdl:message name="getGreetingsResponse"> + <wsdl:part element="tns:getGreetingsResponse" name="parameters"/> + </wsdl:message> + + <wsdl:portType name="HelloWorld"> + <wsdl:operation name="getGreetings"> + <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest"/> + <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> + <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <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: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"/> + </wsdl:port> + </wsdl:service> + +</wsdl:definitions> Added: tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite?rev=690913&view=auto ============================================================================== --- tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite (added) +++ tuscany/java/sca/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite Mon Sep 1 02:03:03 2008 @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" + targetNamespace="http://helloworld" + xmlns:hw="http://helloworld" + name="helloworldwsclient"> + + <!-- A component with an embedded reference definition connecting to an external webservice + The wsdl interface for the reference is derived from the information specified by the 'wsdlElement' + --> + <component name="HelloTuscanyServiceComponent"> + <implementation.java class="binding.jms.HelloWorldServiceImpl"/> + <reference name="helloWorldService"> + <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort2)"/> + </reference> + </component> + + <!-- A component with a reference promoted as a composite reference --> + <component name="HelloWorldServiceComponent"> + <implementation.java class="binding.jms.HelloWorldServiceImpl"/> + </component> + + <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService"> + <interface.java interface="binding.jms.HelloWorldService" /> + <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort2)"/> + </reference> + +</composite> Added: tuscany/java/sca/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java?rev=690913&view=auto ============================================================================== --- tuscany/java/sca/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java (added) +++ tuscany/java/sca/itest/validation/src/test/java/binding/wsxml/WsdlPortTypeDoesNotMatchTestCase.java Mon Sep 1 02:03:03 2008 @@ -0,0 +1,60 @@ +/* + * 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. + */ +package binding.wsxml; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.monitor.Monitor; +import org.apache.tuscany.sca.monitor.Problem; +import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl; + +import domain.CustomCompositeBuilder; + +/** + * This shows how to test the Calculator service component. + */ +public class WsdlPortTypeDoesNotMatchTestCase extends TestCase { + + private CustomCompositeBuilder customDomain; + + @Override + protected void setUp() throws Exception + { + customDomain = CustomCompositeBuilder.getInstance(); + try { + customDomain.loadContribution("src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite", + "TestContribution", "src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/"); + } catch (Exception ex){ + //throw ex; + } + } + + @Override + protected void tearDown() throws Exception { + //node.stop(); + } + + public void testCalculator() { + Monitor monitor = customDomain.getMonitorInstance(); + Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem(); + + assertNotNull(problem); + assertEquals("WsdlPortTypeDoesNotMatch", problem.getMessageId()); + } +} Modified: tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java?rev=690913&r1=690912&r2=690913&view=diff ============================================================================== --- tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java (original) +++ tuscany/java/sca/modules/binding-ws-xml/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java Mon Sep 1 02:03:03 2008 @@ -348,8 +348,12 @@ model.setService(service.getElement()); if (model.getPortName() != null) { Port port = service.getElement().getPort(model.getPortName()); - model.setPort(port); - model.setBinding(port.getBinding()); + if (port != null) { + model.setPort(port); + model.setBinding(port.getBinding()); + } else { + warning("WsdlPortTypeDoesNotMatch", wsdlDefinition, model.getPortName()); + } } } else { warning("WsdlServiceDoesNotMatch", wsdlDefinition, model.getServiceName()); Modified: tuscany/java/sca/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties?rev=690913&r1=690912&r2=690913&view=diff ============================================================================== --- tuscany/java/sca/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties (original) +++ tuscany/java/sca/modules/binding-ws-xml/src/main/resources/binding-wsxml-validation-messages.properties Mon Sep 1 02:03:03 2008 @@ -21,6 +21,8 @@ InvalidWsdlElementAttr = Invalid WebService binding wsdlElement attribute: {0} MustUseWsdlBinding = {0} must use wsdl.binding when using wsa:EndpointReference InvalidInterfaceException = Exception creating interface from WSDL for binding: {0} -WsdlBindingDoesNotMatch = The #wsdl.binding({0}) does not match with the WSDL Definitions +WsdlBindingDoesNotMatch = The #wsdl.binding({0}) does not match with the WSDL Definitions WsdlServiceDoesNotMatch = The #wsdl.service({0}) does not match with the WSDL Definitions +WsdlPortTypeDoesNotMatch = The #wsdl.port({0}) does not match with the WSDL Definitions + From commitscervantesmichelle@example.net Mon Sep 01 20:30:12 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 87421 invoked from network); 1 Sep 2008 20:30:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 20:30:12 -0000 Received: (qmail 87412 invoked by uid 500); 1 Sep 2008 20:30:10 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 87387 invoked by uid 500); 1 Sep 2008 20:30:10 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 87378 invoked by uid 99); 1 Sep 2008 20:30:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 13:30:10 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 20:29:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3DB9B2388986; Mon, 1 Sep 2008 13:29:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691049 - /tuscany/java/sca/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java Date: Mon, 01 Sep 2008 20:29:50 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 13:29:50 2008 New Revision: 691049 URL: http://svn.apache.org/viewvc?rev=691049&view=rev Log: Fixed parameter name, changed servletHost to ejbHost. Modified: tuscany/java/sca/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java Modified: tuscany/java/sca/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java?rev=691049&r1=691048&r2=691049&view=diff ============================================================================== --- tuscany/java/sca/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java (original) +++ tuscany/java/sca/modules/host-ejb/src/main/java/org/apache/tuscany/sca/host/ejb/DefaultEJBHostExtensionPoint.java Mon Sep 1 13:29:50 2008 @@ -31,12 +31,12 @@ private List<EJBHost> ejbHosts = new ArrayList<EJBHost>(); - public void addEJBHost(EJBHost servletHost) { - ejbHosts.add(servletHost); + public void addEJBHost(EJBHost ejbHost) { + ejbHosts.add(ejbHost); } - public void removeEJBHost(EJBHost servletHost) { - ejbHosts.remove(servletHost); + public void removeEJBHost(EJBHost ejbHost) { + ejbHosts.remove(ejbHost); } public List<EJBHost> getEJBHosts() { From commitscervantesmichelle@example.net Mon Sep 01 20:30:48 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 87929 invoked from network); 1 Sep 2008 20:30:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 20:30:48 -0000 Received: (qmail 90924 invoked by uid 500); 1 Sep 2008 20:30:46 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 90909 invoked by uid 500); 1 Sep 2008 20:30:46 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 90900 invoked by uid 99); 1 Sep 2008 20:30:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 13:30:46 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 20:29:57 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0325A238899C; Mon, 1 Sep 2008 13:30:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691050 - /tuscany/java/sca/modules/extensibility-osgi/pom.xml Date: Mon, 01 Sep 2008 20:30:27 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 13:30:27 2008 New Revision: 691050 URL: http://svn.apache.org/viewvc?rev=691050&view=rev Log: Fixed scope of the dependency on the Felix org.osgi.core module, changed it to 'provided' to allow the modules that use extensiblity-osgi to make the choice of using either Felix or Equinox. Modified: tuscany/java/sca/modules/extensibility-osgi/pom.xml Modified: tuscany/java/sca/modules/extensibility-osgi/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/extensibility-osgi/pom.xml?rev=691050&r1=691049&r2=691050&view=diff ============================================================================== --- tuscany/java/sca/modules/extensibility-osgi/pom.xml (original) +++ tuscany/java/sca/modules/extensibility-osgi/pom.xml Mon Sep 1 13:30:27 2008 @@ -37,6 +37,7 @@ <groupId>org.apache.felix</groupId> <artifactId>org.osgi.core</artifactId> <version>1.0.1</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.felix</groupId> From commitscervantesmichelle@example.net Mon Sep 01 20:40:45 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 92789 invoked from network); 1 Sep 2008 20:40:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 20:40:45 -0000 Received: (qmail 1644 invoked by uid 500); 1 Sep 2008 20:40:43 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 1624 invoked by uid 500); 1 Sep 2008 20:40:43 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 1613 invoked by uid 99); 1 Sep 2008 20:40:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 13:40:43 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 20:39:53 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7FDB02388986; Mon, 1 Sep 2008 13:40:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691052 - in /tuscany/java/sca/modules: interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/ interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/ interface-wsdl/src/main/java/org/apache/tuscany/sc... Date: Mon, 01 Sep 2008 20:40:23 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 13:40:23 2008 New Revision: 691052 URL: http://svn.apache.org/viewvc?rev=691052&view=rev Log: Enable interface-wsdl to work with older WSDL4J implementations like wsdl4j 1.4 (as well as the latest wsdl4j 1.6.x). That's what's included in some application servers like WebSphere 6.1 for example, and 1.4 doesn't have WSDLElement or extension attributes. Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java Modified: tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java?rev=691052&r1=691051&r2=691052&view=diff ============================================================================== --- tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java (original) +++ tuscany/java/sca/modules/interface-wsdl-xml/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/xml/WSDLModelResolver.java Mon Sep 1 13:40:23 2008 @@ -128,8 +128,12 @@ wsdlExtensionRegistry.registerDeserializer(Types.class, schema, deserializer); } // ---- Policy WSDL Extensions - wsdlExtensionRegistry.registerExtensionAttributeType(PortType.class, Q_POLICY_ATTRIBUTE_EXTENSION, AttributeExtensible.LIST_OF_QNAMES_TYPE); - wsdlExtensionRegistry.registerExtensionAttributeType(Operation.class, Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION, AttributeExtensible.STRING_TYPE); + try { + wsdlExtensionRegistry.registerExtensionAttributeType(PortType.class, Q_POLICY_ATTRIBUTE_EXTENSION, AttributeExtensible.LIST_OF_QNAMES_TYPE); + wsdlExtensionRegistry.registerExtensionAttributeType(Operation.class, Q_POLICY_END_CONVERSATION_ATTRIBUTE_EXTENSION, AttributeExtensible.STRING_TYPE); + } catch (NoSuchMethodError e) { + // That method does not exist on older WSDL4J levels + } // ---- BPEL additions serializer = new BPELExtensionHandler(); Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java?rev=691052&r1=691051&r2=691052&view=diff ============================================================================== --- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java (original) +++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/WSDLObject.java Mon Sep 1 13:40:23 2008 @@ -19,14 +19,15 @@ package org.apache.tuscany.sca.interfacedef.wsdl; +import java.io.Serializable; + import javax.wsdl.Definition; -import javax.wsdl.WSDLElement; /** * Model for objects in a WSDL definition * @version $Rev$ $Date$ */ -public interface WSDLObject<T extends WSDLElement> { +public interface WSDLObject<T extends Serializable> { /** * Get the owning definition where the element is declared * @return The owning definition Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java?rev=691052&r1=691051&r2=691052&view=diff ============================================================================== --- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java (original) +++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLInterfaceIntrospectorImpl.java Mon Sep 1 13:40:23 2008 @@ -85,7 +85,13 @@ } private void processIntents(WSDLInterface wsdlInterface, PortType portType) { - Object o = portType.getExtensionAttribute(POLICY_REQUIRES); + Object o; + try { + o = portType.getExtensionAttribute(POLICY_REQUIRES); + } catch (NoSuchMethodError e) { + // That method does not exist on older WSDL4J levels + o = null; + } if(o != null && o instanceof Vector) { Vector<QName> policyAttributes = (Vector<QName>) o; @@ -113,7 +119,13 @@ private boolean isConversational(PortType portType) { boolean conversational = false; - Object o = portType.getExtensionAttribute(POLICY_REQUIRES); + Object o; + try { + o = portType.getExtensionAttribute(POLICY_REQUIRES); + } catch (NoSuchMethodError e) { + // That method does not exist on older WSDL4J levels + o =null; + } if(o != null && o instanceof Vector) { Vector<QName> policyAttributes = (Vector<QName>) o; @@ -129,7 +141,13 @@ private boolean isEndConversation(javax.wsdl.Operation operation) { boolean endConversation = false; - Object o = operation.getExtensionAttribute(POLICY_END_CONVERSATION); + Object o; + try { + o = operation.getExtensionAttribute(POLICY_END_CONVERSATION); + } catch (NoSuchMethodError e) { + // That method does not exist on older WSDL4J levels + o = null; + } if(o != null && o instanceof String) { endConversation = Boolean.valueOf((String)o); } Modified: tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java?rev=691052&r1=691051&r2=691052&view=diff ============================================================================== --- tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java (original) +++ tuscany/java/sca/modules/interface-wsdl/src/main/java/org/apache/tuscany/sca/interfacedef/wsdl/impl/WSDLObjectImpl.java Mon Sep 1 13:40:23 2008 @@ -19,15 +19,16 @@ package org.apache.tuscany.sca.interfacedef.wsdl.impl; +import java.io.Serializable; + import javax.wsdl.Definition; -import javax.wsdl.WSDLElement; import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject; /** * @version $Rev$ $Date$ */ -public class WSDLObjectImpl<T extends WSDLElement> implements WSDLObject<T> { +public class WSDLObjectImpl<T extends Serializable> implements WSDLObject<T> { private Definition definition; private T element; From commitscervantesmichelle@example.net Mon Sep 01 20:42:30 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 93428 invoked from network); 1 Sep 2008 20:42:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 20:42:30 -0000 Received: (qmail 5198 invoked by uid 500); 1 Sep 2008 20:42:28 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 5179 invoked by uid 500); 1 Sep 2008 20:42:28 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 5170 invoked by uid 99); 1 Sep 2008 20:42:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 13:42:28 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 20:41:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 016582388986; Mon, 1 Sep 2008 13:42:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691053 - in /tuscany/java/sca/modules: implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/ implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/ implementation-bpel... Date: Mon, 01 Sep 2008 20:42:07 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 13:42:07 2008 New Revision: 691053 URL: http://svn.apache.org/viewvc?rev=691053&view=rev Log: Changed uri and location to strings instead of URI and URL in the BPEL implementation model as strings are more lightweight and that's what we've already done with other similar models as well. Added a pointer to the ModelResolver which can be used to resolve WSDLs and XSDs referenced by the BPEL process when it's deployed and started later, after the original model read/resolve phases. Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java (original) +++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java Mon Sep 1 13:42:07 2008 @@ -209,9 +209,8 @@ * @return - the File object containing the BPEL process */ private File getBPELFile() { - URL fileURL = implementation.getProcessDefinition().getLocation(); try { - File theProcess = new File( fileURL.toURI()); + File theProcess = new File(implementation.getProcessDefinition().getLocation()); return theProcess; } catch( Exception e ) { if(__log.isDebugEnabled()) { Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java (original) +++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java Mon Sep 1 13:42:07 2008 @@ -95,9 +95,9 @@ */ public String getBpelDocument() { //System.out.println("getBPELDocument called"); - URL processURL = implementation.getProcessDefinition().getLocation(); + String processURL = implementation.getProcessDefinition().getLocation(); try { - return getRelativePath( getDirectory(), new File( processURL.toURI() )); + return getRelativePath( getDirectory(), new File(processURL)); } catch (Exception e) { if(__log.isWarnEnabled()) { __log.warn("Unable to resolve relative path of BPEL process" + processURL, e ); @@ -382,9 +382,8 @@ * @return - the File object containing the BPEL process */ private File getBPELFile() { - URL fileURL = implementation.getProcessDefinition().getLocation(); try { - File theProcess = new File( fileURL.toURI()); + File theProcess = new File(implementation.getProcessDefinition().getLocation()); return theProcess; } catch( Exception e ) { if(__log.isDebugEnabled()) { Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java (original) +++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java Mon Sep 1 13:42:07 2008 @@ -19,7 +19,7 @@ package org.apache.tuscany.sca.implementation.bpel.ode.provider; import java.io.File; -import java.net.URL; +import java.net.URI; import javax.transaction.TransactionManager; @@ -95,9 +95,9 @@ odeServer.init(); } - URL deployURL = this.implementation.getProcessDefinition().getLocation(); + URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation()); - File deploymentDir = new File(deployURL.toURI().getPath()).getParentFile(); + File deploymentDir = new File(deployURI.getPath()).getParentFile(); if(__log.isInfoEnabled()) { __log.info(">>> Deploying : " + deploymentDir.toString()); Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELImplementation.java Mon Sep 1 13:42:07 2008 @@ -22,6 +22,7 @@ import org.apache.tuscany.sca.assembly.ComponentType; import org.apache.tuscany.sca.assembly.Implementation; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; /** * The model representing the BPEL implementation in an SCA assembly model. @@ -71,4 +72,20 @@ * @param componentType the component type to set */ public void setComponentType(ComponentType componentType); + + /** + * Returns the model resolver that can be used to resolve WSDLs and XSDs + * referenced by the BPEL process. + * + * @return + */ + ModelResolver getModelResolver(); + + /** + * Sets the model resolver that can be used to resolve WSDLs and XSDs referenced + * by the BPEL process. + * + * @param modelResolver + */ + void setModelResolver(ModelResolver modelResolver); } Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/BPELProcessDefinition.java Mon Sep 1 13:42:07 2008 @@ -57,28 +57,28 @@ * * @return URI for the process */ - URI getURI(); + String getURI(); /** * Set the BPEL process URI * * @param uri for the process */ - void setURI(URI uri); + void setURI(String uri); /** * Get the URL for the process location * * @return */ - URL getLocation(); + String getLocation(); /** * Set the URL for the process location * * @param url */ - void setLocation(URL location); + void setLocation(String location); /** * Return the list of PartnerLinks for this process Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELImplementationImpl.java Mon Sep 1 13:42:07 2008 @@ -29,6 +29,7 @@ import org.apache.tuscany.sca.assembly.Reference; import org.apache.tuscany.sca.assembly.Service; import org.apache.tuscany.sca.assembly.impl.ImplementationImpl; +import org.apache.tuscany.sca.contribution.resolver.ModelResolver; import org.apache.tuscany.sca.implementation.bpel.BPELImplementation; import org.apache.tuscany.sca.implementation.bpel.BPELProcessDefinition; @@ -42,6 +43,7 @@ private QName processName; private BPELProcessDefinition processDefinition; private ComponentType componentType; + private ModelResolver modelResolver; public QName getProcess() { return processName; @@ -61,53 +63,49 @@ @Override public String getURI() { - // The sample BPEL implementation does not have a URI + // The BPEL implementation does not have a URI return null; } @Override public void setURI(String uri) { - // The sample BPEL implementation does not have a URI + // The BPEL implementation does not have a URI } @Override public ConstrainingType getConstrainingType() { - // The sample BPEL implementation does not support constrainingTypes + // The BPEL implementation does not support constrainingTypes return null; } @Override public List<Property> getProperties() { - // The sample BPEL implementation does not support properties + // The BPEL implementation does not support properties return Collections.emptyList(); } - /* - * Returns the componentType for this BPEL process implementation - */ public ComponentType getComponentType() { return componentType; } - /* - * Sets the componentType for this BPEL process implementation - */ public void setComponentType(ComponentType componentType) { this.componentType = componentType; } + public ModelResolver getModelResolver() { + return modelResolver; + } + + public void setModelResolver(ModelResolver modelResolver) { + this.modelResolver = modelResolver; + } + @Override - /** - * Returns a List of the services for this BPEL process implementation - */ public List<Service> getServices() { return componentType.getServices(); } @Override - /** - * Returns a List of the references for this BPEL process implementation - */ public List<Reference> getReferences() { return componentType.getReferences(); } Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/impl/BPELProcessDefinitionImpl.java Mon Sep 1 13:42:07 2008 @@ -19,7 +19,6 @@ package org.apache.tuscany.sca.implementation.bpel.impl; -import java.net.URI; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -39,8 +38,8 @@ */ class BPELProcessDefinitionImpl implements BPELProcessDefinition { private QName name; - private URI uri; - private URL location; + private String uri; + private String location; private boolean unresolved; private List<BPELPartnerLinkElement> partnerLinks = new ArrayList<BPELPartnerLinkElement>(); private List<BPELImportElement> imports = new ArrayList<BPELImportElement>(); @@ -55,19 +54,19 @@ this.name = name; } - public URI getURI() { + public String getURI() { return uri; } - public void setURI(URI uri) { + public void setURI(String uri) { this.uri = uri; } - public URL getLocation() { + public String getLocation() { return location; } - public void setLocation(URL location) { + public void setLocation(String location) { this.location = location; } Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELDocumentProcessor.java Mon Sep 1 13:42:07 2008 @@ -109,7 +109,7 @@ // and relying on componentType file for service definition // so it's OK to set resolved for now processDefinition = readProcessDefinition(artifactURL); - processDefinition.setURI(artifactURI); + processDefinition.setURI(artifactURI.toString()); processDefinition.setUnresolved(false); } catch (Exception e) { ContributionReadException ce = new ContributionReadException(e); @@ -333,7 +333,7 @@ private BPELProcessDefinition readProcessDefinition(URL doc) throws Exception { BPELProcessDefinition processDefinition = factory.createBPELProcessDefinition(); processDefinition.setUnresolved(true); - processDefinition.setLocation(doc); + processDefinition.setLocation(doc.toString()); InputStream is = doc.openStream(); XMLStreamReader reader = null; Modified: tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/xml/BPELImplementationProcessor.java Mon Sep 1 13:42:07 2008 @@ -125,6 +125,8 @@ if( implementation != null && implementation.isUnresolved()) { + implementation.setModelResolver(resolver); + BPELProcessDefinition processDefinition = resolveBPELProcessDefinition(implementation, resolver); if(processDefinition.isUnresolved()) { error("BPELProcessNotFound", implementation, processDefinition.getName()); Modified: tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java?rev=691053&r1=691052&r2=691053&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java (original) +++ tuscany/java/sca/modules/implementation-bpel/src/test/java/org/apache/tuscany/sca/implementation/bpel/BPELDocumentProcessorTestCase.java Mon Sep 1 13:42:07 2008 @@ -54,6 +54,6 @@ assertNotNull(bpelProcessDefinition); assertEquals(new QName("http://tuscany.apache.org/implementation/bpel/example/helloworld", "HelloWorld"), bpelProcessDefinition.getName()); - assertEquals(processLocation, bpelProcessDefinition.getLocation()); + assertEquals(processLocation.toString(), bpelProcessDefinition.getLocation()); } } From commitscervantesmichelle@example.net Mon Sep 01 20:43:10 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 93740 invoked from network); 1 Sep 2008 20:43:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 20:43:10 -0000 Received: (qmail 6709 invoked by uid 500); 1 Sep 2008 20:43:08 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 6695 invoked by uid 500); 1 Sep 2008 20:43:08 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 6686 invoked by uid 99); 1 Sep 2008 20:43:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 13:43:08 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 20:42:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A294D2388989; Mon, 1 Sep 2008 13:42:49 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691054 - /tuscany/java/sca/modules/pom.xml Date: Mon, 01 Sep 2008 20:42:49 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 13:42:49 2008 New Revision: 691054 URL: http://svn.apache.org/viewvc?rev=691054&view=rev Log: Added node-launcher-equinox to the POM. Modified: tuscany/java/sca/modules/pom.xml Modified: tuscany/java/sca/modules/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=691054&r1=691053&r2=691054&view=diff ============================================================================== --- tuscany/java/sca/modules/pom.xml (original) +++ tuscany/java/sca/modules/pom.xml Mon Sep 1 13:42:49 2008 @@ -155,6 +155,7 @@ <module>node-api</module> <module>node-impl</module> <module>node-launcher</module> + <module>node-launcher-equinox</module> <module>node-launcher-osgi</module> <module>node-launcher-webapp</module> <module>node-manager</module> From commitscervantesmichelle@example.net Mon Sep 01 21:03:39 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 5546 invoked from network); 1 Sep 2008 21:03:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 21:03:38 -0000 Received: (qmail 25139 invoked by uid 500); 1 Sep 2008 21:03:37 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 25116 invoked by uid 500); 1 Sep 2008 21:03:37 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 25107 invoked by uid 99); 1 Sep 2008 21:03:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 14:03:37 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 21:02:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E144E2388986; Mon, 1 Sep 2008 14:02:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691059 - in /tuscany/java/sca/distribution/features: all/ all/src/main/components/ core/ core/src/main/components/ ejava/ ejava/src/main/components/ manager/ manager/src/main/components/ process/ process/src/main/components/ web20/ web20/s... Date: Mon, 01 Sep 2008 21:02:47 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 14:02:46 2008 New Revision: 691059 URL: http://svn.apache.org/viewvc?rev=691059&view=rev Log: Added node-launcher-equinox to the distro to test integration with OSGi/Equinox. Added SDO databinding to the Web Service distribution as I had missed it before. Modified: tuscany/java/sca/distribution/features/all/pom.xml tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml tuscany/java/sca/distribution/features/core/pom.xml tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml tuscany/java/sca/distribution/features/ejava/pom.xml tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml tuscany/java/sca/distribution/features/manager/pom.xml tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml tuscany/java/sca/distribution/features/process/pom.xml tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml tuscany/java/sca/distribution/features/web20/pom.xml tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml tuscany/java/sca/distribution/features/webservice/pom.xml tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml Modified: tuscany/java/sca/distribution/features/all/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/all/pom.xml (original) +++ tuscany/java/sca/distribution/features/all/pom.xml Mon Sep 1 14:02:46 2008 @@ -149,6 +149,7 @@ <module>../../../modules/databinding-json</module> <module>../../../modules/databinding-saxon</module> <module>../../../modules/databinding-sdo</module> + <module>../../../modules/databinding-sdo-axiom</module> <module>../../../modules/definitions</module> <module>../../../modules/definitions-xml</module> <module>../../../modules/domain-manager</module> @@ -186,7 +187,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/node-manager</module> <module>../../../modules/policy</module> Modified: tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/all/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -63,6 +63,7 @@ <include>databinding-json/**/*</include> <include>databinding-saxon/**/*</include> <include>databinding-sdo/**/*</include> + <include>databinding-sdo-axiom/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> <include>distribution-core/**/*</include> @@ -106,7 +107,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>node-manager/**/*</include> <include>policy/**/*</include> Modified: tuscany/java/sca/distribution/features/core/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/core/pom.xml (original) +++ tuscany/java/sca/distribution/features/core/pom.xml Mon Sep 1 14:02:46 2008 @@ -170,7 +170,7 @@ </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-osgi</artifactId> + <artifactId>tuscany-node-launcher-equinox</artifactId> <version>1.4-SNAPSHOT</version> </dependency> <dependency> @@ -307,7 +307,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> Modified: tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml (original) +++ tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml Mon Sep 1 14:02:46 2008 @@ -66,7 +66,7 @@ <exclude>org.apache.tuscany.sca:tuscany-node-api</exclude> <exclude>org.apache.tuscany.sca:tuscany-node-impl</exclude> <exclude>org.apache.tuscany.sca:tuscany-node-launcher</exclude> - <exclude>org.apache.tuscany.sca:tuscany-node-launcher-osgi</exclude> + <exclude>org.apache.tuscany.sca:tuscany-node-launcher-equinox</exclude> <exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude> <exclude>org.apache.tuscany.sca:tuscany-policy</exclude> <exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude> @@ -91,13 +91,17 @@ <exclude>javax.xml.bind:jaxb-api</exclude> <exclude>javax.xml.stream:stax-api</exclude> <exclude>javax.xml.ws:jaxws-api</exclude> - <exclude>org.apache.felix:org.apache.felix.framework</exclude> - <exclude>org.apache.felix:org.osgi.compendium</exclude> - <exclude>org.apache.felix:org.osgi.core</exclude> - <exclude>org.apache.felix:org.osgi.foundation</exclude> <exclude>org.apache.geronimo.specs:geronimo-commonj_1.1_spec</exclude> <exclude>org.apache.ws.commons.schema:XmlSchema</exclude> <exclude>org.codehaus.woodstox:wstx-asl</exclude> + <exclude>org.eclipse.core:contenttype</exclude> + <exclude>org.eclipse.core:jobs</exclude> + <exclude>org.eclipse.core:runtime</exclude> + <exclude>org.eclipse.equinox:app</exclude> + <exclude>org.eclipse.equinox:common</exclude> + <exclude>org.eclipse.equinox:preferences</exclude> + <exclude>org.eclipse.equinox:registry</exclude> + <exclude>org.eclipse:osgi</exclude> <exclude>wsdl4j:wsdl4j</exclude> <exclude>org.apache.tuscany.sca:*</exclude> </excludes> Modified: tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/core/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -63,7 +63,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> Modified: tuscany/java/sca/distribution/features/ejava/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/ejava/pom.xml (original) +++ tuscany/java/sca/distribution/features/ejava/pom.xml Mon Sep 1 14:02:46 2008 @@ -160,7 +160,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> Modified: tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/ejava/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -74,7 +74,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> Modified: tuscany/java/sca/distribution/features/manager/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/manager/pom.xml (original) +++ tuscany/java/sca/distribution/features/manager/pom.xml Mon Sep 1 14:02:46 2008 @@ -234,7 +234,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/node-manager</module> <module>../../../modules/policy</module> Modified: tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -81,7 +81,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>node-manager/**/*</include> <include>policy/**/*</include> Modified: tuscany/java/sca/distribution/features/process/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/process/pom.xml (original) +++ tuscany/java/sca/distribution/features/process/pom.xml Mon Sep 1 14:02:46 2008 @@ -136,7 +136,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> Modified: tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -69,7 +69,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> Modified: tuscany/java/sca/distribution/features/web20/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/web20/pom.xml (original) +++ tuscany/java/sca/distribution/features/web20/pom.xml Mon Sep 1 14:02:46 2008 @@ -189,7 +189,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> Modified: tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -79,7 +79,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> Modified: tuscany/java/sca/distribution/features/webservice/pom.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/pom.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/webservice/pom.xml (original) +++ tuscany/java/sca/distribution/features/webservice/pom.xml Mon Sep 1 14:02:46 2008 @@ -89,6 +89,16 @@ <artifactId>tuscany-databinding-jaxb-axiom</artifactId> <version>1.4-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-databinding-sdo</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-databinding-sdo-axiom</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> <!-- Hosts --> <dependency> @@ -172,6 +182,8 @@ <module>../../../modules/databinding-axiom</module> <module>../../../modules/databinding-jaxb</module> <module>../../../modules/databinding-jaxb-axiom</module> + <module>../../../modules/databinding-sdo</module> + <module>../../../modules/databinding-sdo-axiom</module> <module>../../../modules/definitions</module> <module>../../../modules/definitions-xml</module> <module>../../../modules/endpoint</module> @@ -196,7 +208,7 @@ <module>../../../modules/node-api</module> <module>../../../modules/node-impl</module> <module>../../../modules/node-launcher</module> - <module>../../../modules/node-launcher-osgi</module> + <module>../../../modules/node-launcher-equinox</module> <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> Modified: tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml?rev=691059&r1=691058&r2=691059&view=diff ============================================================================== --- tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml (original) +++ tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml Mon Sep 1 14:02:46 2008 @@ -47,6 +47,8 @@ <include>databinding-axiom/**/*</include> <include>databinding-jaxb/**/*</include> <include>databinding-jaxb-axiom/**/*</include> + <include>databinding-sdo/**/*</include> + <include>databinding-sdo-axiom/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> <include>distribution-core/**/*</include> @@ -72,7 +74,7 @@ <include>node-api/**/*</include> <include>node-impl/**/*</include> <include>node-launcher/**/*</include> - <include>node-launcher-osgi/**/*</include> + <include>node-launcher-equinox/**/*</include> <include>node-launcher-webapp/**/*</include> <include>policy/**/*</include> <include>policy-security/**/*</include> From commitscervantesmichelle@example.net Mon Sep 01 21:06:42 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 5938 invoked from network); 1 Sep 2008 21:06:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Sep 2008 21:06:42 -0000 Received: (qmail 26402 invoked by uid 500); 1 Sep 2008 21:06:40 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 26383 invoked by uid 500); 1 Sep 2008 21:06:40 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 26374 invoked by uid 99); 1 Sep 2008 21:06:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 14:06:40 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 21:05:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 194EC238889E; Mon, 1 Sep 2008 14:05:51 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691062 - in /tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode: BPELODEDeployFile.java TuscanyProcessConfImpl.java provider/BPELImplementationProvider.java Date: Mon, 01 Sep 2008 21:05:50 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsdelfino Date: Mon Sep 1 14:05:50 2008 New Revision: 691062 URL: http://svn.apache.org/viewvc?rev=691062&view=rev Log: Fixed conversion between URI string and BPEL File. Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java?rev=691062&r1=691061&r2=691062&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java (original) +++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/BPELODEDeployFile.java Mon Sep 1 14:05:50 2008 @@ -29,6 +29,7 @@ import java.io.PrintStream; import java.io.IOException; import java.io.FileOutputStream; +import java.net.URI; import java.net.URL; import javax.xml.namespace.QName; @@ -210,7 +211,7 @@ */ private File getBPELFile() { try { - File theProcess = new File(implementation.getProcessDefinition().getLocation()); + File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation())); return theProcess; } catch( Exception e ) { if(__log.isDebugEnabled()) { Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java?rev=691062&r1=691061&r2=691062&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java (original) +++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/TuscanyProcessConfImpl.java Mon Sep 1 14:05:50 2008 @@ -95,12 +95,12 @@ */ public String getBpelDocument() { //System.out.println("getBPELDocument called"); - String processURL = implementation.getProcessDefinition().getLocation(); try { - return getRelativePath( getDirectory(), new File(processURL)); + File processFile = new File(URI.create(implementation.getProcessDefinition().getLocation())); + return getRelativePath( getDirectory(), processFile); } catch (Exception e) { if(__log.isWarnEnabled()) { - __log.warn("Unable to resolve relative path of BPEL process" + processURL, e ); + __log.warn("Unable to resolve relative path of BPEL process" + implementation.getProcessDefinition().getLocation(), e ); } return null; } // end try @@ -383,7 +383,7 @@ */ private File getBPELFile() { try { - File theProcess = new File(implementation.getProcessDefinition().getLocation()); + File theProcess = new File(URI.create(implementation.getProcessDefinition().getLocation())); return theProcess; } catch( Exception e ) { if(__log.isDebugEnabled()) { Modified: tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java?rev=691062&r1=691061&r2=691062&view=diff ============================================================================== --- tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java (original) +++ tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/BPELImplementationProvider.java Mon Sep 1 14:05:50 2008 @@ -97,7 +97,7 @@ URI deployURI = URI.create(this.implementation.getProcessDefinition().getLocation()); - File deploymentDir = new File(deployURI.getPath()).getParentFile(); + File deploymentDir = new File(deployURI).getParentFile(); if(__log.isInfoEnabled()) { __log.info(">>> Deploying : " + deploymentDir.toString()); From commitscervantesmichelle@example.net Tue Sep 02 04:29:22 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 39649 invoked from network); 2 Sep 2008 04:29:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 04:29:22 -0000 Received: (qmail 58776 invoked by uid 500); 2 Sep 2008 04:29:20 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 58760 invoked by uid 500); 2 Sep 2008 04:29:20 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 58751 invoked by uid 99); 2 Sep 2008 04:29:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 21:29:20 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 04:28:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 44110238899C; Mon, 1 Sep 2008 21:28:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691103 - in /tuscany/sandbox/travelsample/payment-contribution: pom.xml wsdl/ wsdl/CreditCardPayment.wsdl Date: Tue, 02 Sep 2008 04:28:50 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rfeng Date: Mon Sep 1 21:28:49 2008 New Revision: 691103 URL: http://svn.apache.org/viewvc?rev=691103&view=rev Log: Add WSDL and JAXWS/JAXB code-gen for CreditCardPayement Web Service Added: tuscany/sandbox/travelsample/payment-contribution/wsdl/ tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/pom.xml?rev=691103&r1=691102&r2=691103&view=diff ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/pom.xml (original) +++ tuscany/sandbox/travelsample/payment-contribution/pom.xml Mon Sep 1 21:28:49 2008 @@ -50,8 +50,68 @@ </dependency> </dependencies> - <build> - <finalName>${artifactId}</finalName> + <finalName>${artifactId}</finalName> + <sourceDirectory>${basedir}/src</sourceDirectory> + <resources> + <resource> + <directory>${basedir}</directory> + <excludes> + <exclude>**/*.java</exclude> + <exclude>**/.*/**</exclude> + <exclude>pom.xml</exclude> + <exclude>build.xml</exclude> + <exclude>target/**</exclude> + <exclude>src/**</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.0</version> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>target/jaxws-source</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jaxws-maven-plugin</artifactId> + <version>1.9</version> + <executions> + <execution> + <id>wsimport</id> + <phase>generate-test-sources</phase> + <goals> + <goal>wsimport</goal> + </goals> + <configuration> + <packageName>payment.creditcard</packageName> + <wsdlDirectory>${basedir}/wsdl + </wsdlDirectory> + <wsdlFiles> + <wsdlFile>CreditCardPayment.wsdl</wsdlFile> + </wsdlFiles> + <sourceDestDir>${project.build.directory}/jaxws-source + </sourceDestDir> + <verbose>false</verbose> + <xnocompile>true</xnocompile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </build> </project> Added: tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl?rev=691103&view=auto ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl (added) +++ tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl Mon Sep 1 21:28:49 2008 @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions name="CreditCardPayment" targetNamespace="http://www.example.org/CreditCardPayment/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.org/CreditCardPayment/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <wsdl:types> + <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/CreditCardPayment/" + xmlns:tns="http://www.example.org/CreditCardPayment/"> + <xsd:element name="authorize"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="CreditCard" type="tns:CreditCardDetailsType"></xsd:element> + <xsd:element name="Amount" type="xsd:float"></xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="authorizeResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="Status" type="xsd:string"></xsd:element> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:complexType name="CreditCardDetailsType"> + <xsd:sequence> + <xsd:element name="CreditCardType" type="tns:CreditCardTypeType" minOccurs="0" /> + <xsd:element name="CreditCardNumber" type="xsd:string" minOccurs="0" /> + <xsd:element name="ExpMonth" type="xsd:int" minOccurs="0" /> + <xsd:element name="ExpYear" type="xsd:int" minOccurs="0" /> + <xsd:element name="CardOwner" type="tns:PayerType" minOccurs="0" /> + <xsd:element name="CVV2" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + </xsd:complexType> + <xsd:simpleType name="CreditCardTypeType"> + <xsd:restriction base="xsd:token"> + <xsd:enumeration value="Visa" /> + <xsd:enumeration value="MasterCard" /> + <xsd:enumeration value="Discover" /> + <xsd:enumeration value="Amex" /> + </xsd:restriction> + </xsd:simpleType> + <xsd:complexType name="PayerType"> + <xsd:sequence> + <xsd:element name="Name" type="xsd:string" /> + <xsd:element name="Address" type="tns:AddressType" /> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="AddressType"> + <xsd:sequence> + <xsd:element name="Street" type="xsd:string" /> + <xsd:element name="City" type="xsd:string" /> + <xsd:element name="State" type="xsd:string" /> + <xsd:element name="ZipCode" type="xsd:string" /> + <xsd:element name="HomePhone" type="xsd:string" /> + </xsd:sequence> + </xsd:complexType> + </xsd:schema> + </wsdl:types> + <wsdl:message name="authorizeRequest"> + <wsdl:part name="parameters" element="tns:authorize"></wsdl:part> + </wsdl:message> + <wsdl:message name="authorizeResponse"> + <wsdl:part name="parameters" element="tns:authorizeResponse"></wsdl:part> + </wsdl:message> + <wsdl:portType name="CreditCardPayment"> + <wsdl:operation name="authorize"> + <wsdl:input message="tns:authorizeRequest"></wsdl:input> + <wsdl:output message="tns:authorizeResponse"></wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="CreditCardPaymentBinding" type="tns:CreditCardPayment"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> + <wsdl:operation name="authorize"> + <soap:operation soapAction="http://www.example.org/CreditCardPayment/authorize" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="CreditCardPaymentService"> + <wsdl:port name="CreditCardPaymentPort" binding="tns:CreditCardPaymentBinding"> + <soap:address location="http://localhost:8080/CreditCardPayment" /> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file From commitscervantesmichelle@example.net Tue Sep 02 05:08:43 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 62285 invoked from network); 2 Sep 2008 05:08:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 05:08:43 -0000 Received: (qmail 87123 invoked by uid 500); 2 Sep 2008 05:08:42 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 87104 invoked by uid 500); 2 Sep 2008 05:08:42 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 87095 invoked by uid 99); 2 Sep 2008 05:08:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 22:08:41 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 05:07:41 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0A0DE2388989; Mon, 1 Sep 2008 22:08:12 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691105 - in /tuscany/sandbox/travelsample/payment-contribution: creditcard.composite pom.xml src/payment/ src/payment/creditcard/ src/payment/creditcard/impl/ src/payment/creditcard/impl/CreditCardPaymentImpl.java wsdl/CreditCardPayment.wsdl Date: Tue, 02 Sep 2008 05:08:11 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rfeng Date: Mon Sep 1 22:08:10 2008 New Revision: 691105 URL: http://svn.apache.org/viewvc?rev=691105&view=rev Log: Add the creditcard payment component Added: tuscany/sandbox/travelsample/payment-contribution/creditcard.composite tuscany/sandbox/travelsample/payment-contribution/src/payment/ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java (with props) Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl Added: tuscany/sandbox/travelsample/payment-contribution/creditcard.composite URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/creditcard.composite?rev=691105&view=auto ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/creditcard.composite (added) +++ tuscany/sandbox/travelsample/payment-contribution/creditcard.composite Mon Sep 1 22:08:10 2008 @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" + xmlns:c="http://creditcard" targetNamespace="http://creditcard" name="creditcard"> + <component name="CreditCardPayment"> + <implementation.java class="payment.creditcard.impl.CreditCardPaymentImpl" /> + <reference name="creditCardPayment"> + <binding.ws uri="http://localhost:8080/CreditCardPayment" /> + </reference> + <service name="CreditCardPayment"> + <t:binding.jsonrpc uri="/jsonrpc/CreditCardPayment"> + </t:binding.jsonrpc> + </service> + </component> +</composite> \ No newline at end of file Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/pom.xml?rev=691105&r1=691104&r2=691105&view=diff ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/pom.xml (original) +++ tuscany/sandbox/travelsample/payment-contribution/pom.xml Mon Sep 1 22:08:10 2008 @@ -73,10 +73,10 @@ <version>1.0</version> <executions> <execution> - <id>add-test-source</id> + <id>add-source</id> <phase>generate-sources</phase> <goals> - <goal>add-test-source</goal> + <goal>add-source</goal> </goals> <configuration> <sources> @@ -93,7 +93,7 @@ <executions> <execution> <id>wsimport</id> - <phase>generate-test-sources</phase> + <phase>generate-sources</phase> <goals> <goal>wsimport</goal> </goals> Added: tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java?rev=691105&view=auto ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java (added) +++ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java Mon Sep 1 22:08:10 2008 @@ -0,0 +1,45 @@ +/* + * 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. + */ + +package payment.creditcard.impl; + +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +import payment.creditcard.CreditCardDetailsType; +import payment.creditcard.CreditCardPayment; + +/** + * + */ +@Service(CreditCardPayment.class) +public class CreditCardPaymentImpl implements CreditCardPayment { + @Reference + protected CreditCardPayment creditCardPayment; + + public String authorize(CreditCardDetailsType creditCard, float amount) { + // Validate some of the fields in CreditCardDetailsType + if (creditCard.getCreditCardType() == null) { + return "UnknownCreditCardType"; + } + // Delegate the external web service + return creditCardPayment.authorize(creditCard, amount); + } + +} Propchange: tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/impl/CreditCardPaymentImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl?rev=691105&r1=691104&r2=691105&view=diff ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl (original) +++ tuscany/sandbox/travelsample/payment-contribution/wsdl/CreditCardPayment.wsdl Mon Sep 1 22:08:10 2008 @@ -1,6 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> <wsdl:definitions name="CreditCardPayment" targetNamespace="http://www.example.org/CreditCardPayment/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.org/CreditCardPayment/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.org/CreditCardPayment/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> <wsdl:types> <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/CreditCardPayment/" xmlns:tns="http://www.example.org/CreditCardPayment/"> From commitscervantesmichelle@example.net Tue Sep 02 05:35:29 2008 Return-Path: <commitscervantesmichelle@example.net> Delivered-To: cervantesmichelle@example.net Received: (qmail 74389 invoked from network); 2 Sep 2008 05:35:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Sep 2008 05:35:29 -0000 Received: (qmail 99528 invoked by uid 500); 2 Sep 2008 05:35:25 -0000 Delivered-To: cervantesmichelle@example.net Received: (qmail 99494 invoked by uid 500); 2 Sep 2008 05:35:25 -0000 Mailing-List: contact cervantesmichelle@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:cervantesmichelle@example.net> List-Unsubscribe: <mailto:cervantesmichelle@example.net> List-Post: <mailto:cervantesmichelle@example.net> List-Id: <commits.tuscany.apache.org> Reply-To: cervantesmichelle@example.net Delivered-To: mailing list cervantesmichelle@example.net Received: (qmail 99458 invoked by uid 99); 2 Sep 2008 05:35:25 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Sep 2008 22:35:25 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Sep 2008 05:34:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 03353238899C; Mon, 1 Sep 2008 22:34:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r691111 - in /tuscany/sandbox/travelsample/payment-contribution: ./ src/payment/creditcard/ws/ src/payment/creditcard/ws/impl/ test/ test/payment/ test/payment/creditcard/ Date: Tue, 02 Sep 2008 05:34:57 -0000 To: cervantesmichelle@example.net From: cervantesmichelle@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <cervantesmichelle@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: rfeng Date: Mon Sep 1 22:34:56 2008 New Revision: 691111 URL: http://svn.apache.org/viewvc?rev=691111&view=rev Log: Add a credit card payment emulator WS Added: tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java (with props) tuscany/sandbox/travelsample/payment-contribution/test/ tuscany/sandbox/travelsample/payment-contribution/test/payment/ tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/ tuscany/sandbox/travelsample/payment-contribution/test/payment/creditcard/CreditCardPaymentTestCase.java (with props) Modified: tuscany/sandbox/travelsample/payment-contribution/creditcard.composite tuscany/sandbox/travelsample/payment-contribution/pom.xml Modified: tuscany/sandbox/travelsample/payment-contribution/creditcard.composite URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/creditcard.composite?rev=691111&r1=691110&r2=691111&view=diff ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/creditcard.composite (original) +++ tuscany/sandbox/travelsample/payment-contribution/creditcard.composite Mon Sep 1 22:34:56 2008 @@ -25,8 +25,14 @@ <binding.ws uri="http://localhost:8080/CreditCardPayment" /> </reference> <service name="CreditCardPayment"> - <t:binding.jsonrpc uri="/jsonrpc/CreditCardPayment"> - </t:binding.jsonrpc> + <t:binding.jsonrpc uri="/jsonrpc/CreditCardPayment" /> + <binding.sca /> + </service> + </component> + <component name="CreditCardPaymentWS"> + <implementation.java class="payment.creditcard.ws.impl.CreditCardPaymentWSImpl" /> + <service name="CreditCardPayment"> + <binding.ws uri="http://localhost:8080/CreditCardPayment" /> </service> </component> </composite> \ No newline at end of file Modified: tuscany/sandbox/travelsample/payment-contribution/pom.xml URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/pom.xml?rev=691111&r1=691110&r2=691111&view=diff ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/pom.xml (original) +++ tuscany/sandbox/travelsample/payment-contribution/pom.xml Mon Sep 1 22:34:56 2008 @@ -43,6 +43,27 @@ </dependency> <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-binding-ws-axis2</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-jetty</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.2</version> @@ -53,6 +74,7 @@ <build> <finalName>${artifactId}</finalName> <sourceDirectory>${basedir}/src</sourceDirectory> + <testSourceDirectory>${basedir}/test</testSourceDirectory> <resources> <resource> <directory>${basedir}</directory> @@ -63,6 +85,7 @@ <exclude>build.xml</exclude> <exclude>target/**</exclude> <exclude>src/**</exclude> + <exclude>test/**</exclude> </excludes> </resource> </resources> Added: tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java URL: http://svn.apache.org/viewvc/tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java?rev=691111&view=auto ============================================================================== --- tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java (added) +++ tuscany/sandbox/travelsample/payment-contribution/src/payment/creditcard/ws/impl/CreditCardPaymentWSImpl.java Mon Sep 1 22:34:56 2008 @@ -0,0 +1,37 @@ +/* + * 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. + */ + +package payment.creditcard.ws.impl; + +import org.osoa.sca.annotations.Service; +
{'source': 'Apache Software Foundation Public Mail Archives'}