JUNEAU-21 - Scrub references to IBM from code Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/09d2d0a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/09d2d0a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/09d2d0a3
Branch: refs/heads/master Commit: 09d2d0a3293e96d23435f77a7da62fcf1f569f9f Parents: c86ae39 Author: JamesBognar <[email protected]> Authored: Mon Nov 14 11:37:58 2016 -0500 Committer: JamesBognar <[email protected]> Committed: Mon Nov 14 11:37:58 2016 -0500 ---------------------------------------------------------------------- .../.settings/org.eclipse.jdt.ui.prefs | 1 - .../java/org/apache/juneau/client/SSLOpts.java | 5 +- juneau-core/.settings/org.eclipse.jdt.ui.prefs | 1 - .../java/org/apache/juneau/BeanContext.java | 2 +- .../main/java/org/apache/juneau/ObjectMap.java | 6 +- .../org/apache/juneau/dto/atom/package.html | 30 +- .../apache/juneau/dto/jsonschema/Sample.java | 2 +- .../java/org/apache/juneau/ini/package.html | 6 +- .../apache/juneau/internal/JuneauLogger.java | 4 +- .../apache/juneau/jena/RdfCommonContext.java | 8 +- .../java/org/apache/juneau/jena/RdfParser.java | 2 +- .../apache/juneau/jena/RdfParserContext.java | 4 +- .../juneau/jena/RdfSerializerContext.java | 6 +- .../juneau/jena/annotation/RdfSchema.java | 12 +- .../java/org/apache/juneau/jena/package.html | 66 +-- .../org/apache/juneau/utils/MessageBundle.java | 4 +- .../apache/juneau/xml/XmlSerializerContext.java | 2 +- .../apache/juneau/xml/annotation/XmlSchema.java | 12 +- .../java/org/apache/juneau/xml/package.html | 170 +++--- juneau-core/src/main/javadoc/overview.html | 124 ++--- .../org/apache/juneau/dto/atom/AtomTest.java | 36 +- .../java/org/apache/juneau/html/CommonTest.java | 128 ++--- .../java/org/apache/juneau/html/HtmlTest.java | 128 ++--- .../apache/juneau/jena/CommonParserTest.java | 4 +- .../java/org/apache/juneau/jena/CommonTest.java | 84 +-- .../org/apache/juneau/jena/RdfParserTest.java | 2 +- .../java/org/apache/juneau/jena/RdfTest.java | 22 +- .../java/org/apache/juneau/json/CommonTest.java | 80 +-- .../org/apache/juneau/testbeans/TestURI.java | 16 +- .../juneau/urlencoding/Common_UonTest.java | 80 +-- .../urlencoding/Common_UrlEncodingTest.java | 80 +-- .../java/org/apache/juneau/xml/CommonTest.java | 80 +-- .../java/org/apache/juneau/xml/XmlTest.java | 60 +-- .../src/test/resources/dto/atom/test1.xml | 40 +- .../src/test/resources/dto/atom/test2.xml | 42 +- .../src/test/resources/dto/atom/test3.xml | 40 +- .../test/resources/json/BrokenCognosOutput.json | 2 +- .../src/test/resources/xml/testNamespaces.xml | 2 +- juneau-microservice-template/microservice.cfg | 4 +- .../juneau/microservice/RestMicroservice.java | 4 +- .../org/apache/juneau/microservice/package.html | 8 +- juneau-releng/build.xml | 519 ------------------- juneau-samples/samples.cfg | 2 +- .../samples/addressbook/package-info.java | 16 +- .../juneau/server/samples/AtomFeedResource.java | 6 +- juneau-samples/src/main/resources/samples.cfg | 2 +- .../.settings/org.eclipse.jdt.ui.prefs | 1 - juneau-server-test/juneau-server-test.cfg | 2 +- .../.settings/org.eclipse.jdt.ui.prefs | 1 - .../juneau/server/annotation/RestResource.java | 16 +- .../org/apache/juneau/server/jaxrs/package.html | 6 +- .../java/org/apache/juneau/server/package.html | 16 +- 52 files changed, 732 insertions(+), 1264 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-client/.settings/org.eclipse.jdt.ui.prefs ---------------------------------------------------------------------- diff --git a/juneau-client/.settings/org.eclipse.jdt.ui.prefs b/juneau-client/.settings/org.eclipse.jdt.ui.prefs index 18a1f0f..b892662 100755 --- a/juneau-client/.settings/org.eclipse.jdt.ui.prefs +++ b/juneau-client/.settings/org.eclipse.jdt.ui.prefs @@ -128,7 +128,6 @@ sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false -sp_cleanup.update_ibm_copyright_to_current_year=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false sp_cleanup.use_parentheses_in_expressions=false http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-client/src/main/java/org/apache/juneau/client/SSLOpts.java ---------------------------------------------------------------------- diff --git a/juneau-client/src/main/java/org/apache/juneau/client/SSLOpts.java b/juneau-client/src/main/java/org/apache/juneau/client/SSLOpts.java index 40dd8c7..97fd5e3 100755 --- a/juneau-client/src/main/java/org/apache/juneau/client/SSLOpts.java +++ b/juneau-client/src/main/java/org/apache/juneau/client/SSLOpts.java @@ -62,7 +62,6 @@ public class SSLOpts { * The default value is <jk>"SSL_TLS,TLS,SSL"</js> unless overridden by one of the following * system properties: * <ul> - * <li><js>"com.ibm.team.repository.transport.client.protocol"</js> * <li><js>"transport.client.protocol"</js> * </ul> * <p> @@ -71,9 +70,7 @@ public class SSLOpts { * @return The comma-delimited list of supported protocols. */ protected String getDefaultProtocols() { - String sp = System.getProperty("com.ibm.team.repository.transport.client.protocol"); - if (StringUtils.isEmpty(sp)) - sp = System.getProperty("transport.client.protocol"); + String sp = System.getProperty("transport.client.protocol"); if (StringUtils.isEmpty(sp)) sp = "SSL_TLS,TLS,SSL"; return sp; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/.settings/org.eclipse.jdt.ui.prefs ---------------------------------------------------------------------- diff --git a/juneau-core/.settings/org.eclipse.jdt.ui.prefs b/juneau-core/.settings/org.eclipse.jdt.ui.prefs index f058d1a..5cc218e 100755 --- a/juneau-core/.settings/org.eclipse.jdt.ui.prefs +++ b/juneau-core/.settings/org.eclipse.jdt.ui.prefs @@ -131,7 +131,6 @@ sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true sp_cleanup.sort_members=false sp_cleanup.sort_members_all=false -sp_cleanup.update_ibm_copyright_to_current_year=false sp_cleanup.use_anonymous_class_creation=false sp_cleanup.use_blocks=false sp_cleanup.use_blocks_only_for_return_and_throw=false http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/BeanContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java index 7e7d5fb..7486bba 100644 --- a/juneau-core/src/main/java/org/apache/juneau/BeanContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/BeanContext.java @@ -1667,7 +1667,7 @@ public class BeanContext extends Context { * <h6 class='topic'>Example:</h6> * <ul> * <li><js>"java.lang.String"</js> - * <li><js>"com.ibm.sample.MyBean[]"</js> + * <li><js>"com.foo.sample.MyBean[]"</js> * <li><js>"java.util.HashMap<java.lang.String,java.lang.Integer>"</js> * <li><js>"[Ljava.lang.String;"</js> (i.e. the value of <code>String[].<jk>class</jk>.getName()</code>) * </ul> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java index 73e7443..0ffe5bd 100644 --- a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java +++ b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java @@ -1074,7 +1074,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { * </p> * <p class='bcode'> * { - * _type: <js>'com.ibm.sample.addressBook.Person'</js>, + * _type: <js>'org.apache.juneau.samples.addressbook.Person'</js>, * name: <js>'John Smith'</js>, * ... * } @@ -1107,7 +1107,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { * } * <jc>// LinkedList of beans</jc> * { - * _type: <js>'java.util.LinkedList<com.ibm.sample.addressBook.Person>'</js>, + * _type: <js>'java.util.LinkedList<org.apache.juneau.samples.addressbook.Person>'</js>, * items: [ { name: <js>'John Smith'</js>, ... }, ... ] * } * </p> @@ -1122,7 +1122,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> { * } * <jc>// Array of beans</jc> * { - * _type: <js>'com.ibm.sample.addressBook.Person[]'</js>, + * _type: <js>'org.apache.juneau.samples.addressbook.Person[]'</js>, * items: [ { name: <js>'John Smith'</js>, ... }, ... ] * } * </p> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html index e5b4f90..4acc318 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/dto/atom/package.html @@ -101,7 +101,7 @@ <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) 2016, Apache Foundation"</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>)) + .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>)) @@ -119,7 +119,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>*lt;i>[Update: Juneau supports ATOM.]</i></p></div>"</js>) ) @@ -154,7 +154,7 @@ Juneau ATOM specification <xt></title></xt> <xt><updated></xt>2013-05-08T12:29:29Z<xt></updated></xt> - <xt><generator</xt> <xa>uri</xa>=<xs>'http://juneau.ibm.com/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>></xt> + <xt><generator</xt> <xa>uri</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>></xt> Juneau <xt></generator></xt> <xt><subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>></xt> @@ -178,7 +178,7 @@ Juneau ATOM specification snapshot <xt></title></xt> <xt><updated></xt>2013-05-08T12:29:29Z<xt></updated></xt> - <xt><content</xt> <xa>base</xa>=<xs>'http://www.ibm.com/'</xs> <xa>lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>></xt> + <xt><content</xt> <xa>base</xa>=<xs>'http://www.apache.org/'</xs> <xa>lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>></xt> <xt><div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml";</xs><xt>><p><i></xt>[Update: Juneau supports ATOM.]<xt></i></p></div></xt> <xt></content></xt> <xt><published></xt>2013-05-08T12:29:29Z<xt></published></xt> @@ -202,7 +202,7 @@ <h6 class='figure'>Results</h6> <p class='bcode'> <xt><atom:feed</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs> <xa>xmlns:xml</xa>=<xs>'http://www.w3.org/XML/1998/namespace'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs><xt>></xt> @@ -218,7 +218,7 @@ Juneau ATOM specification <xt></atom:title></xt> <xt><atom:updated></xt>2013-05-08T12:29:29Z<xt></atom:updated></xt> - <xt><atom:generator</xt> <xa>uri</xa>=<xs>'http://juneau.ibm.com/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>></xt> + <xt><atom:generator</xt> <xa>uri</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>></xt> Juneau <xt></atom:generator></xt> <xt><atom:subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>></xt> @@ -242,7 +242,7 @@ Juneau ATOM specification snapshot <xt></atom:title></xt> <xt><atom:updated></xt>2013-05-08T12:29:29Z<xt></atom:updated></xt> - <xt><atom:content</xt> <xa>xml:base</xa>=<xs>'http://www.ibm.com/'</xs> <xa>xml:lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>></xt> + <xt><atom:content</xt> <xa>xml:base</xa>=<xs>'http://www.apache.org/'</xs> <xa>xml:lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>></xt> <xt><div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml";</xs><xt>></xt><xt><p></xt><xt><i></xt>[Update: Juneau supports ATOM.]<xt></i></xt><xt></p></xt><xt></div></xt> <xt></atom:content></xt> <xt><atom:published></xt>2013-05-08T12:29:29Z<xt></atom:published></xt> @@ -281,7 +281,7 @@ Juneau ATOM specification <xt></title></xt> <xt><updated></xt>2013-05-08T12:29:29Z<xt></updated></xt> - <xt><generator</xt> <xa>uri</xa>=<xs>'http://juneau.ibm.com/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>></xt> + <xt><generator</xt> <xa>uri</xa>=<xs>'http://juneau.apache.org/'</xs> <xa>version</xa>=<xs>'1.0'</xs><xt>></xt> Juneau <xt></generator></xt> <xt><subtitle</xt> <xa>type</xa>=<xs>'html'</xs><xt>></xt> @@ -305,7 +305,7 @@ Juneau ATOM specification snapshot <xt></title></xt> <xt><updated></xt>2013-05-08T12:29:29Z<xt></updated></xt> - <xt><content</xt> <xa>xml:base</xa>=<xs>'http://www.ibm.com/'</xs> <xa>xml:lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>></xt> + <xt><content</xt> <xa>xml:base</xa>=<xs>'http://www.apache.org/'</xs> <xa>xml:lang</xa>=<xs>'en'</xs> <xa>type</xa>=<xs>'xhtml'</xs><xt>></xt> <xt><div</xt> <xa>xmlns</xa>=<xs>"http://www.w3.org/1999/xhtml";</xs><xt>></xt><xt><p></xt><xt><i></xt>[Update: Juneau supports ATOM.]<xt></i></xt><xt></p></xt><xt></div></xt> <xt></content></xt> <xt><published></xt>2013-05-08T12:29:29Z<xt></published></xt> @@ -359,7 +359,7 @@ }, updated: <js>'2013-05-08T12:29:29Z'</js>, generator: { - uri: <js>'http://juneau.ibm.com/'</js>, + uri: <js>'http://juneau.apache.org/'</js>, version: <js>'1.0'</js>, text: <js>'Juneau'</js> }, @@ -402,7 +402,7 @@ }, updated: <js>'2013-05-08T12:29:29Z'</js>, content: { - base: <js>'http://www.ibm.com/'</js>, + base: <js>'http://www.apache.org/'</js>, lang: <js>'en'</js>, type: <js>'xhtml'</js>, text: <js>'<div xmlns="http://www.w3.org/1999/xhtml"><p><i>[Update: Juneau supports ATOM.]</i></p></div>'</js> @@ -439,8 +439,8 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>'http://www.w3.org/1999/02/22-rdf-syntax-ns#'</xs> - <xa>xmlns:j</xa>=<xs>'http://www.ibm.com/juneau/'</xs> - <xa>xmlns:jp</xa>=<xs>'http://www.ibm.com/juneaubp/'</xs> + <xa>xmlns:j</xa>=<xs>'http://www.apache.org/juneau/'</xs> + <xa>xmlns:jp</xa>=<xs>'http://www.apache.org/juneaubp/'</xs> <xa>xmlns:atom</xa>=<xs>'http://www.w3.org/2005/Atom/'</xs> <xa>xmlns:j.0</xa>=<xs>'http://www.w3.org/XML/1998/'</xs><xt>></xt> <xt><rdf:Description></xt> @@ -471,7 +471,7 @@ <xt></atom:title></xt> <xt><atom:updated></xt>2013-05-08T12:29:29Z<xt></atom:updated></xt> <xt><atom:generator</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt> - <xt><atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.ibm.com/'</xs><xt>/></xt> + <xt><atom:uri</xt> <xa>rdf:resource</xa>=<xs>'http://juneau.apache.org/'</xs><xt>/></xt> <xt><atom:version></xt>1.0<xt></atom:version></xt> <xt><atom:text></xt>Juneau<xt></atom:text></xt> <xt></atom:generator></xt> @@ -521,7 +521,7 @@ <xt></atom:title></xt> <xt><atom:updated></xt>2013-05-08T12:29:29Z<xt></atom:updated></xt> <xt><atom:content</xt> <xa>rdf:parseType</xa>=<xs>'Resource'</xs><xt>></xt> - <xt><j.0:namespacebase</xt> <xa>rdf:resource</xa>=<xs>'http://www.ibm.com/'</xs><xt>/></xt> + <xt><j.0:namespacebase</xt> <xa>rdf:resource</xa>=<xs>'http://www.apache.org/'</xs><xt>/></xt> <xt><j.0:namespacelang></xt>en<xt></j.0:namespacelang></xt> <xt><atom:type></xt>xhtml<xt></atom:type></xt> <xt><atom:text></xt>&lt;div xmlns="http://www.w3.org/1999/xhtml"&gt;&lt;p&gt;&lt;i&gt;[Update: Juneau supports ATOM.]&lt;/i&gt;&lt;/p&gt;&lt;/div&gt;<xt></atom:text></xt> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Sample.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Sample.java b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Sample.java index b136b2d..8e37172 100644 --- a/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Sample.java +++ b/juneau-core/src/main/java/org/apache/juneau/dto/jsonschema/Sample.java @@ -47,7 +47,7 @@ class Sample { }; // Get schema from the schema map. - Schema purchaseOrderSchema = schemaMap.get("http://www.ibm.com/purchase-order/PurchaseOrder#";); + Schema purchaseOrderSchema = schemaMap.get("http://www.apache.org/purchase-order/PurchaseOrder#";); JsonType streetType = purchaseOrderSchema .getProperty("address",true) // Get "address" property, resolved to Address schema. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/ini/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/package.html b/juneau-core/src/main/java/org/apache/juneau/ini/package.html index e7c5408..141999c 100644 --- a/juneau-core/src/main/java/org/apache/juneau/ini/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/ini/package.html @@ -397,7 +397,7 @@ <p> The <code>org.apache.juneau.microservice.resources.ConfigResource</code> is a predefined REST interface that allows access to the config file used by a microservice.<br> - The <code>com.ibm.team.juneau.samples</code> project is a microservice that includes this resource + The <code>juneau-samples</code> project is a microservice that includes this resource at <code>http://localhost:10000/sample/config</code>.<br> The sample microservice uses the following config file <code>juneau-samples.cfg</code>: </p> @@ -418,7 +418,7 @@ <cc># A JSON map of servlet paths to servlet classes. # Example: - # resourceMap = {'/*':'com.ibm.MyServlet'} + # resourceMap = {'/*':'com.foo.MyServlet'} # Either resourceMap or resources must be specified.</cc> <ck>resourceMap</ck> = @@ -426,7 +426,7 @@ # Resource paths are pulled from @RestResource.path() annotation, or # "/*" if annotation not specified. # Example: - # resources = com.ibm.MyServlet + # resources = com.foo.MyServlet # Default is Rest-Resources in manifest file. # Either resourceMap or resources must be specified.</cc> <ck>resources</ck> = http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java b/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java index bd537b5..acd9ed8 100644 --- a/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java +++ b/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java @@ -60,7 +60,7 @@ public class JuneauLogger extends java.util.logging.Logger { * @param resourceBundleName The name of the resource bundle. * Can be any of the following formats: * <ol> - * <li>An absolute path. E.g. <js>"com/ibm/nls/Messages"</js>. + * <li>An absolute path. E.g. <js>"com/foo/nls/Messages"</js>. * <li>A path relative to the package of the class. E.g. <js>"nls/Messages"</js>. * </ol> * Both <js>'.'</js> and <js>'/'</js> can be used as path delimiters. @@ -77,7 +77,7 @@ public class JuneauLogger extends java.util.logging.Logger { * @param resourceBundleName The name of the resource bundle. * Can be any of the following formats: * <ol> - * <li>An absolute path. E.g. <js>"com/ibm/nls/Messages"</js>. + * <li>An absolute path. E.g. <js>"com/foo/nls/Messages"</js>. * <li>A path relative to the package of the class. E.g. <js>"nls/Messages"</js>. * </ol> * Both <js>'.'</js> and <js>'/'</js> can be used as path delimiters. http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/jena/RdfCommonContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfCommonContext.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfCommonContext.java index 5d2fa5c..bb75270 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfCommonContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfCommonContext.java @@ -35,13 +35,13 @@ import org.apache.juneau.xml.annotation.*; * <td>{@link #RDF_juneauNs}</td> * <td>XML namespace for Juneau properties.</td> * <td>{@link Namespace}</td> - * <td><code>{j:<js>'http://www.ibm.com/juneau/'</js>}</code></td> + * <td><code>{j:<js>'http://www.apache.org/juneau/'</js>}</code></td> * </tr> * <tr> * <td>{@link #RDF_juneauBpNs}</td> * <td>Default XML namespace for bean properties.</td> * <td>{@link Namespace}</td> - * <td><code>{j:<js>'http://www.ibm.com/juneaubp/'</js>}</code></td> + * <td><code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code></td> * </tr> * <tr> * <td>{@link #RDF_useXmlNamespaces}</td> @@ -268,7 +268,7 @@ public interface RdfCommonContext { * <ul> * <li><b>Name:</b> <js>"Rdf.juneauNs"</js> * <li><b>Data type:</b> {@link Namespace} - * <li><b>Default:</b> <code>{j:<js>'http://www.ibm.com/juneau/'</js>}</code> + * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneau/'</js>}</code> * </ul> */ public static final String RDF_juneauNs = "Rdf.juneauNs"; @@ -279,7 +279,7 @@ public interface RdfCommonContext { * <ul> * <li><b>Name:</b> <js>"Rdf.juneauBpNs"</js> * <li><b>Data type:</b> {@link Namespace} - * <li><b>Default:</b> <code>{j:<js>'http://www.ibm.com/juneaubp/'</js>}</code> + * <li><b>Default:</b> <code>{j:<js>'http://www.apache.org/juneaubp/'</js>}</code> * </ul> */ public static final String RDF_juneauBpNs = "Rdf.juneauBpNs"; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java index 00dd08a..4c5fdec 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParser.java @@ -154,7 +154,7 @@ public class RdfParser extends ReaderParser { private List<Resource> getRoots(RdfParserSession session, Model m) { List<Resource> l = new LinkedList<Resource>(); - // First try to find the root using the "http://www.ibm.com/juneau/root"; property. + // First try to find the root using the "http://www.apache.org/juneau/root"; property. Property root = m.createProperty(session.getJuneauNsUri(), RDF_juneauNs_ROOT); for (ResIterator i = m.listResourcesWithProperty(root); i.hasNext();) l.add(i.next()); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/jena/RdfParserContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParserContext.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParserContext.java index 9f047ad..e76d480 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfParserContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfParserContext.java @@ -96,8 +96,8 @@ public final class RdfParserContext extends ParserContext implements RdfCommonCo trimWhitespace = cf.getProperty(RDF_trimWhitespace, boolean.class, false); looseCollections = cf.getProperty(RDF_looseCollections, boolean.class, false); rdfLanguage = cf.getProperty(RDF_language, String.class, "RDF/XML-ABBREV"); - juneauNs = cf.getProperty(RDF_juneauNs, Namespace.class, new Namespace("j", "http://www.ibm.com/juneau/";)); - juneauBpNs = cf.getProperty(RDF_juneauBpNs, Namespace.class, new Namespace("j", "http://www.ibm.com/juneaubp/";)); + juneauNs = cf.getProperty(RDF_juneauNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneau/";)); + juneauBpNs = cf.getProperty(RDF_juneauBpNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneaubp/";)); collectionFormat = cf.getProperty(RDF_collectionFormat, RdfCollectionFormat.class, RdfCollectionFormat.DEFAULT); } } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java index 6819f66..df39e12 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java @@ -103,7 +103,7 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf * <li><b>Default:</b> <jk>false</jk> * </ul> * <p> - * When enabled an RDF property <code>http://www.ibm.com/juneau/root</code> is added with a value of <js>"true"</js> + * When enabled an RDF property <code>http://www.apache.org/juneau/root</code> is added with a value of <js>"true"</js> * to identify the root node in the graph. * This helps locate the root node during parsing. * <p> @@ -167,8 +167,8 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf looseCollections = cf.getProperty(RDF_looseCollections, boolean.class, false); autoDetectNamespaces = cf.getProperty(RDF_autoDetectNamespaces, boolean.class, true); rdfLanguage = cf.getProperty(RDF_language, String.class, "RDF/XML-ABBREV"); - juneauNs = cf.getProperty(RDF_juneauNs, Namespace.class, new Namespace("j", "http://www.ibm.com/juneau/";)); - juneauBpNs = cf.getProperty(RDF_juneauBpNs, Namespace.class, new Namespace("jp", "http://www.ibm.com/juneaubp/";)); + juneauNs = cf.getProperty(RDF_juneauNs, Namespace.class, new Namespace("j", "http://www.apache.org/juneau/";)); + juneauBpNs = cf.getProperty(RDF_juneauBpNs, Namespace.class, new Namespace("jp", "http://www.apache.org/juneaubp/";)); collectionFormat = cf.getProperty(RDF_collectionFormat, RdfCollectionFormat.class, RdfCollectionFormat.DEFAULT); namespaces = cf.getProperty(RDF_namespaces, Namespace[].class, new Namespace[0]); } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java b/juneau-core/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java index bd772b7..2db47b4 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java +++ b/juneau-core/src/main/java/org/apache/juneau/jena/annotation/RdfSchema.java @@ -62,20 +62,20 @@ public @interface RdfSchema { * <jc>// XML namespaces used within this package.</jc> * <ja>@RdfSchema</ja>(prefix=<js>"ab"</js>, * namespaces={ - * <ja>@RdfNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.ibm.com/addressBook/";</js>), - * <ja>@RdfNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.ibm.com/person/";</js>), - * <ja>@RdfNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.ibm.com/address/";</js>), - * <ja>@RdfNs</ja>(prefix=<js>"mail"</js>, namespaceURI="<js>http://www.ibm.com/mail/";</js>) + * <ja>@RdfNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.apache.org/addressBook/";</js>), + * <ja>@RdfNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.apache.org/person/";</js>), + * <ja>@RdfNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.apache.org/address/";</js>), + * <ja>@RdfNs</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.rdf.annotation.*; * </p> * <p> * Class in package using defined namespaces... * </p> * <p class='bcode'> - * <jk>package</jk> com.ibm.sample.addressbook; + * <jk>package</jk> org.apache.juneau.samples.addressbook; * * <jc>// Bean class, override "ab" namespace on package.</jc> * <ja>@Rdf</ja>(prefix=<js>"addr"</js>) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/jena/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/jena/package.html b/juneau-core/src/main/java/org/apache/juneau/jena/package.html index 2d9a689..788b25d 100644 --- a/juneau-core/src/main/java/org/apache/juneau/jena/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/jena/package.html @@ -133,7 +133,7 @@ The predefined serializers and parsers convert POJOs to and from RDF models and then uses Jena to convert them to and from the various RDF languages. </p> <p> - Since Juneau is 100% pure IBM code, the Jena libraries must be provided on the classpath separately if you plan on making use of the RDF support. + Jena libraries must be provided on the classpath separately if you plan on making use of the RDF support. </p> <p> The minimum list of required jars are: @@ -259,8 +259,8 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs><xt>></xt> <xt><rdf:Description></xt> <xt><jp:id></xt>1<xt></jp:id></xt> <xt><jp:name></xt>John Smith<xt></jp:name></xt> @@ -307,13 +307,13 @@ <ja>@RdfSchema</ja>( prefix=<js>"ab"</js>, rdfNs={ - <ja>@RdfNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.ibm.com/addressBook/";</js>), - <ja>@RdfNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.ibm.com/person/";</js>), - <ja>@RdfNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.ibm.com/address/";</js>), - <ja>@RdfNs</ja>(prefix=<js>"mail"</js>, namespaceURI=<js>"http://www.ibm.com/mail/";</js>) + <ja>@RdfNs</ja>(prefix=<js>"ab"</js>, namespaceURI=<js>"http://www.apache.org/addressBook/";</js>), + <ja>@RdfNs</ja>(prefix=<js>"per"</js>, namespaceURI=<js>"http://www.apache.org/person/";</js>), + <ja>@RdfNs</ja>(prefix=<js>"addr"</js>, namespaceURI=<js>"http://www.apache.org/address/";</js>), + <ja>@RdfNs</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.sample.addressbook; <jk>import</jk> org.apache.juneau.xml.annotation.*; </p> <p> @@ -326,9 +326,9 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> - <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs> + <xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/";</xs><xt>></xt> <xt><rdf:Description></xt> <xt><per:id></xt>1<xt></per:id></xt> <xt><per:name></xt>John Smith<xt></per:name></xt> @@ -347,7 +347,7 @@ RdfSerializer s = <jk>new</jk> RdfSerializer.XmlAbbrev() .setProperty(RdfProperties.<jsf>RDF_rdfxml_tab</jsf>, 3) .setProperty(XmlSerializerContext.<jsf>XML_autoDetectNamespaces</jsf>, <jk>false</jk>) - .setProperty(XmlSerializerContext.<jsf>XML_namespaces</jsf>, <js>"{per:'http://www.ibm.com/person/'}"</js>); + .setProperty(XmlSerializerContext.<jsf>XML_namespaces</jsf>, <js>"{per:'http://www.apache.org/person/'}"</js>); </p> <p> This code change will produce the same output as before, but will perform slightly better since it doesn't have to crawl the POJO tree before serializing the result. @@ -401,9 +401,9 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> - <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs> + <xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/";</xs><xt>></xt> <xt><rdf:Description <b><xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1";</xs></b>></xt> <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -502,9 +502,9 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> - <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs> + <xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/";</xs><xt>></xt> <xt><rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1";</xs>></xt> <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -580,11 +580,11 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> - <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs> - <b><xa>xmlns:mail</xa>=<xs>"http://www.ibm.com/mail/";</xs></b> - <b><xa>xmlns:addr</xa>=<xs>"http://www.ibm.com/address/";</xs></b><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs> + <xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/";</xs> + <b><xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/";</xs></b> + <b><xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/";</xs></b><xt>></xt> <xt><rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1";</xs>></xt> <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -645,11 +645,11 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> - <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs> - <xa>xmlns:mail</xa>=<xs>"http://www.ibm.com/mail/";</xs> - <xa>xmlns:addr</xa>=<xs>"http://www.ibm.com/address/";</xs><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs> + <xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/";</xs> + <xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/";</xs> + <xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/";</xs><xt>></xt> <xt><rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1";</xs>></xt> <b><xt><j:root></xt>true<xt></j:root></xt></b> <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> @@ -699,11 +699,11 @@ <p class='bcode'> <xt><rdf:RDF</xt> <xa>xmlns:rdf</xa>=<xs>"http://www.w3.org/1999/02/22-rdf-syntax-ns#";</xs> - <xa>xmlns:j</xa>=<xs>"http://www.ibm.com/juneau/";</xs> - <xa>xmlns:jp</xa>=<xs>"http://www.ibm.com/juneaubp/";</xs> - <xa>xmlns:per</xa>=<xs>"http://www.ibm.com/person/";</xs> - <xa>xmlns:mail</xa>=<xs>"http://www.ibm.com/mail/";</xs> - <xa>xmlns:addr</xa>=<xs>"http://www.ibm.com/address/";</xs><xt>></xt> + <xa>xmlns:j</xa>=<xs>"http://www.apache.org/juneau/";</xs> + <xa>xmlns:jp</xa>=<xs>"http://www.apache.org/juneaubp/";</xs> + <xa>xmlns:per</xa>=<xs>"http://www.apache.org/person/";</xs> + <xa>xmlns:mail</xa>=<xs>"http://www.apache.org/mail/";</xs> + <xa>xmlns:addr</xa>=<xs>"http://www.apache.org/address/";</xs><xt>></xt> <xt><rdf:Description <xa>rdf:about</xa>=<xs>"http://sample/addressBook/person/1";</xs>></xt> <xt><per:addressBookUri</xt> <xa>rdf:resource</xa>=<xs>"http://sample/addressBook";</xs><xt>/></xt> <xt><per:id</xt> <b><xa>rdf:datatype</xa>=<xs>"http://www.w3.org/2001/XMLSchema#int";</xs></b><xt>></xt>1<xt></per:id></xt> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java b/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java index abbeeb3..6d3a4cb 100644 --- a/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java +++ b/juneau-core/src/main/java/org/apache/juneau/utils/MessageBundle.java @@ -78,8 +78,8 @@ public class MessageBundle extends ResourceBundle { * * @param forClass The class using this resource bundle. * @param bundlePath The path of the resource bundle to wrap. - * This can be an absolute path (e.g. <js>"com.ibm.MyMessages"</js>) or a path - * relative to the package of the <l>forClass</l> (e.g. <js>"MyMessages"</js> if <l>forClass</l> is <js>"com.ibm.MyClass"</js>). + * This can be an absolute path (e.g. <js>"com.foo.MyMessages"</js>) or a path + * relative to the package of the <l>forClass</l> (e.g. <js>"MyMessages"</js> if <l>forClass</l> is <js>"com.foo.MyClass"</js>). */ public MessageBundle(Class<?> forClass, String bundlePath) { this(forClass, bundlePath, Locale.getDefault()); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java index ad2001c..5809c5a 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerContext.java @@ -278,7 +278,7 @@ public class XmlSerializerContext extends SerializerContext { autoDetectNamespaces = cf.getProperty(XML_autoDetectNamespaces, boolean.class, true); enableNamespaces = cf.getProperty(XML_enableNamespaces, boolean.class, true); addNamespaceUrlsToRoot = cf.getProperty(XML_addNamespaceUrisToRoot, boolean.class, true); - defaultNamespace = cf.getProperty(XML_defaultNamespaceUri, String.class, "{juneau:'http://www.ibm.com/2013/Juneau'}"); + defaultNamespace = cf.getProperty(XML_defaultNamespaceUri, String.class, "{juneau:'http://www.apache.org/2013/Juneau'}"); xsNamespace = cf.getProperty(XML_xsNamespace, Namespace.class, new Namespace("xs", "http://www.w3.org/2001/XMLSchema";)); xsiNamespace = cf.getProperty(XML_xsiNamespace, Namespace.class, new Namespace("xsi", "http://www.w3.org/2001/XMLSchema-instance";)); namespaces = cf.getProperty(XML_namespaces, Namespace[].class, new Namespace[0]); http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java index 21b1717..8cb98fa 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java +++ b/juneau-core/src/main/java/org/apache/juneau/xml/annotation/XmlSchema.java @@ -62,20 +62,20 @@ public @interface XmlSchema { * <jc>// XML namespaces used within this package.</jc> * <ja>@XmlSchema</ja>(prefix=<js>"ab"</js>, * namespaces={ - * <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.*; * </p> * <p> * Class in package using defined namespaces... * </p> * <p class='bcode'> - * <jk>package</jk> com.ibm.sample.addressbook; + * <jk>package</jk> corg.apache.juneau.samples.addressbook; * * <jc>// Bean class, override "ab" namespace on package.</jc> * <ja>@Xml</ja>(prefix=<js>"addr"</js>) http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/09d2d0a3/juneau-core/src/main/java/org/apache/juneau/xml/package.html ---------------------------------------------------------------------- diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/package.html b/juneau-core/src/main/java/org/apache/juneau/xml/package.html index 83eb7cb..7048618 100644 --- a/juneau-core/src/main/java/org/apache/juneau/xml/package.html +++ b/juneau-core/src/main/java/org/apache/juneau/xml/package.html @@ -579,7 +579,7 @@ </p> <p class='bcode'> <xt><object</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs><xt>></xt> <xt><id></xt>1<xt></id></xt> <xt><name></xt>John Smith<xt></name></xt> @@ -607,17 +607,17 @@ <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.*; </p> <p> - We're defining four namespaces in this package and designating <js>"http://www.ibm.com/addressBook/";</js> as the default + We're defining four namespaces in this package and designating <js>"http://www.apache.org/addressBook/";</js> as the default namespace for all classes and properties within this package. </p> <p> @@ -630,7 +630,7 @@ This may change in some future implementation, but for now it was decided that having separate Juneau XML annotations was less confusing. </p> <p> - On our bean class, we'll specify to use the <js>"http://www.ibm.com/person/";</js> namespace: + On our bean class, we'll specify to use the <js>"http://www.apache.org/person/";</js> namespace: </p> <p class='bcode'> <ja>@Xml</ja>(prefix=<js>"per"</js>) @@ -643,8 +643,8 @@ </p> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> <xt><per:name></xt>John Smith<xt></per:name></xt> @@ -658,15 +658,15 @@ XmlSerializer s = <jk>new</jk> XmlSerializer() .setProperty(SerializerContext.<jsf>SERIALIZER_useIndentation</jsf>, <jk>true</jk>) .setProperty(SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, <js>'\''</js>) - .setProperty(XmlSerializerContext.<jsf>XML_defaultNamespaceUri</jsf>, <js>"http://www.ibm.com/person/";</js>); + .setProperty(XmlSerializerContext.<jsf>XML_defaultNamespaceUri</jsf>, <js>"http://www.apache.org/person/";</js>); </p> <p> This produces the following equivalent where the elements don't need prefixes since they're already in the default document namespace: </p> <p class='bcode'> <xt><person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:juneau</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:juneau</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs><xt>></xt> <xt><id></xt>1<xt></id></xt> <xt><name></xt>John Smith<xt></name></xt> @@ -693,7 +693,7 @@ .setProperty(SerializerContext.<jsf>SERIALIZER_useIndentation</jsf>, <jk>true</jk>) .setProperty(SerializerContext.<jsf>SERIALIZER_quoteChar</jsf>, <js>'\''</js>) .setProperty(XmlSerializerContext.<jsf>XML_autoDetectNamespaces</jsf>, <jk>false</jk>) - .setProperty(XmlSerializerContext.<jsf>XML_namespaces</jsf>, <js>"{per:'http://www.ibm.com/person/'}"</js>); + .setProperty(XmlSerializerContext.<jsf>XML_namespaces</jsf>, <js>"{per:'http://www.apache.org/person/'}"</js>); </p> </div> @@ -749,8 +749,8 @@ </p> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -775,8 +775,8 @@ <h6 class='figure'>Results</h6> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -847,10 +847,10 @@ </p> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -970,7 +970,7 @@ <h6 class='figure'>XML results</h6> <p class='bcode'> <xt><person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><id></xt>1<xt></id></xt> @@ -994,17 +994,17 @@ <p class='bcode'> <xt><schema</xt> <xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> - <xa>targetNamespace</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> + <xa>targetNamespace</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>elementFormDefault</xa>=<xs>'qualified'</xs> - <xa>xmlns:juneau</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs><xt>></xt> - <xt><element</xt> <xa>name</xa>=<xs>'person'</xs> <xa>type</xa>=<xs>'juneau:com.ibm.sample.Person'</xs><xt>/></xt> - <xt><complexType</xt> <xa>name</xa>=<xs>'com.ibm.sample.Person'</xs><xt>></xt> + <xa>xmlns:juneau</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs><xt>></xt> + <xt><element</xt> <xa>name</xa>=<xs>'person'</xs> <xa>type</xa>=<xs>'juneau:org.apache.juneau.samples.addressbook.Person'</xs><xt>/></xt> + <xt><complexType</xt> <xa>name</xa>=<xs>'org.apache.juneau.samples.addressbook.Person'</xs><xt>></xt> <xt><sequence></xt> <xt><element</xt> <xa>name</xa>=<xs>'id'</xs> <xa>type</xa>=<xs>'integer'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'name'</xs> <xa>type</xa>=<xs>'string'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'addressBookUri'</xs> <xa>type</xa>=<xs>'string'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'birthDate'</xs> <xa>type</xa>=<xs>'juneau:java.util.Calendar'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> - <xt><element</xt> <xa>name</xa>=<xs>'addresses'</xs> <xa>type</xa>=<xs>'juneau:java.util.LinkedList_x003C_com.ibm.sample.Address_x003E_'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> + <xt><element</xt> <xa>name</xa>=<xs>'addresses'</xs> <xa>type</xa>=<xs>'juneau:java.util.LinkedList_x003C_org.apache.juneau.samples.addressbook.Address_x003E_'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt></sequence></xt> <xt><attribute</xt> <xa>name</xa>=<xs>'uri'</xs> <xa>type</xa>=<xs>'string'</xs><xt>/></xt> <xt></complexType></xt> @@ -1013,15 +1013,15 @@ <xt><any</xt> <xa>processContents</xa>=<xs>'skip'</xs> <xa>maxOccurs</xa>=<xs>'unbounded'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt></sequence></xt> <xt></complexType></xt> - <xt><complexType</xt> <xa>name</xa>=<xs>'java.util.LinkedList_x003C_com.ibm.sample.Address_x003E_'</xs><xt>></xt> + <xt><complexType</xt> <xa>name</xa>=<xs>'java.util.LinkedList_x003C_org.apache.juneau.samples.addressbook.Address_x003E_'</xs><xt>></xt> <xt><sequence></xt> <xt><choice</xt> <xa>minOccurs</xa>=<xs>'0'</xs> <xa>maxOccurs</xa>=<xs>'unbounded'</xs><xt>></xt> - <xt><element</xt> <xa>name</xa>=<xs>'address'</xs> <xa>type</xa>=<xs>'juneau:com.ibm.sample.Address'</xs><xt>/></xt> + <xt><element</xt> <xa>name</xa>=<xs>'address'</xs> <xa>type</xa>=<xs>'juneau:org.apache.juneau.samples.addressbook.Address'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'null'</xs> <xa>type</xa>=<xs>'string'</xs><xt>/></xt> <xt></choice></xt> <xt></sequence></xt> <xt></complexType></xt> - <xt><complexType</xt> <xa>name</xa>=<xs>'com.ibm.sample.Address'</xs><xt>></xt> + <xt><complexType</xt> <xa>name</xa>=<xs>'org.apache.juneau.samples.addressbook.Address'</xs><xt>></xt> <xt><sequence></xt> <xt><element</xt> <xa>name</xa>=<xs>'personUri'</xs> <xa>type</xa>=<xs>'string'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'id'</xs> <xa>type</xa>=<xs>'integer'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> @@ -1057,10 +1057,10 @@ <h6 class='figure'>XML results</h6> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -1087,15 +1087,15 @@ <p class='bcode'> <xt><schema</xt> <xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> - <xa>targetNamespace</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> + <xa>targetNamespace</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>elementFormDefault</xa>=<xs>'qualified'</xs> - <xa>xmlns:juneau</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs><xt>></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/person/'</xs> <xa>schemaLocation</xa>=<xs>'per.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/address/'</xs> <xa>schemaLocation</xa>=<xs>'addr.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/mail/'</xs> <xa>schemaLocation</xa>=<xs>'mail.xsd'</xs><xt>/></xt> + <xa>xmlns:juneau</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs><xt>></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>schemaLocation</xa>=<xs>'per.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/address/'</xs> <xa>schemaLocation</xa>=<xs>'addr.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>schemaLocation</xa>=<xs>'mail.xsd'</xs><xt>/></xt> <xt><complexType</xt> <xa>name</xa>=<xs>'int'</xs><xt>></xt> <xt><simpleContent></xt> <xt><extension</xt> <xa>base</xa>=<xs>'integer'</xs><xt>/></xt> @@ -1116,10 +1116,10 @@ <xt><any</xt> <xa>processContents</xa>=<xs>'skip'</xs> <xa>maxOccurs</xa>=<xs>'unbounded'</xs> <xa>minOccurs</xa>=<xs>'0'</xs><xt>/></xt> <xt></sequence></xt> <xt></complexType></xt> - <xt><complexType</xt> <xa>name</xa>=<xs>'java.util.LinkedList_x003C_com.ibm.sample.Address_x003E_'</xs><xt>></xt> + <xt><complexType</xt> <xa>name</xa>=<xs>'java.util.LinkedList_x003C_org.apache.juneau.samples.addressbook.Address_x003E_'</xs><xt>></xt> <xt><sequence></xt> <xt><choice</xt> <xa>minOccurs</xa>=<xs>'0'</xs> <xa>maxOccurs</xa>=<xs>'unbounded'</xs><xt>></xt> - <xt><element</xt> <xa>name</xa>=<xs>'address'</xs> <xa>type</xa>=<xs>'addr:com.ibm.sample.Address'</xs><xt>/></xt> + <xt><element</xt> <xa>name</xa>=<xs>'address'</xs> <xa>type</xa>=<xs>'addr:org.apache.juneau.samples.addressbook.Address'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'null'</xs> <xa>type</xa>=<xs>'string'</xs><xt>/></xt> <xt></choice></xt> <xt></sequence></xt> @@ -1133,18 +1133,18 @@ [\u0000] <xt><schema</xt> <xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> - <xa>targetNamespace</xa>=<xs>'http://www.ibm.com/person/'</xs> + <xa>targetNamespace</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>elementFormDefault</xa>=<xs>'qualified'</xs> <xa>attributeFormDefault</xa>=<xs>'qualified'</xs> - <xa>xmlns:juneau</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs><xt>></xt> - <xt><impor</xt>t <xa>namespace</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> <xa>schemaLocation</xa>=<xs>'juneau.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/address/'</xs> <xa>schemaLocation</xa>=<xs>'addr.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/mail/'</xs> <xa>schemaLocation</xa>=<xs>'mail.xsd'</xs><xt>/></xt> - <xt><element</xt> <xa>name</xa>=<xs>'person'</xs> <xa>type</xa>=<xs>'per:com.ibm.sample.Person'</xs><xt>/></xt> - <xt><complexType</xt> <xa>name</xa>=<xs>'com.ibm.sample.Person'</xs><xt>></xt> + <xa>xmlns:juneau</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs><xt>></xt> + <xt><impor</xt>t <xa>namespace</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>schemaLocation</xa>=<xs>'juneau.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/address/'</xs> <xa>schemaLocation</xa>=<xs>'addr.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>schemaLocation</xa>=<xs>'mail.xsd'</xs><xt>/></xt> + <xt><element</xt> <xa>name</xa>=<xs>'person'</xs> <xa>type</xa>=<xs>'per:org.apache.juneau.samples.addressbook.Person'</xs><xt>/></xt> + <xt><complexType</xt> <xa>name</xa>=<xs>'org.apache.juneau.samples.addressbook.Person'</xs><xt>></xt> <xt><sequence></xt> <xt><any</xt> <xa>minOccurs</xa>=<xs>'0'</xs> <xa>maxOccurs</xa>=<xs>'unbounded'</xs><xt>/></xt> <xt></sequence></xt> @@ -1154,22 +1154,22 @@ <xt><element</xt> <xa>name</xa>=<xs>'name'</xs> <xa>type</xa>=<xs>'juneau:java.lang.String'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'addressBookUri'</xs> <xa>type</xa>=<xs>'juneau:java.net.URI'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'birthDate'</xs> <xa>type</xa>=<xs>'juneau:java.util.Calendar'</xs><xt>/></xt> - <xt><element</xt> <xa>name</xa>=<xs>'addresses'</xs> <xa>type</xa>=<xs>'juneau:java.util.LinkedList_x003C_com.ibm.sample.Address_x003E_'</xs><xt>/></xt> + <xt><element</xt> <xa>name</xa>=<xs>'addresses'</xs> <xa>type</xa>=<xs>'juneau:java.util.LinkedList_x003C_org.apache.juneau.samples.addressbook.Address_x003E_'</xs><xt>/></xt> <xt></schema></xt> [\u0000] <xt><schema</xt> <xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> - <xa>targetNamespace</xa>=<xs>'http://www.ibm.com/address/'</xs> + <xa>targetNamespace</xa>=<xs>'http://www.apache.org/address/'</xs> <xa>elementFormDefault</xa>=<xs>'qualified'</xs> <xa>attributeFormDefault</xa>=<xs>'qualified'</xs> - <xa>xmlns:juneau</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs><xt>></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> <xa>schemaLocation</xa>=<xs>'juneau.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/person/'</xs> <xa>schemaLocation</xa>=<xs>'per.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/mail/'</xs> <xa>schemaLocation</xa>=<xs>'mail.xsd'</xs><xt>/></xt> - <xt><complexType</xt> <xa>name</xa>=<xs>'com.ibm.sample.Address'</xs><xt>></xt> + <xa>xmlns:juneau</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs><xt>></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>schemaLocation</xa>=<xs>'juneau.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>schemaLocation</xa>=<xs>'per.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>schemaLocation</xa>=<xs>'mail.xsd'</xs><xt>/></xt> + <xt><complexType</xt> <xa>name</xa>=<xs>'org.apache.juneau.samples.addressbook.Address'</xs><xt>></xt> <xt><sequence></xt> <xt><any</xt> <xa>minOccurs</xa>=<xs>'0'</xs> <xa>maxOccurs</xa>=<xs>'unbounded'</xs><xt>/></xt> <xt></sequence></xt> @@ -1182,16 +1182,16 @@ [\u0000] <xt><schema</xt> <xa>xmlns</xa>=<xs>'http://www.w3.org/2001/XMLSchema'</xs> - <xa>targetNamespace</xa>=<xs>'http://www.ibm.com/mail/'</xs> + <xa>targetNamespace</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>elementFormDefault</xa>=<xs>'qualified'</xs> <xa>attributeFormDefault</xa>=<xs>'qualified'</xs> - <xa>xmlns:juneau</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs><xt>></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> <xa>schemaLocation</xa>=<xs>'juneau.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/person/'</xs> <xa>schemaLocation</xa>=<xs>'per.xsd'</xs><xt>/></xt> - <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.ibm.com/address/'</xs> <xa>schemaLocation</xa>=<xs>'addr.xsd'</xs><xt>/></xt> + <xa>xmlns:juneau</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs><xt>></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> <xa>schemaLocation</xa>=<xs>'juneau.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/person/'</xs> <xa>schemaLocation</xa>=<xs>'per.xsd'</xs><xt>/></xt> + <xt><import</xt> <xa>namespace</xa>=<xs>'http://www.apache.org/address/'</xs> <xa>schemaLocation</xa>=<xs>'addr.xsd'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'street'</xs> <xa>type</xa>=<xs>'juneau:java.lang.String'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'city'</xs> <xa>type</xa>=<xs>'juneau:java.lang.String'</xs><xt>/></xt> <xt><element</xt> <xa>name</xa>=<xs>'state'</xs> <xa>type</xa>=<xs>'juneau:java.lang.String'</xs><xt>/></xt> @@ -1348,10 +1348,10 @@ </p> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -1445,10 +1445,10 @@ </p> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id></xt>1<xt></per:id></xt> @@ -1522,10 +1522,10 @@ <h6 class='figure'>Results</h6> <p class='bcode'> <xt><per:person</xt> - <xa>xmlns</xa>=<xs>'http://www.ibm.com/2013/Juneau'</xs> - <xa>xmlns:per</xa>=<xs>'http://www.ibm.com/person/'</xs> - <xa>xmlns:addr</xa>=<xs>'http://www.ibm.com/address/'</xs> - <xa>xmlns:mail</xa>=<xs>'http://www.ibm.com/mail/'</xs> + <xa>xmlns</xa>=<xs>'http://www.apache.org/2013/Juneau'</xs> + <xa>xmlns:per</xa>=<xs>'http://www.apache.org/person/'</xs> + <xa>xmlns:addr</xa>=<xs>'http://www.apache.org/address/'</xs> + <xa>xmlns:mail</xa>=<xs>'http://www.apache.org/mail/'</xs> <xa>xmlns:xsi</xa>=<xs>'http://www.w3.org/2001/XMLSchema-instance'</xs> <xa>uri</xa>=<xs>'http://sample/addressBook/person/1'</xs><xt>></xt> <xt><per:id</xt> <xa>type</xa>=<xs>'number'</xs><xt>></xt>1<xt></per:id></xt>
