svn commit: r882071 - /webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java

[am...@apache.org]

Author: amilas
Date: Thu Nov 19 08:18:13 2009
New Revision: 882071

URL: http://svn.apache.org/viewvc?rev=882071&view=rev
Log:
moving the classes generated in default package to a axis2 specific package. otherwise those classes can not be accesed by other classes

Modified:
    webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java

Modified: webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=882071&r1=882070&r2=882071&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java Thu Nov 19 08:18:13 2009
@@ -189,6 +189,17 @@
             this.options = options;
         }
 
+        Map<String, String> nsp2PackageMap = this.options.getNs2PackageMap();
+
+        if (nsp2PackageMap == null){
+            nsp2PackageMap = new HashMap();
+            this.options.setNs2PackageMap(nsp2PackageMap);
+        }
+
+        if (!nsp2PackageMap.containsKey("")){
+            nsp2PackageMap.put("","axis2.apache.org");
+        }
+
         //instantiate the maps
         processedTypemap = new HashMap<QName,String>();
         processedGroupTypeMap = new HashMap<QName,String>();
@@ -318,7 +329,16 @@
             //set a mapper package if not avaialable
             if (writer.getExtensionMapperPackageName() == null) {
                 String ns = schema.getTargetNamespace();
-                writer.registerExtensionMapperPackageName(ns == null ? null : URLProcessor.makePackageName(ns));
+                if (ns == null) {
+                    ns = URLProcessor.DEFAULT_PACKAGE;
+                }
+                // if this name space exists in the ns2p list then we use it.
+                if ((options.getNs2PackageMap() != null)
+                        && (options.getNs2PackageMap().containsKey(ns))) {
+                    writer.registerExtensionMapperPackageName(options.getNs2PackageMap().get(ns));
+                } else {
+                    writer.registerExtensionMapperPackageName(URLProcessor.makePackageName(ns));
+                }
             }
         }