[Carbon-commits] [Carbon] svn commit r114756 - in trunk/carbon/components: governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors registry/org.wso2.carbon.registry.extensions/src/main/java/org/wso2/carbon/registry/extensions/utils

[janaka at wso2.com]

Author: janaka
Date: Sun Oct 23 08:18:39 2011
New Revision: 114756
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=114756

Log:
Adding service version related changes


Modified:
   trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java
   trunk/carbon/components/registry/org.wso2.carbon.registry.extensions/src/main/java/org/wso2/carbon/registry/extensions/utils/CommonUtil.java

Modified: trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java?rev=114756&r1=114755&r2=114756&view=diff
==============================================================================
--- trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java	(original)
+++ trunk/carbon/components/governance/org.wso2.carbon.governance.registry.extensions/src/org/wso2/carbon/governance/registry/extensions/executors/ServiceVersionExecutor.java	Sun Oct 23 08:18:39 2011
@@ -297,15 +297,17 @@
     public static void removeEndPointValues(OMElement element, String newValue, String oldValue) {
         OMElement endPointRoot = element.getFirstChildWithName(new QName(CommonConstants.SERVICE_ELEMENT_NAMESPACE,"endpoints"));
 
-        Iterator endpointIterator = endPointRoot.getChildElements();
-        while (endpointIterator.hasNext()) {
-            OMElement endPoint = (OMElement) endpointIterator.next();
-            if(endPoint.getText().equals(oldValue)){
-                endPoint.detach();
-                break;
+        if (endPointRoot != null) {
+            Iterator endpointIterator = endPointRoot.getChildElements();
+            while (endpointIterator.hasNext()) {
+                OMElement endPoint = (OMElement) endpointIterator.next();
+                if(endPoint.getText().equals(oldValue)){
+                    endPoint.detach();
+                    break;
+                }
             }
+            element.build();
         }
-        element.build();
     }
 
 }

Modified: trunk/carbon/components/registry/org.wso2.carbon.registry.extensions/src/main/java/org/wso2/carbon/registry/extensions/utils/CommonUtil.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/registry/org.wso2.carbon.registry.extensions/src/main/java/org/wso2/carbon/registry/extensions/utils/CommonUtil.java?rev=114756&r1=114755&r2=114756&view=diff
==============================================================================
--- trunk/carbon/components/registry/org.wso2.carbon.registry.extensions/src/main/java/org/wso2/carbon/registry/extensions/utils/CommonUtil.java	(original)
+++ trunk/carbon/components/registry/org.wso2.carbon.registry.extensions/src/main/java/org/wso2/carbon/registry/extensions/utils/CommonUtil.java	Sun Oct 23 08:18:39 2011
@@ -34,7 +34,6 @@
 import org.wso2.carbon.user.core.service.RealmService;
 
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListSet;
@@ -276,9 +275,21 @@
     public static void setWSDLURL(OMElement element, String namespace) {
         // This is a path relative to the chroot
         OMElement overview = element.getFirstChildWithName(new QName(CommonConstants.SERVICE_ELEMENT_NAMESPACE, "interface"));
+
+        if(overview == null){
+            OMElement interfaceElement = OMAbstractFactory.getOMFactory().createOMElement(
+                    new QName(CommonConstants.SERVICE_ELEMENT_NAMESPACE, "interface"));
+            OMElement wsdlURLElement = OMAbstractFactory.getOMFactory().createOMElement(
+                    new QName(CommonConstants.SERVICE_ELEMENT_NAMESPACE, "wsdlURL"));
+            wsdlURLElement.setText(namespace);
+            interfaceElement.addChild(wsdlURLElement);
+            element.addChild(interfaceElement);
+            return;
+        }
         if (overview.getFirstChildWithName(new QName(CommonConstants.SERVICE_ELEMENT_NAMESPACE, "wsdlURL")) != null) {
             overview.getFirstChildWithName(new QName(CommonConstants.SERVICE_ELEMENT_NAMESPACE, "wsdlURL")).setText(namespace);
         }
+
     }
 
     public static String getWSDLURL(OMElement element) {