axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ami...@apache.org
Subject svn commit: r691256 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: Constants.java description/AxisService.java util/CommandLineOptionConstants.java
Date Tue, 02 Sep 2008 14:22:04 GMT
Author: amilas
Date: Tue Sep  2 07:22:03 2008
New Revision: 691256

URL: http://svn.apache.org/viewvc?rev=691256&view=rev
Log:
fixed the isse AXIS2-1790. users can set the parameter generateAbsoluteLocationURIs to generate
absolute addresses 

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java?rev=691256&r1=691255&r2=691256&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/Constants.java Tue Sep
 2 07:22:03 2008
@@ -403,5 +403,7 @@
 
         public static final String DEPLOYMENT_LIFE_CYCLE_LISTENER = "deploymentLifeCycleListener";
 
+        public static final String GENERATE_ABSOLUTE_LOCATION_URIS = "generateAbsoluteLocationURIs";
+
     }
 }

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=691256&r1=691255&r2=691256&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisService.java
Tue Sep  2 07:22:03 2008
@@ -39,9 +39,7 @@
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.phaseresolver.PhaseResolver;
 import org.apache.axis2.transport.TransportListener;
-import org.apache.axis2.util.Loader;
-import org.apache.axis2.util.LoggingControl;
-import org.apache.axis2.util.XMLPrettyPrinter;
+import org.apache.axis2.util.*;
 import org.apache.axis2.util.XMLUtils;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.logging.Log;
@@ -1086,40 +1084,40 @@
 	 * 
 	 * @param definition
 	 */
-	private void changeImportAndIncludeLocations(Definition definition) {
+	private void changeImportAndIncludeLocations(Definition definition) throws AxisFault {
 
-		// adjust the schema locations in types section
-		Types types = definition.getTypes();
-		if (types != null) {
-			List extensibilityElements = types.getExtensibilityElements();
-			Object extensibilityElement = null;
-			Schema schema = null;
-			for (Iterator iter = extensibilityElements.iterator(); iter.hasNext();) {
-				extensibilityElement = iter.next();
-				if (extensibilityElement instanceof Schema) {
-					schema = (Schema) extensibilityElement;
-					changeLocations(schema.getElement());
-				}
-			}
-		}
-		
-		Iterator iter = definition.getImports().values().iterator();
-		Vector values = null;
-		Import wsdlImport = null;
-		String originalImprotString = null;
-		for (; iter.hasNext();) {
-		    values = (Vector) iter.next();
-		    for (Iterator valuesIter = values.iterator(); valuesIter.hasNext();) {
-		        wsdlImport = (Import) valuesIter.next();
-		        originalImprotString = wsdlImport.getLocationURI();
-		        if (originalImprotString.indexOf("://") == -1 && originalImprotString.indexOf("?wsdl=")
== -1){
-		            wsdlImport.setLocationURI(this.name + "?wsdl=" + originalImprotString);
-		        }
-		        changeImportAndIncludeLocations(wsdlImport.getDefinition());
-		    }
-		}
-	
-	}
+        // adjust the schema locations in types section
+        Types types = definition.getTypes();
+        if (types != null) {
+            List extensibilityElements = types.getExtensibilityElements();
+            Object extensibilityElement = null;
+            Schema schema = null;
+            for (Iterator iter = extensibilityElements.iterator(); iter.hasNext();) {
+                extensibilityElement = iter.next();
+                if (extensibilityElement instanceof Schema) {
+                    schema = (Schema) extensibilityElement;
+                    changeLocations(schema.getElement());
+                }
+            }
+        }
+
+        Iterator iter = definition.getImports().values().iterator();
+        Vector values = null;
+        Import wsdlImport = null;
+        String originalImprotString = null;
+        for (; iter.hasNext();) {
+            values = (Vector) iter.next();
+            for (Iterator valuesIter = values.iterator(); valuesIter.hasNext();) {
+                wsdlImport = (Import) valuesIter.next();
+                originalImprotString = wsdlImport.getLocationURI();
+                if (originalImprotString.indexOf("://") == -1 && originalImprotString.indexOf("?wsdl=")
== -1){
+                    wsdlImport.setLocationURI(this.getServiceEPR() + "?wsdl=" + originalImprotString);
+                }
+                changeImportAndIncludeLocations(wsdlImport.getDefinition());
+            }
+        }
+
+    }
 
 	/**
 	 * change the schema Location in the elemment
@@ -1127,56 +1125,79 @@
 	 * @param element
 	 */
 
-	private void changeLocations(Element element) {
-		NodeList nodeList = element.getChildNodes();
-		String tagName;
-		for (int i = 0; i < nodeList.getLength(); i++) {
-			tagName = nodeList.item(i).getLocalName();
-			if (IMPORT_TAG.equals(tagName) || INCLUDE_TAG.equals(tagName)) {
-				processImport(nodeList.item(i));
-			}
-		}
-	}
+	private void changeLocations(Element element) throws AxisFault {
+        NodeList nodeList = element.getChildNodes();
+        String tagName;
+        for (int i = 0; i < nodeList.getLength(); i++) {
+            tagName = nodeList.item(i).getLocalName();
+            if (IMPORT_TAG.equals(tagName) || INCLUDE_TAG.equals(tagName)) {
+                processImport(nodeList.item(i));
+            }
+        }
+    }
 
-	private void updateSchemaLocation(XmlSchema schema) {
-	    XmlSchemaObjectCollection includes = schema.getIncludes();
-	    for (int j = 0; j < includes.getCount(); j++) {
-	        Object item = includes.getItem(j);
-	        if (item instanceof XmlSchemaExternal) {
-	            XmlSchemaExternal xmlSchemaExternal = (XmlSchemaExternal) item;
-	            XmlSchema s = xmlSchemaExternal.getSchema();
-	            updateSchemaLocation(s, xmlSchemaExternal);
-	        }
-	    }
-	}
+	private void updateSchemaLocation(XmlSchema schema) throws AxisFault {
+        XmlSchemaObjectCollection includes = schema.getIncludes();
+        for (int j = 0; j < includes.getCount(); j++) {
+            Object item = includes.getItem(j);
+            if (item instanceof XmlSchemaExternal) {
+                XmlSchemaExternal xmlSchemaExternal = (XmlSchemaExternal) item;
+                XmlSchema s = xmlSchemaExternal.getSchema();
+                updateSchemaLocation(s, xmlSchemaExternal);
+            }
+        }
+    }
 	   
-	private void updateSchemaLocation(XmlSchema s, XmlSchemaExternal xmlSchemaExternal) {
-	    if (s != null) {
-	        String schemaLocation = xmlSchemaExternal.getSchemaLocation();
-
-	        if (schemaLocation.indexOf("://") == -1 && schemaLocation.indexOf("?xsd=")
== -1) {	            
-	            String newscheamlocation = this.name + "?xsd=" + schemaLocation;
-	            xmlSchemaExternal.setSchemaLocation(newscheamlocation);                    
          
-	        }
-	    }
-	}
+	private void updateSchemaLocation(XmlSchema s, XmlSchemaExternal xmlSchemaExternal) throws
AxisFault {
+        if (s != null) {
+            String schemaLocation = xmlSchemaExternal.getSchemaLocation();
+
+            if (schemaLocation.indexOf("://") == -1 && schemaLocation.indexOf("?xsd=")
== -1) {
+                String newscheamlocation = this.getServiceEPR() + "?xsd=" + schemaLocation;
+                xmlSchemaExternal.setSchemaLocation(newscheamlocation);
+            }
+        }
+    }
 	   
-	private void processImport(Node importNode) {
-		NamedNodeMap nodeMap = importNode.getAttributes();
-		Node attribute;
-		String attributeValue;
-		for (int i = 0; i < nodeMap.getLength(); i++) {
-			attribute = nodeMap.item(i);
-			if (attribute.getNodeName().equals("schemaLocation")) {
-				attributeValue = attribute.getNodeValue();
+	private void processImport(Node importNode) throws AxisFault {
+        NamedNodeMap nodeMap = importNode.getAttributes();
+        Node attribute;
+        String attributeValue;
+        for (int i = 0; i < nodeMap.getLength(); i++) {
+            attribute = nodeMap.item(i);
+            if (attribute.getNodeName().equals("schemaLocation")) {
+                attributeValue = attribute.getNodeValue();
                 if (attributeValue.indexOf("://") == -1 && attributeValue.indexOf("?xsd=")
== -1) {
-                    attribute.setNodeValue(this.name + "?xsd=" + attributeValue);
+                    attribute.setNodeValue(this.getServiceEPR() + "?xsd=" + attributeValue);
                 }
             }
-		}
-	}
+        }
+    }
 
-	/**
+    private String getServiceEPR() throws AxisFault {
+        String serviceEPR = null;
+        Parameter parameter = this.getParameter(Constants.Configuration.GENERATE_ABSOLUTE_LOCATION_URIS);
+        if ((parameter != null) && JavaUtils.isTrueExplicitly(parameter.getValue()))
{
+            String[] eprs = this.getEPRs();
+            for (int i = 0; i < eprs.length; i++) {
+                if ((eprs[i] != null) && (eprs[i].startsWith("http:"))){
+                    serviceEPR = eprs[i];
+                    break;
+                }
+            }
+            if (serviceEPR == null){
+                serviceEPR = eprs[0];
+            }
+        } else {
+            serviceEPR = this.name;
+        }
+        if (serviceEPR.endsWith("/")){
+            serviceEPR = serviceEPR.substring(0, serviceEPR.lastIndexOf("/"));
+        }
+        return serviceEPR;
+    }
+
+    /**
 	 * Produces a XSD for this AxisService and prints it to the specified
 	 * OutputStream.
 	 * 
@@ -2575,26 +2596,24 @@
 	 * @param xmlSchemaExternal
 	 * @param nameTable
 	 */
-	private void adjustSchemaLocation(XmlSchema s,
-			XmlSchemaExternal xmlSchemaExternal, Hashtable nameTable,
-			Hashtable importedScheams, Hashtable sourceURIToNewLocationMap) {
-		if (s != null) {
-			String schemaLocation = xmlSchemaExternal.getSchemaLocation();
-
-			if (schemaLocation.indexOf("://") == -1) {
-				String newscheamlocation = customSchemaNamePrefix == null ?
-				// use the default mode
-				(getName() + "?xsd=" + getScheamLocationWithDot(
-						sourceURIToNewLocationMap, s))
-						:
-						// custom prefix is present - add the custom prefix
-						(customSchemaNamePrefix + getScheamLocationWithDot(
-								sourceURIToNewLocationMap, s));
-				xmlSchemaExternal.setSchemaLocation(newscheamlocation);
-				importedScheams.put(schemaLocation, newscheamlocation);
-			}
-		}
-	}
+    private void adjustSchemaLocation(XmlSchema s,
+                                      XmlSchemaExternal xmlSchemaExternal, Hashtable nameTable,
+                                      Hashtable importedScheams, Hashtable sourceURIToNewLocationMap)
{
+        if (s != null) {
+            String schemaLocation = xmlSchemaExternal.getSchemaLocation();
+
+            String newscheamlocation = customSchemaNamePrefix == null ?
+                    // use the default mode
+                    (getName() + "?xsd=" + getScheamLocationWithDot(
+                            sourceURIToNewLocationMap, s))
+                    :
+                    // custom prefix is present - add the custom prefix
+                    (customSchemaNamePrefix + getScheamLocationWithDot(
+                            sourceURIToNewLocationMap, s));
+            xmlSchemaExternal.setSchemaLocation(newscheamlocation);
+            importedScheams.put(schemaLocation, newscheamlocation);
+        }
+    }
 
 	private Object getScheamLocationWithDot(
 			Hashtable sourceURIToNewLocationMap, XmlSchema s) {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java?rev=691256&r1=691255&r2=691256&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
(original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/util/CommandLineOptionConstants.java
Tue Sep  2 07:22:03 2008
@@ -51,6 +51,8 @@
         String OUTPUT_LOCATION_OPTION_LONG = "output";
         String OVERRIDE_OPTION = "or";
         String OVERRIDE_OPTION_LONG = "over-ride";
+        String OVERRIDE_ABSOLUTE_ADDRESS_OPTION = "oaa";
+        String OVERRIDE_ABSOLUTE_ADDRESS_OPTION_LONG = "override-absolute-address";
         String PACKAGE_OPTION = "p";
         String PACKAGE_OPTION_LONG = "package";
         String PORT_NAME_OPTION = "pn";



Mime
View raw message