svn commit: r492848 - in /ofbiz/trunk/framework/service/src/org/ofbiz/service: ModelService.java ModelServiceIface.java ModelServiceReader.java

[jaz-3]

Author: jaz
Date: Thu Jan  4 18:12:23 2007
New Revision: 492848

URL: http://svn.apache.org/viewvc?view=rev&rev=492848
Log:
few more updates and corrections for the new service interface code

Modified:
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java
    ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java?view=diff&rev=492848&r1=492847&r2=492848
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelService.java Thu Jan  4 18:12:23 2007
@@ -814,7 +814,7 @@
                     Iterator i = groupedServices.iterator();
                     while (i.hasNext()) {
                         GroupServiceModel sm = (GroupServiceModel) i.next();
-                        implServices.add(sm.getName());
+                        implServices.add(new ModelServiceIface(sm.getName(), true));
                         if (Debug.verboseOn()) Debug.logVerbose("Adding service [" + sm.getName() + "] as interface of: [" + this.name + "]", module);
                     }
                 }

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java?view=diff&rev=492848&r1=492847&r2=492848
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceIface.java Thu Jan  4 18:12:23 2007
@@ -44,4 +44,8 @@
     public void isOptional(boolean optional) {
         this.optional = optional;
     }
+
+    public String toString() {
+        return "[" + service + ":" + optional + "]";
+    }
 }

Modified: ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java?view=diff&rev=492848&r1=492847&r2=492848
==============================================================================
--- ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java (original)
+++ ofbiz/trunk/framework/service/src/org/ofbiz/service/ModelServiceReader.java Thu Jan  4 18:12:23 2007
@@ -402,7 +402,7 @@
         while (implIter.hasNext()) {
             Element implement = (Element) implIter.next();
             String serviceName = UtilXml.checkEmpty(implement.getAttribute("service"));
-            boolean optional = UtilXml.checkBoolean(implement.getAttribute("optional"), false);
+            boolean optional = UtilXml.checkBoolean(implement.getAttribute("optional"), true);
             if (serviceName.length() > 0)
                 service.implServices.add(new ModelServiceIface(serviceName, optional));
                 //service.implServices.add(serviceName);