[Carbon-dev] svn commit r15444 - trunk/carbon/core/src/org/wso2/carbon/persistence

[svn at wso2.org]

Author: azeez
Date: Tue Apr  1 03:16:06 2008
New Revision: 15444

Log:

Updates



Modified:
   trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java

Modified: trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java
==============================================================================
--- trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java	(original)
+++ trunk/carbon/core/src/org/wso2/carbon/persistence/PersistenceManager.java	Tue Apr  1 03:16:06 2008
@@ -59,7 +59,6 @@
 import org.wso2.carbon.persistence.dataobject.ServiceDO;
 import org.wso2.carbon.persistence.dataobject.ServiceGroupDO;
 import org.wso2.carbon.persistence.dataobject.ServiceGroupParameterDO;
-import org.wso2.carbon.persistence.dataobject.ServiceIdentifierDO;
 import org.wso2.carbon.persistence.dataobject.ServiceParameterDO;
 import org.wso2.carbon.persistence.dataobject.ServicePolicyDO;
 import org.wso2.carbon.persistence.dataobject.ServiceUserDO;
@@ -84,7 +83,6 @@
 import org.wso2.registry.Registry;
 import org.wso2.registry.RegistryException;
 import org.wso2.registry.Resource;
-import org.wso2.registry.ResourceImpl;
 import org.wso2.registry.exceptions.ResourceNotFoundException;
 
 import javax.xml.namespace.QName;
@@ -215,8 +213,7 @@
         return new UserRoleDAO(hbConfig).getUserRole(role);
     }
 
-    public Long addTransport(TransportDO protocol)
-            throws TransportAlreadyExistsException {
+    public Long addTransport(TransportDO protocol) throws TransportAlreadyExistsException {
         try {
             return new TransportDAO(hbConfig).create(protocol);
         } catch (DuplicateEntityException e) {
@@ -303,23 +300,6 @@
         new ModuleDAO(hbConfig).updatePolicy(modulePolicy);
     }
 
-    public synchronized long getMaxMessageSequence(String serviceId,
-                                                   String serviceVersion,
-                                                   String operationName) {
-
-        return new MessageDAO(hbConfig).getMaxMessageSequence(serviceId,
-                                                              serviceVersion,
-                                                              operationName);
-    }
-
-    public void addMessage(MessageDO message) {
-        new MessageDAO(hbConfig).addMessage(message);
-    }
-
-    public MessageDO[] getMessages(MessageDO msgSearchCriteria) {
-        return new MessageDAO(hbConfig).getMessages(msgSearchCriteria);
-    }
-
     public void deleteService(AxisService axisService) throws RegistryException {
 
         String serviceResourcePath =
@@ -807,33 +787,21 @@
 
         try {
             serviceDO = (ServiceDO) session.load(ServiceDO.class, serviceDO.getId());
-            String serviceId = serviceDO.getServiceIdentifierDO().getServiceId();
-            String version = serviceDO.getServiceIdentifierDO().getVersion();
-
-            // Handle Security stuff
-//            if (serviceDO.getIsUTAuthEnabled()) {
-//                try {
-            /*axisService.addParameter(WSS4JUtil.
-                    getPasswordCallBackRefParameter(serviceId, version));*/
-//                } catch (AxisFault axisFault) {
-//                    log.error("Cannot add parameter to AxisService", axisFault);
-//                }
-//            }
 
             // Load policies from DB in AxisService object. All other policies contained within
             // axisService will be rendered invalid by this time
             PolicyInclude policyInclude = axisService.getPolicyInclude();
             policyInclude.removeAllPolicyElements();
-            for (Iterator iter = serviceDO.getPolicies().iterator(); iter.hasNext();) {
-                ServicePolicyDO policyDO = (ServicePolicyDO) iter.next();
+            for (Object o : serviceDO.getPolicies()) {
+                ServicePolicyDO policyDO = (ServicePolicyDO) o;
                 String policyStr = policyDO.getPolicy();
                 Policy policy = PolicyEngine.getPolicy(new ByteArrayInputStream(policyStr.getBytes()));
                 policyInclude.addPolicyElement(policyDO.getType(), policy);
             }
 
             // Add the Service Parameters
-            for (Iterator iter = serviceDO.getParameters().iterator(); iter.hasNext();) {
-                ServiceParameterDO paramDO = (ServiceParameterDO) iter.next();
+            for (Object o : serviceDO.getParameters()) {
+                ServiceParameterDO paramDO = (ServiceParameterDO) o;
                 paramDO.getValue();
                 ByteArrayInputStream bais =
                         new ByteArrayInputStream(paramDO.getValue().getBytes());
@@ -866,8 +834,8 @@
             axisService.getEngagedModules().clear();
 
             // Engage modules to service
-            for (Iterator iter = serviceDO.getEngagedModules().iterator(); iter.hasNext();) {
-                ModuleDO moduleDO = (ModuleDO) iter.next();
+            for (Object o : serviceDO.getEngagedModules()) {
+                ModuleDO moduleDO = (ModuleDO) o;
                 ModuleIdentifierDO modID = moduleDO.getModuleIdentifierDO();
                 AxisModule axisModule = axisConfig.getModule(modID.getName(), modID.getVersion());
                 if (!isGloballyEngaged(modID.getName(), modID.getVersion())) {
@@ -877,15 +845,15 @@
             }
 
             // Engage modules to operation
-            for (Iterator iter = serviceDO.getOperations().iterator(); iter.hasNext();) {
-                OperationDO opDO = (OperationDO) iter.next();
+            for (Object o : serviceDO.getOperations()) {
+                OperationDO opDO = (OperationDO) o;
                 AxisOperation axisOp = axisService.getOperation(new QName(opDO.getName()));
 
                 // Disengage all the statically engaged modules (i.e. those module engaged from the services.xml file)
                 axisOp.getEngagedModules().clear();
 
-                for (Iterator iter2 = opDO.getEngagedModules().iterator(); iter2.hasNext();) {
-                    ModuleDO moduleDO = (ModuleDO) iter2.next();
+                for (Object o1 : opDO.getEngagedModules()) {
+                    ModuleDO moduleDO = (ModuleDO) o1;
                     ModuleIdentifierDO modID = moduleDO.getModuleIdentifierDO();
                     AxisModule axisModule = axisConfig.getModule(modID.getName(),
                                                                  modID.getVersion());
@@ -905,8 +873,8 @@
                 }
 
                 // Handle operation parameters
-                for (Iterator opIter = opDO.getParameters().iterator(); opIter.hasNext();) {
-                    OperationParameterDO opParamDO = (OperationParameterDO) opIter.next();
+                for (Object o1 : opDO.getParameters()) {
+                    OperationParameterDO opParamDO = (OperationParameterDO) o1;
                     opParamDO.getValue();
                     ByteArrayInputStream bais =
                             new ByteArrayInputStream(opParamDO.getValue().getBytes());
@@ -934,10 +902,9 @@
             // Handle the exposed transports
             if (!serviceDO.getIsExposedOnAllTransports()) {
                 axisService.setExposedTransports(new ArrayList());
-                for (Iterator transpIter = serviceDO.getTransports().iterator();
-                     transpIter.hasNext();) {
+                for (Object o : serviceDO.getTransports()) {
                     String transportProtocol =
-                            ((TransportDO) transpIter.next()).getTransportProtocol();
+                            ((TransportDO) o).getTransportProtocol();
                     axisService.addExposedTransport(transportProtocol);
                 }
             }