You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2011/02/08 00:09:03 UTC
svn commit: r1068211 - in /tuscany/sca-java-2.x/trunk:
modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/
testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/
testing/itest/references/src/m...
Author: rfeng
Date: Mon Feb 7 23:09:03 2011
New Revision: 1068211
URL: http://svn.apache.org/viewvc?rev=1068211&view=rev
Log:
Finalize the AllowsPassByReference support and add test cases
Added:
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite (with props)
tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java (with props)
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
tuscany/sca-java-2.x/trunk/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java?rev=1068211&r1=1068210&r2=1068211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java Mon Feb 7 23:09:03 2011
@@ -146,7 +146,8 @@ public class RuntimeSCAReferenceBindingP
}
} else {
Reference ref = epr.getReference().getReference();
- boolean allowsPBR = (ref != null && ref.isAllowsPassByReference()) || chain.allowsPassByReference();
+ // The spec says both ref and service needs to allowsPassByReference
+ boolean allowsPBR = (ref != null && ref.isAllowsPassByReference()) && chain.allowsPassByReference();
if (allowsPBR && interfaceContractMapper.isCompatibleByReference(operation,
targetOp,
Modified: tuscany/sca-java-2.x/trunk/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java?rev=1068211&r1=1068210&r2=1068211&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/testing/itest/interfaces/src/test/java/org/apache/tuscany/sca/itest/interfaces/InterfacesTestCase.java Mon Feb 7 23:09:03 2011
@@ -31,7 +31,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-// @Ignore("TUSCANY-3138")
public class InterfacesTestCase {
private static final String PKG = "org/apache/tuscany/sca/itest/interfaces/valid";
private static String ROOT = new File("target/classes/" + PKG).toURI().toString();
@@ -106,8 +105,8 @@ public class InterfacesTestCase {
// TODO: TUSCANY-3479, investigate Node/SCAClient pass by reference
// Test allowsPassByReference
- assertEquals("BComponent", remote.foo3(po));
- assertEquals("BComponent", po.field1);
+// assertEquals("BComponent", remote.foo3(po));
+// assertEquals("BComponent", po.field1);
} catch (Exception e) {
e.printStackTrace();
fail();
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,56 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+/**
+ * The service interface
+ */
+@Remotable
+public interface AService {
+ /**
+ * Create a new object
+ * @param req
+ * @return
+ */
+ MutableObject create(MutableObject req);
+
+ /**
+ *
+ * @param req
+ * @return
+ */
+ MutableObject read(MutableObject req);
+
+ /**
+ *
+ * @param req
+ * @return
+ */
+ MutableObject update(MutableObject req);
+
+ /**
+ *
+ * @param req
+ * @return
+ */
+ MutableObject delete(MutableObject req);
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AService.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,55 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+
+/**
+ * The client interface
+ */
+public interface AServiceClient {
+ /**
+ * Create a new object with the given state
+ * @param state
+ * @return the id
+ */
+ int create(String state);
+
+ /**
+ * Read the object state by id
+ * @param id
+ * @return
+ */
+ String read(int id);
+
+ /**
+ * Update the state
+ * @param id
+ * @param newState
+ * @return
+ */
+ String update(int id, String newState);
+
+ /**
+ * Delete the object by id
+ * @param id
+ * @return
+ */
+ boolean delete(int id);
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/AServiceClient.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,87 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+import junit.framework.Assert;
+
+import org.oasisopen.sca.annotation.ComponentName;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ *
+ */
+@Service(AServiceClient.class)
+@Scope("COMPOSITE")
+public class ClientImplA implements AServiceClient {
+ @ComponentName
+ private String componentName;
+
+ @Reference
+ private AService service;
+
+ @Override
+ public int create(String state) {
+ MutableObject req = new MutableObject(state);
+ MutableObject res = service.create(req);
+ if ("ClientA1Component".equals(componentName)) {
+ Assert.assertTrue(req.getId() == -1);
+ Assert.assertNotSame(req, res);
+ } else if ("ClientA2Component".equals(componentName)) {
+ Assert.assertTrue(req.getId() == -1);
+ Assert.assertNotSame(req, res);
+ }
+ return res.getId();
+ }
+
+ @Override
+ public String read(int id) {
+ MutableObject req = new MutableObject(id);
+ MutableObject res = service.read(req);
+ if ("ClientA1Component".equals(componentName)) {
+ Assert.assertTrue(req.getState() == null);
+ Assert.assertNotSame(req, res);
+ } else if ("ClientA2Component".equals(componentName)) {
+ Assert.assertTrue(req.getState() == null);
+ }
+ return res.getState();
+ }
+
+ @Override
+ public String update(int id, String newState) {
+ MutableObject req = new MutableObject(id, newState);
+ MutableObject res = service.update(req);
+ if ("ClientA1Component".equals(componentName)) {
+ Assert.assertTrue(req.getState() == newState);
+ } else if ("ClientA2Component".equals(componentName)) {
+ Assert.assertTrue(req.getState() == newState);
+ }
+ return res.getState();
+ }
+
+ @Override
+ public boolean delete(int id) {
+ MutableObject req = new MutableObject(id);
+ MutableObject res = service.delete(req);
+ return res != null;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplA.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,90 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+import junit.framework.Assert;
+
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.ComponentName;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Scope;
+import org.oasisopen.sca.annotation.Service;
+
+/**
+ *
+ */
+@Service(AServiceClient.class)
+@Scope("COMPOSITE")
+public class ClientImplB implements AServiceClient {
+ @ComponentName
+ private String componentName;
+
+ @Reference
+ @AllowsPassByReference
+ private AService service;
+
+ @Override
+ public int create(String state) {
+ MutableObject req = new MutableObject(state);
+ MutableObject res = service.create(req);
+ if ("ClientB1Component".equals(componentName)) {
+ Assert.assertTrue(req.getId() == -1);
+ Assert.assertNotSame(req, res);
+ } else if ("ClientB2Component".equals(componentName)) {
+ // Both sides allow PBR, so the id is changed (for the purpose of checking if PBR is used)
+ Assert.assertTrue(req.getId() != -1);
+ }
+ return res.getId();
+ }
+
+ @Override
+ public String read(int id) {
+ MutableObject req = new MutableObject(id);
+ MutableObject res = service.read(req);
+ if ("ClientB1Component".equals(componentName)) {
+ Assert.assertTrue("READ".equals(req.getState()));
+ Assert.assertNotSame(req, res);
+ } else if ("ClientB2Component".equals(componentName)) {
+ Assert.assertTrue("READ".equals(req.getState()));
+ }
+ return res.getState();
+ }
+
+ @Override
+ public String update(int id, String newState) {
+ MutableObject req = new MutableObject(id, newState);
+ MutableObject res = service.update(req);
+ if ("ClientB1Component".equals(componentName)) {
+ Assert.assertTrue(req.getState() == newState);
+ Assert.assertNotSame(req, res);
+ } else if ("ClientB2Component".equals(componentName)) {
+ Assert.assertTrue(req.getState() == newState);
+ }
+ return res.getState();
+ }
+
+ @Override
+ public boolean delete(int id) {
+ MutableObject req = new MutableObject(id);
+ MutableObject res = service.delete(req);
+ return res != null;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ClientImplB.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,77 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+/**
+ * A mutable object
+ */
+public class MutableObject implements Cloneable {
+ private int id = -1;
+ private String state;
+
+ public MutableObject() {
+ }
+
+ public MutableObject(int id, String state) {
+ super();
+ this.id = id;
+ this.state = state;
+ }
+
+ public MutableObject(String state) {
+ super();
+ this.state = state;
+ }
+
+ public MutableObject(int id) {
+ super();
+ this.id = id;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public int getId() {
+ return id;
+ }
+
+ public void setId(int id) {
+ this.id = id;
+ }
+
+ public MutableObject clone() {
+ MutableObject copy = new MutableObject();
+ copy.id = id;
+ copy.state = state;
+ return copy;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder builder = new StringBuilder();
+ builder.append("MutableObject [id=").append(id).append(", state=").append(state).append("]");
+ return builder.toString();
+ }
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/MutableObject.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,61 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Scope;
+
+/**
+ *
+ */
+@Scope("COMPOSITE")
+public class ServiceImplA implements AService {
+ private volatile int count = 0;
+ private Map<Integer, MutableObject> objects = new HashMap<Integer, MutableObject>();
+
+ @Override
+ public MutableObject create(MutableObject req) {
+ req.setId(count++);
+ objects.put(req.getId(), req);
+ return req;
+ }
+
+ @AllowsPassByReference
+ public MutableObject read(MutableObject req) {
+ // Change the state of the request so that the client side can verify if PBR is used
+ req.setState("READ");
+ return objects.get(req.getId());
+ }
+
+ @Override
+ public MutableObject update(MutableObject req) {
+ objects.put(req.getId(), req);
+ return req;
+ }
+
+ @Override
+ public MutableObject delete(MutableObject req) {
+ return objects.remove(req.getId());
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplA.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,70 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.allowspassbyreference;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Scope;
+
+/**
+ *
+ */
+@AllowsPassByReference
+@Scope("COMPOSITE")
+public class ServiceImplB implements AService {
+
+ private volatile int count = 0;
+ private Map<Integer, MutableObject> objects = new HashMap<Integer, MutableObject>();
+
+ @Override
+ public MutableObject create(MutableObject req) {
+ // Change the id of the request so that the client side can verify if PBR is used
+ req.setId(count++);
+ req = req.clone();
+ objects.put(req.getId(), req);
+ return req;
+ }
+
+ @Override
+ public MutableObject read(MutableObject req) {
+ // Change the state of the request so that the client side can verify if PBR is used
+ req.setState("READ");
+ return objects.get(req.getId()).clone();
+ }
+
+ @Override
+ public MutableObject update(MutableObject req) {
+ req = req.clone();
+ objects.put(req.getId(), req);
+ return req;
+ }
+
+ @Override
+ public MutableObject delete(MutableObject req) {
+ MutableObject obj = objects.remove(req.getId());
+ if (obj != null) {
+ return obj.clone();
+ }
+ return obj;
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/java/org/apache/tuscany/sca/itest/allowspassbyreference/ServiceImplB.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite Mon Feb 7 23:09:03 2011
@@ -0,0 +1,50 @@
+<?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
+ * 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://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:foo="http://foo" targetNamespace="http://foo"
+ name="AllowsPBRTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <component name="ClientA1Component">
+ <implementation.java class="org.apache.tuscany.sca.itest.allowspassbyreference.ClientImplA" />
+ <reference name="service" target="ServiceAComponent"/>
+ </component>
+
+ <component name="ClientB1Component">
+ <implementation.java class="org.apache.tuscany.sca.itest.allowspassbyreference.ClientImplB" />
+ <reference name="service" target="ServiceAComponent"/>
+ </component>
+
+ <component name="ClientA2Component">
+ <implementation.java class="org.apache.tuscany.sca.itest.allowspassbyreference.ClientImplA" />
+ <reference name="service" target="ServiceBComponent"/>
+ </component>
+
+ <component name="ClientB2Component">
+ <implementation.java class="org.apache.tuscany.sca.itest.allowspassbyreference.ClientImplB" />
+ <reference name="service" target="ServiceBComponent"/>
+ </component>
+
+ <component name="ServiceAComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.allowspassbyreference.ServiceImplA" />
+ </component>
+
+ <component name="ServiceBComponent">
+ <implementation.java class="org.apache.tuscany.sca.itest.allowspassbyreference.ServiceImplB" />
+ </component>
+
+</composite>
\ No newline at end of file
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/main/resources/AllowsPBRTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java?rev=1068211&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java Mon Feb 7 23:09:03 2011
@@ -0,0 +1,77 @@
+/*
+ * 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 org.apache.tuscany.sca.itest.references;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.itest.allowspassbyreference.AServiceClient;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class AllowsPBRTestCase {
+ private static Node node;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("AllowsPBRTest.composite");
+ node = NodeFactory.newInstance().createNode("AllowsPBRTest.composite", new Contribution("c1", location));
+ node.start();
+ }
+
+ @AfterClass
+ public static void destroy() throws Exception {
+ node.stop();
+ }
+
+ @Test
+ public void testClientA1() {
+ test("ClientA1Component");
+ }
+
+ @Test
+ public void testClientA2() {
+ test("ClientA2Component");
+ }
+
+ @Test
+ public void testClientB1() {
+ test("ClientB1Component");
+ }
+
+ @Test
+ public void testClientB2() {
+ test("ClientB2Component");
+ }
+
+ private void test(String serviceName) {
+ AServiceClient client = node.getService(AServiceClient.class, serviceName);
+ int id = client.create("A");
+ String state = client.read(id);
+ Assert.assertEquals("A", state);
+ state = client.update(id, "B");
+ Assert.assertEquals("B", state);
+ client.delete(id);
+ }
+
+}
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/testing/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AllowsPBRTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date