Author: keith
Date: Wed Jan 16 22:47:44 2008
New Revision: 12380
Log:
Moving more editing code to secured service
Modified:
trunk/mashup/java/modules/admin/service/src/org/wso2/mashup/admin/service/MashupAdminService.java
trunk/mashup/java/modules/coreservices/servicemetadatalister/src/org/wso2/mashup/coreservices/servicemetadatalister/ServiceMetaDataListerService.java
trunk/mashup/java/modules/www/js/services.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 Jan 16 22:47:44 2008
@@ -20,12 +20,25 @@
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.Parameter;
+import org.apache.axis2.description.AxisOperation;
+import org.apache.axis2.AxisFault;
import org.wso2.javascript.rhino.JavaScriptEngineConstants;
import org.wso2.wsas.ServerManager;
+import org.wso2.wsas.persistence.PersistenceManager;
+import org.wso2.wsas.persistence.exception.ServiceNotFoundException;
+import org.wso2.wsas.persistence.dataobject.ServiceIdentifierDO;
+import org.wso2.wsas.persistence.dataobject.ServiceDO;
+import org.wso2.wsas.persistence.dataobject.OperationDO;
+import org.wso2.registry.jdbc.JDBCRegistry;
+import org.wso2.registry.RegistryConstants;
+import org.wso2.registry.Resource;
+import org.wso2.registry.RegistryException;
+import org.wso2.mashup.MashupConstants;
import java.io.File;
import java.io.BufferedWriter;
import java.io.FileWriter;
+import java.util.Iterator;
public class MashupAdminService {
@@ -141,6 +154,119 @@
return Boolean.valueOf(success);
}
+ public Boolean setServiceDocumentation(String serviceName, String
documentation) {
+ boolean success = false;
+
+ MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
+ AxisConfiguration configuration =
+ currentMessageContext.getAxisService().getAxisConfiguration();
+
+ try {
+
+ //Updating Axis and WSAS
+ AxisService axisService = configuration.getService(serviceName);
+ axisService.setDocumentation(documentation);
+
+ PersistenceManager persistenceMgr = new PersistenceManager();
+ String serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
+
+ ServiceDO serviceDO = persistenceMgr.getService(serviceName,
serviceVersion);
+ serviceDO.setDocumentation(documentation);
+
+ persistenceMgr.updateService(serviceDO);
+
+ //Updating the registry
+ JDBCRegistry registry = (JDBCRegistry)
currentMessageContext.getConfigurationContext()
+
.getAxisConfiguration().getParameterValue(RegistryConstants.REGISTRY);
+ Parameter myRegistryPath =
+
axisService.getParameter(MashupConstants.REGISTRY_MASHUP_PATH);
+
+ Resource mashup = registry.get((String) myRegistryPath.getValue());
+ mashup.setDescription(documentation);
+
+ registry.put((String) myRegistryPath.getValue(), mashup);
+
+ success = true;
+
+ } catch (AxisFault axisFault) {
+ axisFault.printStackTrace();
+ } catch (ServiceNotFoundException e) {
+ e.printStackTrace();
+ } catch (RegistryException e) {
+ e.printStackTrace();
+ }
+
+
+ return Boolean.valueOf(success);
+ }
+
+ public Boolean setOperationDocumentation(String serviceName, String
operationName,
+ String documentation) {
+ boolean success = false;
+ MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
+ AxisConfiguration configuration =
+ currentMessageContext.getAxisService().getAxisConfiguration();
+
+
+ try {
+ AxisService axisService = configuration.getService(serviceName);
+ AxisOperation axisOperation;
+
+ for (Iterator children = axisService.getChildren();
children.hasNext();) {
+ axisOperation = (AxisOperation) children.next();
+ if
(axisOperation.getName().toString().compareTo(operationName) == 0) {
+ axisOperation.setDocumentation(documentation);
+ success = true;
+ break;
+ }
+ }
+
+ PersistenceManager persistenceMgr = new PersistenceManager();
+ String serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
+ ServiceDO serviceDO = persistenceMgr.getService(serviceName,
serviceVersion);
+ OperationDO[] opDOArray = serviceDO.getOperation(operationName);
+ if (opDOArray.length != 0) {
+ opDOArray[0].setDocumentation(documentation);
+ success = true;
+ }
+
+ persistenceMgr.updateService(serviceDO);
+
+ } catch (AxisFault axisFault) {
+ axisFault.printStackTrace();
+ } catch (ServiceNotFoundException e) {
+ e.printStackTrace();
+ }
+
+ return Boolean.valueOf(success);
+ }
+
+ public Boolean changeOperationStatus(String serviceName, String
operationName, boolean status) {
+ boolean success = false;
+
+ MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
+ AxisConfiguration configuration =
+ currentMessageContext.getAxisService().getAxisConfiguration();
+
+ try {
+ AxisService axisService = configuration.getService(serviceName);
+ AxisOperation axisOperation;
+ for (Iterator children = axisService.getChildren();
children.hasNext();) {
+ axisOperation = (AxisOperation) children.next();
+ if
(axisOperation.getName().toString().compareTo(operationName) == 0) {
+ axisOperation.setControlOperation(status);
+ success = true;
+ break;
+ }
+ }
+
+ } catch (AxisFault axisFault) {
+ axisFault.printStackTrace();
+ }
+
+ return Boolean.valueOf(success);
+ }
+
public Boolean deleteService(String serviceName) {
boolean success = false;
Modified:
trunk/mashup/java/modules/coreservices/servicemetadatalister/src/org/wso2/mashup/coreservices/servicemetadatalister/ServiceMetaDataListerService.java
==============================================================================
---
trunk/mashup/java/modules/coreservices/servicemetadatalister/src/org/wso2/mashup/coreservices/servicemetadatalister/ServiceMetaDataListerService.java
(original)
+++
trunk/mashup/java/modules/coreservices/servicemetadatalister/src/org/wso2/mashup/coreservices/servicemetadatalister/ServiceMetaDataListerService.java
Wed Jan 16 22:47:44 2008
@@ -100,121 +100,6 @@
return retService;
}
-
- public Boolean setServiceDocumentation(String serviceName, String
documentation) {
- boolean success = false;
-
- MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
- AxisConfiguration configuration =
- currentMessageContext.getAxisService().getAxisConfiguration();
-
- try {
-
- //Updating Axis and WSAS
- AxisService axisService = configuration.getService(serviceName);
- axisService.setDocumentation(documentation);
-
- PersistenceManager persistenceMgr = new PersistenceManager();
- String serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
-
- ServiceDO serviceDO = persistenceMgr.getService(serviceName,
serviceVersion);
- serviceDO.setDocumentation(documentation);
-
- persistenceMgr.updateService(serviceDO);
-
- //Updating the registry
- JDBCRegistry registry = (JDBCRegistry)
currentMessageContext.getConfigurationContext()
-
.getAxisConfiguration().getParameterValue(RegistryConstants.REGISTRY);
- Parameter myRegistryPath =
-
axisService.getParameter(MashupConstants.REGISTRY_MASHUP_PATH);
-
- Resource mashup = registry.get((String) myRegistryPath.getValue());
- mashup.setDescription(documentation);
-
- registry.put((String) myRegistryPath.getValue(), mashup);
-
- success = true;
-
- } catch (AxisFault axisFault) {
- axisFault.printStackTrace();
- } catch (ServiceNotFoundException e) {
- e.printStackTrace();
- } catch (RegistryException e) {
- e.printStackTrace();
- }
-
-
- return Boolean.valueOf(success);
- }
-
- public Boolean setOperationDocumentation(String serviceName, String
operationName,
- String documentation) {
- boolean success = false;
- MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
- AxisConfiguration configuration =
- currentMessageContext.getAxisService().getAxisConfiguration();
-
-
- try {
- AxisService axisService = configuration.getService(serviceName);
- AxisOperation axisOperation;
-
- for (Iterator children = axisService.getChildren();
children.hasNext();) {
- axisOperation = (AxisOperation) children.next();
- if
(axisOperation.getName().toString().compareTo(operationName) == 0) {
- axisOperation.setDocumentation(documentation);
- success = true;
- break;
- }
- }
-
- PersistenceManager persistenceMgr = new PersistenceManager();
- String serviceVersion = ServiceIdentifierDO.EMPTY_SERVICE_VERSION;
- ServiceDO serviceDO = persistenceMgr.getService(serviceName,
serviceVersion);
- OperationDO[] opDOArray = serviceDO.getOperation(operationName);
- if (opDOArray.length != 0) {
- opDOArray[0].setDocumentation(documentation);
- success = true;
- }
-
- persistenceMgr.updateService(serviceDO);
-
- } catch (AxisFault axisFault) {
- axisFault.printStackTrace();
- } catch (ServiceNotFoundException e) {
- e.printStackTrace();
- }
-
- return Boolean.valueOf(success);
- }
-
- public Boolean changeOperationStatus(String serviceName, String
operationName, boolean status) {
- boolean success = false;
-
- MessageContext currentMessageContext =
MessageContext.getCurrentMessageContext();
- AxisConfiguration configuration =
- currentMessageContext.getAxisService().getAxisConfiguration();
-
- try {
- AxisService axisService = configuration.getService(serviceName);
- AxisOperation axisOperation;
- for (Iterator children = axisService.getChildren();
children.hasNext();) {
- axisOperation = (AxisOperation) children.next();
- if
(axisOperation.getName().toString().compareTo(operationName) == 0) {
- axisOperation.setControlOperation(status);
- success = true;
- break;
- }
- }
-
- } catch (AxisFault axisFault) {
- axisFault.printStackTrace();
- }
-
- return Boolean.valueOf(success);
- }
-
-
public String isPossibleToCreate(String servicePath) {
return MashupUtils.isPossibleToCreateService(servicePath);
}
Modified: trunk/mashup/java/modules/www/js/services.js
==============================================================================
--- trunk/mashup/java/modules/www/js/services.js (original)
+++ trunk/mashup/java/modules/www/js/services.js Wed Jan 16 22:47:44 2008
@@ -194,12 +194,12 @@
wso2.mashup.services.editServiceDocumentation =
function (serviceName, documentation, callback, params) {
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
- var body_xml = '<req:editServiceDocRequest
xmlns:req="http://servicemetadatalister.coreservices.mashup.wso2.org/xsd">\n' +
+ var body_xml = '<req:setServiceDocumentation
xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n'
+
' <req:documentation>' + documentation +
'</req:documentation>\n' +
- ' </req:editServiceDocRequest>\n';
+ ' </req:setServiceDocumentation>\n';
new wso2.wsf.WSRequest(callURL, "setServiceDocumentation", body_xml,
callback, params, wso2.mashup.services.defaultErrHandler);
};
@@ -219,13 +219,13 @@
wso2.mashup.services.editOperationDocumentation =
function (serviceName, operationName, documentation, callback, params) {
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
- var body_xml = '<req:editServiceDocRequest
xmlns:req="http://servicemetadatalister.coreservices.mashup.wso2.org/xsd">\n' +
+ var body_xml = '<req:setOperationDocumentation
xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n'
+
' <req:operationName>' + operationName +
'</req:operationName>\n' +
' <req:documentation>' + documentation +
'</req:documentation>\n' +
- ' </req:editServiceDocRequest>\n';
+ ' </req:setOperationDocumentation>\n';
new wso2.wsf.WSRequest(callURL, "setOperationDocumentation", body_xml,
callback, params, wso2.mashup.services.defaultErrHandler);
};
@@ -244,13 +244,13 @@
wso2.mashup.services.setServiceOperationStatus =
function (serviceName, operationName, status, callback, params) {
- var callURL = serverURL + "/" + "ServiceMetaDataLister" + "/" ;
+ var callURL = serverURL + "/" + "MashupAdminService" + "/" ;
- var body_xml = '<req:changeServiceOpRequest
xmlns:req="http://servicemetadatalister.coreservices.mashup.wso2.org/xsd">\n' +
+ var body_xml = '<req:changeOperationStatus
xmlns:req="http://service.admin.mashup.wso2.org/xsd">\n' +
' <req:serviceName>' + serviceName + '</req:serviceName>\n'
+
' <req:operationName>' + operationName +
'</req:operationName>\n' +
' <req:status>' + status + '</req:status>\n' +
- ' </req:changeServiceOpRequest>\n';
+ ' </req:changeOperationStatus>\n';
new wso2.wsf.WSRequest(callURL, "changeOperationStatus", body_xml,
callback, params, wso2.mashup.services.defaultErrHandler);
};
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev