Author: tyrell
Date: Wed Feb 13 23:47:05 2008
New Revision: 13727
Log:
Fixing MASHUP-674
Added:
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/ServiceMetaDataImpl.java
Modified:
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
trunk/mashup/java/modules/www/js/mashup-utils.js
Modified:
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
==============================================================================
---
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
(original)
+++
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
Wed Feb 13 23:47:05 2008
@@ -16,9 +16,9 @@
package org.wso2.mashup.admin.service;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.description.AxisOperation;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
@@ -30,15 +30,15 @@
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
import org.wso2.registry.jdbc.JDBCRegistry;
+import org.wso2.utils.ServerConfiguration;
import org.wso2.wsas.ServerManager;
-import org.wso2.wsas.admin.service.util.ServiceMetaData;
import org.wso2.wsas.admin.service.ServiceAdmin;
+import org.wso2.wsas.admin.service.util.ServiceMetaData;
import org.wso2.wsas.persistence.PersistenceManager;
import org.wso2.wsas.persistence.dataobject.OperationDO;
import org.wso2.wsas.persistence.dataobject.ServiceDO;
import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
import org.wso2.wsas.persistence.exception.ServiceNotFoundException;
-import org.wso2.utils.ServerConfiguration;
import java.io.BufferedWriter;
import java.io.File;
@@ -47,7 +47,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.ArrayList;
public class MashupAdminService {
@@ -417,9 +416,21 @@
getServiceGroupContext().getProperties().clear();
}
- public ServiceMetaData getServiceData(String serviceName) throws AxisFault
{
+ public ServiceMetaDataImpl getServiceData(String serviceName) throws
AxisFault {
ServiceAdmin wsasAdmnin = new ServiceAdmin();
- return wsasAdmnin.getServiceData(serviceName);
+ ServiceMetaData wsasServiceData =
wsasAdmnin.getServiceData(serviceName);
+ ServiceMetaDataImpl returnData = new ServiceMetaDataImpl();
+
+ //Returning only the data necessary for the UI
+ returnData.setServiceId(wsasServiceData.getServiceId());
+ returnData.setName(wsasServiceData.getName());
+ returnData.setDescription(wsasServiceData.getDescription());
+ returnData.setEprs(wsasServiceData.getEprs());
+ returnData.setOperations(wsasServiceData.getOperations());
+ returnData.setActive(wsasServiceData.isActive());
+ returnData.setServiceType(wsasServiceData.getServiceType());
+
+ return returnData;
}
public void startService(String serviceName) throws Exception {
@@ -431,4 +442,6 @@
ServiceAdmin wsasAdmnin = new ServiceAdmin();
wsasAdmnin.stopService(serviceName);
}
+
+
}
Added:
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/ServiceMetaDataImpl.java
==============================================================================
--- (empty file)
+++
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/ServiceMetaDataImpl.java
Wed Feb 13 23:47:05 2008
@@ -0,0 +1,10 @@
+package org.wso2.mashup.admin.service;
+
+import org.wso2.wsas.admin.service.util.ServiceMetaData;
+
+public class ServiceMetaDataImpl extends ServiceMetaData {
+
+ public ServiceMetaDataImpl(){
+ super();
+ }
+}
Modified: trunk/mashup/java/modules/www/js/mashup-utils.js
==============================================================================
--- trunk/mashup/java/modules/www/js/mashup-utils.js (original)
+++ trunk/mashup/java/modules/www/js/mashup-utils.js Wed Feb 13 23:47:05 2008
@@ -68,13 +68,13 @@
var browser = WSRequest.util._getBrowser();
if (browser == "ie" || browser == "ie7") {
- var mashupId =
xmlDataContent.getElementsByTagName("ax25:serviceId")[0].firstChild.nodeValue;
- var mashupTitle =
xmlDataContent.getElementsByTagName("ax25:name")[0].firstChild.nodeValue;
- var mashupDesc =
xmlDataContent.getElementsByTagName("ax25:description")[0].firstChild.nodeValue;
- var mashupEprs = xmlDataContent.getElementsByTagName("ax25:eprs");
- var mashupOperartions =
xmlDataContent.getElementsByTagName("ax25:operations");
- var mashupStatus =
xmlDataContent.getElementsByTagName("ax25:active")[0].firstChild.nodeValue;
- var mashupServiceType =
xmlDataContent.getElementsByTagName("ax25:serviceType")[0].firstChild.nodeValue;
+ var mashupId =
xmlDataContent.getElementsByTagName("ns:serviceId")[0].firstChild.nodeValue;
+ var mashupTitle =
xmlDataContent.getElementsByTagName("ns:name")[0].firstChild.nodeValue;
+ var mashupDesc =
xmlDataContent.getElementsByTagName("ns:description")[0].firstChild.nodeValue;
+ var mashupEprs = xmlDataContent.getElementsByTagName("ns:eprs");
+ var mashupOperartions =
xmlDataContent.getElementsByTagName("ns:operations");
+ var mashupStatus =
xmlDataContent.getElementsByTagName("ns:active")[0].firstChild.nodeValue;
+ var mashupServiceType =
xmlDataContent.getElementsByTagName("ns:serviceType")[0].firstChild.nodeValue;
} else {
mashupId =
xmlDataContent.getElementsByTagName("serviceId")[0].firstChild.nodeValue;
mashupTitle =
xmlDataContent.getElementsByTagName("name")[0].firstChild.nodeValue;
@@ -726,4 +726,4 @@
//Cleaning up the dom
document.getElementById('lyrDialog').parentNode.removeChild(document.getElementById('lyrDialog'));
document.getElementById('dialogMask').parentNode.removeChild(document.getElementById('dialogMask'));
-};
+}
\ No newline at end of file
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
