Changeset 348:d91f6bd7d381 for kraken-dom/src/main/java/org/krakenapps/dom/msgbus/OrganizationPlugin.java

Timestamp:

09/20/11 03:16:11 (8 months ago)

Author:

delmitz

Branch:

default

Convert:

svn:7c3792e6-d75b-4784-96a6-b298f655ee64/trunk@2782

Message:

modified API interfaces.

File:

• kraken-dom/src/main/java/org/krakenapps/dom/msgbus/OrganizationPlugin.java (modified) (4 diffs)

kraken-dom/src/main/java/org/krakenapps/dom/msgbus/OrganizationPlugin.java

@@ -16 +16 @@
 package org.krakenapps.dom.msgbus;
 
-import java.util.Collection;
+import java.util.Map;
 
 import org.apache.felix.ipojo.annotations.Component;
@@ -24 +24 @@
 import org.krakenapps.dom.exception.OrganizationNotFoundException;
 import org.krakenapps.dom.model.Organization;
-import org.krakenapps.dom.model.OrganizationParameter;
-import org.krakenapps.msgbus.Marshaler;
 import org.krakenapps.msgbus.Request;
 import org.krakenapps.msgbus.Response;
@@ -88 +86 @@
         @MsgbusPermission(group = "dom.org", code = "manage")
         public void getOrganizationParameters(Request req, Response resp) {
-                Collection<OrganizationParameter> parameters = organizationParameterApi.getOrganizationParameters(req
-                                .getOrgId());
-                resp.put("result", Marshaler.marshal(parameters));
+                Map<String, String> parameters = organizationParameterApi.getOrganizationParameters(req.getOrgId());
+                resp.put("result", parameters);
         }
 
@@ -96 +93 @@
         @MsgbusPermission(group = "dom.org", code = "manage")
         public void getOrganizationParameter(Request req, Response resp) {
-                OrganizationParameter parameter = null;
-                parameter = organizationParameterApi.getOrganizationParameter(req.getOrgId(), req.getString("name"));
-                resp.put("result", parameter.marshal());
+                String value = organizationParameterApi.getOrganizationParameter(req.getOrgId(), req.getString("name"));
+                resp.put("result", value);
         }