Author: nash
Date: Tue Aug 24 19:38:12 2010
New Revision: 988686
URL: http://svn.apache.org/viewvc?rev=988686&view=rev
Log:
Merge revision 942356 from trunk into the 1.6.1 branch
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java?rev=988686&r1=988685&r2=988686&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
Tue Aug 24 19:38:12 2010
@@ -19,6 +19,8 @@
package supplychain.customer;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
@@ -39,7 +41,7 @@ public class JavaCustomerComponentImpl i
private Retailer retailer3;
- private static ArrayList<String> outstandingOrders = new
ArrayList<String>();
+ private static List<String> outstandingOrders =
Collections.synchronizedList(new ArrayList<String>());
@Reference
public void setRetailer1(Retailer retailer1) {
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java?rev=988686&r1=988685&r2=988686&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerComponentImpl.java
Tue Aug 24 19:38:12 2010
@@ -20,6 +20,8 @@ package supplychain.customer;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.osgi.service.component.ComponentContext;
@@ -36,7 +38,7 @@ public class OSGiCustomerComponentImpl i
private Retailer retailer2;
private Retailer retailer3;
- private static ArrayList<String> outstandingOrders = new
ArrayList<String>();
+ private static List<String> outstandingOrders =
Collections.synchronizedList(new ArrayList<String>());
public OSGiCustomerComponentImpl() {
System.out.println("Created OSGiCustomerComponentImpl " + this);
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java?rev=988686&r1=988685&r2=988686&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerImpl.java
Tue Aug 24 19:38:12 2010
@@ -20,6 +20,8 @@ package supplychain.customer;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.osoa.sca.annotations.AllowsPassByReference;
@@ -32,7 +34,7 @@ import supplychain.retailer.Retailer;
@AllowsPassByReference
public class OSGiCustomerImpl extends OSGiBundleImpl implements Customer {
- private ArrayList<String> outstandingOrders = new ArrayList<String>();
+ private List<String> outstandingOrders = Collections.synchronizedList(new
ArrayList<String>());
private Retailer retailer1;
private Retailer retailer2;
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java?rev=988686&r1=988685&r2=988686&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryComponentImpl.java
Tue Aug 24 19:38:12 2010
@@ -20,6 +20,8 @@ package supplychain.customer;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import org.osgi.service.component.ComponentContext;
@@ -36,7 +38,7 @@ public class OSGiCustomerWithQueryCompon
private Retailer retailer;
private RetailerQuery retailerQuery;
- private static ArrayList<String> outstandingOrders = new
ArrayList<String>();
+ private static List<String> outstandingOrders =
Collections.synchronizedList(new ArrayList<String>());
public OSGiCustomerWithQueryComponentImpl() {
System.out.println("Created OSGiCustomerWithQueryComponentImpl " +
this);
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java?rev=988686&r1=988685&r2=988686&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiCustomerWithQueryImpl.java
Tue Aug 24 19:38:12 2010
@@ -20,6 +20,8 @@ package supplychain.customer;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
import supplychain.OSGiBundleImpl;
import supplychain.retailer.Retailer;
@@ -30,7 +32,7 @@ import supplychain.retailer.RetailerQuer
*/
public class OSGiCustomerWithQueryImpl extends OSGiBundleImpl implements
Customer {
- private static ArrayList<String> outstandingOrders = new
ArrayList<String>();
+ private static List<String> outstandingOrders =
Collections.synchronizedList(new ArrayList<String>());
private Retailer retailer;
private RetailerQuery retailerQuery;
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java?rev=988686&r1=988685&r2=988686&view=diff
==============================================================================
---
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
(original)
+++
tuscany/sca-java-1.x/branches/sca-java-1.6.1/itest/osgi-implementation/src/main/java/supplychain/customer/OSGiVersionedCustomerImpl.java
Tue Aug 24 19:38:12 2010
@@ -20,7 +20,9 @@ package supplychain.customer;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Hashtable;
+import java.util.List;
import org.osgi.framework.BundleContext;
@@ -32,7 +34,7 @@ import supplychain.retailer.Retailer;
*/
public class OSGiVersionedCustomerImpl extends OSGiBundleImpl implements
Customer {
- private static ArrayList<String> outstandingOrders = new
ArrayList<String>();
+ private static List<String> outstandingOrders =
Collections.synchronizedList(new ArrayList<String>());
private Retailer retailer1;
private Retailer retailer2;
