http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/javadoc/overview.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/javadoc/overview.html b/juneau-core/src/main/javadoc/overview.html index 670db8a..00cd936 100644 --- a/juneau-core/src/main/javadoc/overview.html +++ b/juneau-core/src/main/javadoc/overview.html @@ -1532,7 +1532,7 @@ <xt><web-app</xt> <xa>version</xa>=<xs>"2.3"</xs><xt>></xt> <xt><servlet></xt> <xt><servlet-name></xt>SystemPropertiesService<xt></servlet-name></xt> - <xt><servlet-class></xt>com.ibm.sample.SystemPropertiesService<xt></servlet-class></xt> + <xt><servlet-class></xt>org.apache.juneau.samples.SystemPropertiesService<xt></servlet-class></xt> <xt></servlet></xt> <xt><servlet-mapping></xt> <xt><servlet-name></xt>SystemPropertiesService<xt></servlet-name></xt> @@ -1554,7 +1554,7 @@ Arbitrarily complex POJO models can be serialized using any of the supported serializers, and content can be parsed using any of the supported parsers. </p> <p> - The <l>com.ibm.team.juneau.samples</l> project contains various REST resource examples in an easy-to-use REST microservice. + The <l>juneau-samples</l> project contains various REST resource examples in an easy-to-use REST microservice. One of these is <l>AddressBookResource</l> which serializes <l>AddressBook</l> objects defined below (some code omitted): </p> <p class='bcode'> @@ -1562,13 +1562,13 @@ <ja>@XmlSchema</ja>( prefix=<js>"ab"</js>, xmlNs={ - <ja>@XmlNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@XmlNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.ibm.com/person/";</js>), - <ja>@XmlNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.ibm.com/address/";</js>), - <ja>@XmlNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.ibm.com/mail/";</js>) + <ja>@XmlNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@XmlNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.apache.org/person/";</js>), + <ja>@XmlNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.apache.org/address/";</js>), + <ja>@XmlNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.apache.org/mail/";</js>) } ) - <jk>package</jk> com.ibm.sample.addressbook; + <jk>package</jk> org.apache.juneau.samples.addressBook; <jk>import</jk> org.apache.juneau.xml.annotation.*; <jd>/** Address book bean */</jd> @@ -2700,21 +2700,21 @@ <jc>// XML and RDF namespaces used in this package</jc> <ja>@Xml</ja>(ns=<js>"ab"</js>, namespaces={ - <ja>@XmlNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@XmlNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.ibm.com/person/";</js>), - <ja>@XmlNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.ibm.com/address/";</js>), - <ja>@XmlNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.ibm.com/mail/";</js>) + <ja>@XmlNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@XmlNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.apache.org/person/";</js>), + <ja>@XmlNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.apache.org/address/";</js>), + <ja>@XmlNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.apache.org/mail/";</js>) } ) <ja>@Rdf</ja>(ns=<js>"ab"</js>, namespaces={ - <ja>@RdfNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@RdfNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.ibm.com/person/";</js>), - <ja>@RdfNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.ibm.com/address/";</js>), - <ja>@RdfNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.ibm.com/mail/";</js>) + <ja>@RdfNs</ja>(name=<js>"ab"</js>, uri=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@RdfNs</ja>(name=<js>"per"</js>, uri=<js>"http://www.apache.org/person/";</js>), + <ja>@RdfNs</ja>(name=<js>"addr"</js>, uri=<js>"http://www.apache.org/address/";</js>), + <ja>@RdfNs</ja>(name=<js>"mail"</js>, uri=<js>"http://www.apache.org/mail/";</js>) } ) - <jk>package</jk> com.ibm.sample.addressbook; + <jk>package</jk> org.apache.juneau.samples.addressBook; <jk>import</jk> org.apache.juneau.xml.annotation.*; </p> <p> @@ -3293,7 +3293,7 @@ </p> <h6 class='topic'>Notes</h6> <ul class='spaced-list'> - <li>The <l>@RestResource.messages()</l> annotation identifies <l>com/ibm/sample/addressbook/nls/AddressBookResource.properties</l> as the resource bundle for localized message for this class. + <li>The <l>@RestResource.messages()</l> annotation identifies <l>org/apache/juneau/samples/addressbook/nls/AddressBookResource.properties</l> as the resource bundle for localized message for this class. <li>You are setting <l>XML_enableNamespaces</l> to <l>true</l> to enable XML namespaces. By default, XML namespace support is disabled per {@link org.apache.juneau.xml.XmlSerializerContext#XML_enableNamespaces}, so you have to explicitly enable it on our serializers. @@ -3914,8 +3914,8 @@ <jk>new</jk> Link(<js>"alternate"</js>, <js>"text/html"</js>, <js>"http://www.sample.com/";</js>).setHreflang(<js>"en"</js>), <jk>new</jk> Link(<js>"self"</js>, <js>"application/atom+xml"</js>, <js>"http://www.sample.com/feed.atom";</js>) ) - .setRights(<jk>new</jk> Text(<js>"Copyright (c) 2013, IBM"</js>)) - .setGenerator(<jk>new</jk> Generator(<js>"Juneau"</js>).setUri(<jk>new</jk> URI(<js>"http://juneau.ibm.com/";</js>)).setVersion(<js>"1.0"</js>)) + .setRights(<jk>new</jk> Text(<js>"Copyright (c) 2016, Apache Foundation"</js>)) + .setGenerator(<jk>new</jk> Generator(<js>"Juneau"</js>).setUri(<jk>new</jk> URI(<js>"http://juneau.apache.org/";</js>)).setVersion(<js>"1.0"</js>)) .addEntries( <jk>new</jk> Entry() .setTitle(<jk>new</jk> Text(<js>"Juneau ATOM specification snapshot"</js>)) @@ -3933,7 +3933,7 @@ .setContent( <jk>new</jk> Content() .setLang(<js>"en"</js>) - .setBase(<jk>new</jk> URI(<js>"http://www.ibm.com/";</js>)) + .setBase(<jk>new</jk> URI(<js>"http://www.apache.org/";</js>)) .setType(<js>"xhtml"</js>) .setText(<js>"<div xmlns=\"http://www.w3.org/1999/xhtml\"><p><i>[Update: Juneau supports ATOM.]</i></p></div>"</js>) ) @@ -4046,7 +4046,7 @@ # DockerRegistryResource properties #================================================================================</cc> <cs>[DockerRegistry]</cs> - <ck>url</ck> = <cv>http://clmdocker02.ratl.swg.usma.ibm.com:5000/v1</cv> + <ck>url</ck> = <cv>http://clmdocker02.ratl.swg.usma.apache.org:5000/v1</cv> </p> <h6 class='topic'>Additional Information</h6> <ul class='javahierarchy'> @@ -5253,7 +5253,7 @@ Juno 5.2.0.1 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>com.<h6 class='topic'>Core</h6>.team.juno</h6> <ul class='spaced-list'> <li>Improved support for multi-line values in config files. Any line that begins with whitespace is interpreted as a continuation of the previous line. @@ -5288,7 +5288,7 @@ <li>Default value for {@link org.apache.juneau.xml.XmlParserContext#XML_trimWhitespace} changed to <jk>true</jk>. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New methods on {@link org.apache.juneau.server.RestServlet}: <ul> @@ -5297,7 +5297,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>Fixed potential issue in {@link org.apache.juneau.client.RestClient} where the HTTP connection pool could end up exhausted if an error occurred. <li>Improved thread safety on {@link org.apache.juneau.client.RestClient}. @@ -5315,7 +5315,7 @@ Major changes have been made to the microservice architecture and config INI file APIs. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Significant changes and enhancements to the {@link org.apache.juneau.ini} API. <ul> @@ -5502,7 +5502,7 @@ <li>New {@link org.apache.juneau.utils.PojoQuery} modified to handle bean getters that throw exceptions. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>Upgraded to use Apache HttpClient 4.5. <li>New classes: @@ -5614,7 +5614,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New {@link org.apache.juneau.server.ReaderResource} class. Represents the contents of a text file with convenience methods for resolving @@ -5674,7 +5674,7 @@ <li>New {@link org.apache.juneau.server.RestUtils#trimPathInfo(StringBuffer,String,String)} method. </ul> - <h6 class='topic'>com.ibm.team.juno.microservice</h6> + <h6 class='topic'>Microservice</h6> <ul class='spaced-list'> <li>Completely revamped API. <li>New {@link org.apache.juneau.microservice.Microservice} class that serves as a generic @@ -5713,7 +5713,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.samples</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>Converted to a REST microservice. <li>Look-and-feel changed to IBM DevOps. @@ -5740,7 +5740,7 @@ The biggest improvement is the ability to associate external INI config files with REST servlets using the {@link org.apache.juneau.ini.ConfigFile} functionality. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Significant API changes to {@link org.apache.juneau.ini} API. <ul> @@ -5769,7 +5769,7 @@ This affects the way most parsers handle blank values. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>You can now parse into non-static inner classes of a servlet for parameters/attributes/content. Useful if you like to define your marshaller beans inside your servlet. @@ -5815,7 +5815,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.microservice</h6> + <h6 class='topic'>Microservice</h6> <ul class='spaced-list'> <li>New juneau-microservice.jar file that encapsulates all 3 juneau jars with code necessary for creating fast and efficent jetty-powered REST microservices.<br> Contains the following: @@ -5837,7 +5837,7 @@ But it introduces a <a class='doclink' href='#Microservices'>Microservices</a> project for building REST microservices and docker containers. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Beans can now be serialized to and parsed from {@link org.apache.juneau.ObjectMap ObjectMaps}. See <a class='doclink' href='org/apache/juneau/transform/package-summary.html#ToObjectMaps'>Serializing to ObjectMaps</a> for details. @@ -5847,12 +5847,12 @@ <li>Behavior change on <del><code>StringVarResolver</code></del>. <jk>null</jk> input now results in blank strings instead of <jk>null</jk>. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New {@link org.apache.juneau.client.RestClient#doCallback(String)} method. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New {@link org.apache.juneau.server.RestRequest#getHeaders()} method. <li>New <code>RestResponse.getUnbufferedWriter()</code> method. @@ -5874,7 +5874,7 @@ Juno 5.1.0.18 is a minor update affecting the server component only. </p> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>Fixed bug where localized strings weren't resolving when using chained resource bundles. <li>Servlet and method labels and descriptions can now contain embedded string variables. @@ -5902,7 +5902,7 @@ Juno 5.1.0.17 is a major update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>{@link org.apache.juneau.BeanMap#get(Object)} and {@link org.apache.juneau.BeanMap#put(String,Object)} now automatically performs filtering if filters are defined on the bean property or bean property class. @@ -5933,7 +5933,7 @@ </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New {@link org.apache.juneau.server.response.ZipFileListResponseHandler} class. <li>Simplified lables in servlet resource bundles: @@ -6004,7 +6004,7 @@ <li>Support for sorting resources by name in {@link org.apache.juneau.server.labels.ChildResourceDescriptions}. </ul> - <h6 class='topic'>com.ibm.team.juno.samples</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>Added <code>/tempDir/upload</code> showing how to use <code>ServletFileUpload</code> with multipart form posts. </ul> @@ -6019,7 +6019,7 @@ Juno 5.1.0.16 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>New methods on {@link org.apache.juneau.ClassMeta} that eliminates language-specific code in the general class metadata. @@ -6047,14 +6047,14 @@ <li>FindBug fixes. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New {@link org.apache.juneau.server.RestRequest#getServletParentURI()} method. <li>New <code>$R{servletParentURI}</code> variable. <li>Removed final modifier from {@link org.apache.juneau.server.labels.ChildResourceDescriptions}. </ul> - <h6 class='topic'>com.ibm.team.juno.samples</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>Added source code links to examples. </ul> @@ -6068,7 +6068,7 @@ Juno 5.1.0.15 is a minor update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>New properties in {@link org.apache.juneau.serializer.SerializerContext}: <ol> @@ -6080,7 +6080,7 @@ <li>Improvements in {@link org.apache.juneau.csv.CsvSerializer}. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>New properties in <code>RestServletProperties</code>: <ol> @@ -6091,7 +6091,7 @@ <li>Improvements involving path calculations when servlets deployed outside of a war file with a context root. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New convenience methods in {@link org.apache.juneau.client.RestCall}: <ol> @@ -6114,13 +6114,13 @@ to invoke server-side POJO methods through client-side proxy interfaces. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Simplified {@link org.apache.juneau.utils.PojoIntrospector} class. <li>New {@link org.apache.juneau.internal.ClassUtils#getMethodSignature(Method)} method. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New methods in {@link org.apache.juneau.client.RestClient} for working with remoteable services: <ul> @@ -6129,7 +6129,7 @@ </ul> </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>Added a default OPTIONS page to {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}. <li><code>RestServletProperties.REST_allowMethodParam</code> has been enhanced to allow you to @@ -6150,7 +6150,7 @@ Juno 5.1.0.13 is a minor update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>{@link org.apache.juneau.ClassMeta#newInstance()} method can now create new instances of arrays. <li>Arguments passed to {@link org.apache.juneau.dto.Link} are now serialized using {@link org.apache.juneau.urlencoding.UrlEncodingSerializer}, so arbitrary POJOs can now be passed as arguments. @@ -6162,7 +6162,7 @@ <li>Improved implementation of {@link org.apache.juneau.urlencoding.UrlEncodingSerializer#serializeUrlPart(Object)} method. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>{@link org.apache.juneau.server.RestConverter} API fixed to handle the existence of POJO filters. {@link org.apache.juneau.server.converters.Introspectable}/{@link org.apache.juneau.server.converters.Queryable}/{@link org.apache.juneau.server.converters.Traversable} classes can now work with filtered POJOs. @@ -6171,7 +6171,7 @@ <li>Fixed bug where two REST java methods mapped to the same path pattern wasn't triggering an exception when it was supposed to. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New {@link org.apache.juneau.client.RestCall#setRedirectMaxAttempts(int)} method to prevent endless redirection loops. <li>New {@link org.apache.juneau.client.RestCall#setRetryable(int,long,RetryOn)} method to automatically retry on failed connection attempts. @@ -6187,14 +6187,14 @@ Juno 5.1.0.12 is a minor update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Fixed {@link org.apache.juneau.ini.ConfigFile#isEmpty()} method. <li>Changed behavior on {@link org.apache.juneau.urlencoding.UonParser} to not treat <js>'~'</js> characters as escapes unless followed by one of the following characters: <code>( ) , $ = ~</code>. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New class {@link org.apache.juneau.client.RestCallInterceptor}. Allows responses to be inspected and modified before being processed. @@ -6211,7 +6211,7 @@ Juno 5.1.0.11 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Additions to {@link org.apache.juneau.html.annotation.Html @Html} bean annotation. <ul> @@ -6240,7 +6240,7 @@ <li>Config INI files now support keys with name <js>"*"</js>. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>REST method parameters can now be generic types (e.g. <del><ja>@Param</ja></del>(<js>"foo"</js>) Map<String,Integer> foo</code>). This applies to headers, attributes, and parameters. @@ -6272,7 +6272,7 @@ of {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>New method {@link org.apache.juneau.client.RestCall#allowRedirectsOnPosts(boolean)}. <li>New method <code>RestCall.peekInputStream()</code> allows you to read response bodies without interrupting execution flow. @@ -6286,8 +6286,8 @@ <h6 class='topic'>Other changes</h6> <ul class='spaced-list'> - <li><code>com.ibm.team.juno.samples.ear</code> and <code>com.ibm.team.juno.samples.war</code> projects - have been replaced with an OSGi bundle with activated servlets in <code>com.ibm.team.juno.samples</code>. + <li><code>samples.ear</code> and <code>samples.war</code> projects + have been replaced with an OSGi bundle with activated servlets in <code>juno.samples</code>. </ul> </div> @@ -6299,7 +6299,7 @@ Juno 5.1.0.10 is a moderate update. </p> - <h6 class='topic'>com.ibm.team.juno</h6> + <h6 class='topic'>Core</h6> <ul class='spaced-list'> <li>Major changes to URL-Encoded serializer and parser. <ul> @@ -6316,7 +6316,7 @@ <li>New {@link org.apache.juneau.serializer.WriterSerializer#toString(Object)} method that's identical to the serialize method but throws <code>RuntimeExceptions</code> to make the serializer easier to use for debugging. </ul> - <h6 class='topic'>com.ibm.team.juno.server</h6> + <h6 class='topic'>Server</h6> <ul class='spaced-list'> <li>Fixed major issue that prevented parsing URL-Encoded form posts into POJOs. Calling <del><code>HttpServlet.getParameter(String)</code></del> was forcing the underlying servlet code to process the HTTP body itself, preventing the <code>UrlEncodingSerializer</code> @@ -6331,7 +6331,7 @@ {@link org.apache.juneau.server.RestServletDefault} and {@link org.apache.juneau.server.jena.RestServletJenaDefault}. </ul> - <h6 class='topic'>com.ibm.team.juno.client</h6> + <h6 class='topic'>Client</h6> <ul class='spaced-list'> <li>Moved to Apache HttpClient 4.3 to match Jazz 6.0. <li>Renamed <code>RestResponseEntity</code> to {@link org.apache.juneau.client.RestRequestEntity}. @@ -6347,7 +6347,7 @@ <li>Renamed <code>RestClient.shutdown()</code> to {@link org.apache.juneau.client.RestClient#close()} to mirror change in Apache API. </ul> - <h6 class='topic'>com.ibm.team.juno.samples.war</h6> + <h6 class='topic'>Samples</h6> <ul class='spaced-list'> <li>New <code>CodeFormatterResource</code> for quickly formatting Java and XML code samples in Javadocs. <li>New <code>UrlEncodedFormResource</code> for showing how to work with URL-Encoded form posts.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java b/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java index 8852a56..dfe130d 100755 --- a/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/dto/atom/AtomTest.java @@ -34,37 +34,37 @@ public class AtomTest { Feed f2; Feed f = new Feed() - .setTitle(new Text("text", "dive into mark")) - .setSubTitle(new Text("html", "A <em>lot</em> of effort went into making this effortless")) - .setUpdated(parseDateTime("2005-07-31T12:29:29Z")) - .setId(new Id("tag:example.org,2003:3")) + .setTitle(new Text("text", "Title")) + .setSubTitle(new Text("html", "Subtitle")) + .setUpdated(parseDateTime("2016-12-31T01:02:03-04:00")) + .setId(new Id("tag:foo.org")) .addLinks( - new Link("alternate", "text/html", "http://example.org/";).setHreflang("en"), - new Link("self", "application/atom+xml", "http://example.org/feed.atom";) + new Link("alternate", "text/html", "http://foo.org/";).setHreflang("en"), + new Link("self", "application/atom+xml", "http://foo.org/feed.atom";) ) .setRights(new Text("Copyright (c) 2016, Apache Foundation")) - .setGenerator(new Generator("Example Toolkit").setUri(new URI("http://www.example.com/";)).setVersion("1.0")) + .setGenerator(new Generator("Example Toolkit").setUri(new URI("http://www.foo.org/";)).setVersion("1.0")) .addEntries( new Entry() - .setTitle(new Text("Atom draft-07 snapshot")) + .setTitle(new Text("Title")) .addLinks( - new Link("alternate", "text/html", "http://example.org/2005/04/02/atom";), - new Link("enclosure", "audio/mpeg", "http://example.org/audio/ph34r_my_podcast.mp3";).setLength(1337) + new Link("alternate", "text/html", "http://foo.org/2005/04/02/atom";), + new Link("enclosure", "audio/mpeg", "http://foo.org/audio/foobar.mp3";).setLength(1337) ) - .setId(new Id("tag:example.org,2003:3.2397")) - .setUpdated(parseDateTime("2005-07-31T12:29:29Z")) - .setPublished(parseDateTime("2003-12-13T08:29:29-04:00")) - .addAuthors(new Person("Mark Pilgrim").setUri(new URI("http://example.org/";)).setEmail("[email protected]")) + .setId(new Id("tag:foo.org")) + .setUpdated(parseDateTime("2016-12-31T01:02:03-04:00")) + .setPublished(parseDateTime("2016-12-31T01:02:03-04:00")) + .addAuthors(new Person("John Smith").setUri(new URI("http://foo.org/";)).setEmail("[email protected]")) .addContributors( - new Person("Sam Ruby"), - new Person("Joe Gregorio") + new Person("John Smith"), + new Person("Jane Smith") ) .setContent( new Content() .setLang("en") - .setBase(new URI("http://diveintomark.org/";)) + .setBase(new URI("http://foo.org/";)) .setType("xhtml") - .setText("<div xmlns=\"http://www.w3.org/1999/xhtml\";><p><i>[Update: The Atom draft is finished.]</i></p></div>") + .setText("<div xmlns=\"http://www.w3.org/1999/xhtml\";><p><i>[Sample content]</i></p></div>") ) ) ; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java index b7d4952..1549dce 100755 --- a/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/html/CommonTest.java @@ -261,18 +261,18 @@ public class CommonTest { +"\n[f0]=<a href='f0/x0'>f0</a>" +"\n[f1]=<a href='f1/x1'>f1</a>" +"\n[f2]=<a href='/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='f4/x4'>f4</a>" +"\n[f5]=<a href='/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='f8/x8'>f8</a>" +"\n[f9]=<a href='f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -282,18 +282,18 @@ public class CommonTest { +"\n[f0]=<a href='f0/x0'>f0</a>" +"\n[f1]=<a href='f1/x1'>f1</a>" +"\n[f2]=<a href='/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='f4/x4'>f4</a>" +"\n[f5]=<a href='/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='f8/x8'>f8</a>" +"\n[f9]=<a href='f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -303,18 +303,18 @@ public class CommonTest { +"\n[f0]=<a href='/cr/f0/x0'>f0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1</a>" +"\n[f2]=<a href='/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4</a>" +"\n[f5]=<a href='/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -324,18 +324,18 @@ public class CommonTest { +"\n[f0]=<a href='/cr/f0/x0'>f0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1</a>" +"\n[f2]=<a href='/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4</a>" +"\n[f5]=<a href='/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -345,18 +345,18 @@ public class CommonTest { +"\n[f0]=<a href='/f0/x0'>f0</a>" +"\n[f1]=<a href='/f1/x1'>f1</a>" +"\n[f2]=<a href='/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='/f4/x4'>f4</a>" +"\n[f5]=<a href='/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='/f8/x8'>f8</a>" +"\n[f9]=<a href='/f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -368,18 +368,18 @@ public class CommonTest { +"\n[f0]=<a href='f0/x0'>f0</a>" +"\n[f1]=<a href='f1/x1'>f1</a>" +"\n[f2]=<a href='http://foo/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='f4/x4'>f4</a>" +"\n[f5]=<a href='http://foo/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='f8/x8'>f8</a>" +"\n[f9]=<a href='f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -389,18 +389,18 @@ public class CommonTest { +"\n[f0]=<a href='f0/x0'>f0</a>" +"\n[f1]=<a href='f1/x1'>f1</a>" +"\n[f2]=<a href='http://foo/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='f4/x4'>f4</a>" +"\n[f5]=<a href='http://foo/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='f8/x8'>f8</a>" +"\n[f9]=<a href='f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); @@ -410,18 +410,18 @@ public class CommonTest { +"\n[f0]=<a href='f0/x0'>f0</a>" +"\n[f1]=<a href='f1/x1'>f1</a>" +"\n[f2]=<a href='/f2/x2'>f2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>f3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>f3</a>" +"\n[f4]=<a href='f4/x4'>f4</a>" +"\n[f5]=<a href='/f5/x5'>f5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>f6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>f7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>f6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>f7</a>" +"\n[f8]=<a href='f8/x8'>f8</a>" +"\n[f9]=<a href='f9/x9'>f9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>fa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>fa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>fd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>fe</a>" ; assertEquals(expected, r); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/html/HtmlTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/html/HtmlTest.java b/juneau-core/src/test/java/org/apache/juneau/html/HtmlTest.java index eccb9d7..d9ee860 100755 --- a/juneau-core/src/test/java/org/apache/juneau/html/HtmlTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/html/HtmlTest.java @@ -60,18 +60,18 @@ public class HtmlTest { +"\n[f0]=<a href='f0/x0'>f0/x0</a>" +"\n[f1]=<a href='f1/x1'>f1/x1</a>" +"\n[f2]=<a href='/f2/x2'>/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='f4/x4'>f4/x4</a>" +"\n[f5]=<a href='/f5/x5'>/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='f8/x8'>f8/x8</a>" +"\n[f9]=<a href='f9/x9'>f9/x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>http://www.ibm.com/fa/xa#MY_LABEL</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>http://www.apache.org/fa/xa#MY_LABEL</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>"; assertEquals(expected, r); s.setProperty(SERIALIZER_absolutePathUriBase, "http://myhost";); @@ -82,18 +82,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1/x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4/x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8/x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9/x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>http://www.ibm.com/fa/xa#MY_LABEL</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>http://www.apache.org/fa/xa#MY_LABEL</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>"; assertEquals(expected, r); s.setProperty(HTML_uriAnchorText, URI); @@ -102,18 +102,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>/cr/f0/x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>/cr/f1/x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>http://myhost/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>/cr/f4/x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>http://myhost/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>/cr/f8/x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>/cr/f9/x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>http://www.ibm.com/fa/xa#MY_LABEL</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>http://www.apache.org/fa/xa#MY_LABEL</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>"; assertEquals(expected, r); s.setProperty(HTML_uriAnchorText, LAST_TOKEN); @@ -122,18 +122,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>xa</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>xd</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>xe</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>xa</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>xd</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>xe</a>"; assertEquals(expected, r); s.setProperty(HTML_uriAnchorText, URI_ANCHOR); @@ -142,18 +142,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1/x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4/x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8/x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9/x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>MY_LABEL</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>MY_LABEL</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>"; assertEquals(expected, r); s.setProperty(HTML_labelParameter, "label2"); @@ -162,18 +162,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1/x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4/x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8/x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9/x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>MY_LABEL</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>MY_LABEL</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>MY_LABEL</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>MY_LABEL</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>MY_LABEL</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>MY_LABEL</a>"; assertEquals(expected, r); s.setProperty(HTML_detectLinksInStrings, false); @@ -182,18 +182,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1/x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4/x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8/x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9/x9</a>" - +"\n[fa]=<string>http://www.ibm.com/fa/xa#MY_LABEL</string>" - +"\n[fb]=<string>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</string>" - +"\n[fc]=<string>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</string>" - +"\n[fd]=<string>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</string>" - +"\n[fe]=<string>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</string>"; + +"\n[fa]=<string>http://www.apache.org/fa/xa#MY_LABEL</string>" + +"\n[fb]=<string>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</string>" + +"\n[fc]=<string>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</string>" + +"\n[fd]=<string>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</string>" + +"\n[fe]=<string>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</string>"; assertEquals(expected, r); s.setProperty(HTML_detectLinksInStrings, true); @@ -203,18 +203,18 @@ public class HtmlTest { +"\n[f0]=<a href='/cr/f0/x0'>f0/x0</a>" +"\n[f1]=<a href='/cr/f1/x1'>f1/x1</a>" +"\n[f2]=<a href='http://myhost/f2/x2'>/f2/x2</a>" - +"\n[f3]=<a href='http://www.ibm.com/f3/x3'>http://www.ibm.com/f3/x3</a>" + +"\n[f3]=<a href='http://www.apache.org/f3/x3'>http://www.apache.org/f3/x3</a>" +"\n[f4]=<a href='/cr/f4/x4'>f4/x4</a>" +"\n[f5]=<a href='http://myhost/f5/x5'>/f5/x5</a>" - +"\n[f6]=<a href='http://www.ibm.com/f6/x6'>http://www.ibm.com/f6/x6</a>" - +"\n[f7]=<a href='http://www.ibm.com/f7/x7'>http://www.ibm.com/f7/x7</a>" + +"\n[f6]=<a href='http://www.apache.org/f6/x6'>http://www.apache.org/f6/x6</a>" + +"\n[f7]=<a href='http://www.apache.org/f7/x7'>http://www.apache.org/f7/x7</a>" +"\n[f8]=<a href='/cr/f8/x8'>f8/x8</a>" +"\n[f9]=<a href='/cr/f9/x9'>f9/x9</a>" - +"\n[fa]=<a href='http://www.ibm.com/fa/xa#MY_LABEL'>MY_LABEL</a>" - +"\n[fb]=<a href='http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</a>" - +"\n[fc]=<a href='http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</a>" - +"\n[fd]=<a href='http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</a>" - +"\n[fe]=<a href='http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</a>"; + +"\n[fa]=<a href='http://www.apache.org/fa/xa#MY_LABEL'>MY_LABEL</a>" + +"\n[fb]=<a href='http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</a>" + +"\n[fc]=<a href='http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</a>" + +"\n[fd]=<a href='http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</a>" + +"\n[fe]=<a href='http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</a>"; assertEquals(expected, r); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java b/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java index 2a4fc15..04a7f67 100755 --- a/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/jena/CommonParserTest.java @@ -31,8 +31,8 @@ public class CommonParserTest { return "" + "<rdf:RDF" + " xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'" - + " xmlns:j='http://www.ibm.com/juneau/'" - + " xmlns:jp='http://www.ibm.com/juneaubp/'>" + + " xmlns:j='http://www.apache.org/juneau/'" + + " xmlns:jp='http://www.apache.org/juneaubp/'>" + in + "</rdf:RDF>"; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java index 54b1531..c2085a2 100755 --- a/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/jena/CommonTest.java @@ -296,18 +296,18 @@ public class CommonTest { +"\n<<rdf:Description rdf:about='f0/x0'>" +"\n<jp:f1 rdf:resource='f1/x1'/>" +"\n<jp:f2 rdf:resource='/f2/x2'/>" - +"\n<jp:f3 rdf:resource='http://www.ibm.com/f3/x3'/>" + +"\n<jp:f3 rdf:resource='http://www.apache.org/f3/x3'/>" +"\n<jp:f4 rdf:resource='f4/x4'/>" +"\n<jp:f5 rdf:resource='/f5/x5'/>" - +"\n<jp:f6 rdf:resource='http://www.ibm.com/f6/x6'/>" - +"\n<jp:f7 rdf:resource='http://www.ibm.com/f7/x7'/>" + +"\n<jp:f6 rdf:resource='http://www.apache.org/f6/x6'/>" + +"\n<jp:f7 rdf:resource='http://www.apache.org/f7/x7'/>" +"\n<jp:f8 rdf:resource='f8/x8'/>" +"\n<jp:f9 rdf:resource='f9/x9'/>" - +"\n<jp:fa>http://www.ibm.com/fa/xa#MY_LABEL</jp:fa>" - +"\n<jp:fb>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" - +"\n<jp:fc>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" - +"\n<jp:fd>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" - +"\n<jp:fe>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" + +"\n<jp:fa>http://www.apache.org/fa/xa#MY_LABEL</jp:fa>" + +"\n<jp:fb>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" + +"\n<jp:fc>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" + +"\n<jp:fd>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" + +"\n<jp:fe>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" ; assertEquals(expected, r); @@ -322,18 +322,18 @@ public class CommonTest { +"\n<<rdf:Description rdf:about='/cr/f0/x0'>" +"\n<jp:f1 rdf:resource='/cr/f1/x1'/>" +"\n<jp:f2 rdf:resource='/f2/x2'/>" - +"\n<jp:f3 rdf:resource='http://www.ibm.com/f3/x3'/>" + +"\n<jp:f3 rdf:resource='http://www.apache.org/f3/x3'/>" +"\n<jp:f4 rdf:resource='/cr/f4/x4'/>" +"\n<jp:f5 rdf:resource='/f5/x5'/>" - +"\n<jp:f6 rdf:resource='http://www.ibm.com/f6/x6'/>" - +"\n<jp:f7 rdf:resource='http://www.ibm.com/f7/x7'/>" + +"\n<jp:f6 rdf:resource='http://www.apache.org/f6/x6'/>" + +"\n<jp:f7 rdf:resource='http://www.apache.org/f7/x7'/>" +"\n<jp:f8 rdf:resource='/cr/f8/x8'/>" +"\n<jp:f9 rdf:resource='/cr/f9/x9'/>" - +"\n<jp:fa>http://www.ibm.com/fa/xa#MY_LABEL</jp:fa>" - +"\n<jp:fb>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" - +"\n<jp:fc>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" - +"\n<jp:fd>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" - +"\n<jp:fe>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" + +"\n<jp:fa>http://www.apache.org/fa/xa#MY_LABEL</jp:fa>" + +"\n<jp:fb>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" + +"\n<jp:fc>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" + +"\n<jp:fd>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" + +"\n<jp:fe>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" ; assertEquals(expected, r); @@ -348,18 +348,18 @@ public class CommonTest { +"\n<<rdf:Description rdf:about='/f0/x0'>" +"\n<jp:f1 rdf:resource='/f1/x1'/>" +"\n<jp:f2 rdf:resource='/f2/x2'/>" - +"\n<jp:f3 rdf:resource='http://www.ibm.com/f3/x3'/>" + +"\n<jp:f3 rdf:resource='http://www.apache.org/f3/x3'/>" +"\n<jp:f4 rdf:resource='/f4/x4'/>" +"\n<jp:f5 rdf:resource='/f5/x5'/>" - +"\n<jp:f6 rdf:resource='http://www.ibm.com/f6/x6'/>" - +"\n<jp:f7 rdf:resource='http://www.ibm.com/f7/x7'/>" + +"\n<jp:f6 rdf:resource='http://www.apache.org/f6/x6'/>" + +"\n<jp:f7 rdf:resource='http://www.apache.org/f7/x7'/>" +"\n<jp:f8 rdf:resource='/f8/x8'/>" +"\n<jp:f9 rdf:resource='/f9/x9'/>" - +"\n<jp:fa>http://www.ibm.com/fa/xa#MY_LABEL</jp:fa>" - +"\n<jp:fb>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" - +"\n<jp:fc>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" - +"\n<jp:fd>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" - +"\n<jp:fe>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" + +"\n<jp:fa>http://www.apache.org/fa/xa#MY_LABEL</jp:fa>" + +"\n<jp:fb>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" + +"\n<jp:fc>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" + +"\n<jp:fd>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" + +"\n<jp:fe>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" ; assertEquals(expected, r); @@ -372,18 +372,18 @@ public class CommonTest { +"\n<<rdf:Description rdf:about='f0/x0'>" +"\n<jp:f1 rdf:resource='f1/x1'/>" +"\n<jp:f2 rdf:resource='http://foo/f2/x2'/>" - +"\n<jp:f3 rdf:resource='http://www.ibm.com/f3/x3'/>" + +"\n<jp:f3 rdf:resource='http://www.apache.org/f3/x3'/>" +"\n<jp:f4 rdf:resource='f4/x4'/>" +"\n<jp:f5 rdf:resource='http://foo/f5/x5'/>" - +"\n<jp:f6 rdf:resource='http://www.ibm.com/f6/x6'/>" - +"\n<jp:f7 rdf:resource='http://www.ibm.com/f7/x7'/>" + +"\n<jp:f6 rdf:resource='http://www.apache.org/f6/x6'/>" + +"\n<jp:f7 rdf:resource='http://www.apache.org/f7/x7'/>" +"\n<jp:f8 rdf:resource='f8/x8'/>" +"\n<jp:f9 rdf:resource='f9/x9'/>" - +"\n<jp:fa>http://www.ibm.com/fa/xa#MY_LABEL</jp:fa>" - +"\n<jp:fb>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" - +"\n<jp:fc>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" - +"\n<jp:fd>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" - +"\n<jp:fe>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" + +"\n<jp:fa>http://www.apache.org/fa/xa#MY_LABEL</jp:fa>" + +"\n<jp:fb>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" + +"\n<jp:fc>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" + +"\n<jp:fd>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" + +"\n<jp:fe>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" ; assertEquals(expected, r); @@ -398,18 +398,18 @@ public class CommonTest { +"\n<<rdf:Description rdf:about='f0/x0'>" +"\n<jp:f1 rdf:resource='f1/x1'/>" +"\n<jp:f2 rdf:resource='/f2/x2'/>" - +"\n<jp:f3 rdf:resource='http://www.ibm.com/f3/x3'/>" + +"\n<jp:f3 rdf:resource='http://www.apache.org/f3/x3'/>" +"\n<jp:f4 rdf:resource='f4/x4'/>" +"\n<jp:f5 rdf:resource='/f5/x5'/>" - +"\n<jp:f6 rdf:resource='http://www.ibm.com/f6/x6'/>" - +"\n<jp:f7 rdf:resource='http://www.ibm.com/f7/x7'/>" + +"\n<jp:f6 rdf:resource='http://www.apache.org/f6/x6'/>" + +"\n<jp:f7 rdf:resource='http://www.apache.org/f7/x7'/>" +"\n<jp:f8 rdf:resource='f8/x8'/>" +"\n<jp:f9 rdf:resource='f9/x9'/>" - +"\n<jp:fa>http://www.ibm.com/fa/xa#MY_LABEL</jp:fa>" - +"\n<jp:fb>http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" - +"\n<jp:fc>http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" - +"\n<jp:fd>http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" - +"\n<jp:fe>http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" + +"\n<jp:fa>http://www.apache.org/fa/xa#MY_LABEL</jp:fa>" + +"\n<jp:fb>http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar</jp:fb>" + +"\n<jp:fc>http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL</jp:fc>" + +"\n<jp:fd>http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar</jp:fd>" + +"\n<jp:fe>http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL</jp:fe>" ; assertEquals(expected, r); } @@ -495,8 +495,8 @@ public class CommonTest { "</rdf:RDF>\n" )); assertTrue(r.contains("xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#";)); - assertTrue(r.contains("xmlns:j='http://www.ibm.com/juneau/";)); - assertTrue(r.contains("xmlns:jp='http://www.ibm.com/juneaubp/";)); + assertTrue(r.contains("xmlns:j='http://www.apache.org/juneau/";)); + assertTrue(r.contains("xmlns:jp='http://www.apache.org/juneaubp/";)); } public static class R1 { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/jena/RdfParserTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/jena/RdfParserTest.java b/juneau-core/src/test/java/org/apache/juneau/jena/RdfParserTest.java index 05fc94a..684a777 100755 --- a/juneau-core/src/test/java/org/apache/juneau/jena/RdfParserTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/jena/RdfParserTest.java @@ -42,7 +42,7 @@ public class RdfParserTest { .setProperty(RDF_addRootProperty, true); String expected = - "<rdf:RDF a='http://ns/' a1='http://ns2/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF a='http://ns/' a1='http://ns2/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" + "\n <a:f1>1</a:f1>" + "\n <a:f2>f2</a:f2>" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/jena/RdfTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/jena/RdfTest.java b/juneau-core/src/test/java/org/apache/juneau/jena/RdfTest.java index d171dd2..6becb22 100755 --- a/juneau-core/src/test/java/org/apache/juneau/jena/RdfTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/jena/RdfTest.java @@ -43,7 +43,7 @@ public class RdfTest { // Normal format - Sequence //-------------------------------------------------------------------------------- expected = - "<rdf:RDF a='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" + "\n <a:f2>" + "\n <rdf:Seq>" @@ -71,7 +71,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- s.setProperty(RDF_collectionFormat, RdfCollectionFormat.SEQ); expected = - "<rdf:RDF a='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" + "\n <a:f2>" + "\n <rdf:Seq>" @@ -99,7 +99,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- s.setProperty(RDF_collectionFormat, RdfCollectionFormat.BAG); expected = - "<rdf:RDF a='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" + "\n <a:f2>" + "\n <rdf:Bag>" @@ -127,7 +127,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- s.setProperty(RDF_collectionFormat, RdfCollectionFormat.LIST); expected = - "<rdf:RDF a='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" + "\n <a:f2 parseType='Resource'>" + "\n <rdf:first>f2a</rdf:first>" @@ -157,7 +157,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- s.setProperty(RDF_collectionFormat, RdfCollectionFormat.MULTI_VALUED); expected = - "<rdf:RDF a='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF a='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/a'>" + "\n <a:f2>f2a</a:f2>" + "\n <a:f2>f2b</a:f2>" @@ -204,7 +204,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- expected = - "<rdf:RDF b='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF b='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/b'>" + "\n <b:f2>" + "\n <rdf:Seq>" @@ -274,7 +274,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- s.setProperty(RDF_collectionFormat, RdfCollectionFormat.BAG); expected = - "<rdf:RDF b='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF b='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/b'>" + "\n <b:f2>" + "\n <rdf:Seq>" @@ -437,7 +437,7 @@ public class RdfTest { //-------------------------------------------------------------------------------- s.setProperty(RDF_collectionFormat, RdfCollectionFormat.BAG); expected = - "<rdf:RDF b='http://ns/' j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF b='http://ns/' j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://test/b'>" + "\n <b:f2>" + "\n <rdf:Seq>" @@ -536,7 +536,7 @@ public class RdfTest { rdfXml = s.serialize(l); expected = - "<rdf:RDF j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://localhost/f1/2'>" + "\n <jp:f2>f2</jp:f2>" + "\n <jp:f3 resource='http://localhost/f3/2'/>" @@ -552,7 +552,7 @@ public class RdfTest { D[] da = l.toArray(new D[l.size()]); rdfXml = s.serialize(da); expected = - "<rdf:RDF j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://localhost/f1/2'>" + "\n <jp:f2>f2</jp:f2>" + "\n <jp:f3 resource='http://localhost/f3/2'/>" @@ -567,7 +567,7 @@ public class RdfTest { da = p.parse(rdfXml, D[].class); rdfXml = s.serialize(da); expected = - "<rdf:RDF j='http://www.ibm.com/juneau/' jp='http://www.ibm.com/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "<rdf:RDF j='http://www.apache.org/juneau/' jp='http://www.apache.org/juneaubp/' rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>" + "\n <rdf:Description about='http://localhost/f1/2'>" + "\n <jp:f2>f2</jp:f2>" + "\n <jp:f3 resource='http://localhost/f3/2'/>" http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java b/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java index 9ed18bf..c443e31 100755 --- a/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/json/CommonTest.java @@ -260,18 +260,18 @@ public class CommonTest { +"f0:'f0/x0'," +"f1:'f1/x1'," +"f2:'/f2/x2'," - +"f3:'http://www.ibm.com/f3/x3'," + +"f3:'http://www.apache.org/f3/x3'," +"f4:'f4/x4'," +"f5:'/f5/x5'," - +"f6:'http://www.ibm.com/f6/x6'," - +"f7:'http://www.ibm.com/f7/x7'," + +"f6:'http://www.apache.org/f6/x6'," + +"f7:'http://www.apache.org/f7/x7'," +"f8:'f8/x8'," +"f9:'f9/x9'," - +"fa:'http://www.ibm.com/fa/xa#MY_LABEL'," - +"fb:'http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'," - +"fc:'http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'," - +"fd:'http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'," - +"fe:'http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'" + +"fa:'http://www.apache.org/fa/xa#MY_LABEL'," + +"fb:'http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'," + +"fc:'http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'," + +"fd:'http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'," + +"fe:'http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'" +"}"; assertEquals(expected, r); @@ -285,18 +285,18 @@ public class CommonTest { +"f0:'/cr/f0/x0'," +"f1:'/cr/f1/x1'," +"f2:'/f2/x2'," - +"f3:'http://www.ibm.com/f3/x3'," + +"f3:'http://www.apache.org/f3/x3'," +"f4:'/cr/f4/x4'," +"f5:'/f5/x5'," - +"f6:'http://www.ibm.com/f6/x6'," - +"f7:'http://www.ibm.com/f7/x7'," + +"f6:'http://www.apache.org/f6/x6'," + +"f7:'http://www.apache.org/f7/x7'," +"f8:'/cr/f8/x8'," +"f9:'/cr/f9/x9'," - +"fa:'http://www.ibm.com/fa/xa#MY_LABEL'," - +"fb:'http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'," - +"fc:'http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'," - +"fd:'http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'," - +"fe:'http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'" + +"fa:'http://www.apache.org/fa/xa#MY_LABEL'," + +"fb:'http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'," + +"fc:'http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'," + +"fd:'http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'," + +"fe:'http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'" +"}"; assertEquals(expected, r); @@ -310,18 +310,18 @@ public class CommonTest { +"f0:'/f0/x0'," +"f1:'/f1/x1'," +"f2:'/f2/x2'," - +"f3:'http://www.ibm.com/f3/x3'," + +"f3:'http://www.apache.org/f3/x3'," +"f4:'/f4/x4'," +"f5:'/f5/x5'," - +"f6:'http://www.ibm.com/f6/x6'," - +"f7:'http://www.ibm.com/f7/x7'," + +"f6:'http://www.apache.org/f6/x6'," + +"f7:'http://www.apache.org/f7/x7'," +"f8:'/f8/x8'," +"f9:'/f9/x9'," - +"fa:'http://www.ibm.com/fa/xa#MY_LABEL'," - +"fb:'http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'," - +"fc:'http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'," - +"fd:'http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'," - +"fe:'http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'" + +"fa:'http://www.apache.org/fa/xa#MY_LABEL'," + +"fb:'http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'," + +"fc:'http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'," + +"fd:'http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'," + +"fe:'http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'" +"}"; assertEquals(expected, r); @@ -333,18 +333,18 @@ public class CommonTest { +"f0:'f0/x0'," +"f1:'f1/x1'," +"f2:'http://foo/f2/x2'," - +"f3:'http://www.ibm.com/f3/x3'," + +"f3:'http://www.apache.org/f3/x3'," +"f4:'f4/x4'," +"f5:'http://foo/f5/x5'," - +"f6:'http://www.ibm.com/f6/x6'," - +"f7:'http://www.ibm.com/f7/x7'," + +"f6:'http://www.apache.org/f6/x6'," + +"f7:'http://www.apache.org/f7/x7'," +"f8:'f8/x8'," +"f9:'f9/x9'," - +"fa:'http://www.ibm.com/fa/xa#MY_LABEL'," - +"fb:'http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'," - +"fc:'http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'," - +"fd:'http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'," - +"fe:'http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'" + +"fa:'http://www.apache.org/fa/xa#MY_LABEL'," + +"fb:'http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'," + +"fc:'http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'," + +"fd:'http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'," + +"fe:'http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'" +"}"; assertEquals(expected, r); @@ -358,18 +358,18 @@ public class CommonTest { +"f0:'f0/x0'," +"f1:'f1/x1'," +"f2:'/f2/x2'," - +"f3:'http://www.ibm.com/f3/x3'," + +"f3:'http://www.apache.org/f3/x3'," +"f4:'f4/x4'," +"f5:'/f5/x5'," - +"f6:'http://www.ibm.com/f6/x6'," - +"f7:'http://www.ibm.com/f7/x7'," + +"f6:'http://www.apache.org/f6/x6'," + +"f7:'http://www.apache.org/f7/x7'," +"f8:'f8/x8'," +"f9:'f9/x9'," - +"fa:'http://www.ibm.com/fa/xa#MY_LABEL'," - +"fb:'http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar'," - +"fc:'http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL'," - +"fd:'http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar'," - +"fe:'http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL'" + +"fa:'http://www.apache.org/fa/xa#MY_LABEL'," + +"fb:'http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar'," + +"fc:'http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL'," + +"fd:'http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar'," + +"fe:'http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL'" +"}"; assertEquals(expected, r); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/testbeans/TestURI.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/testbeans/TestURI.java b/juneau-core/src/test/java/org/apache/juneau/testbeans/TestURI.java index 86afcf3..b257cb5 100755 --- a/juneau-core/src/test/java/org/apache/juneau/testbeans/TestURI.java +++ b/juneau-core/src/test/java/org/apache/juneau/testbeans/TestURI.java @@ -46,17 +46,17 @@ public class TestURI { public TestURI() throws Exception { f1 = new URI("f1/x1"); f2 = new URI("/f2/x2"); - f3 = new URI("http://www.ibm.com/f3/x3";); + f3 = new URI("http://www.apache.org/f3/x3";); f4 = "f4/x4"; f5 = "/f5/x5"; - f6 = "http://www.ibm.com/f6/x6";; - f7 = new URL("http://www.ibm.com/f7/x7";); + f6 = "http://www.apache.org/f6/x6";; + f7 = new URL("http://www.apache.org/f7/x7";); f8 = new TestURIb(); - fa = "http://www.ibm.com/fa/xa#MY_LABEL";; - fb = "http://www.ibm.com/fb/xb?label=MY_LABEL&foo=bar";; - fc = "http://www.ibm.com/fc/xc?foo=bar&label=MY_LABEL";; - fd = "http://www.ibm.com/fd/xd?label2=MY_LABEL&foo=bar";; - fe = "http://www.ibm.com/fe/xe?foo=bar&label2=MY_LABEL";; + fa = "http://www.apache.org/fa/xa#MY_LABEL";; + fb = "http://www.apache.org/fb/xb?label=MY_LABEL&foo=bar";; + fc = "http://www.apache.org/fc/xc?foo=bar&label=MY_LABEL";; + fd = "http://www.apache.org/fd/xd?label2=MY_LABEL&foo=bar";; + fe = "http://www.apache.org/fe/xe?foo=bar&label2=MY_LABEL";; } @org.apache.juneau.annotation.URI http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java b/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java index f5c541e..bca30f1 100755 --- a/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java +++ b/juneau-core/src/test/java/org/apache/juneau/urlencoding/Common_UonTest.java @@ -257,18 +257,18 @@ public class Common_UonTest { +"f0=f0/x0," +"f1=f1/x1," +"f2=/f2/x2," - +"f3=http://www.ibm.com/f3/x3,"; + +"f3=http://www.apache.org/f3/x3,"; +"f4=f4/x4," +"f5=/f5/x5," - +"f6=http://www.ibm.com/f6/x6,"; - +"f7=http://www.ibm.com/f7/x7,"; + +"f6=http://www.apache.org/f6/x6,"; + +"f7=http://www.apache.org/f7/x7,"; +"f8=f8/x8," +"f9=f9/x9," - +"fa=http://www.ibm.com/fa/xa#MY_LABEL,"; - +"fb=http://www.ibm.com/fb/xb?label~=MY_LABEL&foo~=bar,"; - +"fc=http://www.ibm.com/fc/xc?foo~=bar&label~=MY_LABEL,"; - +"fd=http://www.ibm.com/fd/xd?label2~=MY_LABEL&foo~=bar,"; - +"fe=http://www.ibm.com/fe/xe?foo~=bar&label2~=MY_LABEL"; + +"fa=http://www.apache.org/fa/xa#MY_LABEL,"; + +"fb=http://www.apache.org/fb/xb?label~=MY_LABEL&foo~=bar,"; + +"fc=http://www.apache.org/fc/xc?foo~=bar&label~=MY_LABEL,"; + +"fd=http://www.apache.org/fd/xd?label2~=MY_LABEL&foo~=bar,"; + +"fe=http://www.apache.org/fe/xe?foo~=bar&label2~=MY_LABEL"; +")"; assertEquals(expected, r); @@ -283,18 +283,18 @@ public class Common_UonTest { +"f0=/cr/f0/x0," +"f1=/cr/f1/x1," +"f2=/f2/x2," - +"f3=http://www.ibm.com/f3/x3,"; + +"f3=http://www.apache.org/f3/x3,"; +"f4=/cr/f4/x4," +"f5=/f5/x5," - +"f6=http://www.ibm.com/f6/x6,"; - +"f7=http://www.ibm.com/f7/x7,"; + +"f6=http://www.apache.org/f6/x6,"; + +"f7=http://www.apache.org/f7/x7,"; +"f8=/cr/f8/x8," +"f9=/cr/f9/x9," - +"fa=http://www.ibm.com/fa/xa#MY_LABEL,"; - +"fb=http://www.ibm.com/fb/xb?label~=MY_LABEL&foo~=bar,"; - +"fc=http://www.ibm.com/fc/xc?foo~=bar&label~=MY_LABEL,"; - +"fd=http://www.ibm.com/fd/xd?label2~=MY_LABEL&foo~=bar,"; - +"fe=http://www.ibm.com/fe/xe?foo~=bar&label2~=MY_LABEL"; + +"fa=http://www.apache.org/fa/xa#MY_LABEL,"; + +"fb=http://www.apache.org/fb/xb?label~=MY_LABEL&foo~=bar,"; + +"fc=http://www.apache.org/fc/xc?foo~=bar&label~=MY_LABEL,"; + +"fd=http://www.apache.org/fd/xd?label2~=MY_LABEL&foo~=bar,"; + +"fe=http://www.apache.org/fe/xe?foo~=bar&label2~=MY_LABEL"; +")"; assertEquals(expected, r); @@ -309,18 +309,18 @@ public class Common_UonTest { +"f0=/f0/x0," +"f1=/f1/x1," +"f2=/f2/x2," - +"f3=http://www.ibm.com/f3/x3,"; + +"f3=http://www.apache.org/f3/x3,"; +"f4=/f4/x4," +"f5=/f5/x5," - +"f6=http://www.ibm.com/f6/x6,"; - +"f7=http://www.ibm.com/f7/x7,"; + +"f6=http://www.apache.org/f6/x6,"; + +"f7=http://www.apache.org/f7/x7,"; +"f8=/f8/x8," +"f9=/f9/x9," - +"fa=http://www.ibm.com/fa/xa#MY_LABEL,"; - +"fb=http://www.ibm.com/fb/xb?label~=MY_LABEL&foo~=bar,"; - +"fc=http://www.ibm.com/fc/xc?foo~=bar&label~=MY_LABEL,"; - +"fd=http://www.ibm.com/fd/xd?label2~=MY_LABEL&foo~=bar,"; - +"fe=http://www.ibm.com/fe/xe?foo~=bar&label2~=MY_LABEL"; + +"fa=http://www.apache.org/fa/xa#MY_LABEL,"; + +"fb=http://www.apache.org/fb/xb?label~=MY_LABEL&foo~=bar,"; + +"fc=http://www.apache.org/fc/xc?foo~=bar&label~=MY_LABEL,"; + +"fd=http://www.apache.org/fd/xd?label2~=MY_LABEL&foo~=bar,"; + +"fe=http://www.apache.org/fe/xe?foo~=bar&label2~=MY_LABEL"; +")"; assertEquals(expected, r); @@ -333,18 +333,18 @@ public class Common_UonTest { +"f0=f0/x0," +"f1=f1/x1," +"f2=http://foo/f2/x2,"; - +"f3=http://www.ibm.com/f3/x3,"; + +"f3=http://www.apache.org/f3/x3,"; +"f4=f4/x4," +"f5=http://foo/f5/x5,"; - +"f6=http://www.ibm.com/f6/x6,"; - +"f7=http://www.ibm.com/f7/x7,"; + +"f6=http://www.apache.org/f6/x6,"; + +"f7=http://www.apache.org/f7/x7,"; +"f8=f8/x8," +"f9=f9/x9," - +"fa=http://www.ibm.com/fa/xa#MY_LABEL,"; - +"fb=http://www.ibm.com/fb/xb?label~=MY_LABEL&foo~=bar,"; - +"fc=http://www.ibm.com/fc/xc?foo~=bar&label~=MY_LABEL,"; - +"fd=http://www.ibm.com/fd/xd?label2~=MY_LABEL&foo~=bar,"; - +"fe=http://www.ibm.com/fe/xe?foo~=bar&label2~=MY_LABEL"; + +"fa=http://www.apache.org/fa/xa#MY_LABEL,"; + +"fb=http://www.apache.org/fb/xb?label~=MY_LABEL&foo~=bar,"; + +"fc=http://www.apache.org/fc/xc?foo~=bar&label~=MY_LABEL,"; + +"fd=http://www.apache.org/fd/xd?label2~=MY_LABEL&foo~=bar,"; + +"fe=http://www.apache.org/fe/xe?foo~=bar&label2~=MY_LABEL"; +")"; assertEquals(expected, r); @@ -359,18 +359,18 @@ public class Common_UonTest { +"f0=f0/x0," +"f1=f1/x1," +"f2=/f2/x2," - +"f3=http://www.ibm.com/f3/x3,"; + +"f3=http://www.apache.org/f3/x3,"; +"f4=f4/x4," +"f5=/f5/x5," - +"f6=http://www.ibm.com/f6/x6,"; - +"f7=http://www.ibm.com/f7/x7,"; + +"f6=http://www.apache.org/f6/x6,"; + +"f7=http://www.apache.org/f7/x7,"; +"f8=f8/x8," +"f9=f9/x9," - +"fa=http://www.ibm.com/fa/xa#MY_LABEL,"; - +"fb=http://www.ibm.com/fb/xb?label~=MY_LABEL&foo~=bar,"; - +"fc=http://www.ibm.com/fc/xc?foo~=bar&label~=MY_LABEL,"; - +"fd=http://www.ibm.com/fd/xd?label2~=MY_LABEL&foo~=bar,"; - +"fe=http://www.ibm.com/fe/xe?foo~=bar&label2~=MY_LABEL"; + +"fa=http://www.apache.org/fa/xa#MY_LABEL,"; + +"fb=http://www.apache.org/fb/xb?label~=MY_LABEL&foo~=bar,"; + +"fc=http://www.apache.org/fc/xc?foo~=bar&label~=MY_LABEL,"; + +"fd=http://www.apache.org/fd/xd?label2~=MY_LABEL&foo~=bar,"; + +"fe=http://www.apache.org/fe/xe?foo~=bar&label2~=MY_LABEL"; +")"; assertEquals(expected, r); }
