[Registry-dev] svn commit r17921 -
trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils
deepal at wso2.com
deepal at wso2.com
Wed Jun 4 05:01:48 PDT 2008
Author: deepal
Date: Wed Jun 4 05:01:48 2008
New Revision: 17921
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17921
Log:
fixing wsdl import problem
Modified:
trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLFileProcessor.java
trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLUtils.java
Modified: trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLFileProcessor.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLFileProcessor.java?rev=17921&r1=17920&r2=17921&view=diff
==============================================================================
--- trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLFileProcessor.java (original)
+++ trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLFileProcessor.java Wed Jun 4 05:01:48 2008
@@ -287,36 +287,36 @@
if (wsdlDefinition.getQName() != null) {
String name = wsdlDefinition.getQName().getLocalPart();
if (name != null) {
- wsdlResource.addProperty("Name", name);
+ wsdlResource.addProperty("org.wso2.wsdl.Name", name);
}
}
if (wsdlDefinition.getDocumentationElement() != null) {
String document = wsdlDefinition.getDocumentationElement().getTextContent();
if (document != null) {
- wsdlResource.addProperty("documentation", document);
+ wsdlResource.addProperty("org.wso2.wsdl.documentation", document);
}
}
String targetNamespace = wsdlDefinition.getTargetNamespace();
- wsdlResource.addProperty("TargetNamespace", targetNamespace);
+ wsdlResource.addProperty("org.wso2.wsdl.TargetNamespace", targetNamespace);
wsdlResource.setContent(wsdlResourceContent);
repository.put(wsdlPath, wsdlResource);
if (metadata !=null && original) {
- metadata.addProperty("TargetNamespace", targetNamespace);
+ metadata.addProperty("org.wso2.wsdl.TargetNamespace", targetNamespace);
if (wsdlDefinition.getQName() != null) {
String name = wsdlDefinition.getQName().getLocalPart();
if (name != null) {
- metadata.addProperty("Name", name);
+ metadata.addProperty("org.wso2.wsdl.Name", name);
}
}
if (wsdlDefinition.getDocumentationElement() != null) {
String document = wsdlDefinition.getDocumentationElement().getTextContent();
if (document != null) {
- metadata.addProperty("documentation", document);
+ metadata.addProperty("org.wso2.wsdl.documentation", document);
}
}
}
@@ -372,7 +372,7 @@
private void persistAssociations(Registry registry, List <Association> associations)
throws RegistryException {
Iterator <Association> associationIterator = associations.iterator();
-
+
while(associationIterator.hasNext()) {
Association association = associationIterator.next();
@@ -380,4 +380,4 @@
association.getAssociationType());
}
}
-}
+}
\ No newline at end of file
Modified: trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLUtils.java
URL: http://wso2.org/svn/browse/wso2/trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLUtils.java?rev=17921&r1=17920&r2=17921&view=diff
==============================================================================
--- trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLUtils.java (original)
+++ trunk/registry/modules/extensions/src/org/wso2/registry/handlers/utils/WSDLUtils.java Wed Jun 4 05:01:48 2008
@@ -20,31 +20,35 @@
import org.apache.xerces.xs.XSModel;
import org.eclipse.wsdl.validate.ValidationInfo;
import org.eclipse.wsdl.validate.ValidationMessage;
+import org.eclipse.wsdl.validate.exception.ValidateWSDLException;
+import org.eclipse.wsdl.validate.wsdl11.internal.WSDL11ValidationInfoImpl;
+import org.eclipse.wsdl.validate.wsdl11.internal.WSDL11BasicValidator;
+import org.eclipse.wsdl.validate.wsdl11.internal.WSDL11ValidatorController;
+import org.eclipse.wsdl.validate.wsdl11.internal.WSDLDocument;
import org.eclipse.wsdl.validate.internal.ValidationInfoImpl;
import org.eclipse.wsdl.validate.internal.resolver.URIResolver;
import org.eclipse.wsdl.validate.internal.util.MessageGenerator;
import org.eclipse.wsdl.validate.internal.xml.LineNumberDOMParser;
-import org.eclipse.wsdl.validate.wsdl11.internal.WSDL11BasicValidator;
-import org.eclipse.wsdl.validate.wsdl11.internal.WSDL11ValidationInfoImpl;
-import org.eclipse.wsdl.validate.wsdl11.internal.WSDL11ValidatorController;
-import org.eclipse.wsdl.validate.wsdl11.internal.WSDLDocument;
import org.eclipse.wsdl.validate.wsi.internal.bp10.WSIValidator;
import org.w3c.dom.Document;
-import org.wso2.registry.Resource;
import org.wso2.registry.exceptions.RegistryException;
import org.wso2.registry.jdbc.handlers.RequestContext;
+import org.wso2.registry.Resource;
+import org.xml.sax.SAXException;
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.*;
-import java.net.URL;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.wsdl.xml.WSDLReader;
+import javax.wsdl.factory.WSDLFactory;
+import javax.wsdl.Definition;
+import javax.wsdl.WSDLException;
+import java.util.ResourceBundle;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
-import java.util.ResourceBundle;
+import java.util.Iterator;
+import java.io.*;
+import java.net.URL;
public class WSDLUtils {
@@ -53,10 +57,10 @@
private static final String WSDL_STATUS = "org.wso2.wsdl.validationStatus ";
private static final String WSI_STATUS = "org.wso2.wsi.validationStatus ";
- private static final String WSDL_VALID = "WSDL is valid";
- private static final String WSDL_VALID_I = "WSDL is valid for WSI";
- private static final String WSDL_INVALID = "WSDL is invalid ";
- private static final String WSDL_INVALID_I = "WSDL is invalid for WSI ";
+ private static final String WSDL_VALID = "true";
+ private static final String WSDL_VALID_I = "true";
+ private static final String WSDL_INVALID = "false";
+ private static final String WSDL_INVALID_I = "false";
public static String[] validateForWSI(String uri) throws RegistryException {
ArrayList<String> errorMesage = new ArrayList();
@@ -123,7 +127,7 @@
validateWSI(requestContext.getSourceURL(), resource);
}
} catch (Exception e) {
- throw new RegistryException(e.getMessage());
+ resource.setProperty(WSI_STATUS, WSDL_INVALID_I);
}
}
@@ -166,6 +170,7 @@
validaWSDLFromURI(requestContext.getSourceURL(), resource);
}
} catch (Exception e) {
+ resource.setProperty(WSDL_STATUS, WSDL_INVALID);
throw new RegistryException(e.getMessage());
}
resource.setContentStream(null);
More information about the Registry-dev
mailing list