From seam-commits at lists.jboss.org Wed Apr 23 15:27:50 2008
Content-Type: multipart/mixed; boundary="===============0321887423126831830=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r8013 - trunk/src/main/org/jboss/seam/init.
Date: Wed, 23 Apr 2008 15:27:50 -0400
Message-ID: <E1JokdC-0006hL-LI@committer01.frg.pub.inap.atl.jboss.com>

--===============0321887423126831830==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: norman.richards(a)jboss.com
Date: 2008-04-23 15:27:50 -0400 (Wed, 23 Apr 2008)
New Revision: 8013

Modified:
   trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java
Log:
JBSEAM-775

Modified: trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java	2008-0=
4-23 19:22:18 UTC (rev 8012)
+++ trunk/src/main/org/jboss/seam/init/NamespacePackageResolver.java	2008-0=
4-23 19:27:50 UTC (rev 8013)
@@ -14,187 +14,123 @@
 =

 /**
  * <p>Converts an <a href=3D"http://www.w3.org/TR/xml-names/">XML namespac=
e</a> to a Java package name.</p>
- *
- * <p>The conversion algorithm is as follows:
- * <ul>
- *   <li>The XML namespace is parsed using <code><a href=3D"http://java.su=
n.com/j2se/1.5.0/docs/api/java/net/URI.html">
- *     java.net.URI</a></code>. Only absolute URIs are supported (i.e., a =
scheme must be specified).</li>
- *   <li>URIs must be <i>hierarchical</i> (i.e., the scheme must be follow=
ed by <code>//</code>) with one exception:
- *     <ul><li>If the scheme is <code>seam:</code>, the URI is considered =
<i>opaque</i>, and is converted to a Java
- *       package using <a href=3D"#seam_scheme">alternate rules</a>.</li><=
/ul></li>
- *   <li>The authority component must be <i>server-based</i> (nearly all U=
RI schemes currently in use are server-based).
- *   <li>The host portion of the namespace is converted as described by <a
- *     href=3D"http://java.sun.com/docs/books/jls/third_edition/html/packa=
ges.html#7.7">Section 7.7</a> of the
- *     <i>Java Language Specification, 3rd Edition</i></li>. That is, "sub=
domains" are reversed from left-to-right to
- *       right-to-left order. The top-level domain becomes the root Java p=
ackage. </li>
- *   <li>The path, as returned by <code><a href=3D"http://java.sun.com/j2s=
e/1.5.0/docs/api/java/net/URI.html#getPath()">
- *     URI.getPath()</a></code> is mapped to further Java packages such th=
at each path element becomes another Java package
- *     appended in left-to-right order.</li>
- *   <li>A leading <code>www</code> subdomain, if specified, is ignored.</=
li>
- *   <li>Values returned by <code><a href=3D"http://java.sun.com/j2se/1.5.=
0/docs/api/java/net/URI.html#getUserInfo()">
- *     URI.getUserInfo()</a></code>, <code><a href=3D"http://java.sun.com/=
j2se/1.5.0/docs/api/java/net/URI.html#getPort()">
- *     URI.getPort()</a></code>, <code><a href=3D"http://java.sun.com/j2se=
/1.5.0/docs/api/java/net/URI.html#getQuery()">
- *     URI.getQuery()</a></code>, and <code><a href=3D"http://java.sun.com=
/j2se/1.5.0/docs/api/java/net/URI.html#getFragment()">
- *     URI.getFragment()</a></code> are ignored.</li>
- * </ul></p>
  * =

- * <h2><a id=3D"seam_proto" name=3D"#seam_scheme">The <code>seam:</code> S=
cheme</a></h2>
- *
- * <p>If the scheme is <code>seam:</code>, the URI is considered <i>opaque=
</i>, and is converted to a Java package using
- * these rules:
- * <ul>
- *   <li>The <i>scheme-specific-part</i> is parsed into components using t=
he Java package delimiter, <code>period</code> (".")</li>
- *   <li>Each component is appended, in left-to-right order, to build a co=
mplete Java package.</li>
- * </ul>
- * </p>
- *
- * <p>Characters specified in the URI which are not valid characters for J=
ava packages result in {@link #resolve(String)}
- * throwing <code>IllegalArgumentException</code>, with one exception: the=
 hyphen ("-") character is converted to
- * the valid Java package characer, the underscore ("_").</p>
- *
- * <h3>Valid Examples</h3>
- * =

- *  <ul>
- *    <li>seam:com.company.department.product =3D=3D> com.company.departme=
nt.product</li>
- *    <li>seam:org.acme-widgets.shipping.persistence =3D=3D> org.acme_widg=
ets.shipping.persistence</li>
- *    <li>http://www.company.com/department/product =3D=3D> com.company.de=
partment.product</li>
- *    <li>https://my-company.com/department/product =3D=3D> com.my_company=
.department.product</li>
- *    <li>http://ericjung:password(a)www.company.com:8080/foo/bar/baz#anch=
or?param1=3D332&param2=3D334 =3D=3D> com.company.foo.bar.baz</li>
- * </ul>
- * <h3>Invalid Examples</h3>
- * <ul>    =

- * 	<li>http://cats.import.com (<code>import</code> is a java keyword)</li>
- * 	<li>http://bar#foo#com</li>
- *    <li>seam:com!company!department</li>
- *    <li>com.company.department</li>
- *    <li>mailto:java-net(a)java.sun.com</li>
- *    <li>news:comp.lang.java</li>
- *    <li>urn:isbn:096139210x</li>    	=

- * </ul>
- *
  * @author <a href=3D"mailto:eric DOT jung AT yahoo DOT com">Eric H. Jung<=
/a>
  */
 public class NamespacePackageResolver {
-	private static final String JAVA_SCHEME =3D "java";
-
-	private static final LogProvider log =3D =

-		Logging.getLogProvider(NamespacePackageResolver.class);
-
-
-	/**
-	 * <p>Converts an XML namespace, <code>ns</code>, to a Stringified packag=
e name according to the rules
-	 * detailed in this class's javadoc.</p>
-	 *
-	 * <p>Characters specified in <code>ns</code> which are not valid charact=
ers
-	 * for Java packages result <code>IllegalArgumentException</code> being t=
hrown, with one exception. The
-	 * hyphen ("-") character is converted to the valid Java package characer=
, the underscore ("_").</p>
-	 *
-	 * @param ns the xml namespace to convert
-	 * =

-	 * @returns a namespace descriptor
-	 */
-	public String resolve(final String ns) {
-		try {
-			return parseURI(new URI(ns));
-		} catch (Exception e) {
-			// the exact exception doesn't matter here.  The caller
-			// can log if needed
-			return null;
-		}
-	}
-
-	private String parseURI(URI uri) {
-		if (!uri.isAbsolute()) {
-			throw new IllegalArgumentException(uri + " is not an absolute URI");
-		}
+    private static final String JAVA_SCHEME =3D "java";
+    =

+    private static final LogProvider log =3D =

+        Logging.getLogProvider(NamespacePackageResolver.class);
+    =

+    =

+    /**
+     * <p>Converts an XML namespace, <code>ns</code>, to a Stringified pac=
kage name
+     *
+     * @param ns the xml namespace to convert
+     * =

+     * @returns a namespace descriptor
+     */
+    public String resolve(final String ns) {
+        try {
+            return parseURI(new URI(ns));
+        } catch (Exception e) {
+            // the exact exception doesn't matter here.  The caller
+            // can log if needed
+            return null;
+        }
+    }
+    =

+    private String parseURI(URI uri) {
+        if (!uri.isAbsolute()) {
+            throw new IllegalArgumentException(uri + " is not an absolute =
URI");
+        }
 		=

-		return uri.isOpaque() ? parseOpaqueURI(uri) : parseHierarchicalURI(uri);
-	}
-
+        return uri.isOpaque() ? parseOpaqueURI(uri) : parseHierarchicalURI=
(uri);
+    }
+    =

+    /**
+     * java:package =

+     * seam:component
+     * seam:package:prefix
+     */
+    private String parseOpaqueURI(URI uri) {
+        if (uri.getScheme().equalsIgnoreCase(JAVA_SCHEME)) {
+            return uri.getSchemeSpecificPart();
+        }
+        throw new IllegalArgumentException("Unrecognized scheme in " + uri=
);
+    }
+    =

+    private String parseHierarchicalURI(URI uri) {
+        String scheme =3D uri.getScheme().toLowerCase();
+        if (!scheme.equals("http") && !scheme.equals("https")) {
+            throw new IllegalArgumentException("Hierarchical URLs must use=
 http or https scheme " + uri);
+        }
 	=

-	/**
-	 * java:package =

-	 * seam:component
-	 * seam:package:prefix
-	 */
-	private String parseOpaqueURI(URI uri) {
-		if (uri.getScheme().equalsIgnoreCase(JAVA_SCHEME)) {
-			return uri.getSchemeSpecificPart();
-		}
-		throw new IllegalArgumentException("Unrecognized scheme in " + uri);
-	}
-
-	private String parseHierarchicalURI(URI uri) {
-		String scheme =3D uri.getScheme().toLowerCase();
-		if (!scheme.equals("http") && !scheme.equals("https")) {
-			throw new IllegalArgumentException("Hierarchical URLs must use http or =
https scheme " + uri);
-		}
-		=

-		StringBuffer buf =3D new StringBuffer();
-		=

-		appendToPackageName(buf, hostnameToPackage(uri.getHost()));
-		appendToPackageName(buf, pathToPackage(uri.getPath()));
-		=

-		return buf.toString();
-	}
-
-	/**
-	 * Convert path elements to package names in forward order
-	 */
-	String pathToPackage(String path) {
-		StringBuffer buf =3D new StringBuffer();
-		=

-		if (path !=3D null) {
-			String[] pathElements =3D path.split("/");
-			for (int i =3D 1, len =3D pathElements.length; i < len; i++) {
-				appendToPackageName(buf, pathElements[i]);
-			}
-		}
-		=

-		return buf.toString();
-	}
+        StringBuffer buf =3D new StringBuffer();
 	=

-	String hostnameToPackage(String hostname) {
-		StringBuffer result =3D new StringBuffer(); =

-		=

-		String[] subdomains =3D hostname.split("\\.");
-
-		//Iterate through the subdomains in reverse converting each to a package=
 name. =

-		for (int i =3D subdomains.length - 1; i >=3D 0; i--) {
-			String subdomain =3D subdomains[i];
-			if (i > 0 || !subdomain.equalsIgnoreCase("www")) {
-				appendToPackageName(result, subdomain);
-			}
-		}
-		=

-		return result.toString();
-	}	=

-
-	private void appendToPackageName(StringBuffer buf, String subdomain) {
-		if (subdomain.length()>0) {
-			subdomain =3D makeSafeForJava(subdomain);
+        appendToPackageName(buf, hostnameToPackage(uri.getHost()));
+        appendToPackageName(buf, pathToPackage(uri.getPath()));
 	=

-			if (buf.length() > 0) {
-				buf.append('.');
-			}
-			=

-			buf.append(subdomain);
-		}
-	}
-
-	/**
-	 * Converts characters in <code>subdomain</code> which aren't java-friend=
ly
-	 * into java-friendly equivalents. Right now, we only support the convers=
ion
-	 * of hyphens ("-") to underscores ("_"). We could do other things like t=
oLowerCase(),
-	 * but there are instances of upper-case package names in widespread use =
even by the
-	 * likes of IBM (e.g., <a href=3D"http://publib.boulder.ibm.com/infocente=
r/db2luw/v8/index.jsp?topic=3D/com.ibm.db2.udb.dc.doc/dc/r_jdbcdrivers.htm">
-	 * COM.ibm.db2 classnames</a>).
-	 * =

-	 * @param subdomain
-	 * @return
-	 */
-	private String makeSafeForJava(String subdomain) {
-		return subdomain.replace("-", "_");
-	}
-
+        return buf.toString();
+    }
+    =

+    /**
+     * Convert path elements to package names in forward order
+     */
+    private String pathToPackage(String path) {
+        StringBuffer buf =3D new StringBuffer();
+	=

+        if (path !=3D null) {
+            String[] pathElements =3D path.split("/");
+            for (int i =3D 1, len =3D pathElements.length; i < len; i++) {
+                appendToPackageName(buf, pathElements[i]);
+            }
+        }
+	=

+        return buf.toString();
+    }
+	=

+    private String hostnameToPackage(String hostname) {
+        StringBuffer result =3D new StringBuffer(); =

+	=

+        String[] subdomains =3D hostname.split("\\.");
+        =

+        //Iterate through the subdomains in reverse converting each to a p=
ackage name. =

+        for (int i =3D subdomains.length - 1; i >=3D 0; i--) {
+            String subdomain =3D subdomains[i];
+            if (i > 0 || !subdomain.equalsIgnoreCase("www")) {
+                appendToPackageName(result, subdomain);
+            }
+        }
+        =

+        return result.toString();
+    }	=

+    =

+    private void appendToPackageName(StringBuffer buf, String subdomain) {
+        if (subdomain.length()>0) {
+            subdomain =3D makeSafeForJava(subdomain);
+            =

+            if (buf.length() > 0) {
+                buf.append('.');
+            }
+            =

+            buf.append(subdomain);
+        }
+    }
+    =

+    /**
+     * Converts characters in <code>subdomain</code> which aren't java-fri=
endly
+     * into java-friendly equivalents. Right now, we only support the conv=
ersion
+     * of hyphens ("-") to underscores ("_"). We could do other things lik=
e toLowerCase(),
+     * but there are instances of upper-case package names in widespread u=
se even by the
+     * likes of IBM (e.g., <a href=3D"http://publib.boulder.ibm.com/infoce=
nter/db2luw/v8/index.jsp?topic=3D/com.ibm.db2.udb.dc.doc/dc/r_jdbcdrivers.h=
tm">
+     * COM.ibm.db2 classnames</a>).
+     * =

+     * @param subdomain
+     * @return
+     */
+    private String makeSafeForJava(String subdomain) {
+        return subdomain.replace("-", "_");
+    }
 }


--===============0321887423126831830==--