Author: rfeng
Date: Fri Nov 16 15:15:14 2007
New Revision: 595867
URL: http://svn.apache.org/viewvc?rev=595867&view=rev
Log:
Bring up the AmazonCart tutorial test case
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCart.java
incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCartImpl.java
incubator/tuscany/java/sca/tutorial/amazon/amazoncart.composite
incubator/tuscany/java/sca/tutorial/amazon/pom.xml
incubator/tuscany/java/sca/tutorial/amazon/test/AmazonCartTestCase.java
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
(original)
+++
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/processor/DataBindingJavaInterfaceProcessor.java
Fri Nov 16 15:15:14 2007
@@ -78,6 +78,9 @@
}
}
for (Method method : clazz.getMethods()) {
+ if (method.getDeclaringClass() == Object.class) {
+ continue;
+ }
Operation operation = opMap.get(method.getName());
DataBinding methodDataBinding =
clazz.getAnnotation(DataBinding.class);
if (methodDataBinding == null) {
Modified:
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/OMElement2XMLStreamReader.java
Fri Nov 16 15:15:14 2007
@@ -25,11 +25,12 @@
import org.apache.tuscany.sca.databinding.TransformationContext;
import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
-public class OMElement2XMLStreamReader extends BaseTransformer<OMElement,
XMLStreamReader> implements PullTransformer<OMElement, XMLStreamReader> {
+public class OMElement2XMLStreamReader extends BaseTransformer<OMElement,
XMLStreamReader> implements
+ PullTransformer<OMElement, XMLStreamReader> {
// private XmlOptions options;
-
+
public XMLStreamReader transform(OMElement source, TransformationContext
context) {
- return source.getXMLStreamReader();
+ return source != null ? source.getXMLStreamReader() : null;
}
@Override
Modified:
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
(original)
+++
incubator/tuscany/java/sca/modules/databinding-axiom/src/main/java/org/apache/tuscany/sca/databinding/axiom/XMLStreamReader2OMElement.java
Fri Nov 16 15:15:14 2007
@@ -35,6 +35,9 @@
}
public OMElement transform(XMLStreamReader source, TransformationContext
context) {
+ if (source == null) {
+ return null;
+ }
try {
StAXOMBuilder builder = new StAXOMBuilder(source);
OMElement element = builder.getDocumentElement();
Modified:
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
(original)
+++
incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
Fri Nov 16 15:15:14 2007
@@ -55,8 +55,8 @@
if (source == target) {
return true;
}
-
- if(source.isDynamic() || target.isDynamic()) {
+
+ if (source.isDynamic() || target.isDynamic()) {
return true;
}
@@ -64,11 +64,15 @@
if (!source.getName().equals(target.getName())) {
return false;
}
-
+
if (source.getInterface().isRemotable() !=
target.getInterface().isRemotable()) {
return false;
}
+ // if (source.getInterface().isRemotable()) {
+ // return true;
+ // }
+
// FIXME: We need to deal with wrapped<-->unwrapped conversion
// Check output type
@@ -81,15 +85,22 @@
return false;
}
+ boolean checkSourceWrapper = true;
List<DataType> sourceInputType = source.getInputType().getLogical();
- if (source.isWrapperStyle()) {
+ if (source.isWrapperStyle() && source.getWrapper() != null) {
sourceInputType =
source.getWrapper().getUnwrappedInputType().getLogical();
+ checkSourceWrapper = false;
}
+ boolean checkTargetWrapper = true;
List<DataType> targetInputType = target.getInputType().getLogical();
- if (target.isWrapperStyle()) {
+ if (target.isWrapperStyle() && target.getWrapper() != null) {
targetInputType =
target.getWrapper().getUnwrappedInputType().getLogical();
+ checkTargetWrapper = false;
}
+ if (checkSourceWrapper != checkTargetWrapper) {
+ return true;
+ }
if (sourceInputType.size() != targetInputType.size()) {
return false;
}
@@ -144,7 +155,7 @@
if (source.getInterface().isDynamic() ||
target.getInterface().isDynamic()) {
return true;
}
-
+
if (source.getInterface().isRemotable() !=
target.getInterface().isRemotable()) {
if (!silent) {
throw new IncompatibleInterfaceContractException("Remotable
settings do not match", source, target);
@@ -198,7 +209,8 @@
}
for (Operation operation :
source.getCallbackInterface().getOperations()) {
- Operation targetOperation =
getOperation(target.getCallbackInterface().getOperations(),
operation.getName());
+ Operation targetOperation =
+ getOperation(target.getCallbackInterface().getOperations(),
operation.getName());
if (targetOperation == null) {
if (!silent) {
throw new IncompatibleInterfaceContractException("Callback
operation not found on target", source,
@@ -230,11 +242,11 @@
if (source == null || target == null) {
return false;
}
-
+
if (source.isDynamic() || target.isDynamic()) {
return true;
}
-
+
if (source.isRemotable() != target.isRemotable()) {
return false;
}
Modified: incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCart.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCart.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCart.java
(original)
+++ incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCart.java Fri
Nov 16 15:15:14 2007
@@ -18,15 +18,27 @@
*/
package amazon.cart;
+import org.apache.tuscany.sca.databinding.annotation.DataBinding;
import org.osoa.sca.annotations.Remotable;
-import com.cart.amazon.*;
+import com.cart.amazon.CartAdd;
+import com.cart.amazon.CartAddResponse;
+import com.cart.amazon.CartClear;
+import com.cart.amazon.CartClearResponse;
+import com.cart.amazon.CartCreate;
+import com.cart.amazon.CartCreateResponse;
+import com.cart.amazon.CartGet;
+import com.cart.amazon.CartGetResponse;
@Remotable
[EMAIL PROTECTED](value="commonj.sdo.DataObject", wrapped=true)
public interface AmazonCart {
-
- public CartCreateResponse CartCreate(CartCreate cartCreate);
- public CartAddResponse CartAdd(CartAdd cartAdd);
- public CartClearResponse CartClear(CartClear cartClear);
- public CartGetResponse CartGet(CartGet cartGet);
+
+ public CartCreateResponse CartCreate(CartCreate cartCreate);
+
+ public CartAddResponse CartAdd(CartAdd cartAdd);
+
+ public CartClearResponse CartClear(CartClear cartClear);
+
+ public CartGetResponse CartGet(CartGet cartGet);
}
Modified:
incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCartImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCartImpl.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCartImpl.java
(original)
+++ incubator/tuscany/java/sca/tutorial/amazon/amazon/cart/AmazonCartImpl.java
Fri Nov 16 15:15:14 2007
@@ -18,88 +18,103 @@
*/
package amazon.cart;
-import org.osoa.sca.annotations.Remotable;
-
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.cart.amazon.*;
+import org.osoa.sca.annotations.Service;
+import com.cart.amazon.AmazonFactory;
+import com.cart.amazon.Cart;
+import com.cart.amazon.CartAdd;
+import com.cart.amazon.CartAddRequest;
+import com.cart.amazon.CartAddResponse;
+import com.cart.amazon.CartClear;
+import com.cart.amazon.CartClearResponse;
+import com.cart.amazon.CartCreate;
+import com.cart.amazon.CartCreateResponse;
+import com.cart.amazon.CartGet;
+import com.cart.amazon.CartGetResponse;
+import com.cart.amazon.CartItem;
+import com.cart.amazon.CartItems;
+import com.cart.amazon.Item1;
+import com.cart.amazon.Items1;
[EMAIL PROTECTED]
[EMAIL PROTECTED](AmazonCart.class)
public class AmazonCartImpl {
- protected Map<String, Cart> cartsHash = new HashMap<String, Cart>();
-
- public CartCreateResponse CartCreate(CartCreate cartCreate){
-
- System.out.println("CartServiceID: " + this.toString());
- System.out.println("Entering cartCreate...");
- String userId = cartCreate.getAWSAccessKeyId();
-
- Cart cart = getCart(userId);
- if(cart != null){
- System.out.println("User " +
cartCreate.getAWSAccessKeyId() + " has already created a cart with ID: " +
cart.getCartId());
- return null;
- }
- cart = new Cart();
- cart.setCartItems(new CartItems());
- addCart(userId, cart);
-
- System.out.println("Exiting cartCreate...");
- return null;
-
- }
-
- public CartAddResponse CartAdd(CartAdd cartAdd){
-
- String userId = cartAdd.getAWSAccessKeyId();
-
- Cart cart = getCart(userId);
- if(cart == null){
- System.out.println("User has not associated Cart
yet...");
- return null;
- }
-
- List cartAddRequestList = cartAdd.getRequest();
- CartAddRequest car = (CartAddRequest) cartAddRequestList.get(0);
- Items1 carItems = car.getItems();
- List itemList = carItems.getItem();
- Item1 item = (Item1) itemList.get(0); //Take only the first
one, no iteration for now
- System.out.println("item.getASIN: " + item.getASIN());
- System.out.println("item.getQuantity(): " + item.getQuantity());
- CartItems cartItems = cart.getCartItems();
- List<CartItem> cartItemList = cartItems.getCartItem();
- cart.setCartItems(cartItems);
- return null;
- }
-
- public CartClearResponse CartClear(CartClear cartClear){
- String userId = cartClear.getAWSAccessKeyId();
-
- Cart cart = getCart(userId);
- if(cart == null){
- System.out.println("User has not associated Cart
yet...");
- return null;
- }
-
- cart.setCartItems(new CartItems());
- return null;
- }
-
- public CartGetResponse CartGet(CartGet cartGet){
- return null;
- }
-
-
- private Cart getCart(String userId){
- Cart cart = null;
- cart = this.cartsHash.get(userId);
- return cart;
- }
-
- private void addCart(String userId, Cart cart){
- this.cartsHash.put(userId, cart);
- }
+ protected Map<String, Cart> cartsHash = new HashMap<String, Cart>();
+
+ public CartCreateResponse CartCreate(CartCreate cartCreate) {
+
+ System.out.println("CartServiceID: " + this.toString());
+ System.out.println("Entering cartCreate...");
+ String userId = cartCreate.getAWSAccessKeyId();
+
+ Cart cart = getCart(userId);
+ if (cart != null) {
+ System.out.println("User " + cartCreate.getAWSAccessKeyId()
+ + " has already created a cart with ID: "
+ + cart.getCartId());
+ return null;
+ }
+ cart = new Cart();
+ cart.setCartItems(new CartItems());
+ addCart(userId, cart);
+
+ CartCreateResponse response =
AmazonFactory.INSTANCE.createCartCreateResponse();
+ System.out.println("Exiting cartCreate...");
+ return response;
+
+ }
+
+ public CartAddResponse CartAdd(CartAdd cartAdd) {
+
+ String userId = cartAdd.getAWSAccessKeyId();
+
+ Cart cart = getCart(userId);
+ if (cart == null) {
+ System.out.println("User has not associated Cart yet...");
+ return null;
+ }
+
+ List cartAddRequestList = cartAdd.getRequest();
+ CartAddRequest car = (CartAddRequest)cartAddRequestList.get(0);
+ Items1 carItems = car.getItems();
+ List itemList = carItems.getItem();
+ Item1 item = (Item1)itemList.get(0); //Take only the first one, no
iteration for now
+ System.out.println("item.getASIN: " + item.getASIN());
+ System.out.println("item.getQuantity(): " + item.getQuantity());
+ CartItems cartItems = cart.getCartItems();
+ List<CartItem> cartItemList = cartItems.getCartItem();
+ cart.setCartItems(cartItems);
+ return null;
+ }
+
+ public CartClearResponse CartClear(CartClear cartClear) {
+ String userId = cartClear.getAWSAccessKeyId();
+
+ Cart cart = getCart(userId);
+ if (cart == null) {
+ System.out.println("User has not associated Cart yet...");
+ return null;
+ }
+
+ cart.setCartItems(new CartItems());
+ return null;
+ }
+
+ public CartGetResponse CartGet(CartGet cartGet) {
+ return null;
+ }
+
+ private Cart getCart(String userId) {
+ Cart cart = null;
+ cart = this.cartsHash.get(userId);
+ return cart;
+ }
+
+ private void addCart(String userId, Cart cart) {
+ this.cartsHash.put(userId, cart);
+ }
}
Modified: incubator/tuscany/java/sca/tutorial/amazon/amazoncart.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/amazon/amazoncart.composite?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/amazon/amazoncart.composite (original)
+++ incubator/tuscany/java/sca/tutorial/amazon/amazoncart.composite Fri Nov 16
15:15:14 2007
@@ -1,33 +1,33 @@
-<?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://amazon.cart.com/";
- xmlns:tns="http://amazon.cart.com/";
- name="AmazonCart">
-
+<?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://amazonCart";
+ xmlns:tns="http://amazonCart";
+ name="amazonCart">
+
<component name="AmazonCartServiceComponent">
- <implementation.java class="amazon.cart.AmazonCartImpl" />
- <service name="AmazonCartService" >
- <interface.wsdl
interface="http://amazon.cart.com/#wsdl.interface(AmazonCartServicePortType)" />
- <binding.ws />
- </service>
+ <implementation.java class="amazon.cart.AmazonCartImpl" />
+ <service name="AmazonCart">
+ <interface.wsdl
interface="http://amazon.cart.com/#wsdl.interface(AmazonCartServicePortType)" />
+ <binding.ws />
+ </service>
</component>
</composite>
Modified: incubator/tuscany/java/sca/tutorial/amazon/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/amazon/pom.xml?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/amazon/pom.xml (original)
+++ incubator/tuscany/java/sca/tutorial/amazon/pom.xml Fri Nov 16 15:15:14 2007
@@ -29,132 +29,158 @@
<name>Apache Tuscany SCA Tutorial Amazon Cart</name>
<dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-lib</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-sdo</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>compile</scope>
- </dependency>
-
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-jetty</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-api</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-lib</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-impl</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.2</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
-
+
<build>
- <finalName>${artifactId}</finalName>
- <sourceDirectory>${basedir}</sourceDirectory>
- <resources>
- <resource>
- <directory>${basedir}</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- <exclude>pom.xml</exclude>
- <exclude>build.xml</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-plugin</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
-
<schemaFile>${basedir}/amazon/cart/AmazonCart.wsdl</schemaFile>
- <noNotification>true</noNotification>
- <noContainer>true</noContainer>
- <noInterfaces>true</noInterfaces>
- <noUnsettable>true</noUnsettable>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-wsdl2java</artifactId>
- <version>1.1-incubating-SNAPSHOT</version>
- <executions>
- <execution>
- <configuration>
-
<wsdlFile>${basedir}/amazon/cart/AmazonCart.wsdl</wsdlFile>
- <javaPackage>amazon.cart.api</javaPackage>
- </configuration>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <finalName>${artifactId}</finalName>
+ <sourceDirectory>${basedir}</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ <exclude>pom.xml</exclude>
+ <exclude>build.xml</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-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>target/sdo-source</source>
+ <source>target/wsdl2java-source</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sdo</groupId>
+ <artifactId>tuscany-sdo-plugin</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+
<schemaFile>${basedir}/amazon/cart/AmazonCart.wsdl</schemaFile>
+ <noNotification>true</noNotification>
+ <noContainer>true</noContainer>
+ <noInterfaces>true</noInterfaces>
+ <noUnsettable>true</noUnsettable>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-ant-generator</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-wsdl2java</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <configuration>
+
<wsdlFile>${basedir}/amazon/cart/AmazonCart.wsdl</wsdlFile>
+ <javaPackage>amazon.cart.api</javaPackage>
+ </configuration>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
<plugin>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-ant-generator</artifactId>
@@ -180,9 +206,9 @@
<version>1.6.5</version>
</dependency>
</dependencies>
- </plugin>
- </plugins>
+ </plugin>
+ </plugins>
</build>
-
-</project>
+
+</project>
Modified:
incubator/tuscany/java/sca/tutorial/amazon/test/AmazonCartTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/tutorial/amazon/test/AmazonCartTestCase.java?rev=595867&r1=595866&r2=595867&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tutorial/amazon/test/AmazonCartTestCase.java
(original)
+++ incubator/tuscany/java/sca/tutorial/amazon/test/AmazonCartTestCase.java Fri
Nov 16 15:15:14 2007
@@ -33,6 +33,8 @@
import amazon.cart.AmazonCart;
+import com.cart.amazon.AmazonFactory;
+import com.cart.amazon.CartCreate;
import commonj.sdo.DataObject;
/**
@@ -69,7 +71,8 @@
@Test
public void testCartCreate() throws Exception {
System.out.println("Entering test...");
- DataObject root = amazonCart.CartCreate(null);
+ CartCreate create = AmazonFactory.INSTANCE.createCartCreate();
+ DataObject root = amazonCart.CartCreate(create);
// Assert.assertEquals("Hello Smith", msg);
System.out.println("Exiting test...");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
