[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/uri Authority.java, 1.6.2.4, 1.6.2.5

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/uri
In directory vz-cvs-3.sog:/tmp/cvs-serv3111/src/org/sblim/cimclient/internal/uri

Modified Files:
      Tag: Experimental
	Authority.java 
Log Message:
3374012 - Sblim client CIMObjectPath class defect for LLA format URL

Index: Authority.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/uri/Authority.java,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -d -r1.6.2.4 -r1.6.2.5
--- Authority.java	23 Feb 2009 18:25:58 -0000	1.6.2.4
+++ Authority.java	24 Jul 2011 20:41:51 -0000	1.6.2.5
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2009
+ * (C) Copyright IBM Corp. 2006, 2011
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -16,6 +16,7 @@
  * 1723607    2007-05-22  ebak         IPv6 support in WBEM-URI strings
  * 2003590    2008-06-30  blaschke-oss Change licensing from CPL to EPL
  * 2524131    2009-01-21  raman_arora  Upgrade client to JDK 1.5 (Phase 1)
+ * 3374012    2011-07-24  blaschke-oss Sblim client CIMObjectPath class defect for LLA format URL
  */
 
 package org.sblim.cimclient.internal.uri;
@@ -32,13 +33,14 @@
  *               / "*" / "+" / "," / ";" / "="<br>
  * ALPHA = regex([A-Za-z])<br>
  * DIGIT = regex([0-9])<br><br>
+ * Zone-index = ["%" ( 1*unreserved )]
  * host        = IP-literal / IPv4address / reg-name<br>
  * IP-literal = "[" ( IPv6address / IPvFuture  ) "]"<br>
  * IPvFuture  = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )<br>
  * IPv4address = dec-octet "." dec-octet "." dec-octet "." dec-octet<br>
  * reg-name    = *( unreserved / pct-encoded / sub-delims )<br><br>
  * 
- * IPv6address =                            6( h16 ":" ) ls32<br>
+ * IPv6address =   (                         6( h16 ":" ) ls32<br>
  *                /                       "::" 5( h16 ":" ) ls32<br>
  *                / [               h16 ] "::" 4( h16 ":" ) ls32<br>
  *                / [ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32<br>
@@ -46,7 +48,7 @@
  *                / [ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32<br>
  *                / [ *4( h16 ":" ) h16 ] "::"              ls32<br>
  *                / [ *5( h16 ":" ) h16 ] "::"              h16<br>
- *                / [ *6( h16 ":" ) h16 ] "::"<br><br>
+ *                / [ *6( h16 ":" ) h16 ] "::" ) Zone-index<br><br>
  * 
  *    ls32        = ( h16 ":" h16 ) / IPv4address<br>
  *                ; least-significant 32 bits of address<br><br>
@@ -66,6 +68,8 @@
 	private static final String REGNAMEREG = "([" + UNRESERVED + SUBDELIMS + "]|" + PCTENCODED
 			+ ")+";
 
+	private static final String ZONEINDEX = "(%[" + UNRESERVED + "]+)?";
+
 	private static final String IPV4 = "([0-9]{1,3}\\.){3}[0-9]{1,3}";
 
 	private static final String H16 = "[0-9A-Fa-f]{1,4}";
@@ -74,7 +78,7 @@
 
 	private static final String IPV6 =
 	// 6( h16 ":" ) ls32
-	"((" + H16 + ":){6}" + LS32 + ")|" +
+	"(((" + H16 + ":){6}" + LS32 + ")|" +
 	// "::" 5( h16 ":" )
 			"(::(" + H16 + ":){5}" + LS32 + ")|" +
 			// [ h16 ] "::" 4( h16 ":" ) ls32
@@ -90,7 +94,7 @@
 			// [ *5( h16 ":" ) h16 ] "::" h16
 			"(((" + H16 + ":){0,5}" + H16 + ")?::" + H16 + ")|" +
 			// [ *6( h16 ":" ) h16 ] "::"
-			"(((" + H16 + ":){0,6}" + H16 + ")?::)";
+			"(((" + H16 + ":){0,6}" + H16 + ")?::))" + ZONEINDEX;
 
 	// IPvFuture = "v" 1*HEXDIG "." 1*( unreserved / sub-delims / ":" )
 	private static final String IPVFUTURE = "v[0-9A-Fa-f]+\\.([" + UNRESERVED + SUBDELIMS + "]|:)+";