[jboss-svn-commits] JBossWS SVN: r618 - in trunk/src: main/java/org/jboss/ws/tools main/java/org/jboss/ws/tools/helpers test/java/org/jboss/test/ws/tools/utils
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 18 17:26:25 EDT 2006
Author: darran.lofthouse at jboss.com
Date: 2006-07-18 17:26:19 -0400 (Tue, 18 Jul 2006)
New Revision: 618
Added:
trunk/src/main/java/org/jboss/ws/tools/NamespacePackageMapping.java
trunk/src/test/java/org/jboss/test/ws/tools/utils/NamespacePackageMappingTestCase.java
Modified:
trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java
trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
trunk/src/test/java/org/jboss/test/ws/tools/utils/ToolsUtilsTestCase.java
Log:
JBWS-1049 - Merged re-implemented namespace to package mapping from
branches/jbossws-1.0 to trunk
Copied: trunk/src/main/java/org/jboss/ws/tools/NamespacePackageMapping.java (from rev 617, branches/jbossws-1.0/src/main/java/org/jboss/ws/tools/NamespacePackageMapping.java)
Modified: trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2006-07-18 21:12:51 UTC (rev 617)
+++ trunk/src/main/java/org/jboss/ws/tools/ToolsUtils.java 2006-07-18 21:26:19 UTC (rev 618)
@@ -127,79 +127,6 @@
}
/**
- * Gets the Java Package Name as defined by the JAXB 2.0Spec
- * Section D5-1
- * @param targetNS Target Namespace
- * @return Java Package Name
- */
- public static String getJavaPackageName(String targetNS)
- {
- if(targetNS == null)
- throw new IllegalArgumentException("TargetNS is null");
- String pkgName = null;
- /**
- * Step 1: Remove the scheme and ":" part from the beginning of the URI, if
- * present.
- */
- if (!(targetNS.startsWith("http") || targetNS.startsWith("urn")) )
- throw new IllegalArgumentException("TargetNS should start with http/https/urn");
- targetNS = targetNS.substring(targetNS.indexOf(":") + 1);
- if(targetNS.startsWith("//www")) targetNS =targetNS.substring(6);//www.
-
- /**
- * Step 2: Remove the trailing .?? or .??? or .html
- */
- //Remove trailing "/"
- if(targetNS.endsWith("/"))
- targetNS = targetNS.substring(0,targetNS.lastIndexOf("/"));
- //Divide targetNS into two before the last "/"
- int ind = targetNS.lastIndexOf("/");
- if(ind > 0 )
- {
- String first = targetNS.substring(0,ind);
- String subs = targetNS.substring(ind+1);
- int dotindex = subs.lastIndexOf(".");
- if(dotindex > -1) subs = subs.substring(0,dotindex); //Chop the file type
- targetNS = first+"." +subs;
- }
-
- /**
- * Step 3: Convert all "/" to "."
- */
- pkgName = targetNS.replace("/",".");
- pkgName = pkgName.replace("-",".");//urn
- pkgName = pkgName.replace(":",".");
- //Remove the leading ".."
- if(pkgName.startsWith("..")) pkgName = pkgName.substring(2);
- /**
- * Step 4: Check for the domain name:org,com,edu,net or
- * ISO Standard 3166 country code
- */
- StringTokenizer st = new StringTokenizer(pkgName,".");
- List<String>lst = new ArrayList<String>();
- String toplevel = null;
- while(st.hasMoreTokens())
- {
- String token = st.nextToken();
- if("net".equals(token) || "org".equals(token)||"edu".equals(token)
- || "gov".equals(token)) toplevel = token;
- else
- lst.add(token);
- }
-
- int len =lst.size();
- pkgName = toplevel != null ? toplevel:"";
- for(String token:lst)
- {
- if(Character.isDigit(token.charAt(0))) token = "_" + token;
- if(pkgName == "" ) pkgName+= token;
- else
- pkgName += "." + token;
- }
- return pkgName;
- }
-
- /**
* Returns a Java Identifier from a XML Name
* as specified by both JAXB 1 and JAXB 2 specs.
* Used for deriving class names, method names etc
Modified: trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-07-18 21:12:51 UTC (rev 617)
+++ trunk/src/main/java/org/jboss/ws/tools/WSDLToJava.java 2006-07-18 21:26:19 UTC (rev 618)
@@ -171,7 +171,7 @@
//Check if there is an user override
String packageName = namespacePackageMap != null?namespacePackageMap.get(targetNS):null;
if(packageName == null || packageName.length() == 0)
- packageName = ToolsUtils.getJavaPackageName(targetNS);
+ packageName = NamespacePackageMapping.getJavaPackageName(targetNS);
this.seiPkgName = packageName;
Modified: trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-07-18 21:12:51 UTC (rev 617)
+++ trunk/src/main/java/org/jboss/ws/tools/helpers/ToolsHelper.java 2006-07-18 21:26:19 UTC (rev 618)
@@ -56,6 +56,7 @@
import org.jboss.ws.tools.Configuration;
import org.jboss.ws.tools.JavaToWSDL;
import org.jboss.ws.tools.JavaWriter;
+import org.jboss.ws.tools.NamespacePackageMapping;
import org.jboss.ws.tools.ToolsUtils;
import org.jboss.ws.tools.WSDLToJava;
import org.jboss.ws.tools.WSDotXMLCreator;
@@ -397,7 +398,7 @@
}
}
- return ToolsUtils.getJavaPackageName(wsdl.getTargetNamespace());
+ return NamespacePackageMapping.getJavaPackageName(wsdl.getTargetNamespace());
}
private void createDir(String path)
Copied: trunk/src/test/java/org/jboss/test/ws/tools/utils/NamespacePackageMappingTestCase.java (from rev 617, branches/jbossws-1.0/src/test/java/org/jboss/test/ws/tools/utils/NamespacePackageMappingTestCase.java)
Modified: trunk/src/test/java/org/jboss/test/ws/tools/utils/ToolsUtilsTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/utils/ToolsUtilsTestCase.java 2006-07-18 21:12:51 UTC (rev 617)
+++ trunk/src/test/java/org/jboss/test/ws/tools/utils/ToolsUtilsTestCase.java 2006-07-18 21:26:19 UTC (rev 618)
@@ -35,16 +35,6 @@
public class ToolsUtilsTestCase extends TestCase
{
- /**
- * Tests Java Package Name construction
- */
- public void testGetJavaPackageName()
- {
- assertEquals("org.jboss.types",ToolsUtils.getJavaPackageName("http://www.jboss.org/types"));
- assertEquals("org.jboss.types.file",ToolsUtils.getJavaPackageName("http://www.jboss.org/types/file.xsd"));
- assertEquals("org.jboss._1ver.types",ToolsUtils.getJavaPackageName("http://www.jboss.org.1ver/types"));
- assertEquals("org.jboss.v1",ToolsUtils.getJavaPackageName("urn:jboss-org:v1"));
- }
/**
* Tests whether the character is a punctuation character
More information about the jboss-svn-commits
mailing list