svn commit: r671223 - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ framework/base/src/base/org/ofbiz/base/util/ framework/base/src/base/org/ofbiz/base/util/collections/ framework/catalina/src/org/ofbiz/catalina/container/ framework/en...

[jacopoc]

Author: jacopoc
Date: Tue Jun 24 08:47:28 2008
New Revision: 671223

URL: http://svn.apache.org/viewvc?rev=671223&view=rev
Log:
Cleaned up a bunch of warning messages for deprecated methods; in preparation for the framework release.

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/AliasKeyManager.java
    ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/OrderedMap.java
    ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/CursorConnection.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Jun 24 08:47:28 2008
@@ -4782,10 +4782,10 @@
         try {
             beganTransaction = TransactionUtil.begin();
         
-            List exprs = UtilMisc.toList(new EntityExpr("automaticExtend", EntityOperator.EQUALS, "Y"),
-             new EntityExpr("orderId", EntityOperator.NOT_EQUAL, null),
-             new EntityExpr("productId", EntityOperator.NOT_EQUAL, null));
-            EntityCondition cond = new EntityConditionList(exprs, EntityOperator.AND);
+            List exprs = UtilMisc.toList(EntityCondition.makeCondition("automaticExtend", EntityOperator.EQUALS, "Y"),
+                    EntityCondition.makeCondition("orderId", EntityOperator.NOT_EQUAL, null),
+                    EntityCondition.makeCondition("productId", EntityOperator.NOT_EQUAL, null));
+            EntityCondition cond = EntityCondition.makeCondition(exprs, EntityOperator.AND);
             EntityListIterator eli = null;
             eli = delegator.find("Subscription", cond, null, null, null, null);
     

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/AliasKeyManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/AliasKeyManager.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/AliasKeyManager.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/AliasKeyManager.java Tue Jun 24 08:47:28 2008
@@ -75,7 +75,7 @@
         return certArray;
     }
 
-    public String[] getClientAliases(String keyType, Principal... issuers) {
+    public String[] getClientAliases(String keyType, Principal[] issuers) {
         return keyManager.getClientAliases(keyType, issuers);
     }
 
@@ -86,7 +86,7 @@
         return pk;
     }
 
-    public String[] getServerAliases(String keyType, Principal... issuers) {
+    public String[] getServerAliases(String keyType, Principal[] issuers) {
         return keyManager.getServerAliases(keyType, issuers);
     }
 }

Modified: ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/OrderedMap.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/OrderedMap.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/OrderedMap.java (original)
+++ ofbiz/trunk/framework/base/src/base/org/ofbiz/base/util/collections/OrderedMap.java Tue Jun 24 08:47:28 2008
@@ -22,6 +22,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -39,7 +40,7 @@
      * @see java.util.Map#keySet()
      */  
     public Set keySet() {
-        return new OrderedSet(orderedKeys);
+        return new LinkedHashSet(orderedKeys);
     }
 
     /**

Modified: ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java (original)
+++ ofbiz/trunk/framework/catalina/src/org/ofbiz/catalina/container/CatalinaContainer.java Tue Jun 24 08:47:28 2008
@@ -385,10 +385,10 @@
             mcast.setMcastBindAddress(mcb);
         }
 
-        mcast.setMcastAddr(mca);
-        mcast.setMcastPort(mcp);
+        mcast.setAddress(mca);
+        mcast.setPort(mcp);
         mcast.setMcastDropTime(mcd);
-        mcast.setMcastFrequency(mcf);
+        mcast.setFrequency(mcf);
 
         String tla = ContainerConfig.getPropertyValue(clusterProps, "tcp-listen-host", "auto");
         int tlp = ContainerConfig.getPropertyValue(clusterProps, "tcp-listen-port", 4001);
@@ -401,10 +401,11 @@
         }
 
         NioReceiver listener = new NioReceiver();
-        listener.setTcpListenAddress(tla);
-        listener.setTcpListenPort(tlp);
-        listener.setTcpSelectorTimeout(tlt);
-        listener.setTcpThreadCount(tlc);
+        listener.setAddress(tla);
+        listener.setPort(tlp);
+        listener.setSelectorTimeout(tlt);
+        listener.setMaxThreads(tlc);
+        listener.setMinThreads(tlc);
         //listener.setIsSenderSynchronized(false);
 
         ReplicationTransmitter trans = new ReplicationTransmitter();

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/CursorConnection.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/CursorConnection.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/CursorConnection.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/CursorConnection.java Tue Jun 24 08:47:28 2008
@@ -37,7 +37,7 @@
         this.con = con;
     }
 
-    public Object invoke(Object proxy, Method method, Object... args) throws Throwable {
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (method.getName().equals("prepareStatement")) {
             System.err.println("prepareStatement");
             args[0] = "DECLARE " + cursorName + " CURSOR FOR " + args[0];

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ServiceUtil.java Tue Jun 24 08:47:28 2008
@@ -617,7 +617,7 @@
         }
 
         String jobId = (String) context.get("jobId");
-        Map fields = UtilMisc.toMap("jobId", jobId);
+        Map<String, ? extends Object> fields = UtilMisc.toMap("jobId", jobId);
         GenericValue job;
         try {
             job = delegator.findOne("JobSandbox", fields, false);

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java?rev=671223&r1=671222&r2=671223&view=diff
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/eca/ServiceEcaAction.java Tue Jun 24 08:47:28 2008
@@ -156,7 +156,7 @@
 
         // use the result to update the result fields
         if (resultToResult) {
-         Map normalizedActionResult = dctx.getModelService(selfService).makeValid(actionResult, ModelService.OUT_PARAM, false, null);
+         Map<String, Object> normalizedActionResult = dctx.getModelService(selfService).makeValid(actionResult, ModelService.OUT_PARAM, false, null);
          // don't copy over the error messages, use the combining code to do that later
          normalizedActionResult.remove(ModelService.ERROR_MESSAGE);
          normalizedActionResult.remove(ModelService.ERROR_MESSAGE_LIST);