You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/04/28 13:34:37 UTC
svn commit: r397870 - in /webservices/axis2/trunk/java: maven.xml
modules/core/src/org/apache/axis2/description/AxisService2OM.java
modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
Author: deepal
Date: Fri Apr 28 04:34:36 2006
New Revision: 397870
URL: http://svn.apache.org/viewcvs?rev=397870&view=rev
Log:
- made changes after security name changes
- small fix in WSDL2AxisServiceBuilder
Modified:
webservices/axis2/trunk/java/maven.xml
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
Modified: webservices/axis2/trunk/java/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/maven.xml?rev=397870&r1=397869&r2=397870&view=diff
==============================================================================
--- webservices/axis2/trunk/java/maven.xml (original)
+++ webservices/axis2/trunk/java/maven.xml Fri Apr 28 04:34:36 2006
@@ -488,8 +488,8 @@
<ant:copy toFile="target/dist/addressing-${addressing_version}.mar"
file="modules/addressing/target/addressing-${addressing_version}.mar"/>
- <ant:copy toFile="target/dist/security-${security_version}.mar"
- file="modules/security/target/security-${security_version}.mar"/>
+ <ant:copy toFile="target/dist/aegis-${aegis_version}.mar"
+ file="modules/security/target/aegis-${aegis_version}.mar"/>
<ant:copy toFile="target/dist/soapmonitor-${soapmonitor_version}.mar"
file="modules/soapmonitor/target/soapmonitor-${soapmonitor_version}.mar"/>
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java?rev=397870&r1=397869&r2=397870&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService2OM.java Fri Apr 28 04:34:36 2006
@@ -140,7 +140,8 @@
ArrayList schemas = axisService.getSchema();
for (int i = 0; i < schemas.size(); i++) {
StringWriter writer = new StringWriter();
- XmlSchema schema = (XmlSchema) schemas.get(i);
+// XmlSchema schema = (XmlSchema) schemas.get(i);
+ XmlSchema schema = axisService.getSchema(i);
schema.write(writer);
if (!"".equals(writer.toString())) {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java?rev=397870&r1=397869&r2=397870&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/WSDL2AxisServiceBuilder.java Fri Apr 28 04:34:36 2006
@@ -231,7 +231,6 @@
for (int i = 0; i < schemaElements.length; i++) {
Element schemaElement = schemaElements[i];
if (schemaElement != null) {
- System.out.println(schemaElement.getNamespaceURI());
axisService.addSchema(getXMLSchema(schemaElement, null));
}
}
@@ -894,8 +893,18 @@
Definition importedDef = wsdlImport.getDefinition();
if (importedDef != null) {
processImports(importedDef);
- //copy ns
- wsdl4jDefinition.getNamespaces().putAll(importedDef.getNamespaces());
+ //copy ns
+
+ Map namespaces = importedDef.getNamespaces();
+ Iterator keys = namespaces.keySet().iterator();
+ while (keys.hasNext()) {
+ Object key = keys.next();
+ if (! wsdl4jDefinition.getNamespaces().containsValue(namespaces.get(key))) {
+ wsdl4jDefinition.getNamespaces().put(key, namespaces.get(key));
+ }
+ }
+
+ wsdl4jDefinition.getNamespaces().putAll(namespaces);
//copy types
Types t = importedDef.getTypes();
List typesList = t.getExtensibilityElements();