[Carbon-commits] [Carbon] svn commit r110917 - in trunk/carbon: components/registry/org.wso2.carbon.registry.ws.api/src/main/java/org/wso2/carbon/registry/ws/api components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry service-stubs/org.wso2.carbon.registry.ws.stub/src/main/resources
janaka at wso2.com
janaka at wso2.com
Wed Jul 27 07:57:41 EDT 2011
Author: janaka
Date: Wed Jul 27 04:57:40 2011
New Revision: 110917
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=110917
Log:
Adding reverted changes
Modified:
trunk/carbon/components/registry/org.wso2.carbon.registry.ws.api/src/main/java/org/wso2/carbon/registry/ws/api/WSRegistry.java
trunk/carbon/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java
trunk/carbon/service-stubs/org.wso2.carbon.registry.ws.stub/src/main/resources/WSRegistryService.wsdl
Modified: trunk/carbon/components/registry/org.wso2.carbon.registry.ws.api/src/main/java/org/wso2/carbon/registry/ws/api/WSRegistry.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/registry/org.wso2.carbon.registry.ws.api/src/main/java/org/wso2/carbon/registry/ws/api/WSRegistry.java?rev=110917&r1=110916&r2=110917&view=diff
==============================================================================
--- trunk/carbon/components/registry/org.wso2.carbon.registry.ws.api/src/main/java/org/wso2/carbon/registry/ws/api/WSRegistry.java (original)
+++ trunk/carbon/components/registry/org.wso2.carbon.registry.ws.api/src/main/java/org/wso2/carbon/registry/ws/api/WSRegistry.java Wed Jul 27 04:57:40 2011
@@ -15,35 +15,22 @@
*/
package org.wso2.carbon.registry.ws.api;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.activation.DataHandler;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.registry.common.services.RegistryAbstractAdmin;
-import org.wso2.carbon.registry.core.Aspect;
-import org.wso2.carbon.registry.core.Association;
-import org.wso2.carbon.registry.core.Collection;
-import org.wso2.carbon.registry.core.Comment;
-import org.wso2.carbon.registry.core.LogEntry;
-import org.wso2.carbon.registry.core.LogEntryCollection;
-import org.wso2.carbon.registry.core.Registry;
-import org.wso2.carbon.registry.core.Resource;
-import org.wso2.carbon.registry.core.Tag;
-import org.wso2.carbon.registry.core.TaggedResourcePath;
+import org.wso2.carbon.registry.core.*;
import org.wso2.carbon.registry.core.config.RegistryContext;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.core.utils.UUIDGenerator;
import org.wso2.carbon.registry.ws.api.utils.CommonUtil;
import org.wso2.carbon.utils.ServerConstants;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import java.io.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
@SuppressWarnings("unused")
public class WSRegistry extends RegistryAbstractAdmin implements Registry {
@@ -927,10 +914,44 @@
getRootRegistry().restore(path, reader);
}
+ public void wsRestore(String path, DataHandler dataHandler) throws RegistryException {
+
+ ByteArrayOutputStream output = new ByteArrayOutputStream();
+ try {
+ dataHandler.writeTo(output);
+ } catch (IOException e) {
+ String msg = "Failed to read the input";
+ log.error(msg, e);
+ throw new RegistryException(msg, e);
+ }
+
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(output.toByteArray());
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+
+ restore(path, reader);
+ }
+
public void dump(String path, Writer writer) throws RegistryException {
getRootRegistry().dump(path, writer);
}
+ public DataHandler wsDump(String path) throws RegistryException {
+ DataHandler dataHandler = null;
+ try {
+ FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+ Writer writer = new OutputStreamWriter(fileOutputStream);
+ dump(path, writer);
+ writer.flush();
+ fileOutputStream.close();
+ return new DataHandler(new FileDataSource(tempFile));
+
+ } catch (IOException e) {
+ String msg = "get Content failed - Unable to generate temp file";
+ log.error(msg, e);
+ throw new RegistryException(msg, e);
+ }
+ }
+
/**
* Gets the URL of the WS-Eventing Service.
*
Modified: trunk/carbon/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java?rev=110917&r1=110916&r2=110917&view=diff
==============================================================================
--- trunk/carbon/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java (original)
+++ trunk/carbon/components/registry/org.wso2.carbon.registry.ws.client/src/main/java/org/wso2/carbon/registry/ws/client/registry/WSRegistryServiceClient.java Wed Jul 27 04:57:40 2011
@@ -16,12 +16,6 @@
package org.wso2.carbon.registry.ws.client.registry;
-import java.io.*;
-import java.util.*;
-
-import javax.activation.DataHandler;
-import javax.xml.stream.XMLStreamException;
-
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants;
@@ -36,23 +30,22 @@
import org.apache.rampart.RampartMessageData;
import org.apache.rampart.policy.model.CryptoConfig;
import org.apache.rampart.policy.model.RampartConfig;
+import org.wso2.carbon.authenticator.stub.AuthenticationAdminStub;
import org.wso2.carbon.core.common.AuthenticationException;
import org.wso2.carbon.registry.core.*;
-import org.wso2.carbon.registry.core.Association;
import org.wso2.carbon.registry.core.Collection;
-import org.wso2.carbon.registry.core.Comment;
-import org.wso2.carbon.registry.core.Registry;
-import org.wso2.carbon.registry.core.Resource;
-import org.wso2.carbon.registry.core.Tag;
-import org.wso2.carbon.registry.core.TaggedResourcePath;
import org.wso2.carbon.registry.core.config.RegistryContext;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
-import org.wso2.carbon.registry.ws.stub.WSRegistryServiceStub;
import org.wso2.carbon.registry.ws.client.resource.OnDemandContentCollectionImpl;
import org.wso2.carbon.registry.ws.client.resource.OnDemandContentResourceImpl;
+import org.wso2.carbon.registry.ws.stub.WSRegistryServiceStub;
import org.wso2.carbon.registry.ws.stub.xsd.*;
-import org.wso2.carbon.authenticator.stub.AuthenticationAdminStub;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import javax.xml.stream.XMLStreamException;
+import java.io.*;
+import java.util.*;
public class WSRegistryServiceClient implements Registry {
private static final Log log = LogFactory.getLog(WSRegistryServiceClient.class);
@@ -783,11 +776,56 @@
}
public void dump(String s, Writer writer) throws RegistryException {
- throw new UnsupportedOperationException("This operation is not supported");
+ try {
+ DataHandler dataHandler = stub.wsDump(s);
+ ByteArrayInputStream inputStream = new ByteArrayInputStream(WSRegistryClientUtils.makeBytesFromDataHandler(dataHandler));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+
+ String inputLine;
+ while ((inputLine = reader.readLine()) != null) {
+ writer.append(inputLine);
+ }
+ writer.flush();
+ reader.close();
+
+ } catch (Exception e) {
+ String msg = "Failed to perform dump operation.";
+ log.error(msg, e);
+ throw new RegistryException(msg, e);
+ }
}
- public void restore(String s, Reader reader) throws RegistryException {
- throw new UnsupportedOperationException("This operation is not supported");
+ public void restore(String path, Reader reader) throws RegistryException {
+ try {
+
+ BufferedReader bufferedReader = new BufferedReader(reader);
+
+ File tempFile = new File("tempFile");
+ tempFile.deleteOnExit();
+
+ FileOutputStream fileOutputStream = new FileOutputStream(tempFile);
+ Writer writer = new OutputStreamWriter(fileOutputStream);
+
+ String inputLine;
+ while ((inputLine = bufferedReader.readLine()) != null) {
+ writer.append(inputLine);
+ }
+
+ writer.flush();
+ fileOutputStream.close();
+ writer.close();
+ bufferedReader.close();
+
+ DataHandler handler = new DataHandler(new FileDataSource(tempFile));
+
+ stub.wsRestore(path, handler);
+
+ tempFile.delete();
+ } catch (Exception e) {
+ String msg = "Failed to perform restore operation.";
+ log.error(msg, e);
+ throw new RegistryException(msg, e);
+ }
}
public LogEntryCollection getLogCollection(String s, int i, String s1, Date date, Date date1,
Modified: trunk/carbon/service-stubs/org.wso2.carbon.registry.ws.stub/src/main/resources/WSRegistryService.wsdl
URL: http://wso2.org/svn/browse/wso2/trunk/carbon/service-stubs/org.wso2.carbon.registry.ws.stub/src/main/resources/WSRegistryService.wsdl?rev=110917&r1=110916&r2=110917&view=diff
==============================================================================
--- trunk/carbon/service-stubs/org.wso2.carbon.registry.ws.stub/src/main/resources/WSRegistryService.wsdl (original)
+++ trunk/carbon/service-stubs/org.wso2.carbon.registry.ws.stub/src/main/resources/WSRegistryService.wsdl Wed Jul 27 04:57:40 2011
@@ -1,6 +1,8 @@
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax2427="http://api.ws.registry.carbon.wso2.org/xsd" xmlns:ns="http://api.ws.registry.carbon.wso2.org" xmlns:ax2423="http://exceptions.core.registry.carbon.wso2.org/xsd" xmlns:ax2424="http://api.registry.carbon.wso2.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:ax2429="http://io.java/xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://api.ws.registry.carbon.wso2.org">
+
+
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ax2427="http://io.java/xsd" xmlns:ns="http://api.ws.registry.carbon.wso2.org" xmlns:ax2425="http://api.ws.registry.carbon.wso2.org/xsd" xmlns:ax2421="http://exceptions.core.registry.carbon.wso2.org/xsd" xmlns:ax2422="http://api.registry.carbon.wso2.org/xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://api.ws.registry.carbon.wso2.org">
<wsdl:documentation>WSRegistryService</wsdl:documentation>
<wsdl:types>
<xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.ws.registry.carbon.wso2.org/xsd">
@@ -23,7 +25,7 @@
<xs:element minOccurs="0" name="path" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="pathID" type="xs:int" />
<xs:element minOccurs="0" name="permanentPath" nillable="true" type="xs:string" />
- <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax2427:WSProperty" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="properties" nillable="true" type="ax2425:WSProperty" />
<xs:element minOccurs="0" name="propertiesModified" type="xs:boolean" />
<xs:element minOccurs="0" name="snapshotID" type="xs:long" />
<xs:element minOccurs="0" name="state" type="xs:int" />
@@ -41,7 +43,7 @@
</xs:complexType>
<xs:complexType name="WSCollection">
<xs:complexContent>
- <xs:extension base="ax2427:WSResource">
+ <xs:extension base="ax2425:WSResource">
<xs:sequence>
<xs:element minOccurs="0" name="childCount" type="xs:int" />
<xs:element maxOccurs="unbounded" minOccurs="0" name="children" nillable="true" type="xs:string" />
@@ -71,7 +73,7 @@
<xs:sequence>
<xs:element minOccurs="0" name="resourcePath" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="tagCount" type="xs:long" />
- <xs:element maxOccurs="unbounded" minOccurs="0" name="tagCounts" nillable="true" type="ax2427:WSMap" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="tagCounts" nillable="true" type="ax2425:WSMap" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="WSMap">
@@ -97,11 +99,11 @@
</xs:sequence>
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax2425="http://api.registry.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exceptions.core.registry.carbon.wso2.org/xsd">
+ <xs:schema xmlns:ax2423="http://api.registry.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://exceptions.core.registry.carbon.wso2.org/xsd">
<xs:import namespace="http://api.registry.carbon.wso2.org/xsd" />
<xs:complexType name="RegistryException">
<xs:complexContent>
- <xs:extension base="ax2425:RegistryException">
+ <xs:extension base="ax2423:RegistryException">
<xs:sequence />
</xs:extension>
</xs:complexContent>
@@ -112,14 +114,14 @@
<xs:sequence />
</xs:complexType>
</xs:schema>
- <xs:schema xmlns:ax2428="http://api.ws.registry.carbon.wso2.org/xsd" xmlns:ax2426="http://exceptions.core.registry.carbon.wso2.org/xsd" xmlns:ax2430="http://io.java/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.ws.registry.carbon.wso2.org">
+ <xs:schema xmlns:ax2428="http://io.java/xsd" xmlns:ax2426="http://api.ws.registry.carbon.wso2.org/xsd" xmlns:ax2424="http://exceptions.core.registry.carbon.wso2.org/xsd" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://api.ws.registry.carbon.wso2.org">
<xs:import namespace="http://exceptions.core.registry.carbon.wso2.org/xsd" />
<xs:import namespace="http://api.ws.registry.carbon.wso2.org/xsd" />
<xs:import namespace="http://io.java/xsd" />
<xs:element name="WSRegistryServiceRegistryException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="RegistryException" nillable="true" type="ax2426:RegistryException" />
+ <xs:element minOccurs="0" name="RegistryException" nillable="true" type="ax2424:RegistryException" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -257,6 +259,17 @@
</xs:sequence>
</xs:complexType>
</xs:element>
+ <xs:element name="invokeAspectWithParam">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element minOccurs="0" name="resourcePath" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="aspectName" nillable="true" type="xs:string" />
+ <xs:element minOccurs="0" name="action" nillable="true" type="xs:string" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="keys" nillable="true" type="xs:string" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="values" nillable="true" type="xs:string" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:element name="invokeAspectNoParam">
<xs:complexType>
<xs:sequence>
@@ -473,14 +486,14 @@
<xs:element name="WSsearchContentResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSCollection" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSCollection" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="WSRegistryServiceIOException">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="IOException" nillable="true" type="ax2429:IOException" />
+ <xs:element minOccurs="0" name="IOException" nillable="true" type="ax2427:IOException" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -488,7 +501,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="suggestedPath" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="wsResource" nillable="true" type="ax2427:WSResource" />
+ <xs:element minOccurs="0" name="wsResource" nillable="true" type="ax2425:WSResource" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -507,7 +520,7 @@
<xs:element name="WSnewResourceResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSResource" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSResource" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -519,7 +532,7 @@
<xs:element name="WSnewCollectionResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSCollection" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSCollection" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -528,7 +541,7 @@
<xs:sequence>
<xs:element minOccurs="0" name="suggestedPath" nillable="true" type="xs:string" />
<xs:element minOccurs="0" name="sourceURL" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="metadata" nillable="true" type="ax2427:WSResource" />
+ <xs:element minOccurs="0" name="metadata" nillable="true" type="ax2425:WSResource" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -551,7 +564,7 @@
<xs:element name="WSgetWithPageSizeResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSCollection" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSCollection" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -565,7 +578,7 @@
<xs:element name="WSgetTagsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2427:WSTag" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2425:WSTag" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -579,7 +592,7 @@
<xs:element name="WSgetSingleCommentResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSComment" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSComment" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -593,7 +606,7 @@
<xs:element name="WSgetResourcePathsWithTagResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2427:WSTaggedResourcePath" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2425:WSTaggedResourcePath" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -607,7 +620,7 @@
<xs:element name="WSgetMetaDataResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSResource" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSResource" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -626,7 +639,7 @@
<xs:element name="WSgetLogsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2427:WSLogEntry" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2425:WSLogEntry" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -640,7 +653,7 @@
<xs:element name="WSgetCommentsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2427:WSComment" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2425:WSComment" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -656,7 +669,7 @@
<xs:element name="WSgetChildCollectionResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSCollection" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSCollection" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -671,7 +684,7 @@
<xs:element name="WSgetAssociationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2427:WSAssociation" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2425:WSAssociation" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -685,7 +698,7 @@
<xs:element name="WSgetAllAssociationsResponse">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2427:WSAssociation" />
+ <xs:element maxOccurs="unbounded" minOccurs="0" name="return" nillable="true" type="ax2425:WSAssociation" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -699,7 +712,7 @@
<xs:element name="WSgetResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSResource" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSResource" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -715,7 +728,7 @@
<xs:element name="WSexecuteQueryResponse">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="return" nillable="true" type="ax2427:WSCollection" />
+ <xs:element minOccurs="0" name="return" nillable="true" type="ax2425:WSCollection" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -723,7 +736,7 @@
<xs:complexType>
<xs:sequence>
<xs:element minOccurs="0" name="resourcePath" nillable="true" type="xs:string" />
- <xs:element minOccurs="0" name="comment" nillable="true" type="ax2427:WSComment" />
+ <xs:element minOccurs="0" name="comment" nillable="true" type="ax2425:WSComment" />
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -789,6 +802,9 @@
<wsdl:message name="wsDumpResponse">
<wsdl:part name="parameters" element="ns:wsDumpResponse" />
</wsdl:message>
+ <wsdl:message name="invokeAspectWithParamRequest">
+ <wsdl:part name="parameters" element="ns:invokeAspectWithParam" />
+ </wsdl:message>
<wsdl:message name="removeAspectRequest">
<wsdl:part name="parameters" element="ns:removeAspect" />
</wsdl:message>
@@ -1039,6 +1055,10 @@
<wsdl:output message="ns:wsDumpResponse" wsaw:Action="urn:wsDumpResponse" />
<wsdl:fault message="ns:WSRegistryServiceRegistryException" name="WSRegistryServiceRegistryException" wsaw:Action="urn:wsDumpWSRegistryServiceRegistryException" />
</wsdl:operation>
+ <wsdl:operation name="invokeAspectWithParam">
+ <wsdl:input message="ns:invokeAspectWithParamRequest" wsaw:Action="urn:invokeAspectWithParam" />
+ <wsdl:fault message="ns:WSRegistryServiceRegistryException" name="WSRegistryServiceRegistryException" wsaw:Action="urn:invokeAspectWithParamWSRegistryServiceRegistryException" />
+ </wsdl:operation>
<wsdl:operation name="removeAspect">
<wsdl:input message="ns:removeAspectRequest" wsaw:Action="urn:removeAspect" />
<wsdl:output message="ns:removeAspectResponse" wsaw:Action="urn:removeAspectResponse" />
@@ -1343,6 +1363,15 @@
<soap:fault use="literal" name="WSRegistryServiceRegistryException" />
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="invokeAspectWithParam">
+ <soap:operation soapAction="urn:invokeAspectWithParam" style="document" />
+ <wsdl:input>
+ <soap:body use="literal" />
+ </wsdl:input>
+ <wsdl:fault name="WSRegistryServiceRegistryException">
+ <soap:fault use="literal" name="WSRegistryServiceRegistryException" />
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="getAspectActions">
<soap:operation soapAction="urn:getAspectActions" style="document" />
<wsdl:input>
@@ -1886,6 +1915,15 @@
<soap12:fault use="literal" name="WSRegistryServiceRegistryException" />
</wsdl:fault>
</wsdl:operation>
+ <wsdl:operation name="invokeAspectWithParam">
+ <soap12:operation soapAction="urn:invokeAspectWithParam" style="document" />
+ <wsdl:input>
+ <soap12:body use="literal" />
+ </wsdl:input>
+ <wsdl:fault name="WSRegistryServiceRegistryException">
+ <soap12:fault use="literal" name="WSRegistryServiceRegistryException" />
+ </wsdl:fault>
+ </wsdl:operation>
<wsdl:operation name="getAspectActions">
<soap12:operation soapAction="urn:getAspectActions" style="document" />
<wsdl:input>
@@ -2396,6 +2434,12 @@
<mime:content type="text/xml" part="parameters" />
</wsdl:output>
</wsdl:operation>
+ <wsdl:operation name="invokeAspectWithParam">
+ <http:operation location="invokeAspectWithParam" />
+ <wsdl:input>
+ <mime:content type="text/xml" part="parameters" />
+ </wsdl:input>
+ </wsdl:operation>
<wsdl:operation name="getAspectActions">
<http:operation location="getAspectActions" />
<wsdl:input>
@@ -2708,22 +2752,22 @@
</wsdl:binding>
<wsdl:service name="WSRegistryService">
<wsdl:port name="WSRegistryServiceHttpsSoap11Endpoint" binding="ns:WSRegistryServiceSoap11Binding">
- <soap:address location="https://192.168.1.9:9443/services/WSRegistryService.WSRegistryServiceHttpsSoap11Endpoint/" />
+ <soap:address location="https://10.100.0.32:9443/services/WSRegistryService.WSRegistryServiceHttpsSoap11Endpoint/" />
</wsdl:port>
<wsdl:port name="WSRegistryServiceHttpSoap11Endpoint" binding="ns:WSRegistryServiceSoap11Binding">
- <soap:address location="http://192.168.1.9:9763/services/WSRegistryService.WSRegistryServiceHttpSoap11Endpoint/" />
+ <soap:address location="http://10.100.0.32:9763/services/WSRegistryService.WSRegistryServiceHttpSoap11Endpoint/" />
</wsdl:port>
<wsdl:port name="WSRegistryServiceHttpsSoap12Endpoint" binding="ns:WSRegistryServiceSoap12Binding">
- <soap12:address location="https://192.168.1.9:9443/services/WSRegistryService.WSRegistryServiceHttpsSoap12Endpoint/" />
+ <soap12:address location="https://10.100.0.32:9443/services/WSRegistryService.WSRegistryServiceHttpsSoap12Endpoint/" />
</wsdl:port>
<wsdl:port name="WSRegistryServiceHttpSoap12Endpoint" binding="ns:WSRegistryServiceSoap12Binding">
- <soap12:address location="http://192.168.1.9:9763/services/WSRegistryService.WSRegistryServiceHttpSoap12Endpoint/" />
+ <soap12:address location="http://10.100.0.32:9763/services/WSRegistryService.WSRegistryServiceHttpSoap12Endpoint/" />
</wsdl:port>
<wsdl:port name="WSRegistryServiceHttpEndpoint" binding="ns:WSRegistryServiceHttpBinding">
- <http:address location="http://192.168.1.9:9763/services/WSRegistryService.WSRegistryServiceHttpEndpoint/" />
+ <http:address location="http://10.100.0.32:9763/services/WSRegistryService.WSRegistryServiceHttpEndpoint/" />
</wsdl:port>
<wsdl:port name="WSRegistryServiceHttpsEndpoint" binding="ns:WSRegistryServiceHttpBinding">
- <http:address location="https://192.168.1.9:9443/services/WSRegistryService.WSRegistryServiceHttpsEndpoint/" />
+ <http:address location="https://10.100.0.32:9443/services/WSRegistryService.WSRegistryServiceHttpsEndpoint/" />
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
\ No newline at end of file
More information about the Carbon-commits
mailing list