You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/10/17 07:39:17 UTC
svn commit: r464816 - in
/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment:
DeploymentConstants.java ServiceBuilder.java
Author: saminda
Date: Mon Oct 16 22:39:16 2006
New Revision: 464816
URL: http://svn.apache.org/viewvc?view=rev&rev=464816
Log:
Changed <p2n/> to <mapping/> with @namespace and @package.
Modified:
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java?view=diff&rev=464816&r1=464815&r2=464816
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/DeploymentConstants.java Mon Oct 16 22:39:16 2006
@@ -89,8 +89,9 @@
String SCHEMA_NAME_SPACE = "schemaNamespace";
String SCHEMA_ELEMENT_QUALIFIED = "elementFormDefaultQualified";
String SCHEMA = "schema";
- String P2N = "p2n";
- String COMMA = ",";
+ String MAPPING = "mapping";
+ String ATTRIBUTE_NAMESPACE = "namespace";
+ String ATTRIBUTE_PACKAGE = "package";
String ATTRIBUTE_DEFAULT_VERSION = "version";
String ATTRIBUTE_SCOPE = "scope";
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=464816&r1=464815&r2=464816
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Oct 16 22:39:16 2006
@@ -157,18 +157,31 @@
}
}
- //p2n mapping. This will be an element that maps pkg names to a namespace
+ //package to namespace mapping. This will be an element that maps pkg names to a namespace
//when this is doing AxisService.getSchematargetNamespace will be overridden
- //This will be <p2n>pkgName,namespace</p2n>
- Iterator p2nIterator = schemaElement.getChildrenWithName(new QName(P2N));
- if (p2nIterator != null) {
+ //This will be <mapping/> with @namespace and @package
+ Iterator mappingIterator = schemaElement.getChildrenWithName(new QName(MAPPING));
+ if (mappingIterator != null) {
Map pkg2nsMap = new Hashtable();
- while(p2nIterator.hasNext()) {
- OMElement p2nElement = (OMElement)p2nIterator.next();
- String p2nText = p2nElement.getText();
- if (p2nText != null) {
- pkg2nsMap.put(p2nText.substring(0, p2nText.indexOf(COMMA)).trim(),
- p2nText.substring(p2nText.indexOf(COMMA) + 1, p2nText.length()).trim());
+ while (mappingIterator.hasNext()) {
+ OMElement mappingElement = (OMElement) mappingIterator.next();
+ OMAttribute namespaceAttribute =
+ mappingElement.getAttribute(new QName(ATTRIBUTE_NAMESPACE));
+ OMAttribute packageAttribute =
+ mappingElement.getAttribute(new QName(ATTRIBUTE_PACKAGE));
+ if (namespaceAttribute != null && packageAttribute != null) {
+ String namespaceAttributeValue = namespaceAttribute.getAttributeValue();
+ String packageAttributeValue = packageAttribute.getAttributeValue();
+ if (namespaceAttributeValue != null && packageAttributeValue != null) {
+ pkg2nsMap.put(packageAttributeValue.trim(),
+ namespaceAttributeValue.trim());
+ } else {
+ log.warn(
+ "Either value of @namespce or @packagename not available. Thus, generated will be selected.");
+ }
+ } else {
+ log.warn(
+ "Either @namespce or @packagename not available. Thus, generated will be selected.");
}
}
service.setP2nMap(pkg2nsMap);
@@ -350,7 +363,7 @@
/**
* To get the methods which dose not use RPC* Message Recievers
*
- * @return
+ * @return ArrayList
*/
private ArrayList getNonPRCMethods(AxisService axisService) {
ArrayList excludeOperations = new ArrayList();
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org