svn commit: r21555 - in /dev/incubator/juneau: binaries/juneau-6.4.0-incubating-RC1/ source/juneau-6.4.0-incubating-RC1/

2017-09-10 Thread jamesbognar
Author: jamesbognar
Date: Sun Sep 10 23:16:07 2017
New Revision: 21555

Log:
juneau-6.4.0-incubating-RC1

Added:
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/

dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip
   (with props)

dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.asc

dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.md5

dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.sha1
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/

dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip
   (with props)

dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.asc

dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.md5

dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.sha1

Added: 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip
==
Binary file - no diff available.

Propchange: 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.asc
==
--- 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.asc
 (added)
+++ 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.asc
 Sun Sep 10 23:16:07 2017
@@ -0,0 +1,10 @@
+-BEGIN PGP SIGNATURE-
+
+iQEcBAABCAAGBQJZtcXyAAoJEDYpK9K6fTqGoYsIALkRX2lCqI67WVBgsQQ9Dlwx
+2a2EOnXf48dH7ssam/w8rtHjIM1AnVtNs9oRT1ORoYmXWOY9+fEq4WS0nP9olB6T
+Wtmaacr6X6zrPV9zPQXMjcX4Lbyht3LmDGWLJzNJontd/wL5utxXr2OhNs0mCBxb
+sm9FFVJvslDr3S8C8lXUBLi/IUqJd0/VTPUBT5Iljqqb0cr/uqgY84MpdbDKm3E5
+wPgXC9okadm6rOHsnUt6t9yN68lPoG4zz9sl2om+rY45lB+IfZmdExg75MPLJtDw
+vbwUKy6RVmaTEWGCi8P/TRuMevN9fa+mlAJ9IZaJg9e9ppFzDU83wpEplHwNMa8=
+=hY68
+-END PGP SIGNATURE-

Added: 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.md5
==
--- 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.md5
 (added)
+++ 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.md5
 Sun Sep 10 23:16:07 2017
@@ -0,0 +1 @@
+23183baf4364c987dabb7ad112a04db0
\ No newline at end of file

Added: 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.sha1
==
--- 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.sha1
 (added)
+++ 
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-bin.zip.sha1
 Sun Sep 10 23:16:07 2017
@@ -0,0 +1 @@
+b456a34aa6b7c36abf7208b391734f16c0634ca5
\ No newline at end of file

Added: 
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip
==
Binary file - no diff available.

Propchange: 
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.asc
==
--- 
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.asc
 (added)
+++ 
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.asc
 Sun Sep 10 23:16:07 2017
@@ -0,0 +1,10 @@
+-BEGIN PGP SIGNATURE-
+
+iQEcBAABCAAGBQJZtcV4AAoJEDYpK9K6fTqG/JkH/1sKCIMYSvqUA9HRvIB5lFkd
+vg2GOeHhaBAPisP15IcG8NWyk0EH7Dr98tuC6pO3kn/XMT6XrLeEws15Pwhvx9Tm
+zdgB/NokhgqhyUZcUjoNZHo68T9wc7ZIpkLnKiQSbX+k68igVPVL52P73KQzKSHc
+6t2reFJx78Y9nfWwDCl72dQoOBdBmbxIrIzgl7JrIdJNd/t5XFbvc4DkWYbw/G2d
+AXPJr1lKHQmkqTCwGdh+xUsNMKrx/8SZDp4yawbUI+QFYRrh2yqNboAMBlXObg7c
+rElOUqLAcUSOTdobM+vX7iYeRK8Jo3DaKkBDO/A4XMA3v3VIV3aDlYk6sSwZMtA=
+=KAGt
+-END PGP SIGNATURE-

Added: 
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/apache-juneau-6.4.0-incubating-src.zip.md5
=

svn commit: r21554 - in /dev/incubator/juneau: binaries/juneau-6.4.0-incubating-RC1/ source/juneau-6.4.0-incubating-RC1/

2017-09-10 Thread jamesbognar
Author: jamesbognar
Date: Sun Sep 10 23:12:37 2017
New Revision: 21554

Log:
juneau-6.4.0-incubating-RC1

Added:
dev/incubator/juneau/binaries/juneau-6.4.0-incubating-RC1/
dev/incubator/juneau/source/juneau-6.4.0-incubating-RC1/



[incubator-juneau] Git Push Summary

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Tags:  refs/tags/juneau-6.4.0-incubating-RC1 [created] 1c7f7a1f2


incubator-juneau git commit: [maven-release-plugin] prepare for next development iteration

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 231c3b226 -> 7e7c0bcd8


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/7e7c0bcd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/7e7c0bcd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/7e7c0bcd

Branch: refs/heads/master
Commit: 7e7c0bcd8165316e93e0df384ac60f2b1b1e407c
Parents: 231c3b2
Author: jamesbognar 
Authored: Sun Sep 10 19:04:57 2017 -0400
Committer: jamesbognar 
Committed: Sun Sep 10 19:04:57 2017 -0400

--
 juneau-core/juneau-config/pom.xml| 2 +-
 juneau-core/juneau-core-test/pom.xml | 2 +-
 juneau-core/juneau-dto/pom.xml   | 2 +-
 juneau-core/juneau-marshall-rdf/pom.xml  | 2 +-
 juneau-core/juneau-marshall/pom.xml  | 2 +-
 juneau-core/juneau-svl/pom.xml   | 2 +-
 juneau-core/pom.xml  | 2 +-
 juneau-examples/juneau-examples-core/pom.xml | 2 +-
 juneau-examples/juneau-examples-rest/pom.xml | 2 +-
 juneau-examples/pom.xml  | 2 +-
 juneau-microservice/juneau-microservice-server/pom.xml   | 2 +-
 juneau-microservice/juneau-microservice-template/pom.xml | 4 ++--
 juneau-microservice/juneau-microservice-test/pom.xml | 2 +-
 juneau-microservice/pom.xml  | 2 +-
 juneau-releng/juneau-all/pom.xml | 2 +-
 juneau-releng/juneau-distrib/pom.xml | 2 +-
 juneau-releng/pom.xml| 2 +-
 juneau-rest/juneau-rest-client/pom.xml   | 2 +-
 juneau-rest/juneau-rest-server-jaxrs/pom.xml | 2 +-
 juneau-rest/juneau-rest-server/pom.xml   | 2 +-
 juneau-rest/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 22 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7e7c0bcd/juneau-core/juneau-config/pom.xml
--
diff --git a/juneau-core/juneau-config/pom.xml 
b/juneau-core/juneau-config/pom.xml
index da3ee35..d9756c6 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-config

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7e7c0bcd/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index d711ea8..cfc600a 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-core-test

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7e7c0bcd/juneau-core/juneau-dto/pom.xml
--
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 9fd27c9..e035ca8 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-dto

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7e7c0bcd/juneau-core/juneau-marshall-rdf/pom.xml
--
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml 
b/juneau-core/juneau-marshall-rdf/pom.xml
index ea641d9..6ed6bf1 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-marshall-rdf

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/7e7c0bcd/juneau-core/juneau-marshall/pom.xml
--
diff --git a/juneau-core/juneau-marshall/pom.xml 
b/juneau-core/juneau-marshall/pom.xml
index 5a2b945..98ae24e 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -20

incubator-juneau git commit: [maven-release-plugin] prepare release juneau-6.4.0-incubating-RC1

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 72a03d332 -> 231c3b226


[maven-release-plugin] prepare release juneau-6.4.0-incubating-RC1


Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/231c3b22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/231c3b22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/231c3b22

Branch: refs/heads/master
Commit: 231c3b226762e08de1250be681e2b5be680d7ff8
Parents: 72a03d3
Author: jamesbognar 
Authored: Sun Sep 10 19:04:41 2017 -0400
Committer: jamesbognar 
Committed: Sun Sep 10 19:04:41 2017 -0400

--
 juneau-core/juneau-config/pom.xml| 2 +-
 juneau-core/juneau-core-test/pom.xml | 2 +-
 juneau-core/juneau-dto/pom.xml   | 2 +-
 juneau-core/juneau-marshall-rdf/pom.xml  | 2 +-
 juneau-core/juneau-marshall/pom.xml  | 2 +-
 juneau-core/juneau-svl/pom.xml   | 2 +-
 juneau-core/pom.xml  | 2 +-
 juneau-examples/juneau-examples-core/pom.xml | 2 +-
 juneau-examples/juneau-examples-rest/pom.xml | 2 +-
 juneau-examples/pom.xml  | 2 +-
 juneau-microservice/juneau-microservice-server/pom.xml   | 2 +-
 juneau-microservice/juneau-microservice-template/pom.xml | 4 ++--
 juneau-microservice/juneau-microservice-test/pom.xml | 2 +-
 juneau-microservice/pom.xml  | 2 +-
 juneau-releng/juneau-all/pom.xml | 2 +-
 juneau-releng/juneau-distrib/pom.xml | 2 +-
 juneau-releng/pom.xml| 2 +-
 juneau-rest/juneau-rest-client/pom.xml   | 2 +-
 juneau-rest/juneau-rest-server-jaxrs/pom.xml | 2 +-
 juneau-rest/juneau-rest-server/pom.xml   | 2 +-
 juneau-rest/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 22 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/231c3b22/juneau-core/juneau-config/pom.xml
--
diff --git a/juneau-core/juneau-config/pom.xml 
b/juneau-core/juneau-config/pom.xml
index d9756c6..da3ee35 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-config

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/231c3b22/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index cfc600a..d711ea8 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-core-test

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/231c3b22/juneau-core/juneau-dto/pom.xml
--
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index e035ca8..9fd27c9 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-dto

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/231c3b22/juneau-core/juneau-marshall-rdf/pom.xml
--
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml 
b/juneau-core/juneau-marshall-rdf/pom.xml
index 6ed6bf1..ea641d9 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-marshall-rdf

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/231c3b22/juneau-core/juneau-marshall/pom.xml
--
diff --git a/juneau-core/juneau-marshall/pom.xml 
b/juneau-core/juneau-marshall/pom.xml
index 98ae24e..5a2b945 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@

incubator-juneau git commit: Remove dependency-reduced-pom.xml

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 6b0a28a5b -> 72a03d332


Remove dependency-reduced-pom.xml

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/72a03d33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/72a03d33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/72a03d33

Branch: refs/heads/master
Commit: 72a03d332b6776f83948c7d479a78e12a4b22173
Parents: 6b0a28a
Author: JamesBognar 
Authored: Sun Sep 10 18:50:24 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 18:50:24 2017 -0400

--
 .../dependency-reduced-pom.xml  | 66 
 .../juneau-microservice-template/pom.xml|  3 +
 2 files changed, 3 insertions(+), 66 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/72a03d33/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
--
diff --git 
a/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml 
b/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
deleted file mode 100644
index 6083bd2..000
--- 
a/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-
-http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-  
-juneau-microservice
-org.apache.juneau
-6.4.1-incubating-SNAPSHOT
-  
-  4.0.0
-  juneau-microservice-template
-  Apache Juneau Microservice Template
-  A template project developers use to start with to create a 
microservice.
-  
-
-  
-maven-compiler-plugin
-
-  1.6
-  1.6
-
-  
-  
-maven-jar-plugin
-
-  
-
-  
org.apache.juneau.microservice.RestMicroservice
-
-
-  
org.apache.juneau.microservice.sample.RootResources
-  microservice.cfg
-
-  
-
-  
-  
-maven-shade-plugin
-3.0.0
-
-  
-package
-
-  shade
-
-
-  
-
-  *:*
-  
-META-INF/*.SF
-META-INF/*.RSA
-META-INF/*.INF
-  
-
-  
-
-  
-
-  
-
-  
-  
-6.4.1-incubating-SNAPSHOT
-UTF-8
-  
-
-

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/72a03d33/juneau-microservice/juneau-microservice-template/pom.xml
--
diff --git a/juneau-microservice/juneau-microservice-template/pom.xml 
b/juneau-microservice/juneau-microservice-template/pom.xml
index 376dc36..40505ac 100644
--- a/juneau-microservice/juneau-microservice-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-template/pom.xml
@@ -78,6 +78,9 @@
org.apache.maven.plugins
maven-shade-plugin
3.0.0
+   
+   
false
+   


package



[incubator-juneau] Git Push Summary

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Tags:  refs/tags/juneau-6.4.0-incubating-RC1 [deleted] bdf0ccbe4


incubator-juneau git commit: [maven-release-plugin] prepare for next development iteration

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master f8718c6b2 -> 6b0a28a5b


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6b0a28a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6b0a28a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6b0a28a5

Branch: refs/heads/master
Commit: 6b0a28a5b9e16c3e217a6410a51c83215bb25082
Parents: f8718c6
Author: jamesbognar 
Authored: Sun Sep 10 18:42:04 2017 -0400
Committer: jamesbognar 
Committed: Sun Sep 10 18:42:04 2017 -0400

--
 juneau-core/juneau-config/pom.xml| 2 +-
 juneau-core/juneau-core-test/pom.xml | 2 +-
 juneau-core/juneau-dto/pom.xml   | 2 +-
 juneau-core/juneau-marshall-rdf/pom.xml  | 2 +-
 juneau-core/juneau-marshall/pom.xml  | 2 +-
 juneau-core/juneau-svl/pom.xml   | 2 +-
 juneau-core/pom.xml  | 2 +-
 juneau-examples/juneau-examples-core/pom.xml | 2 +-
 juneau-examples/juneau-examples-rest/pom.xml | 2 +-
 juneau-examples/pom.xml  | 2 +-
 juneau-microservice/juneau-microservice-server/pom.xml   | 2 +-
 juneau-microservice/juneau-microservice-template/pom.xml | 4 ++--
 juneau-microservice/juneau-microservice-test/pom.xml | 2 +-
 juneau-microservice/pom.xml  | 2 +-
 juneau-releng/juneau-all/pom.xml | 2 +-
 juneau-releng/juneau-distrib/pom.xml | 2 +-
 juneau-releng/pom.xml| 2 +-
 juneau-rest/juneau-rest-client/pom.xml   | 2 +-
 juneau-rest/juneau-rest-server-jaxrs/pom.xml | 2 +-
 juneau-rest/juneau-rest-server/pom.xml   | 2 +-
 juneau-rest/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 22 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b0a28a5/juneau-core/juneau-config/pom.xml
--
diff --git a/juneau-core/juneau-config/pom.xml 
b/juneau-core/juneau-config/pom.xml
index da3ee35..d9756c6 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-config

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b0a28a5/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index d711ea8..cfc600a 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-core-test

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b0a28a5/juneau-core/juneau-dto/pom.xml
--
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 9fd27c9..e035ca8 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-dto

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b0a28a5/juneau-core/juneau-marshall-rdf/pom.xml
--
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml 
b/juneau-core/juneau-marshall-rdf/pom.xml
index ea641d9..6ed6bf1 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-marshall-rdf

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6b0a28a5/juneau-core/juneau-marshall/pom.xml
--
diff --git a/juneau-core/juneau-marshall/pom.xml 
b/juneau-core/juneau-marshall/pom.xml
index 5a2b945..98ae24e 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -20

[incubator-juneau] Git Push Summary

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Tags:  refs/tags/juneau-6.4.0-incubating-RC1 [created] bdf0ccbe4


incubator-juneau git commit: [maven-release-plugin] prepare release juneau-6.4.0-incubating-RC1

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 2d4220b33 -> f8718c6b2


[maven-release-plugin] prepare release juneau-6.4.0-incubating-RC1


Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/f8718c6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/f8718c6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/f8718c6b

Branch: refs/heads/master
Commit: f8718c6b26e2e62ebc97e805e1a86406a9ffc34c
Parents: 2d4220b
Author: jamesbognar 
Authored: Sun Sep 10 18:41:47 2017 -0400
Committer: jamesbognar 
Committed: Sun Sep 10 18:41:47 2017 -0400

--
 juneau-core/juneau-config/pom.xml| 2 +-
 juneau-core/juneau-core-test/pom.xml | 2 +-
 juneau-core/juneau-dto/pom.xml   | 2 +-
 juneau-core/juneau-marshall-rdf/pom.xml  | 2 +-
 juneau-core/juneau-marshall/pom.xml  | 2 +-
 juneau-core/juneau-svl/pom.xml   | 2 +-
 juneau-core/pom.xml  | 2 +-
 juneau-examples/juneau-examples-core/pom.xml | 2 +-
 juneau-examples/juneau-examples-rest/pom.xml | 2 +-
 juneau-examples/pom.xml  | 2 +-
 juneau-microservice/juneau-microservice-server/pom.xml   | 2 +-
 juneau-microservice/juneau-microservice-template/pom.xml | 4 ++--
 juneau-microservice/juneau-microservice-test/pom.xml | 2 +-
 juneau-microservice/pom.xml  | 2 +-
 juneau-releng/juneau-all/pom.xml | 2 +-
 juneau-releng/juneau-distrib/pom.xml | 2 +-
 juneau-releng/pom.xml| 2 +-
 juneau-rest/juneau-rest-client/pom.xml   | 2 +-
 juneau-rest/juneau-rest-server-jaxrs/pom.xml | 2 +-
 juneau-rest/juneau-rest-server/pom.xml   | 2 +-
 juneau-rest/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 22 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f8718c6b/juneau-core/juneau-config/pom.xml
--
diff --git a/juneau-core/juneau-config/pom.xml 
b/juneau-core/juneau-config/pom.xml
index d9756c6..da3ee35 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-config

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f8718c6b/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index cfc600a..d711ea8 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-core-test

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f8718c6b/juneau-core/juneau-dto/pom.xml
--
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index e035ca8..9fd27c9 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-dto

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f8718c6b/juneau-core/juneau-marshall-rdf/pom.xml
--
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml 
b/juneau-core/juneau-marshall-rdf/pom.xml
index 6ed6bf1..ea641d9 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.1-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-marshall-rdf

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f8718c6b/juneau-core/juneau-marshall/pom.xml
--
diff --git a/juneau-core/juneau-marshall/pom.xml 
b/juneau-core/juneau-marshall/pom.xml
index 98ae24e..5a2b945 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@

incubator-juneau git commit: Update versions.

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master c31cc80ef -> 2d4220b33


Update versions.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/2d4220b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/2d4220b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/2d4220b3

Branch: refs/heads/master
Commit: 2d4220b5847c8457f69d745b881ceb57eb0e
Parents: c31cc80
Author: JamesBognar 
Authored: Sun Sep 10 18:22:23 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 18:22:23 2017 -0400

--
 .../juneau-microservice-template/dependency-reduced-pom.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/2d4220b3/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
--
diff --git 
a/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml 
b/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
index 31bbbe5..6083bd2 100644
--- 
a/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
+++ 
b/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   
 juneau-microservice
 org.apache.juneau
-6.3.2-incubating-SNAPSHOT
+6.4.1-incubating-SNAPSHOT
   
   4.0.0
   juneau-microservice-template
@@ -59,7 +59,7 @@
 
   
   
-6.3.2-incubating-SNAPSHOT
+6.4.1-incubating-SNAPSHOT
 UTF-8
   
 



incubator-juneau git commit: Fix juneau-all packaging.

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 398a3cbcc -> c31cc80ef


Fix juneau-all packaging.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/c31cc80e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/c31cc80e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/c31cc80e

Branch: refs/heads/master
Commit: c31cc80efe36dd056f65862bfa057a3a587e914d
Parents: 398a3cb
Author: JamesBognar 
Authored: Sun Sep 10 18:03:28 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 18:03:28 2017 -0400

--
 juneau-releng/juneau-all/pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/c31cc80e/juneau-releng/juneau-all/pom.xml
--
diff --git a/juneau-releng/juneau-all/pom.xml b/juneau-releng/juneau-all/pom.xml
index 27202e7..458a39b 100644
--- a/juneau-releng/juneau-all/pom.xml
+++ b/juneau-releng/juneau-all/pom.xml
@@ -68,12 +68,12 @@

false


-   
org.apache.juneau:juneau-core
-   
org.apache.juneau:juneau-core-rdf
-   
org.apache.juneau:juneau-rest
-   
org.apache.juneau:juneau-rest-jaxrs
+   
org.apache.juneau:juneau-marshall
+   
org.apache.juneau:juneau-svl
+   
org.apache.juneau:juneau-config
+   
org.apache.juneau:juneau-dto
+   
org.apache.juneau:juneau-rest-server

org.apache.juneau:juneau-rest-client
-   
org.apache.juneau:juneau-microservice






[incubator-juneau] Git Push Summary

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Tags:  refs/tags/juneau-6.4.0-incubating-RC1 [deleted] 0f0eb64cf


incubator-juneau git commit: [maven-release-plugin] prepare release juneau-6.4.0-incubating-RC1

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 293a4bfa0 -> 8a6597a37


[maven-release-plugin] prepare release juneau-6.4.0-incubating-RC1


Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/8a6597a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/8a6597a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/8a6597a3

Branch: refs/heads/master
Commit: 8a6597a3775e2337ecd67be3c18691fe2d5af8f1
Parents: 293a4bf
Author: jamesbognar 
Authored: Sun Sep 10 17:39:05 2017 -0400
Committer: jamesbognar 
Committed: Sun Sep 10 17:39:05 2017 -0400

--
 juneau-core/juneau-config/pom.xml| 7 ++-
 juneau-core/juneau-core-test/pom.xml | 7 ++-
 juneau-core/juneau-dto/pom.xml   | 7 ++-
 juneau-core/juneau-marshall-rdf/pom.xml  | 7 ++-
 juneau-core/juneau-marshall/pom.xml  | 7 ++-
 juneau-core/juneau-svl/pom.xml   | 7 ++-
 juneau-core/pom.xml  | 7 ++-
 juneau-examples/juneau-examples-core/pom.xml | 7 ++-
 juneau-examples/juneau-examples-rest/pom.xml | 7 ++-
 juneau-examples/pom.xml  | 7 ++-
 juneau-microservice/juneau-microservice-server/pom.xml   | 5 ++---
 juneau-microservice/juneau-microservice-template/pom.xml | 9 +++--
 juneau-microservice/juneau-microservice-test/pom.xml | 5 ++---
 juneau-microservice/pom.xml  | 7 ++-
 juneau-releng/juneau-all/pom.xml | 5 ++---
 juneau-releng/juneau-distrib/pom.xml | 7 ++-
 juneau-releng/pom.xml| 5 ++---
 juneau-rest/juneau-rest-client/pom.xml   | 5 ++---
 juneau-rest/juneau-rest-server-jaxrs/pom.xml | 7 ++-
 juneau-rest/juneau-rest-server/pom.xml   | 5 ++---
 juneau-rest/pom.xml  | 7 ++-
 pom.xml  | 9 +++--
 22 files changed, 46 insertions(+), 100 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8a6597a3/juneau-core/juneau-config/pom.xml
--
diff --git a/juneau-core/juneau-config/pom.xml 
b/juneau-core/juneau-config/pom.xml
index 8ba341a..da3ee35 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -13,17 +13,14 @@
  * specific language governing permissions and limitations under the License.  
*
  
***
 -->
-http://maven.apache.org/POM/4.0.0";
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
 
4.0.0
 

org.apache.juneau
juneau-core
-   6.3.2-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-config

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8a6597a3/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index 9ad8933..d711ea8 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -13,17 +13,14 @@
  * specific language governing permissions and limitations under the License.  
*
  
***
 -->
-http://maven.apache.org/POM/4.0.0";
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
 
4.0.0
 

org.apache.juneau
juneau-core
-   6.3.2-incubating-SNAPSHOT
+   6.4.0-incubating

 
juneau-core-test

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/8

[incubator-juneau] Git Push Summary

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Tags:  refs/tags/juneau-6.4.0-incubating-RC1 [created] 0f0eb64cf


incubator-juneau git commit: [maven-release-plugin] prepare for next development iteration

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master 8a6597a37 -> 398a3cbcc


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/398a3cbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/398a3cbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/398a3cbc

Branch: refs/heads/master
Commit: 398a3cbcc558b5ab06aa0b65d7a58cec2d49c621
Parents: 8a6597a
Author: jamesbognar 
Authored: Sun Sep 10 17:39:34 2017 -0400
Committer: jamesbognar 
Committed: Sun Sep 10 17:39:34 2017 -0400

--
 juneau-core/juneau-config/pom.xml| 2 +-
 juneau-core/juneau-core-test/pom.xml | 2 +-
 juneau-core/juneau-dto/pom.xml   | 2 +-
 juneau-core/juneau-marshall-rdf/pom.xml  | 2 +-
 juneau-core/juneau-marshall/pom.xml  | 2 +-
 juneau-core/juneau-svl/pom.xml   | 2 +-
 juneau-core/pom.xml  | 2 +-
 juneau-examples/juneau-examples-core/pom.xml | 2 +-
 juneau-examples/juneau-examples-rest/pom.xml | 2 +-
 juneau-examples/pom.xml  | 2 +-
 juneau-microservice/juneau-microservice-server/pom.xml   | 2 +-
 juneau-microservice/juneau-microservice-template/pom.xml | 4 ++--
 juneau-microservice/juneau-microservice-test/pom.xml | 2 +-
 juneau-microservice/pom.xml  | 2 +-
 juneau-releng/juneau-all/pom.xml | 2 +-
 juneau-releng/juneau-distrib/pom.xml | 2 +-
 juneau-releng/pom.xml| 2 +-
 juneau-rest/juneau-rest-client/pom.xml   | 2 +-
 juneau-rest/juneau-rest-server-jaxrs/pom.xml | 2 +-
 juneau-rest/juneau-rest-server/pom.xml   | 2 +-
 juneau-rest/pom.xml  | 2 +-
 pom.xml  | 4 ++--
 22 files changed, 24 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/398a3cbc/juneau-core/juneau-config/pom.xml
--
diff --git a/juneau-core/juneau-config/pom.xml 
b/juneau-core/juneau-config/pom.xml
index da3ee35..d9756c6 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-config

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/398a3cbc/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index d711ea8..cfc600a 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-core-test

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/398a3cbc/juneau-core/juneau-dto/pom.xml
--
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 9fd27c9..e035ca8 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-dto

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/398a3cbc/juneau-core/juneau-marshall-rdf/pom.xml
--
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml 
b/juneau-core/juneau-marshall-rdf/pom.xml
index ea641d9..6ed6bf1 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -20,7 +20,7 @@

org.apache.juneau
juneau-core
-   6.4.0-incubating
+   6.4.1-incubating-SNAPSHOT

 
juneau-marshall-rdf

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/398a3cbc/juneau-core/juneau-marshall/pom.xml
--
diff --git a/juneau-core/juneau-marshall/pom.xml 
b/juneau-core/juneau-marshall/pom.xml
index 5a2b945..98ae24e 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -20

incubator-juneau git commit: Release notes for 6.4.0

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master d2baa5465 -> 293a4bfa0


Release notes for 6.4.0

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/293a4bfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/293a4bfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/293a4bfa

Branch: refs/heads/master
Commit: 293a4bfa0e164969f28482c0c42beb82e25748bc
Parents: d2baa54
Author: JamesBognar 
Authored: Sun Sep 10 17:23:09 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 17:23:09 2017 -0400

--
 RELEASE-NOTES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/293a4bfa/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 165dcdf..48ceb1b 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -11,6 +11,7 @@
 * specific language governing permissions and limitations under the License.   
   *
 
***
 
+
 Release Notes - Juneau - Version 6.4.0
 
 ** Improvement



incubator-juneau git commit: Fix POM issues.

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master e530d6c5c -> d2baa5465


Fix POM issues.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/d2baa546
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/d2baa546
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/d2baa546

Branch: refs/heads/master
Commit: d2baa546541d9bca12a36108b1f29534e95d752d
Parents: e530d6c
Author: JamesBognar 
Authored: Sun Sep 10 17:22:54 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 17:22:54 2017 -0400

--
 juneau-core/juneau-core-test/pom.xml |   5 -
 juneau-microservice/.DS_Store| Bin 0 -> 6148 bytes
 .../juneau-microservice-server/pom.xml   |   2 +-
 .../dependency-reduced-pom.xml   |   2 +-
 .../juneau-microservice-template/pom.xml |   2 +-
 .../juneau-microservice-test/pom.xml |   2 +-
 juneau-releng/juneau-distrib/pom.xml |   8 
 juneau-rest/juneau-rest-server/pom.xml   |   5 -
 .../juneau-microservice-test.launch  |  18 --
 9 files changed, 8 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d2baa546/juneau-core/juneau-core-test/pom.xml
--
diff --git a/juneau-core/juneau-core-test/pom.xml 
b/juneau-core/juneau-core-test/pom.xml
index 429c802..9ad8933 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -58,11 +58,6 @@
${project.version}


-   org.apache.juneau
-   juneau-marshall-rdf
-   ${project.version}
-   
-   
org.apache.jena
jena-core
false

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d2baa546/juneau-microservice/.DS_Store
--
diff --git a/juneau-microservice/.DS_Store b/juneau-microservice/.DS_Store
new file mode 100644
index 000..b0b1a8b
Binary files /dev/null and b/juneau-microservice/.DS_Store differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d2baa546/juneau-microservice/juneau-microservice-server/pom.xml
--
diff --git a/juneau-microservice/juneau-microservice-server/pom.xml 
b/juneau-microservice/juneau-microservice-server/pom.xml
index d10c107..121f0a7 100644
--- a/juneau-microservice/juneau-microservice-server/pom.xml
+++ b/juneau-microservice/juneau-microservice-server/pom.xml
@@ -20,7 +20,7 @@
 

org.apache.juneau
-   juneau-rest
+   juneau-microservice
6.3.2-incubating-SNAPSHOT

 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d2baa546/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
--
diff --git 
a/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml 
b/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
index e5c46a1..31bbbe5 100644
--- 
a/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
+++ 
b/juneau-microservice/juneau-microservice-template/dependency-reduced-pom.xml
@@ -1,7 +1,7 @@
 
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
   
-juneau-rest
+juneau-microservice
 org.apache.juneau
 6.3.2-incubating-SNAPSHOT
   

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d2baa546/juneau-microservice/juneau-microservice-template/pom.xml
--
diff --git a/juneau-microservice/juneau-microservice-template/pom.xml 
b/juneau-microservice/juneau-microservice-template/pom.xml
index 0352b34..7590e42 100644
--- a/juneau-microservice/juneau-microservice-template/pom.xml
+++ b/juneau-microservice/juneau-microservice-template/pom.xml
@@ -30,7 +30,7 @@


org.apache.juneau
-   juneau-rest
+   juneau-microservice
6.3.2-incubating-SNAPSHOT

 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/d2baa546/juneau-microservice/juneau-microservice-test/pom.xml
--
diff --git a/juneau-microservice/juneau-microservice-test/pom.xml 
b/juneau

incubator-juneau git commit: Release notes for 6.4.0

2017-09-10 Thread jamesbognar
Repository: incubator-juneau
Updated Branches:
  refs/heads/master f5f5edfb6 -> e530d6c5c


Release notes for 6.4.0

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/e530d6c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/e530d6c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/e530d6c5

Branch: refs/heads/master
Commit: e530d6c5cbb0e2edd4f5a289229f6a2d3a49129f
Parents: f5f5edf
Author: JamesBognar 
Authored: Sun Sep 10 16:40:54 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 16:40:54 2017 -0400

--
 RELEASE-NOTES.txt | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/e530d6c5/RELEASE-NOTES.txt
--
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index b8c5229..165dcdf 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -11,7 +11,17 @@
 * specific language governing permissions and limitations under the License.   
   *
 
***
 
+Release Notes - Juneau - Version 6.4.0
 
+** Improvement
+* [JUNEAU-46] - Remove references to wink
+* [JUNEAU-64] - Support advanced annotated variables on methods 
implementing onPreCall and onPostCall
+
+** New Feature
+* [JUNEAU-62] - Support complete customization of jetty runtime
+* [JUNEAU-65] - utility for merging two like POJOs
+
+
 Release Notes - Juneau - Version 6.3.1
 
 ** Bug



incubator-juneau-website git commit: Update javadocs.

2017-09-10 Thread jamesbognar
Repository: incubator-juneau-website
Updated Branches:
  refs/heads/asf-site 62afb533d -> 294a19efa


Update javadocs.

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/294a19ef
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/294a19ef
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/294a19ef

Branch: refs/heads/asf-site
Commit: 294a19efa06585c45914aed39e69e873085d249b
Parents: 62afb53
Author: JamesBognar 
Authored: Sun Sep 10 16:33:01 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 16:33:01 2017 -0400

--
 .../org/apache/juneau/annotation/Swap.html  | 359 +++
 .../org/apache/juneau/annotation/Swaps.html | 233 
 .../org/apache/juneau/transform/Surrogate.html  | 280 +++
 .../org/apache/juneau/annotation/Swap.html  | 192 ++
 .../org/apache/juneau/annotation/Swaps.html | 116 ++
 .../org/apache/juneau/transform/Surrogate.html  | 206 +++
 6 files changed, 1386 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/294a19ef/content/site/apidocs/org/apache/juneau/annotation/Swap.html
--
diff --git a/content/site/apidocs/org/apache/juneau/annotation/Swap.html 
b/content/site/apidocs/org/apache/juneau/annotation/Swap.html
new file mode 100644
index 000..1f352a6
--- /dev/null
+++ b/content/site/apidocs/org/apache/juneau/annotation/Swap.html
@@ -0,0 +1,359 @@
+http://www.w3.org/TR/html4/loose.dtd";>
+
+
+
+
+
+Swap (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)
+
+
+
+
+
+
+
+JavaScript is disabled on your browser.
+
+
+
+
+
+Skip navigation links
+
+
+
+
+Overview
+Package
+Class
+Tree
+Deprecated
+Index
+Help
+
+
+
+
+Prev Class
+Next Class
+
+
+Frames
+No Frames
+
+
+All Classes
+
+
+
+
+
+
+
+Summary: 
+Field | 
+Required | 
+Optional
+
+
+Detail: 
+Field | 
+Element
+
+
+
+
+
+
+
+
+org.apache.juneau.annotation
+Annotation Type Swap
+
+
+
+
+
+
+
+http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true";
 title="class or interface in java.lang.annotation">@Documented
+ http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true";
 title="class or interface in java.lang.annotation">@Target(http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--";
 title="class or interface in java.lang.annotation">value={http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#TYPE";
 title="class or interface in java.lang.annotation">TYPE,http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#ANNOTATION_TYPE";
 title="class or interface in java.lang.annotation">ANNOTATION_TYPE,http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#FIELD";
 title="class or interface in java.lang.annotation">FIELD,http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#METHOD";
 title="clas
 s or interface in java.lang.annotation">METHOD})
+ http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true";
 title="class or interface in java.lang.annotation">@Retention(http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--";
 title="class or interface in java.lang.annotation">value=http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME";
 title="class or interface in java.lang.annotation">RUNTIME)
+ http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true";
 title="class or interface in java.lang.annotation">@Inherited
+public @interface Swap
+Associates PojoSwap and Surrogate classes with POJOs 
and bean properties.
+
+ 
+ A typical example is for rendering http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
 title="class or interface in java.util">Dates and http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendars as a 
formatted string:
+
+ Example:
+ 
+   public class MyClass {
+
+  //

[32/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/ClassMeta.html
--
diff --git a/content/site/apidocs/org/apache/juneau/ClassMeta.html 
b/content/site/apidocs/org/apache/juneau/ClassMeta.html
index a1ca80e..65ccfc7 100644
--- a/content/site/apidocs/org/apache/juneau/ClassMeta.html
+++ b/content/site/apidocs/org/apache/juneau/ClassMeta.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 
 
 @Bean(properties="innerClass,classCategory,elementType,keyType,valueType,notABeanReason,initException,beanMeta")
-public final class ClassMeta
+public final class ClassMeta
 extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object
 implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/Type.html?is-external=true";
 title="class or interface in java.lang.reflect">Type
 A wrapper class around the http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class object that 
provides cached information about that class.
@@ -322,8 +322,8 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 PojoSwap
-getPojoSwap()
-Returns the PojoSwap associated with this 
class.
+getPojoSwap(BeanSession session)
+Returns the PojoSwap associated with this 
class that's the best match for the specified session.
 
 
 
@@ -359,7 +359,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 ClassMeta
-getSerializedClassMeta()
+getSerializedClassMeta(BeanSession session)
 Returns the serialized (swapped) form of this class if 
there is an PojoSwap 
associated with it.
 
 
@@ -663,7 +663,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 getBeanTypePropertyName
-public http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String getBeanTypePropertyName()
+public http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String getBeanTypePropertyName()
 Returns the type property name associated with this class 
and subclasses.
 
  
@@ -681,7 +681,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 getDictionaryName
-public http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String getDictionaryName()
+public http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String getDictionaryName()
 Returns the bean dictionary name associated with this class.
 
  
@@ -699,7 +699,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 getBeanRegistry
-public BeanRegistry getBeanRegistry()
+public BeanRegistry getBeanRegistry()
 Returns the bean registry for this class.
 
  
@@ -718,7 +718,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 getClassCategory
-public org.apache.juneau.ClassMeta.ClassCategory getClassCategory()
+public org.apache.juneau.ClassMeta.ClassCategory getClassCategory()
 Returns the category of this class.
 
 Returns:
@@ -732,7 +732,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 isAssignableFrom
-public boolean isAssignableFrom(http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class c)
+public boolean isAssignableFrom(http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class c)
 Returns true if this class is a superclass of or 
the same as the specified class.
 
 Parameters:
@@ -748,7 +748,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 isInstanceOf
-public boolean isInstanceOf(http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class c)
+public boolean isInstanceOf(http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
 title="class or interface in java.lang">Class c)
 Returns true if this class is a subclass of or the 
same as the specified class.
 
 Parameters:
@@ -764,7 +764,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 hasChildPojoSwaps
-protected boolean hasChildPojoSwaps()
+protected boolean hasChildPojoSwaps()
 Returns true if this class or any child classes 
has a PojoSwap associated with it.
 
  
@@ -782,7 +782,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/T
 
 
 getChildPojoSwapForSwap
-protected PojoSwap getChildPojoSwapForSwap(http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-exter

[20/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
--
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
index e15a096..6012d78 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.html
@@ -137,915 +137,938 @@
 129rawTypeMeta = 
f.resolveClassMeta(p, field.getGenericType(), typeVarImpls);
 130isUri |= (rawTypeMeta.isUri() 
|| field.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
 131if (p != null) {
-132   swap = 
getPropertyPojoSwap(p);
-133   if (! 
p.properties().isEmpty())
-134  properties = 
split(p.properties());
-135   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
-136}
-137 }
-138
-139 if (getter != null) {
-140BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);
-141if (rawTypeMeta == null)
-142   rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);
-143isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
-144if (p != null) {
-145   if (swap == null)
-146  swap = 
getPropertyPojoSwap(p);
-147   if (properties != null 
&& ! p.properties().isEmpty())
-148  properties = 
split(p.properties());
-149   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
-150}
-151 }
-152
-153 if (setter != null) {
-154BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);
-155if (rawTypeMeta == null)
-156   rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);
-157isUri |= (rawTypeMeta.isUri() 
|| setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
-158if (p != null) {
-159   if (swap == null)
-160  swap = 
getPropertyPojoSwap(p);
-161   if (properties != null 
&& ! p.properties().isEmpty())
-162  properties = 
split(p.properties());
-163   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
-164}
-165 }
-166
-167 if (rawTypeMeta == null)
-168return false;
-169
-170 this.beanRegistry = new 
BeanRegistry(beanContext, parentBeanRegistry, bdClasses.toArray(new 
Class[0]));
-171
-172 isDyna = "*".equals(name);
-173
-174 // Do some annotation 
validation.
-175 Class c = 
rawTypeMeta.getInnerClass();
-176 if (getter != null) {
-177if (isDyna) {
-178   if (! 
isParentClass(Map.class, c))
-179  return false;
-180} else {
-181   if (! 
isParentClass(getter.getReturnType(), c))
-182  return false;
-183}
-184 }
-185 if (setter != null) {
-186Class[] pt = 
setter.getParameterTypes();
-187if (pt.length != (isDyna ? 2 
: 1))
-188   return false;
-189if (isDyna) {
-190   if (! 
pt[0].equals(String.class))
+132   if (! 
p.properties().isEmpty())
+133  properties = 
split(p.properties());
+134   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
+135}
+136Swap s = 
field.getAnnotation(Swap.class);
+137if (s != null) {
+138   swap = 
getPropertyPojoSwap(s);
+139}
+140 }
+141
+142 if (getter != null) {
+143BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);
+144if (rawTypeMeta == null)
+145   rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);
+146isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
+147if (p != null) {
+148   if (properties != null 
&& ! p.properties().isEmpty())
+149  properties = 
split(p.properties());
+150   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
+151}
+152Swap s = 
getter.getAnnotation(Swap.class);
+153if (s != null && swap 
== null) {
+154   swap = 
getPropertyPojoSwap(s);
+155}
+156 }
+157
+158 if (setter != null) {
+159BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);
+160if (rawTypeMeta == null)
+161   rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes(

[26/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeShort.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeShort.html 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeShort.html
index 0c96146..f063f45 100644
--- 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeShort.html
+++ 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeShort.html
@@ -223,7 +223,7 @@ extends 
 
 Methods inherited from class org.apache.juneau.transform.PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeSimple.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeSimple.html
 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeSimple.html
index 1c5adf6..3cb35cb 100644
--- 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeSimple.html
+++ 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.TimeSimple.html
@@ -221,7 +221,7 @@ extends 
 
 Methods inherited from class org.apache.juneau.transform.PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.ToString.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.ToString.html 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.ToString.html
index 8c39c87..3275551 100644
--- 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.ToString.html
+++ 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.ToString.html
@@ -221,7 +221,7 @@ extends 
 
 Methods inherited from class org.apache.juneau.transform.PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.html 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.html
index efe4cbd..f2ff683 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/CalendarSwap.html
@@ -369,7 +369,7 @@ extends 
 
 Methods inherited from class org.apache.juneau.transform.PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateLongSwap.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/DateLongSwap.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateLongSwap.html
index 67f00c9..610a3dc 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateLongSwap.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/DateLongSwap.html
@@ -187,7 +187,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 
@@ -257,7 +257,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
 title="class or interface in java.util">Date unswap(BeanSession session,
http://docs.oracle.com/javase/7/docs/api/java/lang/L

[34/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
Update javadocs

Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/commit/62afb533
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/tree/62afb533
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/diff/62afb533

Branch: refs/heads/asf-site
Commit: 62afb533d8930c1c86e4aba0380e47756ec66a0b
Parents: 1019556
Author: JamesBognar 
Authored: Sun Sep 10 16:31:57 2017 -0400
Committer: JamesBognar 
Committed: Sun Sep 10 16:31:57 2017 -0400

--
 content/site/apidocs/allclasses-frame.html  |4 +-
 content/site/apidocs/allclasses-noframe.html|4 +-
 content/site/apidocs/index-all.html |   97 +-
 .../apidocs/org/apache/juneau/BeanContext.html  |   93 +-
 .../site/apidocs/org/apache/juneau/BeanMap.html |4 +-
 .../apidocs/org/apache/juneau/BeanMapEntry.html |4 +-
 .../apache/juneau/BeanPropertyMeta.Builder.html |2 +-
 .../org/apache/juneau/BeanPropertyMeta.html |   44 +-
 .../apidocs/org/apache/juneau/ClassMeta.html|  179 +-
 .../org/apache/juneau/CoreObjectBuilder.html|2 +-
 .../apache/juneau/annotation/BeanProperty.html  |   59 +-
 .../juneau/annotation/ParentProperty.html   |4 +-
 .../org/apache/juneau/annotation/Pojo.html  |  271 --
 .../apache/juneau/annotation/ThreadSafe.html|4 +-
 .../apache/juneau/annotation/package-frame.html |3 +-
 .../juneau/annotation/package-summary.html  |   12 +-
 .../apache/juneau/annotation/package-tree.html  |3 +-
 .../org/apache/juneau/csv/CsvParserBuilder.html |2 +-
 .../apache/juneau/csv/CsvSerializerBuilder.html |2 +-
 .../org/apache/juneau/dto/atom/CommonEntry.html |2 +-
 .../org/apache/juneau/dto/atom/Entry.html   |2 +-
 .../Schema.BooleanOrSchemaArraySwap.html|2 +-
 .../jsonschema/Schema.BooleanOrSchemaSwap.html  |2 +-
 .../Schema.JsonTypeOrJsonTypeArraySwap.html |2 +-
 .../Schema.SchemaOrSchemaArraySwap.html |2 +-
 .../apache/juneau/dto/jsonschema/Schema.html|8 +-
 .../apache/juneau/html/HtmlParserBuilder.html   |2 +-
 .../juneau/html/HtmlSerializerBuilder.html  |2 +-
 .../apidocs/org/apache/juneau/http/Accept.html  |4 +-
 .../org/apache/juneau/http/ContentType.html |2 +-
 .../org/apache/juneau/http/MediaType.html   |  158 +-
 .../org/apache/juneau/http/MediaTypeRange.html  |   30 +-
 .../org/apache/juneau/internal/ArrayUtils.html  |   51 +-
 .../juneau/internal/ClassUtils.MethodInfo.html  |8 +-
 .../org/apache/juneau/internal/ClassUtils.html  |   34 +-
 .../apache/juneau/internal/DelegateBeanMap.html |4 +-
 .../apache/juneau/jena/RdfParserBuilder.html|2 +-
 .../juneau/jena/RdfSerializerBuilder.html   |2 +-
 .../org/apache/juneau/jso/JsoParserBuilder.html |2 +-
 .../apache/juneau/jso/JsoSerializerBuilder.html |2 +-
 .../apache/juneau/json/JsonParserBuilder.html   |2 +-
 .../json/JsonSchemaSerializerBuilder.html   |2 +-
 .../juneau/json/JsonSerializerBuilder.html  |2 +-
 .../juneau/json/JsonSerializerSession.html  |4 +-
 .../DirectoryResource.FileResource.html |2 +-
 .../resources/LogsResource.FileResource.html|2 +-
 .../juneau/msgpack/MsgPackParserBuilder.html|2 +-
 .../msgpack/MsgPackSerializerBuilder.html   |2 +-
 .../org/apache/juneau/parser/ParserBuilder.html |2 +-
 .../plaintext/PlainTextParserBuilder.html   |2 +-
 .../plaintext/PlainTextSerializerBuilder.html   |2 +-
 .../juneau/rest/client/RestClientBuilder.html   |2 +-
 .../juneau/rest/converters/Introspectable.html  |6 +-
 .../juneau/rest/converters/Traversable.html |6 +-
 .../juneau/serializer/SerializerBuilder.html|2 +-
 .../juneau/serializer/SerializerGroup.html  |  115 +-
 .../juneau/soap/SoapXmlSerializerBuilder.html   |2 +-
 .../org/apache/juneau/transform/MapSwap.html|2 +-
 .../org/apache/juneau/transform/PojoSwap.html   |  485 ++-
 .../org/apache/juneau/transform/StringSwap.html |6 +-
 .../apache/juneau/transform/SurrogateSwap.html  |  127 +-
 .../apache/juneau/transform/package-frame.html  |4 +
 .../juneau/transform/package-summary.html   |   24 +-
 .../apache/juneau/transform/package-tree.html   |4 +
 .../juneau/transforms/BeanStringSwap.html   |2 +-
 .../juneau/transforms/ByteArrayBase64Swap.html  |   18 +-
 .../juneau/transforms/CalendarLongSwap.html |   14 +-
 .../juneau/transforms/CalendarMapSwap.html  |   14 +-
 .../transforms/CalendarSwap.DateFull.html   |2 +-
 .../transforms/CalendarSwap.DateLong.html   |2 +-
 .../transforms/CalendarSwap.DateMedium.html |2 +-
 .../transforms/CalendarSwap.DateShort.html  |2 +-
 .../transforms/CalendarSwap.DateSimple.html |2 +-
 .../transforms/CalendarSwap.DateTimeFull.ht

[13/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
--
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
 
b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
index 6cbb889..57fc64b 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.ClassComparator.html
@@ -464,656 +464,662 @@
 456 oc = oc.getSuperclass();
 457  }
 458
-459  ParameterizedType opt = 
(ParameterizedType)oc.getGenericSuperclass();
-460  Type actualType = 
opt.getActualTypeArguments()[index];
-461
-462  if 
(typeMap.containsKey(actualType))
-463 actualType = 
typeMap.get(actualType);
+459  Type gsc = 
oc.getGenericSuperclass();
+460  
+461  // Not actually a parameterized 
type.
+462  if (! (gsc instanceof 
ParameterizedType))
+463 return Object.class;
 464
-465  if (actualType instanceof Class) 
{
-466 return 
(Class)actualType;
+465  ParameterizedType opt = 
(ParameterizedType)gsc;
+466  Type actualType = 
opt.getActualTypeArguments()[index];
 467
-468  } else if (actualType instanceof 
GenericArrayType) {
-469 Class cmpntType = 
(Class)((GenericArrayType)actualType).getGenericComponentType();
-470 return 
Array.newInstance(cmpntType, 0).getClass();
-471
-472  } else if (actualType instanceof 
TypeVariable) {
-473 TypeVariable 
typeVariable = (TypeVariable)actualType;
-474 List> 
nestedOuterTypes = new LinkedList>();
-475 for (Class ec = 
oc.getEnclosingClass(); ec != null; ec = ec.getEnclosingClass()) {
-476try {
-477   Class outerClass 
= oc.getClass();
-478   
nestedOuterTypes.add(outerClass);
-479   Map 
outerTypeMap = new HashMap();
-480   extractTypes(outerTypeMap, 
outerClass);
-481   for 
(Map.Entry entry : outerTypeMap.entrySet()) {
-482  Type key = 
entry.getKey(), value = entry.getValue();
-483  if (key instanceof 
TypeVariable) {
-484 
TypeVariable keyType = (TypeVariable)key;
-485 if 
(keyType.getName().equals(typeVariable.getName()) && 
isInnerClass(keyType.getGenericDeclaration(), 
typeVariable.getGenericDeclaration())) {
-486if (value 
instanceof Class)
-487   return 
(Class)value;
-488typeVariable = 
(TypeVariable)entry.getValue();
-489 }
-490  }
-491   }
-492} catch (Exception e) {
-493   throw new 
RuntimeException(e);
-494}
-495 }
-496 throw new 
FormattedRuntimeException("Could not resolve type: {0}", actualType);
-497  } else {
-498 throw new 
FormattedRuntimeException("Invalid type found in resolveParameterType: {0}", 
actualType);
-499  }
-500   }
-501
-502   private static boolean 
isInnerClass(GenericDeclaration od, GenericDeclaration id) {
-503  if (od instanceof Class && 
id instanceof Class) {
-504 Class oc = 
(Class)od;
-505 Class ic = 
(Class)id;
-506 while ((ic = 
ic.getEnclosingClass()) != null)
-507if (ic == oc)
-508   return true;
-509  }
-510  return false;
-511   }
-512
-513   private static void 
extractTypes(Map typeMap, Class c) {
-514  Type gs = 
c.getGenericSuperclass();
-515  if (gs instanceof 
ParameterizedType) {
-516 ParameterizedType pt = 
(ParameterizedType)gs;
-517 Type[] typeParameters = 
((Class)pt.getRawType()).getTypeParameters();
-518 Type[] actualTypeArguments = 
pt.getActualTypeArguments();
-519 for (int i = 0; i < 
typeParameters.length; i++) {
-520if 
(typeMap.containsKey(actualTypeArguments[i]))
-521   actualTypeArguments[i] = 
typeMap.get(actualTypeArguments[i]);
-522
typeMap.put(typeParameters[i], actualTypeArguments[i]);
-523 }
-524  }
-525   }
-526
-527   /**
-528* Finds a public method with the 
specified parameters.
-529*
-530* @param c The class to look for the 
method.
-531* @param name The method name.
-532* @param returnType
-533*The return type of the method.
-534*Can be a super type of the 
actual return type.
-535*For example, if the actual 
return type is CharSequence, then 
Object will match but
-536*String 
will not.
-537* @param parameterTypes
-538*The parameter types 

[27/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/CalendarLongSwap.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarLongSwap.html 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarLongSwap.html
index 5d45b31..8c70ecc 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/CalendarLongSwap.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/CalendarLongSwap.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-public class CalendarLongSwap
+public class CalendarLongSwap
 extends PojoSwapCalendar,http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long>
 Transforms http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendars to http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Longs using 
Calender.getTime().getTime().
 
@@ -187,7 +187,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 
@@ -216,7 +216,7 @@ extends 
 
 CalendarLongSwap
-public CalendarLongSwap()
+public CalendarLongSwap()
 
 
 
@@ -233,7 +233,7 @@ extends 
 
 swap
-public http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long swap(BeanSession session,
+public http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long swap(BeanSession session,
  http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar o)
 Converts the specified http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar to a http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long.
 
@@ -254,10 +254,10 @@ extends 
 
 unswap
-public http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar unswap(BeanSession session,
+public http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar unswap(BeanSession session,
http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long o,
ClassMeta hint)
-throws ParseException
+throws http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception
 Converts the specified http://docs.oracle.com/javase/7/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long to a http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendar.
 
 Overrides:
@@ -273,7 +273,7 @@ extends Returns:
 The narrowed object.
 Throws:
-ParseException
+http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
 title="class or interface in java.lang">Exception - If this method 
is not implemented.
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/CalendarMapSwap.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/CalendarMapSwap.html 
b/content/site/apidocs/org/apache/juneau/transforms/CalendarMapSwap.html
index c4b2220..3606091 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/CalendarMapSwap.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/CalendarMapSwap.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 
 
 
-public class CalendarMapSwap
+public class CalendarMapSwap
 extends PojoSwapCalendar,http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true";
 title="class or interface in java.util">Map>
 Transforms http://docs.oracle.com/javase/7/docs/api/java/util/Calendar.html?is-external=true";
 title="class or interface in java.util">Calendars to http://docs.ora

[06/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/transform/SurrogateSwap.html
--
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/transform/SurrogateSwap.html 
b/content/site/apidocs/src-html/org/apache/juneau/transform/SurrogateSwap.html
index 61a2749..13a3aa0 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/transform/SurrogateSwap.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/transform/SurrogateSwap.html
@@ -29,204 +29,95 @@
 021import org.apache.juneau.serializer.*;
 022
 023/**
-024 * Specialized {@link PojoSwap} for 
surrogate classes.
+024 * Specialized {@link PojoSwap} for 
{@link Surrogate} classes.
 025 *
-026 * 

-027 * Surrogate classes are used in place of other classes during serialization. -028 * For example, you may want to use a surrogate class to change the names or order of bean properties on a bean. -029 * -030 *

-031 * The following is an example of a surrogate class change changes a property name: -032 *

-033 *public class SurrogateClass { -034 * public String surrogateField; // New bean property -035 * -036 * public SurrogateClass(NormalClass normalClass) { -037 * this.surrogateField = normalClass.normalField; -038 * } -039 *} -040 *

-041 * -042 *

-043 * Optionally, a public static method can be used to un-transform a class during parsing: -044 *

-045 *public class SurrogateClass { -046 * ... -047 * public static NormalClass toNormalClass(SurrogateClass surrogateClass) { -048 * return new NormalClass(surrogateClass.transformedField); -049 * } -050 *} -051 *

-052 * -053 *

-054 * Surrogate classes must conform to the following: -055 *

    -056 *
  • -057 * It must have a one or more public constructors that take in a single parameter whose type is the normal types. -058 * (It is possible to define a class as a surrogate for multiple class types by using multiple constructors with -059 * different parameter types). -060 *
  • -061 * It optionally can have a public static method that takes in a single parameter whose type is the transformed -062 * type and returns an instance of the normal type. -063 * This is called the un-transform method. -064 * The method can be called anything. -065 *
  • -066 * If an un-transform method is present, the class must also contain a no-arg constructor (so that the -067 * transformed class can be instantiated by the parser before being converted into the normal class by the -068 * un-transform method). -069 *
-070 * -071 *

-072 * Surrogate classes are associated with serializers and parsers using the {@link CoreObjectBuilder#pojoSwaps(Class...)} -073 * method. -074 *

-075 *@Test -076 *public void test() throws Exception { -077 * JsonSerializer s = new JsonSerializerBuilder().simple().pojoSwaps(Surrogate.class).build(); -078 * JsonParser p = new JsonParserBuilder().pojoSwaps(Surrogate.class).build(); -079 * String r; -080 * Normal n = Normal.create(); -081 * -082 * r = s.serialize(n); -083 * assertEquals("{f2:'f1'}", r); -084 * -085 * n = p.parse(r, Normal.class); -086 * assertEquals("f1", n.f1); -087 *} -088 * -089 *// The normal class -090 *public class Normal { -091 * public String f1; -092 * -093 * public static Normal create() { -094 * Normal n = new Normal(); -095 * n.f1 = "f1"; -096 * return n; -097 * } -098 *} -099 * -100 *// The surrogate class -101 *public static class Surrogate { -102 * public String f2; -103 * -104 * // Surrogate constructor -105 * public Surrogate(Normal n) { -106 * f2 = n.f1; -107 * } -108 * -109 * // Constructor used during parsing (only needed if un-transform method specified) -110 * public Surrogate() {} -111 * -112 * // Un-transform method (optional) -113 * public static Normal toNormal(Surrogate f) { -114 * Normal n = new Normal(); -115 * n.f1 = f.f2; -116 * return n; -117 * } -118 *} -119 *

-120 * -121 *

-122 * It should be noted that a surrogate class is functionally equivalent to the following {@link PojoSwap} -123 * implementation: -124 *


[21/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
--
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
index e15a096..6012d78 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/BeanPropertyMeta.Builder.html
@@ -137,915 +137,938 @@
 129rawTypeMeta = 
f.resolveClassMeta(p, field.getGenericType(), typeVarImpls);
 130isUri |= (rawTypeMeta.isUri() 
|| field.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
 131if (p != null) {
-132   swap = 
getPropertyPojoSwap(p);
-133   if (! 
p.properties().isEmpty())
-134  properties = 
split(p.properties());
-135   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
-136}
-137 }
-138
-139 if (getter != null) {
-140BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);
-141if (rawTypeMeta == null)
-142   rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);
-143isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
-144if (p != null) {
-145   if (swap == null)
-146  swap = 
getPropertyPojoSwap(p);
-147   if (properties != null 
&& ! p.properties().isEmpty())
-148  properties = 
split(p.properties());
-149   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
-150}
-151 }
-152
-153 if (setter != null) {
-154BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);
-155if (rawTypeMeta == null)
-156   rawTypeMeta = 
f.resolveClassMeta(p, setter.getGenericParameterTypes()[0], typeVarImpls);
-157isUri |= (rawTypeMeta.isUri() 
|| setter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
-158if (p != null) {
-159   if (swap == null)
-160  swap = 
getPropertyPojoSwap(p);
-161   if (properties != null 
&& ! p.properties().isEmpty())
-162  properties = 
split(p.properties());
-163   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
-164}
-165 }
-166
-167 if (rawTypeMeta == null)
-168return false;
-169
-170 this.beanRegistry = new 
BeanRegistry(beanContext, parentBeanRegistry, bdClasses.toArray(new 
Class[0]));
-171
-172 isDyna = "*".equals(name);
-173
-174 // Do some annotation 
validation.
-175 Class c = 
rawTypeMeta.getInnerClass();
-176 if (getter != null) {
-177if (isDyna) {
-178   if (! 
isParentClass(Map.class, c))
-179  return false;
-180} else {
-181   if (! 
isParentClass(getter.getReturnType(), c))
-182  return false;
-183}
-184 }
-185 if (setter != null) {
-186Class[] pt = 
setter.getParameterTypes();
-187if (pt.length != (isDyna ? 2 
: 1))
-188   return false;
-189if (isDyna) {
-190   if (! 
pt[0].equals(String.class))
+132   if (! 
p.properties().isEmpty())
+133  properties = 
split(p.properties());
+134   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
+135}
+136Swap s = 
field.getAnnotation(Swap.class);
+137if (s != null) {
+138   swap = 
getPropertyPojoSwap(s);
+139}
+140 }
+141
+142 if (getter != null) {
+143BeanProperty p = 
getMethodAnnotation(BeanProperty.class, getter);
+144if (rawTypeMeta == null)
+145   rawTypeMeta = 
f.resolveClassMeta(p, getter.getGenericReturnType(), typeVarImpls);
+146isUri |= (rawTypeMeta.isUri() 
|| getter.isAnnotationPresent(org.apache.juneau.annotation.URI.class));
+147if (p != null) {
+148   if (properties != null 
&& ! p.properties().isEmpty())
+149  properties = 
split(p.properties());
+150   
bdClasses.addAll(Arrays.asList(p.beanDictionary()));
+151}
+152Swap s = 
getter.getAnnotation(Swap.class);
+153if (s != null && swap 
== null) {
+154   swap = 
getPropertyPojoSwap(s);
+155}
+156 }
+157
+158 if (setter != null) {
+159BeanProperty p = 
getMethodAnnotation(BeanProperty.class, setter);
+160if (rawTypeMeta == null)
+161   rawTypeMeta = 
f.resolveCla

[14/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
--
diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html 
b/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
index 93e09f2..f0b9175 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/http/Accept.html
@@ -227,43 +227,44 @@
 219
 220 for (int i = 0; i < 
mediaTypes.length; i++) {
 221MediaType mt = 
mediaTypes[i];
-222int matchQuant2 = 
mt.match(mr.getMediaType());
-223if (matchQuant2 > 
matchQuant) {
-224   matchIndex = i;
-225   matchQuant = 
matchQuant2;
-226   q = q2;
-227}
-228 }
-229  }
-230
-231  return matchIndex;
-232   }
-233
-234   /**
-235* Convenience method for searching 
through all of the subtypes of all the media ranges in this header for the
-236* presence of a subtype fragment.
-237*
-238* 

-239* For example, given the header "text/json+activity", calling -240* hasSubtypePart("activity") returns true. -241* -242* @param part The media type subtype fragment. -243* @return true if subtype fragment exists. -244*/ -245 public boolean hasSubtypePart(String part) { -246 -247 for (MediaTypeRange mr : this.mediaRanges) -248 if (mr.getQValue() > 0 && mr.getMediaType().getSubTypes().indexOf(part) >= 0) -249return true; -250 -251 return false; -252 } -253 -254 @Override /* Object */ -255 public String toString() { -256 return join(mediaRanges, ','); -257 } -258} +222int matchQuant2 = mr.getMediaType().match(mt, false); +223 +224if (matchQuant2 > matchQuant) { +225 matchIndex = i; +226 matchQuant = matchQuant2; +227 q = q2; +228} +229 } +230 } +231 +232 return matchIndex; +233 } +234 +235 /** +236* Convenience method for searching through all of the subtypes of all the media ranges in this header for the +237* presence of a subtype fragment. +238* +239*

+240* For example, given the header "text/json+activity", calling +241* hasSubtypePart("activity") returns true. +242* +243* @param part The media type subtype fragment. +244* @return true if subtype fragment exists. +245*/ +246 public boolean hasSubtypePart(String part) { +247 +248 for (MediaTypeRange mr : this.mediaRanges) +249 if (mr.getQValue() > 0 && mr.getMediaType().getSubTypes().indexOf(part) >= 0) +250return true; +251 +252 return false; +253 } +254 +255 @Override /* Object */ +256 public String toString() { +257 return join(mediaRanges, ','); +258 } +259} http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html -- diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html b/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html index d01d39a..e953f75 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html +++ b/content/site/apidocs/src-html/org/apache/juneau/http/ContentType.html @@ -103,7 +103,7 @@ 095 096 for (int i = 0; i < mediaTypes.length; i++) { 097 MediaType mt = mediaTypes[i]; -098 int matchQuant2 = mt.match(this); +098 int matchQuant2 = mt.match(this, true); 099 if (matchQuant2 > matchQuant) { 100matchQuant = matchQuant2; 101matchIndex = i; http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html -- diff --git a/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html b/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html index 462166a..c795479 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html +++ b/content/site/apidocs/src-html/org/apache/juneau/http/MediaType.html @@ -20,307 +20,355 @@ 012// *** 013package org.apache.juneau.http; 014 -015import java.util.*; -016import java.util.concurrent.*; -017 -018import org.apache.juneau.annotation.*; -019import org.apache.juneau.internal.*; -020import org.apache.juneau.json.*; -021 -022 -023/** -024 * Describes a single media type used in


[25/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeLong.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeLong.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeLong.html
index 486ab26..23e348b 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeLong.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeLong.html
@@ -223,7 +223,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeMedium.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeMedium.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeMedium.html
index f99ae90..fe5b586 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeMedium.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeMedium.html
@@ -223,7 +223,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeShort.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeShort.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeShort.html
index 242bcdf..26e0297 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeShort.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeShort.html
@@ -223,7 +223,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeSimple.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeSimple.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeSimple.html
index 9d0e564..897e9d6 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeSimple.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.TimeSimple.html
@@ -221,7 +221,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateSwap.ToString.html
--
diff --git 
a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.ToString.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.ToString.html
index f261ab9..8cf8e38 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.ToString.html
+++ b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.ToString.html
@@ -221,7 +221,7 @@ extends PojoSwap
-getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 toString
+forMediaTypes,
 forMediaTypes,
 getNormalClass,
 getSwapClass,
 getSwapClassMeta,
 isNormalObject,
 isSwappedObject,
 match,
 swap, toString,
 unswap,
 withTemplate,
 withTemplate
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transforms/DateSwap.html
--
diff --git a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.html 
b/content/site/apidocs/org/apache/juneau/transforms/DateSwap.html
index d509056..c08e003 100644
--- a/content/site/apidocs/org/apache/juneau/transforms/DateSwap.html
+++ b/content/site/apidocs/org/apache/juneau/tr

[12/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.MethodInfo.html
--
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.MethodInfo.html
 
b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.MethodInfo.html
index 6cbb889..57fc64b 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.MethodInfo.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.MethodInfo.html
@@ -464,656 +464,662 @@
 456 oc = oc.getSuperclass();
 457  }
 458
-459  ParameterizedType opt = 
(ParameterizedType)oc.getGenericSuperclass();
-460  Type actualType = 
opt.getActualTypeArguments()[index];
-461
-462  if 
(typeMap.containsKey(actualType))
-463 actualType = 
typeMap.get(actualType);
+459  Type gsc = 
oc.getGenericSuperclass();
+460  
+461  // Not actually a parameterized 
type.
+462  if (! (gsc instanceof 
ParameterizedType))
+463 return Object.class;
 464
-465  if (actualType instanceof Class) 
{
-466 return 
(Class)actualType;
+465  ParameterizedType opt = 
(ParameterizedType)gsc;
+466  Type actualType = 
opt.getActualTypeArguments()[index];
 467
-468  } else if (actualType instanceof 
GenericArrayType) {
-469 Class cmpntType = 
(Class)((GenericArrayType)actualType).getGenericComponentType();
-470 return 
Array.newInstance(cmpntType, 0).getClass();
-471
-472  } else if (actualType instanceof 
TypeVariable) {
-473 TypeVariable 
typeVariable = (TypeVariable)actualType;
-474 List> 
nestedOuterTypes = new LinkedList>();
-475 for (Class ec = 
oc.getEnclosingClass(); ec != null; ec = ec.getEnclosingClass()) {
-476try {
-477   Class outerClass 
= oc.getClass();
-478   
nestedOuterTypes.add(outerClass);
-479   Map 
outerTypeMap = new HashMap();
-480   extractTypes(outerTypeMap, 
outerClass);
-481   for 
(Map.Entry entry : outerTypeMap.entrySet()) {
-482  Type key = 
entry.getKey(), value = entry.getValue();
-483  if (key instanceof 
TypeVariable) {
-484 
TypeVariable keyType = (TypeVariable)key;
-485 if 
(keyType.getName().equals(typeVariable.getName()) && 
isInnerClass(keyType.getGenericDeclaration(), 
typeVariable.getGenericDeclaration())) {
-486if (value 
instanceof Class)
-487   return 
(Class)value;
-488typeVariable = 
(TypeVariable)entry.getValue();
-489 }
-490  }
-491   }
-492} catch (Exception e) {
-493   throw new 
RuntimeException(e);
-494}
-495 }
-496 throw new 
FormattedRuntimeException("Could not resolve type: {0}", actualType);
-497  } else {
-498 throw new 
FormattedRuntimeException("Invalid type found in resolveParameterType: {0}", 
actualType);
-499  }
-500   }
-501
-502   private static boolean 
isInnerClass(GenericDeclaration od, GenericDeclaration id) {
-503  if (od instanceof Class && 
id instanceof Class) {
-504 Class oc = 
(Class)od;
-505 Class ic = 
(Class)id;
-506 while ((ic = 
ic.getEnclosingClass()) != null)
-507if (ic == oc)
-508   return true;
-509  }
-510  return false;
-511   }
-512
-513   private static void 
extractTypes(Map typeMap, Class c) {
-514  Type gs = 
c.getGenericSuperclass();
-515  if (gs instanceof 
ParameterizedType) {
-516 ParameterizedType pt = 
(ParameterizedType)gs;
-517 Type[] typeParameters = 
((Class)pt.getRawType()).getTypeParameters();
-518 Type[] actualTypeArguments = 
pt.getActualTypeArguments();
-519 for (int i = 0; i < 
typeParameters.length; i++) {
-520if 
(typeMap.containsKey(actualTypeArguments[i]))
-521   actualTypeArguments[i] = 
typeMap.get(actualTypeArguments[i]);
-522
typeMap.put(typeParameters[i], actualTypeArguments[i]);
-523 }
-524  }
-525   }
-526
-527   /**
-528* Finds a public method with the 
specified parameters.
-529*
-530* @param c The class to look for the 
method.
-531* @param name The method name.
-532* @param returnType
-533*The return type of the method.
-534*Can be a super type of the 
actual return type.
-535*For example, if the actual 
return type is CharSequence, then 
Object will match but
-536*String 
will not.
-537* @param parameterTypes
-538*The parameter types of the 
method.
-539*

[17/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/CoreObjectBuilder.html
--
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/CoreObjectBuilder.html 
b/content/site/apidocs/src-html/org/apache/juneau/CoreObjectBuilder.html
index dc4a547..841c51b 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/CoreObjectBuilder.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/CoreObjectBuilder.html
@@ -1062,7 +1062,7 @@
 1054* There are two category of classes 
that can be passed in through this method:
 1055* 
    1056*
  • Subclasses of {@link PojoSwap}. -1057*
  • Surrogate classes. A shortcut for defining a {@link SurrogateSwap}. +1057*
  • Implementations of {@link Surrogate}. 1058*
1059* 1060*
Notes:
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html -- diff --git a/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html index 0904ec5..82c476a 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html +++ b/content/site/apidocs/src-html/org/apache/juneau/annotation/BeanProperty.html @@ -24,285 +24,261 @@ 016import static java.lang.annotation.RetentionPolicy.*; 017 018import java.lang.annotation.*; -019import java.util.*; -020 -021import org.apache.juneau.*; -022import org.apache.juneau.transform.*; -023 -024/** -025 * Used tailor how bean properties get interpreted by the framework. -026 * -027 *

-028 * Can be used to do the following: -029 *

    +019 +020import org.apache.juneau.*; +021 +022/** +023 * Used tailor how bean properties get interpreted by the framework. +024 * +025 *

    +026 * Can be used to do the following: +027 *

      +028 *
    • +029 * Override the name of a property. 030 *
    • -031 * Override the name of a property. +031 * Identify a getter or setter with a non-standard naming convention. 032 *
    • -033 * Identify a getter or setter with a non-standard naming convention. +033 * Identify a specific subclass for a property with a general class type. 034 *
    • -035 * Identify a specific subclass for a property with a general class type. +035 * Identify class types of elements in properties of type Collection or Map. 036 *
    • -037 * Identify class types of elements in properties of type Collection or Map. +037 * Hide properties during serialization. 038 *
    • -039 * Hide properties during serialization. -040 *
    • -041 * Associate transforms with bean property values, such as a POJO swap to convert a Calendar field -042 * to a string. -043 *
    • -044 * Override the list of properties during serialization on child elements of a property of type -045 * Collection or Map. +039 * Associate transforms with bean property values, such as a POJO swap to convert a Calendar field +040 * to a string. +041 *
    • +042 * Override the list of properties during serialization on child elements of a property of type +043 * Collection or Map. +044 *
    • +045 * Identify a property as the URL for a bean. 046 *
    • -047 * Identify a property as the URL for a bean. -048 *
    • -049 * Identify a property as the ID for a bean. -050 *
    -051 * -052 *

    -053 * This annotation is applied to public fields and public getter/setter methods of beans. -054 */ -055@Documented -056@Target({FIELD,METHOD}) -057@Retention(RUNTIME) -058@Inherited -059public @interface BeanProperty { -060 -061 /** -062* Identifies the name of the property. -063* -064*

    -065* Normally, this is automatically inferred from the field name or getter method name of the property. -066* However, this property can be used to assign a different property name from the automatically inferred value. -067* -068*

    -069* If the {@link BeanContext#BEAN_beanFieldVisibility} setting on the bean context excludes this field (e.g. the -070* visibility is set to PUBLIC, but the field is PROTECTED), this annotation can be used to force the field to be -071* identified as a property. -072* -073*

    Dynamic beans
    -074*

    -075* The bean property named "*" is the designated "dynamic property" which allows for "extra" bean -076* properties n


[28/34] incubator-juneau-website git commit: Update javadocs

2017-09-10 Thread jamesbognar
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/transform/PojoSwap.html
--
diff --git a/content/site/apidocs/org/apache/juneau/transform/PojoSwap.html 
b/content/site/apidocs/org/apache/juneau/transform/PojoSwap.html
index 15ace1e..ca46b45 100644
--- a/content/site/apidocs/org/apache/juneau/transform/PojoSwap.html
+++ b/content/site/apidocs/org/apache/juneau/transform/PojoSwap.html
@@ -18,7 +18,7 @@
 catch(err) {
 }
 //-->
-var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10};
+var methods = 
{"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance 
Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -117,15 +117,18 @@ var activeTableTab = "activeTableTab";
 
 
 
-public abstract class PojoSwap
+public abstract class PojoSwap
 extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object
-Used to swap out non-serializable objects with serializable 
replacements during serialization, and vis-versa during parsing.
+Used to swap out non-serializable objects with serializable 
replacements during serialization, and vis-versa during
+ parsing.
 
- Description:
 
+ Description:
+
+ 
  PojoSwaps are used to extend the functionality of the 
serializers and parsers to be able to handle
- POJOs that aren't automatically handled by the serializers or parsers.  For 
example, JSON does not have a standard
- representation for rendering dates.
+ POJOs that aren't automatically handled by the serializers or parsers.
+ For example, JSON does not have a standard representation for rendering 
dates.
  By defining a special Date swap and associating it with a 
serializer and parser, you can convert a
  Date object to a String during serialization, and 
convert that String object back into a
  Date object during parsing.
@@ -135,7 +138,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
 
  
  PojoSwaps are associated with instances of BeanContexts by passing the swap
- class to the CoreObjectBuilder.pojoSwaps(Class...)
 method.
+ class to the SerializerBuilder.pojoSwaps(Class...)
 and ParserBuilder.pojoSwaps(Class...)
 methods.
  When associated with a bean context, fields of the specified type will 
automatically be converted when the
  BeanMap.get(Object)
 or BeanMap.put(String,
 Object) methods are called.
 
@@ -150,6 +153,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
  Parsers use swaps to convert 
objects of type S into objects of type T, and on calls to
  BeanMap.put(String,Object).
 
+
  Subtypes
 
  The following abstract subclasses are provided for common swap types:
@@ -158,13 +162,6 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
MapSwap - Objects 
swapped with ObjectMaps.
  
 
- Localization
-
- Swaps have access to the session locale and timezone through the BeanSession.getLocale()
 and
- BeanSession.getTimeZone()
 methods.
- This allows you to specify localized swap values when needed.
- If using the REST server API, the locale and timezone are set based on the 
Accept-Language and
- Time-Zone headers on the request.
 
  Swap Class Type 
 
@@ -188,10 +185,60 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
   An array of anything on this list.
  
 
+
  Normal Class Type 
 
  The normal object representation of an object.
 
+
+ Overview
+
+ The following is an example of a swap that replaces byte arrays with BASE-64 
encoded strings:
+
+ 
+   public class ByteArrayBase64Swap extends 
PojoSwap {
+
+  public String swap(BeanSession session, byte[] b) 
throws SerializeException {
+ return StringUtils.base64Encode(b);
+  }
+
+  public byte[] unswap(BeanSession session, String s, 
ClassMeta hint) throws ParseException {
+ return StringUtils.base64Decode(s);
+  }
+   }
+ 
+
+ 
+   WriterSerializer s = 
JsonSerializer.DEFAULT_LAX.builder().pojoSwaps(ByteArrayBase64Swap.class).build();
+   String json = s.serialize(new byte[] {1,2,3});  // Produces 
"'AQID'"
+ 
+
+
+ Swap annotation
+
+ 
+ Swap classes are often associated directly with POJOs using the @Swap annotation.
+
+ 
+   public class MyPojoSwap extends 
PojoSwap { ... }
+
+   @Swap(MyPojoSwap.class)
+   public class MyPojo { ... }
+ 
+
+ 
+ The @Swap annotation is often simpler since you do not need to tell 
your serializers and parsers about them
+ leading to less code.
+
+ 
+ Swaps can also be associated with getters and setters as well:
+
+ 
+   @BeanProperty(swap=MyPojo.class)
+   public MyPojo getMyPojo();
+ 
+
+
  One-way vs. Two-way Serializati

[23/34] incubator-juneau-website git commit: Update javadocs

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
--
diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html 
b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
index 5d2e3c8..4000c8c 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/BeanContext.html
@@ -652,1136 +652,1146 @@
 644*
  • Subclasses of {@link PojoSwap}. 645*
  • Surrogate classes. A shortcut for defining a {@link SurrogateSwap}. 646* -647*/ -648 public static final String BEAN_pojoSwaps = "BeanContext.pojoSwaps.list"; -649 -650 /** -651* Configuration property: Add to POJO swap classes. +647* +648*

    +649* Multiple POJO swaps can be associated with a single class. +650* When multiple swaps are applicable to the same class, the media type pattern defined by +651* {@link PojoSwap#forMediaTypes()} or {@link Swap#mediaTypes()} are used to come up with the best match. 652*/ -653 public static final String BEAN_pojoSwaps_add = "BeanContext.pojoSwaps.list.add"; +653 public static final String BEAN_pojoSwaps = "BeanContext.pojoSwaps.list"; 654 655 /** -656* Configuration property: Remove from POJO swap classes. +656* Configuration property: Add to POJO swap classes. 657*/ -658 public static final String BEAN_pojoSwaps_remove = "BeanContext.pojoSwaps.list.remove"; +658 public static final String BEAN_pojoSwaps_add = "BeanContext.pojoSwaps.list.add"; 659 660 /** -661* Configuration property: Implementation classes for interfaces and abstract classes. -662* -663*

      -664*
    • Name: "BeanContext.implClasses.map" -665*
    • Data type: Map<Class,Class> -666*
    • Default: empty map -667*
    • Session-overridable: false -668*
    -669* -670*

    -671* For interfaces and abstract classes this method can be used to specify an implementation class for the -672* interface/abstract class so that instances of the implementation class are used when instantiated (e.g. during a -673* parse). -674*/ -675 public static final String BEAN_implClasses = "BeanContext.implClasses.map"; -676 -677 /** -678* Configuration property: Add an implementation class. +661* Configuration property: Remove from POJO swap classes. +662*/ +663 public static final String BEAN_pojoSwaps_remove = "BeanContext.pojoSwaps.list.remove"; +664 +665 /** +666* Configuration property: Implementation classes for interfaces and abstract classes. +667* +668*

      +669*
    • Name: "BeanContext.implClasses.map" +670*
    • Data type: Map<Class,Class> +671*
    • Default: empty map +672*
    • Session-overridable: false +673*
    +674* +675*

    +676* For interfaces and abstract classes this method can be used to specify an implementation class for the +677* interface/abstract class so that instances of the implementation class are used when instantiated (e.g. during a +678* parse). 679*/ -680 public static final String BEAN_implClasses_put = "BeanContext.implClasses.map.put"; +680 public static final String BEAN_implClasses = "BeanContext.implClasses.map"; 681 682 /** -683* Configuration property: Explicitly specify visible bean properties. -684* -685*

      -686*
    • Name: "BeanContext.includeProperties" -687*
    • Data type: Map<String,String> -688*
    • Default: {} -689*
    • Session-overridable: false -690*
    -691* -692*

    -693* Specifies to only include the specified list of properties for the specified bean classes. -694* -695*

    -696* The keys are either fully-qualified or simple class names, and the values are comma-delimited lists of property -697* names. -698* The key "*" means all bean classes. +683* Configuration property: Add an implementation class. +684*/ +685 public static final String BEAN_implClasses_put = "BeanContext.implClasses.map.put"; +686 +687 /** +688* Configuration property: Explicitly specify visible bean properties. +689* +690*

      +691*
    • Name: "BeanContext.includeProperties" +692*
    • Data type: Map<String,String> +693*
    • Default: {} +694*
    • Session-overridable: false +695*
    +696

  • [30/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/http/MediaType.html
    --
    diff --git a/content/site/apidocs/org/apache/juneau/http/MediaType.html 
    b/content/site/apidocs/org/apache/juneau/http/MediaType.html
    index fb8c4b8..34e256c 100644
    --- a/content/site/apidocs/org/apache/juneau/http/MediaType.html
    +++ b/content/site/apidocs/org/apache/juneau/http/MediaType.html
    @@ -18,7 +18,7 @@
     catch(err) {
     }
     //-->
    -var methods = 
    {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
    +var methods = 
    {"i0":10,"i1":10,"i2":9,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10};
     var tabs = {65535:["t0","All Methods"],1:["t1","Static 
    Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
     var altColor = "altColor";
     var rowColor = "rowColor";
    @@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
     
     
     @BeanIgnore
    -public class MediaType
    +public class MediaType
     extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true";
     title="class or interface in java.lang">Object
     implements http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true";
     title="class or interface in java.lang">Comparable
     Describes a single media type used in content negotiation 
    between an HTTP client and server, as described in
    @@ -263,52 +263,60 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
     
     
     
    +static MediaType[]
    +forStrings(http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
     title="class or interface in java.lang">String... s)
    +Same as forString(String)
     but allows you to construct an array of MediaTypes from an
    + array of strings.
    +
    +
    +
     http://docs.oracle.com/javase/7/docs/api/java/util/Map.html?is-external=true";
     title="class or interface in java.util">MapString,http://docs.oracle.com/javase/7/docs/api/java/util/Set.html?is-external=true";
     title="class or interface in java.util">SetString>>
     getParameters()
     Returns the additional parameters on this media type.
     
     
    -
    +
     http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
     title="class or interface in java.lang">String
     getSubType()
     Returns the 'subType' fragment of the 
    'type/subType' string.
     
     
    -
    +
     http://docs.oracle.com/javase/7/docs/api/java/util/List.html?is-external=true";
     title="class or interface in java.util">ListString>
     getSubTypes()
     Returns the subtypes broken down by fragments delimited by 
    "'".
     
     
    -
    +
     http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
     title="class or interface in java.lang">String
     getType()
     Returns the 'type' fragment of the 
    'type/subType' string.
     
     
    -
    +
     int
     hashCode() 
     
    -
    +
     boolean
     hasSubType(http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
     title="class or interface in java.lang">String st)
     Returns true if the subtype contains the specified 
    '+' delimited subtype value.
     
     
    -
    -int
    -match(MediaType o)
    -Returns a match metric against the specified media type 
    where a larger number represents a better match.
    -
    -
     
     boolean
    -matches(MediaType o)
    -Returns true if this media type is a match for the 
    specified media type.
    +isMeta()
    +Returns true if this media type contains the 
    '*' meta character.
     
     
     
    +int
    +match(MediaType o,
    + boolean allowExtraSubTypes)
    +Returns a match metric against the specified media type 
    where a larger number represents a better match.
    +
    +
    +
     http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
     title="class or interface in java.lang">String
     toString() 
     
    @@ -340,7 +348,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
     
     
     CSV
    -public static final MediaType CSV
    +public static final MediaType CSV
     Reusable predefined media type
     
     
    @@ -350,7 +358,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
     
     
     HTML
    -public static final MediaType HTML
    +public static final MediaType HTML
     Reusable predefined media type
     
     
    @@ -360,7 +368,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
     
     
     JSON
    -public static final MediaType JSON
    +public static final MediaType JSON
     Reusable predefined media type
     
     
    @@ -370,7 +378,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/lang/Comparabl
     
     
     MSGPACK
    -public static final MediaType MSGPACK
    +public static final MediaType MSGPACK
     Reusable predefined med

    [31/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html 
    b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
    index 2376fcf..81582fc 100644
    --- a/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
    +++ b/content/site/apidocs/org/apache/juneau/annotation/ParentProperty.html
    @@ -43,7 +43,7 @@
     
     
     Prev Class
    -Next Class
    +Next Class
     
     
     Frames
    @@ -147,7 +147,7 @@ public @interface 
     
     Prev Class
    -Next Class
    +Next Class
     
     
     Frames
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/annotation/Pojo.html
    --
    diff --git a/content/site/apidocs/org/apache/juneau/annotation/Pojo.html 
    b/content/site/apidocs/org/apache/juneau/annotation/Pojo.html
    deleted file mode 100644
    index e63d609..000
    --- a/content/site/apidocs/org/apache/juneau/annotation/Pojo.html
    +++ /dev/null
    @@ -1,271 +0,0 @@
    -http://www.w3.org/TR/html4/loose.dtd";>
    -
    -
    -
    -
    -
    -Pojo (Apache Juneau (incubating) 6.3.2-incubating-SNAPSHOT)
    -
    -
    -
    -
    -
    -
    -
    -JavaScript is disabled on your browser.
    -
    -
    -
    -
    -
    -Skip navigation links
    -
    -
    -
    -
    -Overview
    -Package
    -Class
    -Tree
    -Deprecated
    -Index
    -Help
    -
    -
    -
    -
    -Prev Class
    -Next Class
    -
    -
    -Frames
    -No Frames
    -
    -
    -All Classes
    -
    -
    -
    -
    -
    -
    -
    -Summary: 
    -Field | 
    -Required | 
    -Optional
    -
    -
    -Detail: 
    -Field | 
    -Element
    -
    -
    -
    -
    -
    -
    -
    -
    -org.apache.juneau.annotation
    -Annotation Type Pojo
    -
    -
    -
    -
    -
    -
    -
    -http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Documented.html?is-external=true";
     title="class or interface in java.lang.annotation">@Documented
    - http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true";
     title="class or interface in java.lang.annotation">@Target(http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Target.html?is-external=true#value--";
     title="class or interface in java.lang.annotation">value=http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/ElementType.html?is-external=true#TYPE";
     title="class or interface in java.lang.annotation">TYPE)
    - http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true";
     title="class or interface in java.lang.annotation">@Retention(http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Retention.html?is-external=true#value--";
     title="class or interface in java.lang.annotation">value=http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/RetentionPolicy.html?is-external=true#RUNTIME";
     title="class or interface in java.lang.annotation">RUNTIME)
    - http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/Inherited.html?is-external=true";
     title="class or interface in java.lang.annotation">@Inherited
    -public @interface Pojo
    -Used to tailor how POJOs get interpreted by the 
    framework.
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -Optional Element Summary
    -
    -Optional Elements 
    -
    -Modifier and Type
    -Optional Element and Description
    -
    -
    -http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
     title="class or interface in java.lang">Class
    -swap
    -Associate a PojoSwap or SurrogateSwap with this class 
    type.
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -Element Detail
    -
    -
    -
    -
    -
    -swap
    -public abstract http://docs.oracle.com/javase/7/docs/api/java/lang/Class.html?is-external=true";
     title="class or interface in java.lang">Class swap
    -Associate a PojoSwap or SurrogateSwap with this class 
    type.
    -
    - 
    - Supports the following class types:
    - 
    -   Subclasses of PojoSwap.
    -   Any other class.  Will get interpreted as a SurrogateSwap.
    - 
    -
    - Example:
    - 
    - In this case, a swap is being applied to a bean that will force it to be 
    serialized as a String:
    - 
    -   // Our bean class
    -   @Pojo(swap=BSwap.class)
    -   public class B {
    -  public String f1;
    -   }
    -
    -   // Our POJO swap to force the bean to be serialized as a String
    -   public class BSwap extends PojoSwap {
    -  public String swap(BeanSession s, B o) throws 
    SerializeException {
    - return o.f1;
    -  }
    -  public B unswap(BeanSession s, String f) throws 
    ParseException { {
    - B b1 = new B();
    - b1.f1 = f;
    - return b1;
    -  }
    -   }
    -
    -   public void test() throws Exception {
    -  WriterSerializer s = JsonSerializer.DEFAULT;
    -  B b

    [04/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html 
    b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
    index 1e05dec..15937e8 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/uon/UonSerializerSession.html
    @@ -137,149 +137,150 @@
     129 aType = object();
     130  }
     131
    -132  sType = 
    aType.getSerializedClassMeta();
    +132  sType = aType;
     133  String typeName = 
    getBeanTypeName(eType, aType, pMeta);
     134
     135  // Swap if necessary
    -136  PojoSwap swap = 
    aType.getPojoSwap();
    +136  PojoSwap swap = 
    aType.getPojoSwap(this);
     137  if (swap != null) {
     138 o = swap.swap(this, o);
    -139
    -140 // If the getSwapClass() method 
    returns Object, we need to figure out
    -141 // the actual type now.
    -142 if (sType.isObject())
    -143sType = 
    getClassMetaForObject(o);
    -144  }
    -145
    -146  // '\0' characters are considered 
    null.
    -147  if (o == null || (sType.isChar() 
    && ((Character)o).charValue() == 0))
    -148 out.appendObject(null, false);
    -149  else if (sType.isBoolean())
    -150 out.appendBoolean(o);
    -151  else if (sType.isNumber())
    -152 out.appendNumber(o);
    -153  else if (sType.isBean())
    -154 serializeBeanMap(out, 
    toBeanMap(o), typeName);
    -155  else if (sType.isUri() || (pMeta != 
    null && pMeta.isUri()))
    -156 out.appendUri(o);
    -157  else if (sType.isMap()) {
    -158 if (o instanceof BeanMap)
    -159serializeBeanMap(out, 
    (BeanMap)o, typeName);
    -160 else
    -161serializeMap(out, (Map)o, 
    eType);
    -162  }
    -163  else if (sType.isCollection()) {
    -164 serializeCollection(out, 
    (Collection) o, eType);
    -165  }
    -166  else if (sType.isArray()) {
    -167 serializeCollection(out, 
    toList(sType.getInnerClass(), o), eType);
    -168  }
    -169  else if (sType.isReader() || 
    sType.isInputStream()) {
    -170 IOUtils.pipe(o, out);
    -171  }
    -172  else {
    -173 out.appendObject(o, false);
    -174  }
    -175
    -176  if (! isRecursion)
    -177 pop();
    -178  return out;
    -179   }
    -180
    -181   @SuppressWarnings({ "rawtypes", 
    "unchecked" })
    -182   private SerializerWriter 
    serializeMap(UonWriter out, Map m, ClassMeta type) throws Exception 
    {
    -183
    -184  m = sort(m);
    -185
    -186  ClassMeta keyType = 
    type.getKeyType(), valueType = type.getValueType();
    -187
    -188  if (! plainTextParams)
    -189 out.append('(');
    -190
    -191  Iterator mapEntries = 
    m.entrySet().iterator();
    -192
    -193  while (mapEntries.hasNext()) {
    -194 Map.Entry e = (Map.Entry) 
    mapEntries.next();
    -195 Object value = e.getValue();
    -196 Object key = 
    generalize(e.getKey(), keyType);
    -197 out.cr(indent).appendObject(key, 
    false).append('=');
    -198 serializeAnything(out, value, 
    valueType, (key == null ? null : toString(key)), null);
    -199 if (mapEntries.hasNext())
    -200out.append(',');
    -201  }
    -202
    -203  if (m.size() > 0)
    -204 out.cre(indent-1);
    -205
    -206  if (! plainTextParams)
    -207 out.append(')');
    -208
    -209  return out;
    -210   }
    -211
    -212   private SerializerWriter 
    serializeBeanMap(UonWriter out, BeanMap m, String typeName) throws 
    Exception {
    -213
    -214  if (! plainTextParams)
    -215 out.append('(');
    -216
    -217  boolean addComma = false;
    -218
    -219  for (BeanPropertyValue p : 
    m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, 
    typeName) : null)) {
    -220 BeanPropertyMeta pMeta = 
    p.getMeta();
    -221 ClassMeta cMeta = 
    p.getClassMeta();
    -222
    -223 String key = p.getName();
    -224 Object value = p.getValue();
    -225 Throwable t = p.getThrown();
    -226 if (t != null)
    -227onBeanGetterException(pMeta, 
    t);
    -228
    -229 if (canIgnoreValue(cMeta, key, 
    value))
    -230continue;
    -231
    -232 if (addComma)
    -233out.append(',');
    -234
    -235 out.cr(indent).appendObject(key, 
    false).append('=');
    -236
    -237 serializeAnything(out, value, 
    cMeta, key, pMeta);
    -238
    -239 addComma = true;
    -240  }
    -241
    -242  if (m.size() > 0)
    -243 out.cre(indent-1);
    -244  if (! plainTextParams)
    -245 out.append(')');
    -246
    -247  return out;
    -248   }
    -249
    -250   @SuppressWarnings({ "rawtypes", 
    "unchecked" })
    -251   private SerializerWriter 
    serializeCollection(UonWriter out, Collection c, ClassMeta type) 
    throws Exception {
    -252
    -253  ClassMeta elementType = 
    type.getElementType();
    -254
    -255  c = sort(c)

    [11/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.html 
    b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.html
    index 6cbb889..57fc64b 100644
    --- a/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.html
    +++ b/content/site/apidocs/src-html/org/apache/juneau/internal/ClassUtils.html
    @@ -464,656 +464,662 @@
     456 oc = oc.getSuperclass();
     457  }
     458
    -459  ParameterizedType opt = 
    (ParameterizedType)oc.getGenericSuperclass();
    -460  Type actualType = 
    opt.getActualTypeArguments()[index];
    -461
    -462  if 
    (typeMap.containsKey(actualType))
    -463 actualType = 
    typeMap.get(actualType);
    +459  Type gsc = 
    oc.getGenericSuperclass();
    +460  
    +461  // Not actually a parameterized 
    type.
    +462  if (! (gsc instanceof 
    ParameterizedType))
    +463 return Object.class;
     464
    -465  if (actualType instanceof Class) 
    {
    -466 return 
    (Class)actualType;
    +465  ParameterizedType opt = 
    (ParameterizedType)gsc;
    +466  Type actualType = 
    opt.getActualTypeArguments()[index];
     467
    -468  } else if (actualType instanceof 
    GenericArrayType) {
    -469 Class cmpntType = 
    (Class)((GenericArrayType)actualType).getGenericComponentType();
    -470 return 
    Array.newInstance(cmpntType, 0).getClass();
    -471
    -472  } else if (actualType instanceof 
    TypeVariable) {
    -473 TypeVariable 
    typeVariable = (TypeVariable)actualType;
    -474 List> 
    nestedOuterTypes = new LinkedList>();
    -475 for (Class ec = 
    oc.getEnclosingClass(); ec != null; ec = ec.getEnclosingClass()) {
    -476try {
    -477   Class outerClass 
    = oc.getClass();
    -478   
    nestedOuterTypes.add(outerClass);
    -479   Map 
    outerTypeMap = new HashMap();
    -480   extractTypes(outerTypeMap, 
    outerClass);
    -481   for 
    (Map.Entry entry : outerTypeMap.entrySet()) {
    -482  Type key = 
    entry.getKey(), value = entry.getValue();
    -483  if (key instanceof 
    TypeVariable) {
    -484 
    TypeVariable keyType = (TypeVariable)key;
    -485 if 
    (keyType.getName().equals(typeVariable.getName()) && 
    isInnerClass(keyType.getGenericDeclaration(), 
    typeVariable.getGenericDeclaration())) {
    -486if (value 
    instanceof Class)
    -487   return 
    (Class)value;
    -488typeVariable = 
    (TypeVariable)entry.getValue();
    -489 }
    -490  }
    -491   }
    -492} catch (Exception e) {
    -493   throw new 
    RuntimeException(e);
    -494}
    -495 }
    -496 throw new 
    FormattedRuntimeException("Could not resolve type: {0}", actualType);
    -497  } else {
    -498 throw new 
    FormattedRuntimeException("Invalid type found in resolveParameterType: {0}", 
    actualType);
    -499  }
    -500   }
    -501
    -502   private static boolean 
    isInnerClass(GenericDeclaration od, GenericDeclaration id) {
    -503  if (od instanceof Class && 
    id instanceof Class) {
    -504 Class oc = 
    (Class)od;
    -505 Class ic = 
    (Class)id;
    -506 while ((ic = 
    ic.getEnclosingClass()) != null)
    -507if (ic == oc)
    -508   return true;
    -509  }
    -510  return false;
    -511   }
    -512
    -513   private static void 
    extractTypes(Map typeMap, Class c) {
    -514  Type gs = 
    c.getGenericSuperclass();
    -515  if (gs instanceof 
    ParameterizedType) {
    -516 ParameterizedType pt = 
    (ParameterizedType)gs;
    -517 Type[] typeParameters = 
    ((Class)pt.getRawType()).getTypeParameters();
    -518 Type[] actualTypeArguments = 
    pt.getActualTypeArguments();
    -519 for (int i = 0; i < 
    typeParameters.length; i++) {
    -520if 
    (typeMap.containsKey(actualTypeArguments[i]))
    -521   actualTypeArguments[i] = 
    typeMap.get(actualTypeArguments[i]);
    -522
    typeMap.put(typeParameters[i], actualTypeArguments[i]);
    -523 }
    -524  }
    -525   }
    -526
    -527   /**
    -528* Finds a public method with the 
    specified parameters.
    -529*
    -530* @param c The class to look for the 
    method.
    -531* @param name The method name.
    -532* @param returnType
    -533*The return type of the method.
    -534*Can be a super type of the 
    actual return type.
    -535*For example, if the actual 
    return type is CharSequence, then 
    Object will match but
    -536*String 
    will not.
    -537* @param parameterTypes
    -538*The parameter types of the 
    method.
    -539*Can be subtypes of the actual 
    parameter types.
    -540  

    [18/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
    --
    diff --git a/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html 
    b/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
    index 7eeef6b..bcff7b5 100644
    --- a/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
    +++ b/content/site/apidocs/src-html/org/apache/juneau/ClassMeta.html
    @@ -30,162 +30,162 @@
     022import java.net.*;
     023import java.net.URI;
     024import java.util.*;
    -025import java.util.concurrent.*;
    -026import java.util.concurrent.locks.*;
    -027
    -028import org.apache.juneau.annotation.*;
    -029import org.apache.juneau.internal.*;
    -030import org.apache.juneau.parser.*;
    -031import org.apache.juneau.remoteable.*;
    -032import org.apache.juneau.serializer.*;
    -033import org.apache.juneau.transform.*;
    -034import org.apache.juneau.utils.*;
    -035
    -036/**
    -037 * A wrapper class around the {@link 
    Class} object that provides cached information about that class.
    -038 *
    -039 * 

    -040 * Instances of this class can be created through the {@link BeanContext#getClassMeta(Class)} method. -041 * -042 *

    -043 * The {@link BeanContext} class will cache and reuse instances of this class except for the following class types: -044 *

      -045 *
    • Arrays -046 *
    • Maps with non-Object key/values. -047 *
    • Collections with non-Object key/values. -048 *
    -049 * -050 *

    -051 * This class is tied to the {@link BeanContext} class because it's that class that makes the determination of what is -052 * a bean. -053 * -054 * @param The class type of the wrapped class. -055 */ -056@Bean(properties="innerClass,classCategory,elementType,keyType,valueType,notABeanReason,initException,beanMeta") -057public final class ClassMeta implements Type { -058 -059 /** Class categories. */ -060 enum ClassCategory { -061 MAP, COLLECTION, CLASS, METHOD, NUMBER, DECIMAL, BOOLEAN, CHAR, DATE, ARRAY, ENUM, OTHER, CHARSEQ, STR, OBJ, URI, BEANMAP, READER, INPUTSTREAM, VOID, ARGS -062 } -063 -064 final Class innerClass; // The class being wrapped. +025import java.util.Date; +026import java.util.concurrent.*; +027import java.util.concurrent.locks.*; +028 +029import org.apache.juneau.annotation.*; +030import org.apache.juneau.http.*; +031import org.apache.juneau.internal.*; +032import org.apache.juneau.parser.*; +033import org.apache.juneau.remoteable.*; +034import org.apache.juneau.serializer.*; +035import org.apache.juneau.transform.*; +036import org.apache.juneau.utils.*; +037 +038/** +039 * A wrapper class around the {@link Class} object that provides cached information about that class. +040 * +041 *

    +042 * Instances of this class can be created through the {@link BeanContext#getClassMeta(Class)} method. +043 * +044 *

    +045 * The {@link BeanContext} class will cache and reuse instances of this class except for the following class types: +046 *

      +047 *
    • Arrays +048 *
    • Maps with non-Object key/values. +049 *
    • Collections with non-Object key/values. +050 *
    +051 * +052 *

    +053 * This class is tied to the {@link BeanContext} class because it's that class that makes the determination of what is +054 * a bean. +055 * +056 * @param The class type of the wrapped class. +057 */ +058@Bean(properties="innerClass,classCategory,elementType,keyType,valueType,notABeanReason,initException,beanMeta") +059public final class ClassMeta implements Type { +060 +061 /** Class categories. */ +062 enum ClassCategory { +063 MAP, COLLECTION, CLASS, METHOD, NUMBER, DECIMAL, BOOLEAN, CHAR, DATE, ARRAY, ENUM, OTHER, CHARSEQ, STR, OBJ, URI, BEANMAP, READER, INPUTSTREAM, VOID, ARGS +064 } 065 -066 private final Class implClass; // The implementation class to use if this is an interface. -067 private final ClassCategory cc; // The class category. -068 private final Method fromStringMethod; // The static valueOf(String) or fromString(String) or forString(String) method (if it has one). -069 private final Constructor -070 noArgConstructor; // The no-arg constructor for this class (if it has one). -071 private final Constructor -072 stringConstructor, // The X(String) constructor (if it has one). -073 numberConstructor, // The X(Number) constructor (if it has one). -074 swapConstructor; // The X(Swappable) constructor (if it has one). -075 private final Class -076 swapMethodType, // The class type of the object in the number constructor. -077 numberConstructorType; -078 private final Method -


    [19/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
    --
    diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html 
    b/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
    index 42f96a2..685b699 100644
    --- a/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
    +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanSession.html
    @@ -365,19 +365,19 @@
     357 if (tc == Class.class)
     358return 
    (T)(ctx.classLoader.loadClass(value.toString()));
     359
    -360 if (type.getPojoSwap() != null) 
    {
    -361PojoSwap f = 
    type.getPojoSwap();
    -362Class nc = 
    f.getNormalClass(), fc = f.getSwapClass();
    +360 PojoSwap swap = 
    type.getPojoSwap(this);
    +361 if (swap != null) {
    +362Class nc = 
    swap.getNormalClass(), fc = swap.getSwapClass();
     363if (isParentClass(nc, tc) 
    && isParentClass(fc, value.getClass()))
    -364   return (T)f.unswap(this, 
    value, type);
    +364   return 
    (T)swap.unswap(this, value, type);
     365 }
     366
     367 ClassMeta vt = 
    ctx.getClassMetaForObject(value);
    -368 if (vt.getPojoSwap() != null) 
    {
    -369PojoSwap f = 
    vt.getPojoSwap();
    -370Class nc = 
    f.getNormalClass(), fc = f.getSwapClass();
    +368 swap = vt.getPojoSwap(this);
    +369 if (swap != null) {
    +370Class nc = 
    swap.getNormalClass(), fc = swap.getSwapClass();
     371if (isParentClass(nc, 
    vt.getInnerClass()) && isParentClass(fc, tc))
    -372   return (T)f.swap(this, 
    value);
    +372   return (T)swap.swap(this, 
    value);
     373 }
     374
     375 if (type.isPrimitive()) {
    
    
    

    [24/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/overview-summary.html
    --
    diff --git a/content/site/apidocs/overview-summary.html 
    b/content/site/apidocs/overview-summary.html
    index 6ff8830..92f2522 100644
    --- a/content/site/apidocs/overview-summary.html
    +++ b/content/site/apidocs/overview-summary.html
    @@ -434,7 +434,7 @@
       Transforms
       
      PojoSwaps
    - @Pojo 
    annotation
    + @Swap 
    annotation
      Swap 
    methods
      BeanFilters and 
    @Bean annotations
      Serializing Readers and 
    InputStreams
    @@ -1123,7 +1123,7 @@
       
       
      
    -@Pojo 
    +@Swap 
     - Used to tailor how non-bean POJOs get interpreted by the 
    framework.
      
     @Bean 
    @@ -1250,17 +1250,17 @@
       
    
       
    -  
    -  2.6.2 - @Pojo annotation
    +  
    +  2.6.2 - @Swap annotation
       
      
    -@Pojo can be used to 
    associate a swap class using an 
    +@Swap can be used to 
    associate a swap class using an 
     annotation.
     This is often cleaner than using the builder 
    pojoSwaps() method since you can keep
     your swap class near your POJO class. 
      
      
    -   @Pojo(swap=MyPojoSwap.class)
    +   @Swap(MyPojoSwap.class)
    public class MyPojo {
       ...
    }
    @@ -1531,7 +1531,7 @@
     all other renditions as-is:
      
      
    -   @Pojo(swap=MyBeanSwap.class)
    +   @Swap(MyBeanSwap.class)
    public class MyBean {...}
    
    public class MyBeanSwap extends 
    PojoSwap {
    @@ -2440,8 +2440,7 @@
     
     
    Juneau uses swaps to convert non-serializable object to 
    serializable forms:
    -   @BeanProperty(swap=...)
    -   @Pojo(swap=...)
    +   @Swap
     
      
      
    @@ -7090,7 +7089,7 @@
    
    What's new in each release
    
    -  6.3.2 (TBD)
    +  6.4.0 (TBD)
       6.3.1 (Aug 1, 2017)
       6.3.0 (Jun 30, 2017)
       6.2.0 (Apr 28, 2017)
    @@ -7160,8 +7159,8 @@
    
     
    
    -   
    -   6.3.2 (TBD)
    +   
    +   6.4.0 (TBD)
    
       
      The major change in this release is the project structure
    @@ -7174,8 +7173,8 @@
     CategoryMaven 
    ArtifactsDescriptionPrereqs
      
      
    -Juneau Core
    -juneau-marshall
    +Juneau Core
    +juneau-marshall
     Serializers and parsers for:
    
       JSON
    @@ -7198,7 +7197,7 @@
     
      
      
    -juneau-marshall-rdf
    +juneau-marshall-rdf
     
    Serializers and parsers for:
    
    @@ -7217,7 +7216,7 @@
     
      
      
    -juneau-dto
    +juneau-dto
     
    Data Transfer Objects for:
    
    @@ -7231,22 +7230,22 @@
     Java 6
      
      
    -juneau-svl
    +juneau-svl
     
    Simple Variable Language API
     
     Java 6
      
      
    -juneau-config
    +juneau-config
     
    Configuration file API
     
     Java 6
      
      
    -Juneau REST
    -juneau-rest-server
    +Juneau REST
    +juneau-rest-server
     
    REST Servlet API
     
    @@ -7258,7 +7257,7 @@
     
      
      
    -juneau-rest-server-jaxrs
    +juneau-rest-server-jaxrs
     
    Optional JAX-RS support
     
    @@ -7270,7 +7269,7 @@
     
      
      
    -juneau-rest-client
    +juneau-rest-client
     
    REST Client API
     
    @@ -7281,10 +7280,11 @@
    
     
      
    - 
    -juneau-microservice
    + 
    +Juneau 
    Microservice
    +juneau-microservice-server
     
    -   REST Microservice API
    +   REST Microservice Server API
     
     
    
    @@ -7293,8 +7293,8 @@
    
     
      
    - 
    -juneau-microservice-template
    + 
    +juneau-microservice-template
     
    Developer template project
     
    @@ -7305,23 +7305,23 @@
    
     
      
    - 
    -Examples
    + 
    +Examples
     juneau-examples-core
     
    Core code examples
     
     
      
    - 
    + 
     juneau-examples-rest
     
    REST code examples
     
     
      
    - 
    -Juneau All
    + 
    +Juneau All
     juneau-

    [22/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
    --
    diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html 
    b/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
    index e1de77e..48220e8 100644
    --- a/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
    +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMap.html
    @@ -190,7 +190,7 @@
     182* in a transformed value.
     183* For example, if the bean property 
    type class is a {@link Date} and the bean property has the
     184* {@link 
    org.apache.juneau.transforms.DateSwap.ISO8601DT} swap associated with it 
    through the
    -185* {@link BeanProperty#swap() 
    @BeanProperty.swap()} annotation, the value being passed in must be
    +185* {@link Swap#value() @Swap.value()} 
    annotation, the value being passed in must be
     186* a String containing an ISO8601 
    date-time string value.
     187*
     188* 
    Example:
    @@ -269,7 +269,7 @@ 261* will return the transformed value. 262* For example, if the bean property type class is a {@link Date} and the bean property has the 263* {@link org.apache.juneau.transforms.DateSwap.ISO8601DT} swap associated with it through the -264* {@link BeanProperty#swap() @BeanProperty.swap()} annotation, this method will return a String containing an +264* {@link Swap#value() @Swap.value()} annotation, this method will return a String containing an 265* ISO8601 date-time string value. 266* 267*
    Example:
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/BeanMapEntry.html -- diff --git a/content/site/apidocs/src-html/org/apache/juneau/BeanMapEntry.html b/content/site/apidocs/src-html/org/apache/juneau/BeanMapEntry.html index 1bc4bb1..6c538cd 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/BeanMapEntry.html +++ b/content/site/apidocs/src-html/org/apache/juneau/BeanMapEntry.html @@ -80,7 +80,7 @@ 072* will return the transformed value. 073* For example, if the bean property type class is a {@link Date} and the bean property has the 074* {@link org.apache.juneau.transforms.DateSwap.ISO8601DT} swap associated with it through the -075* {@link BeanProperty#swap() @BeanProperty.swap()} annotation, this method will return a String containing an +075* {@link Swap#value() @Swap.value()} annotation, this method will return a String containing an 076* ISO8601 date-time string value. 077*/ 078 @Override /* Map.Entry */ @@ -103,7 +103,7 @@ 095* in a transformed value. 096* For example, if the bean property type class is a {@link Date} and the bean property has the 097* {@link org.apache.juneau.transforms.DateSwap.ISO8601DT} swap associated with it through the -098* {@link BeanProperty#swap() @BeanProperty.swap()} annotation, the value being passed in must be a String +098* {@link Swap#value() @Swap.value()} annotation, the value being passed in must be a String 099* containing an ISO8601 date-time string value. 100* 101* @return The set value after it's been converted.

    [08/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
    index 1d21b2c..f02d666 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/rest/labels/BeanDescription.html
    @@ -75,7 +75,7 @@
     067   */
     068  public 
    BeanPropertyDescription(String name, ClassMeta type) {
     069 this.name = name;
    -070 this.type = 
    type.getSerializedClassMeta().toString();
    +070 this.type = 
    type.getSerializedClassMeta(null).toString();
     071  }
     072   }
     073}
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
    index 6f551f0..8ff3238 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/serializer/SerializerGroup.html
    @@ -38,195 +38,232 @@
     030 *
  • 031 * Sets common properties on all serializers in a single method call. 032 *
  • -033 * Locks all serializers in a single method call. -034 *
  • -035 * Clones existing groups and all serializers within the group in a single method call. -036 * +033 * Clones existing groups and all serializers within the group in a single method call. +034 * +035 * +036 *
    Match ordering
    037 * -038 *
    Match ordering
    +038 * Serializers are matched against Accept strings in the order they exist in this group. 039 * -040 * Serializers are matched against Accept strings in the order they exist in this group. -041 * -042 *

    -043 * Adding new entries will cause the entries to be prepended to the group. -044 * This allows for previous serializers to be overridden through subsequent calls. -045 * -046 *

    -047 * For example, calling g.append(S1.class,S2.class).append(S3.class,S4.class) -048 * will result in the order S3, S4, S1, S2. -049 * -050 *

    Example:
    -051 *

    -052 *// Construct a new serializer group -053 *SerializerGroup g = new SerializerGroupBuilder(); -054 * .append(JsonSerializer.class, XmlSerializer.class); // Add some serializers to it -055 * .ws().pojoSwaps(CalendarSwap.ISO8601DT.class) // Change settings for all serializers in the group. -056 * .build(); -057 * -058 *// Find the appropriate serializer by Accept type -059 *String mediaTypeMatch = g.findMatch("text/foo, text/json;q=0.8, text/*;q:0.6, *\/*;q=0.0"); -060 *WriterSerializer s = g.getWriterSerializer(mediaTypeMatch); -061 * -062 *// Serialize a bean to JSON text -063 *AddressBook addressBook = new AddressBook(); // Bean to serialize. -064 *String json = s.serialize(addressBook); -065 *

    -066 */ -067public final class SerializerGroup { +040 *

    +041 * Adding new entries will cause the entries to be prepended to the group. +042 * This allows for previous serializers to be overridden through subsequent calls. +043 * +044 *

    +045 * For example, calling g.append(S1.class,S2.class).append(S3.class,S4.class) +046 * will result in the order S3, S4, S1, S2. +047 * +048 *

    Example:
    +049 *

    +050 *// Construct a new serializer group +051 *SerializerGroup g = new SerializerGroupBuilder(); +052 * .append(JsonSerializer.class, XmlSerializer.class); // Add some serializers to it +053 * .ws().pojoSwaps(CalendarSwap.ISO8601DT.class) // Change settings for all serializers in the group. +054 * .build(); +055 * +056 *// Find the appropriate serializer by Accept type +057 *WriterSerializer s = g.getWriterSerializer("text/foo, text/json;q=0.8, text/*;q:0.6, *\/*;q=0.0"); +058 * +059 *// Serialize a bean to JSON text +060 *AddressBook addressBook = new AddressBook(); // Bean to serialize. +061 *String json = s.serialize(addressBook); +062 *

    +06

  • [09/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
    index d6f6d8a..f780d6c 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/json/JsonSerializerSession.html
    @@ -102,172 +102,173 @@
     094 aType = object();
     095  }
     096
    -097  sType = 
    aType.getSerializedClassMeta();
    +097  sType = aType;
     098  String typeName = 
    getBeanTypeName(eType, aType, pMeta);
     099
     100  // Swap if necessary
    -101  PojoSwap swap = 
    aType.getPojoSwap();
    +101  PojoSwap swap = 
    aType.getPojoSwap(this);
     102  if (swap != null) {
     103 o = swap.swap(this, o);
    -104
    -105 // If the getSwapClass() method 
    returns Object, we need to figure out
    -106 // the actual type now.
    -107 if (sType.isObject())
    -108sType = 
    getClassMetaForObject(o);
    -109  }
    -110
    -111  String wrapperAttr = 
    sType.getExtendedMeta(JsonClassMeta.class).getWrapperAttr();
    -112  if (wrapperAttr != null) {
    -113 
    out.append('{').cr(indent).attr(wrapperAttr).append(':').s(indent);
    -114 indent++;
    -115  }
    -116
    -117  // '\0' characters are considered 
    null.
    -118  if (o == null || (sType.isChar() 
    && ((Character)o).charValue() == 0))
    -119 out.append("null");
    -120  else if (sType.isNumber() || 
    sType.isBoolean())
    -121 out.append(o);
    -122  else if (sType.isBean())
    -123 serializeBeanMap(out, 
    toBeanMap(o), typeName);
    -124  else if (sType.isUri() || (pMeta != 
    null && pMeta.isUri()))
    -125 out.uriValue(o);
    -126  else if (sType.isMap()) {
    -127 if (o instanceof BeanMap)
    -128serializeBeanMap(out, 
    (BeanMap)o, typeName);
    -129 else
    -130serializeMap(out, (Map)o, 
    eType);
    -131  }
    -132  else if (sType.isCollection()) {
    -133 serializeCollection(out, 
    (Collection) o, eType);
    -134  }
    -135  else if (sType.isArray()) {
    -136 serializeCollection(out, 
    toList(sType.getInnerClass(), o), eType);
    -137  }
    -138  else if (sType.isReader() || 
    sType.isInputStream()) {
    -139 IOUtils.pipe(o, out);
    -140  }
    -141  else
    -142 out.stringValue(toString(o));
    -143
    -144  if (wrapperAttr != null) {
    -145 indent--;
    -146 out.cre(indent-1).append('}');
    -147  }
    -148
    -149  if (! isRecursion)
    -150 pop();
    -151  return out;
    -152   }
    -153
    -154   @SuppressWarnings({ "rawtypes", 
    "unchecked" })
    -155   private SerializerWriter 
    serializeMap(JsonWriter out, Map m, ClassMeta type) throws Exception 
    {
    -156
    -157  ClassMeta keyType = 
    type.getKeyType(), valueType = type.getValueType();
    -158
    -159  m = sort(m);
    -160
    -161  int i = indent;
    -162  out.append('{');
    -163
    -164  Iterator mapEntries = 
    m.entrySet().iterator();
    -165
    -166  while (mapEntries.hasNext()) {
    -167 Map.Entry e = (Map.Entry) 
    mapEntries.next();
    -168 Object value = e.getValue();
    -169
    -170 Object key = 
    generalize(e.getKey(), keyType);
    -171
    -172 
    out.cr(i).attr(toString(key)).append(':').s(i);
    -173
    -174 serializeAnything(out, value, 
    valueType, (key == null ? null : toString(key)), null);
    -175
    -176 if (mapEntries.hasNext())
    -177out.append(',').smi(i);
    -178  }
    -179
    -180  out.cre(i-1).append('}');
    -181
    -182  return out;
    -183   }
    -184
    -185   private SerializerWriter 
    serializeBeanMap(JsonWriter out, BeanMap m, String typeName) throws 
    Exception {
    -186  int i = indent;
    -187  out.append('{');
    -188
    -189  boolean addComma = false;
    -190  for (BeanPropertyValue p : 
    m.getValues(isTrimNulls(), typeName != null ? createBeanTypeNameProperty(m, 
    typeName) : null)) {
    -191 BeanPropertyMeta pMeta = 
    p.getMeta();
    -192 ClassMeta cMeta = 
    p.getClassMeta();
    -193 String key = p.getName();
    -194 Object value = p.getValue();
    -195 Throwable t = p.getThrown();
    -196 if (t != null)
    -197onBeanGetterException(pMeta, 
    t);
    -198
    -199 if (canIgnoreValue(cMeta, key, 
    value))
    -200continue;
    -201
    -202 if (addComma)
    -203out.append(',').smi(i);
    -204
    -205 
    out.cr(i).attr(key).append(':').s(i);
    -206
    -207 serializeAnything(out, value, 
    cMeta, key, pMeta);
    -208
    -209 addComma = true;
    -210  }
    -211  out.cre(i-1).append('}');
    -212  return out;
    -213   }
    -214
    -215   @SuppressWarnings({"rawtypes", 
    "unchecked"})
    -216   private SerializerWriter 
    serializeCollection(JsonWriter out, Collection c, ClassMeta type) 
    throws Exception 

    [05/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/transforms/ReaderSwap.PlainText.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/transforms/ReaderSwap.PlainText.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/transforms/ReaderSwap.PlainText.html
    index b0ee597..a58cf63 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/transforms/ReaderSwap.PlainText.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/transforms/ReaderSwap.PlainText.html
    @@ -28,95 +28,87 @@
     020import org.apache.juneau.html.*;
     021import org.apache.juneau.json.*;
     022import org.apache.juneau.parser.*;
    -023import org.apache.juneau.serializer.*;
    -024import org.apache.juneau.transform.*;
    -025import org.apache.juneau.xml.*;
    -026
    -027/**
    -028 * Transforms the contents of a {@link 
    Reader} into an {@code Object}.
    -029 *
    -030 * 
    Description:
    -031 * -032 * The {@code Reader} must contain JSON, Juneau-generated XML (output from {@link XmlSerializer}), or Juneau-generated -033 * HTML (output from {@link JsonSerializer}) in order to be parsed correctly. -034 * -035 *

    -036 * Useful for serializing models that contain {@code Readers} created by {@code RestCall} instances. -037 * -038 *

    -039 * This is a one-way transform, since {@code Readers} cannot be reconstituted. -040 * -041 *

    Behavior-specific subclasses
    -042 * -043 * The following direct subclasses are provided for convenience: -044 *
      -045 *
    • {@link Json} - Parses JSON text. -046 *
    • {@link Xml} - Parses XML text. -047 *
    • {@link Html} - Parses HTML text. -048 *
    • {@link PlainText} - Parses plain text. -049 *
    -050 */ -051public class ReaderSwap extends PojoSwap { -052 -053 /** Reader transform for reading JSON text. */ -054 public static class Json extends ReaderSwap { -055 /** Constructor */ -056 public Json() { -057 super(JsonParser.DEFAULT); -058 } -059 } -060 -061 /** Reader transform for reading XML text. */ -062 public static class Xml extends ReaderSwap { -063 /** Constructor */ -064 public Xml() { -065 super(XmlParser.DEFAULT); -066 } -067 } -068 -069 /** Reader transform for reading HTML text. */ -070 public static class Html extends ReaderSwap { -071 /** Constructor */ -072 public Html() { -073 super(HtmlParser.DEFAULT); -074 } -075 } -076 -077 /** Reader transform for reading plain text. */ -078 public static class PlainText extends ReaderSwap { -079 /** Constructor */ -080 public PlainText() { -081 super(null); -082 } -083 } -084 -085 /** The parser to use to parse the contents of the Reader. */ -086 private ReaderParser parser; -087 -088 /** -089* @param parser The parser to use to convert the contents of the reader to Java objects. -090*/ -091 public ReaderSwap(ReaderParser parser) { -092 this.parser = parser; -093 } -094 -095 /** -096* Converts the specified {@link Reader} to an {@link Object} whose type is determined by the contents of the reader. -097*/ -098 @Override /* PojoSwap */ -099 public Object swap(BeanSession session, Reader o) throws SerializeException { -100 try { -101 if (parser == null) -102return read(o); -103 return parser.parse(o, Object.class); -104 } catch (IOException e) { -105 return e.getLocalizedMessage(); -106 } catch (Exception e) { -107 throw new SerializeException("ReaderSwap could not transform object of type ''{0}''", -108o == null ? null : o.getClass().getName()).initCause(e); -109 } -110 } -111} +023import org.apache.juneau.transform.*; +024import org.apache.juneau.xml.*; +025 +026/** +027 * Transforms the contents of a {@link Reader} into an {@code Object}. +028 * +029 *
    Description:
    +030 * +031 * The {@code Reader} must contain JSON, Juneau-generated XML (output from {@link XmlSerializer}), or Juneau-generated +032 * HTML (output from {@link JsonSerializer}) in order to be parsed correctly. +033 * +034 *

    +035 * Useful for serializing models that contain {@code Readers} created by {@code RestCall} instances. +036 * +037 *

    +038 * This is a one-way transform, since {@code Readers} cannot be reconstituted. +039 * +040 *

    Behavior-specific subclasses
    +041 * +042 * The following direct subclasses are provided for convenience: +043 *
      +044 *
    • {@link Json} - Parses JSON text. +045 *
    • {@link Xml} - Parses XML text. +046 *
    • {@link Html} - Parses HTML text. +047 *
    • {@link PlainText} - Parses plain text. +048 *
    +049 */ +050public class ReaderSwap extends PojoSwap { +051 +052 /** Reader transform f

    [29/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializerBuilder.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializerBuilder.html 
    b/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializerBuilder.html
    index 02cf1e8..3091241 100644
    --- 
    a/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializerBuilder.html
    +++ 
    b/content/site/apidocs/org/apache/juneau/json/JsonSchemaSerializerBuilder.html
    @@ -2937,7 +2937,7 @@ extends 
    Subclasses of PojoSwap.
    -   Surrogate classes.  A shortcut for defining a SurrogateSwap.
    +   Implementations of Surrogate.
      
     
      Notes:
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/json/JsonSerializerBuilder.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/json/JsonSerializerBuilder.html 
    b/content/site/apidocs/org/apache/juneau/json/JsonSerializerBuilder.html
    index b9c87ad..8072c73 100644
    --- a/content/site/apidocs/org/apache/juneau/json/JsonSerializerBuilder.html
    +++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializerBuilder.html
    @@ -2962,7 +2962,7 @@ extends PojoSwap.
    -   Surrogate classes.  A shortcut for defining a SurrogateSwap.
    +   Implementations of Surrogate.
      
     
      Notes:
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html 
    b/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
    index 36374ce..a4741ef 100644
    --- a/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
    +++ b/content/site/apidocs/org/apache/juneau/json/JsonSerializerSession.html
    @@ -322,7 +322,7 @@ extends 
     
     isAddBeanTypeProperties
    -protected final boolean isAddBeanTypeProperties()
    +protected final boolean isAddBeanTypeProperties()
     Returns the JsonSerializerContext.JSON_addBeanTypeProperties
     setting value for this session.
     
     Overrides:
    @@ -338,7 +338,7 @@ extends 
     
     getJsonWriter
    -protected final JsonWriter getJsonWriter(SerializerPipe out)
    +protected final JsonWriter getJsonWriter(SerializerPipe out)
       throws http://docs.oracle.com/javase/7/docs/api/java/lang/Exception.html?is-external=true";
     title="class or interface in java.lang">Exception
     Converts the specified output target object to an JsonWriter.
     
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
     
    b/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
    index acb963e..3cb6a54 100644
    --- 
    a/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
    +++ 
    b/content/site/apidocs/org/apache/juneau/microservice/resources/DirectoryResource.FileResource.html
    @@ -289,7 +289,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
     
     
     getLastModified
    -@BeanProperty(swap=DateSwap.ISO8601DTP.class)
    +@Swap(value=DateSwap.ISO8601DTP.class)
     public http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
     title="class or interface in java.util">Date getLastModified()
     
     Returns:
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
     
    b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
    index 04f7e46..952dbae 100644
    --- 
    a/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
    +++ 
    b/content/site/apidocs/org/apache/juneau/microservice/resources/LogsResource.FileResource.html
    @@ -244,7 +244,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
     
     
     lastModified
    -@BeanProperty(swap=DateSwap.DateTimeMedium.class)
    +@Swap(value=DateSwap.DateTimeMedium.class)
     public http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
     title="class or interface in java.util">Date lastModified
     
     
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/msgpack/MsgPackParserBuilder.html
    

    [16/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html 
    b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
    index 3f8181a..023c575 100644
    --- a/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
    +++ b/content/site/apidocs/src-html/org/apache/juneau/dto/jsonschema/Schema.html
    @@ -234,7 +234,7 @@
     226*The value of the 
    type property on this bean, or 
    null if it is not set.
     227*Can be either a {@link JsonType} 
    or {@link JsonTypeArray} depending on what value was used to set it.
     228*/
    -229   
    @BeanProperty(swap=JsonTypeOrJsonTypeArraySwap.class)
    +229   
    @Swap(JsonTypeOrJsonTypeArraySwap.class)
     230   public Object getType() {
     231  if (typeJsonType != null)
     232 return typeJsonType;
    @@ -558,7 +558,7 @@
     550*The value of the 
    items property on this bean, or 
    null if it is not set.
     551*Can be either a {@link Schema} 
    or {@link SchemaArray} depending on what value was used to set it.
     552*/
    -553   
    @BeanProperty(swap=SchemaOrSchemaArraySwap.class)
    +553   @Swap(SchemaOrSchemaArraySwap.class)
     554   public Object getItems() {
     555  if (itemsSchema != null)
     556 return itemsSchema;
    @@ -835,7 +835,7 @@
     827*not set.
     828*Can be either a {@link Boolean} 
    or {@link SchemaArray} depending on what value was used to set it.
     829*/
    -830   
    @BeanProperty(swap=BooleanOrSchemaArraySwap.class)
    +830   
    @Swap(BooleanOrSchemaArraySwap.class)
     831   public Object getAdditionalItems() {
     832  if (additionalItemsBoolean != 
    null)
     833 return additionalItemsBoolean;
    @@ -1115,7 +1115,7 @@
     1107*is not set.
     1108*Can be either a {@link Boolean} 
    or {@link SchemaArray} depending on what value was used to set it.
     1109*/
    -1110   
    @BeanProperty(swap=BooleanOrSchemaSwap.class)
    +1110   @Swap(BooleanOrSchemaSwap.class)
        public Object 
    getAdditionalProperties() {
     1112  if (additionalPropertiesBoolean != 
    null)
     1113 return 
    additionalItemsBoolean;
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParserSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParserSession.html 
    b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParserSession.html
    index f06ac97..61c944a 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParserSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlParserSession.html
    @@ -91,8 +91,8 @@
     083
     084  if (eType == null)
     085 eType = 
    (ClassMeta)object();
    -086  PojoSwap transform 
    = (PojoSwap)eType.getPojoSwap();
    -087  ClassMeta sType = 
    eType.getSerializedClassMeta();
    +086  PojoSwap transform 
    = (PojoSwap)eType.getPojoSwap(this);
    +087  ClassMeta sType = 
    transform == null ? eType : transform.getSwapClassMeta(this);
     088  setCurrentClass(sType);
     089
     090  int event = r.getEventType();
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializerSession.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializerSession.html
    index c33472d..270926a 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializerSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSchemaDocSerializerSession.html
    @@ -76,7 +76,7 @@
     068
     069  aType = push(attrName, eType, 
    null);
     070
    -071  sType = 
    eType.getSerializedClassMeta();
    +071  sType = 
    eType.getSerializedClassMeta(this);
     072  String type = null;
     073
     074  if (sType.isEnum() || 
    sType.isCharSequence() || sType.isChar())
    @@ -94,7 +94,7 @@
     086
     087  out.put("type", type);
     088  out.put("class", 
    eType.toString());
    -089  PojoSwap t = eType.getPojoSwap();
    +089  PojoSwap t = 
    eType.getPojoSwap(this);
     090  if (t != null)
     091 out.put("transform", t);
     092
    
    
    

    [33/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/BeanMap.html
    --
    diff --git a/content/site/apidocs/org/apache/juneau/BeanMap.html 
    b/content/site/apidocs/org/apache/juneau/BeanMap.html
    index f682882..273a8da 100644
    --- a/content/site/apidocs/org/apache/juneau/BeanMap.html
    +++ b/content/site/apidocs/org/apache/juneau/BeanMap.html
    @@ -578,7 +578,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
     title="class or interface in java.util">Date and the bean 
    property has the
      DateSwap.ISO8601DT swap 
    associated with it through the
    - @BeanProperty.swap()
     annotation, the value being passed in must be
    + @Swap.value()
     annotation, the value being passed in must be
      a String containing an ISO8601 date-time string value.
     
      Example:
    @@ -651,7 +651,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
     title="class or interface in java.util">Date and the bean 
    property has the
      DateSwap.ISO8601DT swap 
    associated with it through the
    - @BeanProperty.swap()
     annotation, this method will return a String containing an
    + @Swap.value()
     annotation, this method will return a String containing an
      ISO8601 date-time string value.
     
      Example:
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/BeanMapEntry.html
    --
    diff --git a/content/site/apidocs/org/apache/juneau/BeanMapEntry.html 
    b/content/site/apidocs/org/apache/juneau/BeanMapEntry.html
    index 1cc3a1b..a6ed2e6 100644
    --- a/content/site/apidocs/org/apache/juneau/BeanMapEntry.html
    +++ b/content/site/apidocs/org/apache/juneau/BeanMapEntry.html
    @@ -292,7 +292,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry
      will return the transformed value.
      For example, if the bean property type class is a http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
     title="class or interface in java.util">Date and the bean 
    property has the
      DateSwap.ISO8601DT swap 
    associated with it through the
    - @BeanProperty.swap()
     annotation, this method will return a String containing an
    + @Swap.value()
     annotation, this method will return a String containing an
      ISO8601 date-time string value.
     
     Specified by:
    @@ -321,7 +321,7 @@ implements http://docs.oracle.com/javase/7/docs/api/java/util/Map.Entry
      in a transformed value.
      For example, if the bean property type class is a http://docs.oracle.com/javase/7/docs/api/java/util/Date.html?is-external=true";
     title="class or interface in java.util">Date and the bean 
    property has the
      DateSwap.ISO8601DT swap 
    associated with it through the
    - @BeanProperty.swap()
     annotation, the value being passed in must be a String
    + @Swap.value()
     annotation, the value being passed in must be a String
      containing an ISO8601 date-time string value.
     
     Specified by:
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.Builder.html
    --
    diff --git 
    a/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.Builder.html 
    b/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.Builder.html
    index 130bcf0..eaea951 100644
    --- a/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.Builder.html
    +++ b/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.Builder.html
    @@ -215,7 +215,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
     
     
     build
    -public BeanPropertyMeta build()
    +public BeanPropertyMeta build()
     
     Returns:
     A new BeanPropertyMeta object using this builder.
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.html
    --
    diff --git a/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.html 
    b/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.html
    index 9c31668..a1ce3ba 100644
    --- a/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.html
    +++ b/content/site/apidocs/org/apache/juneau/BeanPropertyMeta.html
    @@ -343,7 +343,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
     
     
     BeanPropertyMeta
    -protected BeanPropertyMeta(BeanPropertyMeta.Builder b)
    +protected BeanPropertyMeta(BeanPropertyMeta.Builder b)
     Creates a new BeanPropertyMeta using the contents of the 
    specified builder.
     
     Parameters:
    @@ -365,7 +365,7 @@ extends http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?
     
     
     getName
    -public http://docs.oracle.com/javase/7/docs/api/java/lang/String.html?is-external=true";
     title="class or interface in java.lang">String getName()
    +public http://docs.oracle.com/javase/7/docs/api/java/lang/S

    [03/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializerSession.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializerSession.html
    index 2ab742f..9a65496 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializerSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSchemaSerializerSession.html
    @@ -70,7 +70,7 @@
     062  Namespace xs = xsNamespace;
     063  Namespace[] allNs = append(new 
    Namespace[]{defaultNamespace}, namespaces);
     064
    -065  Schemas schemas = new Schemas(xs, 
    defaultNamespace, allNs);
    +065  Schemas schemas = new Schemas(this, 
    xs, defaultNamespace, allNs);
     066  schemas.process(o);
     067  
    schemas.serializeTo(out.getWriter());
     068   }
    @@ -152,410 +152,412 @@
     144  private static final long 
    serialVersionUID = 1L;
     145
     146  private Namespace defaultNs;
    -147  private 
    LinkedList
    -148 elementQueue = new 
    LinkedList(),
    -149 attributeQueue = new 
    LinkedList(),
    -150 typeQueue = new 
    LinkedList();
    -151
    -152  private Schemas(Namespace xs, 
    Namespace defaultNs, Namespace[] allNs) throws IOException {
    -153 this.defaultNs = defaultNs;
    -154 for (Namespace ns : allNs)
    -155put(ns, new Schema(this, xs, 
    ns, defaultNs, allNs));
    -156  }
    -157
    -158  private Schema getSchema(Namespace 
    ns) {
    -159 if (ns == null)
    -160ns = defaultNs;
    -161 Schema s = get(ns);
    -162 if (s == null)
    -163throw new 
    FormattedRuntimeException("No schema defined for namespace ''{0}''", ns);
    -164 return s;
    -165  }
    -166
    -167  private void process(Object o) 
    throws IOException {
    -168 ClassMeta cm = 
    getClassMetaForObject(o);
    -169 Namespace ns = defaultNs;
    -170 if (cm == null)
    -171queueElement(ns, "null", 
    object());
    -172 else {
    -173XmlClassMeta xmlMeta = 
    cm.getExtendedMeta(XmlClassMeta.class);
    -174if (cm.getDictionaryName() != 
    null && xmlMeta.getNamespace() != null)
    -175   ns = 
    xmlMeta.getNamespace();
    -176queueElement(ns, 
    cm.getDictionaryName(), cm);
    -177 }
    -178 processQueue();
    -179  }
    -180
    -181
    -182  private void processQueue() throws 
    IOException {
    -183 boolean b;
    -184 do {
    -185b = false;
    -186while (! 
    elementQueue.isEmpty()) {
    -187   QueueEntry q = 
    elementQueue.removeFirst();
    -188   b |= 
    getSchema(q.ns).processElement(q.name, q.cm);
    -189}
    -190while (! typeQueue.isEmpty()) 
    {
    -191   QueueEntry q = 
    typeQueue.removeFirst();
    -192   b |= 
    getSchema(q.ns).processType(q.name, q.cm);
    -193}
    -194while (! 
    attributeQueue.isEmpty()) {
    -195   QueueEntry q = 
    attributeQueue.removeFirst();
    -196   b |= 
    getSchema(q.ns).processAttribute(q.name, q.cm);
    -197}
    -198 } while (b);
    -199  }
    -200
    -201  private void queueElement(Namespace 
    ns, String name, ClassMeta cm) {
    -202 elementQueue.add(new 
    QueueEntry(ns, name, cm));
    -203  }
    -204
    -205  private void queueType(Namespace 
    ns, String name, ClassMeta cm) {
    -206 if (name == null)
    -207name = 
    XmlUtils.encodeElementName(cm);
    -208 typeQueue.add(new QueueEntry(ns, 
    name, cm));
    -209  }
    -210
    -211  private void 
    queueAttribute(Namespace ns, String name, ClassMeta cm) {
    -212 attributeQueue.add(new 
    QueueEntry(ns, name, cm));
    -213  }
    -214
    -215  private void serializeTo(Writer w) 
    throws IOException {
    -216 boolean b = false;
    -217 for (Schema s : values()) {
    -218if (b)
    -219   w.append('\u');
    -220w.append(s.toString());
    -221b = true;
    -222 }
    -223  }
    -224   }
    -225
    -226   /* An encapsulation of a single 
    schema. */
    -227   private class Schema {
    -228  private StringWriter sw = new 
    StringWriter();
    -229  private XmlWriter w;
    -230  private Namespace defaultNs, 
    targetNs;
    -231  private Schemas schemas;
    -232  private Set
    -233 processedTypes = new 
    HashSet(),
    -234 processedAttributes = new 
    HashSet(),
    -235 processedElements = new 
    HashSet();
    -236
    -237  public Schema(Schemas schemas, 
    Namespace xs, Namespace targetNs, Namespace defaultNs, Namespace[] allNs) 
    throws IOException {
    -238 this.schemas = schemas;
    -239 this.defaultNs = defaultNs;
    -240 this.targetNs = targetNs;
    -241 w = new XmlWriter(sw, 
    isUseWhitespace(), getMaxIndent

    [15/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
     
    b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
    index cae9c9d..9e204ee 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlSerializerSession.html
    @@ -271,545 +271,550 @@
     263aType = 
    ((Delegate)o).getClassMeta();
     264 }
     265
    -266 sType = 
    aType.getSerializedClassMeta();
    -267 String typeName = null;
    -268 if (isAddBeanTypeProperties() 
    && ! eType.equals(aType))
    -269typeName = 
    aType.getDictionaryName();
    -270
    -271 // Swap if necessary
    -272 PojoSwap swap = 
    aType.getPojoSwap();
    -273 if (swap != null) {
    -274o = swap.swap(this, o);
    -275
    -276// If the getSwapClass() 
    method returns Object, we need to figure out
    -277// the actual type now.
    -278if (sType.isObject())
    -279   sType = 
    getClassMetaForObject(o);
    -280 }
    -281
    -282 // Handle the case where we're 
    serializing a raw stream.
    -283 if (sType.isReader() || 
    sType.isInputStream()) {
    -284pop();
    -285indent -= xIndent;
    -286IOUtils.pipe(o, out);
    -287return 
    ContentResult.CR_SIMPLE;
    -288 }
    -289
    -290 HtmlClassMeta html = 
    sType.getExtendedMeta(HtmlClassMeta.class);
    -291 HtmlRender render = (pMeta == 
    null ? null : pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).getRender());
    -292 if (render == null)
    -293render = html.getRender();
    -294
    -295 if (render != null) {
    -296Object o2 = 
    render.getContent(this, o);
    -297if (o2 != o) {
    -298   indent -= xIndent;
    -299   pop();
    -300   out.nl(indent);
    -301   return 
    serializeAnything(out, o2, null, typeName, xIndent, null, false);
    -302}
    -303 }
    -304
    -305 if (html.isAsXml() || (pMeta != 
    null && pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isAsXml())) 
    {
    -306pop();
    -307indent++;
    -308super.serializeAnything(out, 
    o, null, null, null, false, XmlFormat.MIXED, false, false, null);
    -309indent -= xIndent+1;
    -310return cr;
    -311
    -312 } else if (html.isAsPlainText() 
    || (pMeta != null && 
    pMeta.getExtendedMeta(HtmlBeanPropertyMeta.class).isAsPlainText())) {
    -313out.write(o == null ? "null" 
    : o.toString());
    -314cr = CR_SIMPLE;
    -315
    -316 } else if (o == null || 
    (sType.isChar() && ((Character)o).charValue() == 0)) {
    -317out.tag("null");
    -318cr = CR_SIMPLE;
    -319
    -320 } else if (sType.isNumber()) {
    -321if (eType.isNumber() 
    && ! isRoot)
    -322   out.append(o);
    -323else
    -324   
    out.sTag("number").append(o).eTag("number");
    -325cr = CR_SIMPLE;
    -326
    -327 } else if (sType.isBoolean()) 
    {
    -328if (eType.isBoolean() 
    && ! isRoot)
    -329   out.append(o);
    -330else
    -331   
    out.sTag("boolean").append(o).eTag("boolean");
    -332cr = CR_SIMPLE;
    -333
    -334 } else if (sType.isMap() || 
    (wType != null && wType.isMap())) {
    -335out.nlIf(! isRoot, 
    xIndent+1);
    -336if (o instanceof BeanMap)
    -337   serializeBeanMap(out, 
    (BeanMap)o, eType, pMeta);
    -338else
    -339   serializeMap(out, (Map)o, 
    sType, eType.getKeyType(), eType.getValueType(), typeName, pMeta);
    -340
    -341 } else if (sType.isBean()) {
    -342BeanMap m = toBeanMap(o);
    -343Class c = 
    o.getClass();
    -344if 
    (c.isAnnotationPresent(HtmlLink.class)) {
    -345   HtmlLink h = 
    o.getClass().getAnnotation(HtmlLink.class);
    -346   Object urlProp = 
    m.get(h.hrefProperty());
    -347   Object nameProp = 
    m.get(h.nameProperty());
    -348   
    out.oTag("a").attrUri("href", 
    urlProp).append('>').text(nameProp).eTag("a");
    -349   cr = CR_SIMPLE;
    -350} else {
    -351   out.nlIf(! isRoot, 
    xIndent+2);
    -352   serializeBeanMap(out, m, 
    eType, pMeta);
    -353}
    -354
    -355 } else if (sType.isCollection() 
    || sType.isArray() || (wType != null && wType.isCollection())) {
    -356out.nlIf(! isRoot, 
    xIndent+1);
    -357serializeCollection(out, o, 
    sType, eType, name, pMeta);
    -358
    -359 } else if (isUri(sType, pMeta, 
    o)) {
    -360String label = 
    getAnchorText(pMeta, o);
    -361out.oTag("a").attrUri("href", 
    o).append('>');
    -362 

    [07/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/transform/PojoSwap.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/transform/PojoSwap.html 
    b/content/site/apidocs/src-html/org/apache/juneau/transform/PojoSwap.html
    index ccac44c..2c886f5 100644
    --- a/content/site/apidocs/src-html/org/apache/juneau/transform/PojoSwap.html
    +++ b/content/site/apidocs/src-html/org/apache/juneau/transform/PojoSwap.html
    @@ -25,264 +25,601 @@
     017import java.util.*;
     018
     019import org.apache.juneau.*;
    -020import org.apache.juneau.parser.*;
    -021import org.apache.juneau.serializer.*;
    -022
    -023/**
    -024 * Used to swap out non-serializable 
    objects with serializable replacements during serialization, and vis-versa 
    during parsing.
    -025 *
    -026 * 
    Description:
    -027 * -028 * PojoSwaps are used to extend the functionality of the serializers and parsers to be able to handle -029 * POJOs that aren't automatically handled by the serializers or parsers. For example, JSON does not have a standard -030 * representation for rendering dates. -031 * By defining a special {@code Date} swap and associating it with a serializer and parser, you can convert a -032 * {@code Date} object to a {@code String} during serialization, and convert that {@code String} object back into a -033 * {@code Date} object during parsing. -034 * -035 *

    -036 * Swaps MUST declare a public no-arg constructor so that the bean context can instantiate them. -037 * -038 *

    -039 * PojoSwaps are associated with instances of {@link BeanContext BeanContexts} by passing the swap -040 * class to the {@link CoreObjectBuilder#pojoSwaps(Class...)} method. -041 *
    When associated with a bean context, fields of the specified type will automatically be converted when the -042 * {@link BeanMap#get(Object)} or {@link BeanMap#put(String, Object)} methods are called. -043 * -044 *

    -045 * PojoSwaps have two parameters: -046 *

      -047 *
    1. {@code } - The normal representation of an object. -048 *
    2. {@code } - The swapped representation of an object. -049 *
    -050 *
    {@link Serializer Serializers} use swaps to convert objects of type T into objects of type S, and on calls to -051 * {@link BeanMap#get(Object)}. -052 *
    {@link Parser Parsers} use swaps to convert objects of type S into objects of type T, and on calls to -053 * {@link BeanMap#put(String,Object)}. -054 * -055 *
    Subtypes
    -056 * -057 * The following abstract subclasses are provided for common swap types: -058 *
      -059 *
    1. {@link StringSwap} - Objects swapped with strings. -060 *
    2. {@link MapSwap} - Objects swapped with {@link ObjectMap ObjectMaps}. -061 *
    +020import org.apache.juneau.annotation.*; +021import org.apache.juneau.http.*; +022import org.apache.juneau.parser.*; +023import org.apache.juneau.serializer.*; +024 +025/** +026 * Used to swap out non-serializable objects with serializable replacements during serialization, and vis-versa during +027 * parsing. +028 * +029 * +030 *
    Description:
    +031 * +032 *

    +033 * PojoSwaps are used to extend the functionality of the serializers and parsers to be able to handle +034 * POJOs that aren't automatically handled by the serializers or parsers. +035 *
    For example, JSON does not have a standard representation for rendering dates. +036 * By defining a special {@code Date} swap and associating it with a serializer and parser, you can convert a +037 * {@code Date} object to a {@code String} during serialization, and convert that {@code String} object back into a +038 * {@code Date} object during parsing. +039 * +040 *

    +041 * Swaps MUST declare a public no-arg constructor so that the bean context can instantiate them. +042 * +043 *

    +044 * PojoSwaps are associated with instances of {@link BeanContext BeanContexts} by passing the swap +045 * class to the {@link SerializerBuilder#pojoSwaps(Class...)} and {@link ParserBuilder#pojoSwaps(Class...)} methods. +046 *
    When associated with a bean context, fields of the specified type will automatically be converted when the +047 * {@link BeanMap#get(Object)} or {@link BeanMap#put(String, Object)} methods are called. +048 * +049 *

    +050 * PojoSwaps have two parameters: +051 *

      +052 *
    1. {@code } - The normal representation of an object. +053 *
    2. {@code } - The swapped representation of an object. +054 *
    +055 *
    {@link Serializer Serializers} use swaps to convert objects of type T into objects of type S, and on calls to +056 * {@link BeanMap#get(Object)}. +057 *
    {@link Parser Parsers} use swaps to convert objects of type S into objects of type T, and on calls to +058 * {@link BeanMap#

    [01/34] incubator-juneau-website git commit: Update javadocs

    Repository: incubator-juneau-website
    Updated Branches:
      refs/heads/asf-site 1019556e2 -> 62afb533d
    
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/stylesheet.css
    --
    diff --git a/content/site/apidocs/stylesheet.css 
    b/content/site/apidocs/stylesheet.css
    deleted file mode 100644
    index 98055b2..000
    --- a/content/site/apidocs/stylesheet.css
    +++ /dev/null
    @@ -1,574 +0,0 @@
    -/* Javadoc style sheet */
    -/*
    -Overall document style
    -*/
    -
    -@import url('resources/fonts/dejavu.css');
    -
    -body {
    -background-color:#ff;
    -color:#353833;
    -font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
    -font-size:14px;
    -margin:0;
    -}
    -a:link, a:visited {
    -text-decoration:none;
    -color:#4A6782;
    -}
    -a:hover, a:focus {
    -text-decoration:none;
    -color:#bb7a2a;
    -}
    -a:active {
    -text-decoration:none;
    -color:#4A6782;
    -}
    -a[name] {
    -color:#353833;
    -}
    -a[name]:hover {
    -text-decoration:none;
    -color:#353833;
    -}
    -pre {
    -font-family:'DejaVu Sans Mono', monospace;
    -font-size:14px;
    -}
    -h1 {
    -font-size:20px;
    -}
    -h2 {
    -font-size:18px;
    -}
    -h3 {
    -font-size:16px;
    -font-style:italic;
    -}
    -h4 {
    -font-size:13px;
    -}
    -h5 {
    -font-size:12px;
    -}
    -h6 {
    -font-size:11px;
    -}
    -ul {
    -list-style-type:disc;
    -}
    -code, tt {
    -font-family:'DejaVu Sans Mono', monospace;
    -font-size:14px;
    -padding-top:4px;
    -margin-top:8px;
    -line-height:1.4em;
    -}
    -dt code {
    -font-family:'DejaVu Sans Mono', monospace;
    -font-size:14px;
    -padding-top:4px;
    -}
    -table tr td dt code {
    -font-family:'DejaVu Sans Mono', monospace;
    -font-size:14px;
    -vertical-align:top;
    -padding-top:4px;
    -}
    -sup {
    -font-size:8px;
    -}
    -/*
    -Document title and Copyright styles
    -*/
    -.clear {
    -clear:both;
    -height:0px;
    -overflow:hidden;
    -}
    -.aboutLanguage {
    -float:right;
    -padding:0px 21px;
    -font-size:11px;
    -z-index:200;
    -margin-top:-9px;
    -}
    -.legalCopy {
    -margin-left:.5em;
    -}
    -.bar a, .bar a:link, .bar a:visited, .bar a:active {
    -color:#FF;
    -text-decoration:none;
    -}
    -.bar a:hover, .bar a:focus {
    -color:#bb7a2a;
    -}
    -.tab {
    -background-color:#0066FF;
    -color:#ff;
    -padding:8px;
    -width:5em;
    -font-weight:bold;
    -}
    -/*
    -Navigation bar styles
    -*/
    -.bar {
    -background-color:#4D7A97;
    -color:#FF;
    -padding:.8em .5em .4em .8em;
    -height:auto;/*height:1.8em;*/
    -font-size:11px;
    -margin:0;
    -}
    -.topNav {
    -background-color:#4D7A97;
    -color:#FF;
    -float:left;
    -padding:0;
    -width:100%;
    -clear:right;
    -height:2.8em;
    -padding-top:10px;
    -overflow:hidden;
    -font-size:12px; 
    -}
    -.bottomNav {
    -margin-top:10px;
    -background-color:#4D7A97;
    -color:#FF;
    -float:left;
    -padding:0;
    -width:100%;
    -clear:right;
    -height:2.8em;
    -padding-top:10px;
    -overflow:hidden;
    -font-size:12px;
    -}
    -.subNav {
    -background-color:#dee3e9;
    -float:left;
    -width:100%;
    -overflow:hidden;
    -font-size:12px;
    -}
    -.subNav div {
    -clear:left;
    -float:left;
    -padding:0 0 5px 6px;
    -text-transform:uppercase;
    -}
    -ul.navList, ul.subNavList {
    -float:left;
    -margin:0 25px 0 0;
    -padding:0;
    -}
    -ul.navList li{
    -list-style:none;
    -float:left;
    -padding: 5px 6px;
    -text-transform:uppercase;
    -}
    -ul.subNavList li{
    -list-style:none;
    -float:left;
    -}
    -.topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, 
    .bottomNav a:active, .bottomNav a:visited {
    -color:#FF;
    -text-decoration:none;
    -text-transform:uppercase;
    -}
    -.topNav a:hover, .bottomNav a:hover {
    -text-decoration:none;
    -color:#bb7a2a;
    -text-transform:uppercase;
    -}
    -.navBarCell1Rev {
    -background-color:#F8981D;
    -color:#253441;
    -margin: auto 5px;
    -}
    -.skipNav {
    -position:absolute;
    -top:auto;
    -left:-px;
    -overflow:hidden;
    -}
    -/*
    -Page header and footer styles
    -*/
    -.header, .footer {
    -clear:both;
    -margin:0 20px;
    -padding:5px 0 0 0;
    -}
    -.indexHeader {
    -margin:10px;
    -position:relative;
    -}
    -.indexHeader span{
    -margin-right:15px;
    -}
    -.indexHeader h1 {
    -font-size:13px;
    -}
    -.title {
    -color:#2c4557;
    -margin:10px 0;
    -}
    -.subTitle {
    -margin:5px 0 0 0;
    -}
    -.header ul {
    -margin:0 0 15px 0;
    -padding:0;
    -}
    -.footer ul {
    -margin:20px 0 5px 0;
    -}
    -.header ul li, .footer ul li {
    -list-style:none;
    -font-size:13px;
    -}
    -/*
    -Heading styles
    -*/
    -div.details ul.blockList ul.blockList ul.blockList li.blockList h4, 
    div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
    -background-color:#dee3e9;
    -border:1px solid #d0d9e0;
    -margin:0 0 6px -8px;
    -padding:7px 5px;
    -}
    -ul.blockList ul.blockList ul.blockList li.blockList h3 {
    -background-color:#dee3e9;
    -border:1px solid #d0d9e0;
    -margin:0 0 6px -8px

    [02/34] incubator-juneau-website git commit: Update javadocs

    http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/62afb533/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
    --
    diff --git 
    a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html 
    b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
    index f0cdf4a..ea2d295 100644
    --- 
    a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
    +++ 
    b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlSerializerSession.html
    @@ -310,439 +310,440 @@
     302eType = aType = 
    ((Delegate)o).getClassMeta();
     303 }
     304
    -305 sType = 
    aType.getSerializedClassMeta();
    +305 sType = aType;
     306
     307 // Swap if necessary
    -308 PojoSwap swap = 
    aType.getPojoSwap();
    +308 PojoSwap swap = 
    aType.getPojoSwap(this);
     309 if (swap != null) {
     310o = swap.swap(this, o);
    -311
    -312// If the getSwapClass() 
    method returns Object, we need to figure out
    -313// the actual type now.
    -314if (sType.isObject())
    -315   sType = 
    getClassMetaForObject(o);
    -316 }
    -317  } else {
    -318 sType = 
    eType.getSerializedClassMeta();
    -319  }
    -320
    -321  // Does the actual type match the 
    expected type?
    -322  boolean isExpectedType = true;
    -323  if (o == null || ! 
    eType.same(aType)) {
    -324 if (eType.isNumber())
    -325isExpectedType = 
    aType.isNumber();
    -326 else if (eType.isMap())
    -327isExpectedType = 
    aType.isMap();
    -328 else if 
    (eType.isCollectionOrArray())
    -329isExpectedType = 
    aType.isCollectionOrArray();
    -330 else
    -331isExpectedType = false;
    -332  }
    -333
    -334  String resolvedDictionaryName = 
    isExpectedType ? null : aType.getDictionaryName();
    -335
    -336  // Note that the dictionary name 
    may be specified on the actual type or the serialized type.
    -337  // HTML templates will have them 
    defined on the serialized type.
    -338  String dictionaryName = 
    aType.getDictionaryName();
    -339  if (dictionaryName == null)
    -340 dictionaryName = 
    sType.getDictionaryName();
    -341
    -342  // char '\0' is interpreted as 
    null.
    -343  if (o != null && 
    sType.isChar() && ((Character)o).charValue() == 0)
    -344 o = null;
    -345
    -346  boolean isCollapsed = false; // 
    If 'true', this is a collection and we're not rendering the outer element.
    -347  boolean isRaw = (sType.isReader() 
    || sType.isInputStream()) && o != null;
    -348
    -349  // Get the JSON type string.
    -350  if (o == null) {
    -351 type = NULL;
    -352  } else if (sType.isCharSequence() 
    || sType.isChar()) {
    -353 type = STRING;
    -354  } else if (sType.isNumber()) {
    -355 type = NUMBER;
    -356  } else if (sType.isBoolean()) {
    -357 type = BOOLEAN;
    -358  } else if (sType.isMapOrBean()) {
    -359 isCollapsed = 
    sType.getExtendedMeta(XmlClassMeta.class).getFormat() == COLLAPSED;
    -360 type = OBJECT;
    -361  } else if 
    (sType.isCollectionOrArray()) {
    -362 isCollapsed = (format == 
    COLLAPSED && ! addNamespaceUris);
    -363 type = ARRAY;
    -364  } else {
    -365 type = STRING;
    -366  }
    -367
    -368  if 
    (format.isOneOf(MIXED,MIXED_PWS,TEXT,TEXT_PWS,XMLTEXT) && 
    type.isOneOf(NULL,STRING,NUMBER,BOOLEAN))
    -369 isCollapsed = true;
    -370
    -371  // Is there a name associated with 
    this bean?
    -372  if (elementName == null && 
    dictionaryName != null) {
    -373 elementName = dictionaryName;
    -374 isExpectedType = true;
    -375  }
    -376
    -377  if (enableNamespaces) {
    -378 if (elementNamespace == null)
    -379elementNamespace = 
    sType.getExtendedMeta(XmlClassMeta.class).getNamespace();
    -380 if (elementNamespace == null)
    -381elementNamespace = 
    aType.getExtendedMeta(XmlClassMeta.class).getNamespace();
    -382 if (elementNamespace != null 
    && elementNamespace.uri == null)
    -383elementNamespace = null;
    -384 if (elementNamespace == null)
    -385elementNamespace = 
    defaultNamespace;
    -386  } else {
    -387 elementNamespace = null;
    -388  }
    -389
    -390  // Do we need a carriage return 
    after the start tag?
    -391  boolean cr = o != null && 
    (sType.isMapOrBean() || sType.isCollectionOrArray()) && ! isMixed;
    -392
    -393  String en = elementName;
    -394  if (en == null && ! isRaw) 
    {
    -395 en = type.toString();
    -396 type = null;
    -397  }
    -398  boolean encodeEn = elementName != 
    null;
    -399  String ns = (elementNamespace == 
    null ? null : elementNamespace.name);
    -400  String dns = null, elementNs = 
    null;
    -401  if (enableNamespaces) {
    -402 dns = elementName == null 
    && defaultNamespace != null ? defaultNamespace.name : null;
    -403 elementNs 

    [2/2] incubator-juneau git commit: Templated and per-media-type swaps.

    Templated and per-media-type swaps.
    
    Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
    Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/f5f5edfb
    Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/f5f5edfb
    Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/f5f5edfb
    
    Branch: refs/heads/master
    Commit: f5f5edfb6de63cb66adb847d49df1ab3d9c5f91b
    Parents: 1bb80a0
    Author: JamesBognar 
    Authored: Sun Sep 10 16:30:51 2017 -0400
    Committer: JamesBognar 
    Committed: Sun Sep 10 16:30:51 2017 -0400
    
    --
     eclipse-preferences/user-dictionary.txt |   1 +
     .../org/apache/juneau/DynaBeanComboTest.java|   3 +-
     .../a/rttests/RoundTripTransformBeansTest.java  |   2 +-
     .../org/apache/juneau/jena/RdfParserTest.java   |   4 +-
     .../juneau/transforms/CalendarSwapTest.java |   6 +-
     .../apache/juneau/transforms/PojoSwapTest.java  |  86 
     .../transforms/SwapsAnnotationComboTest.java| 467 +--
     .../org/apache/juneau/dto/atom/CommonEntry.java |   2 +-
     .../java/org/apache/juneau/dto/atom/Entry.java  |   2 +-
     .../apache/juneau/dto/jsonschema/Schema.java|   8 +-
     .../java/org/apache/juneau/BeanContext.java |  28 +-
     .../main/java/org/apache/juneau/BeanMap.java|   4 +-
     .../java/org/apache/juneau/BeanMapEntry.java|   4 +-
     .../org/apache/juneau/BeanPropertyMeta.java |  37 +-
     .../main/java/org/apache/juneau/ClassMeta.java  |  27 +-
     .../org/apache/juneau/CoreObjectBuilder.java|   2 +-
     .../apache/juneau/annotation/BeanProperty.java  |  24 -
     .../java/org/apache/juneau/annotation/Swap.java |  91 +++-
     .../org/apache/juneau/annotation/Swaps.java |  19 +-
     .../juneau/serializer/SerializerGroup.java  |  45 +-
     .../org/apache/juneau/transform/PojoSwap.java   | 313 +++--
     .../org/apache/juneau/transform/Surrogate.java  | 134 ++
     .../apache/juneau/transform/SurrogateSwap.java  | 111 +
     .../org/apache/juneau/transform/package.html|   2 +-
     .../juneau/transforms/ByteArrayBase64Swap.java  |  18 +-
     .../juneau/transforms/CalendarLongSwap.java |  19 +-
     .../juneau/transforms/CalendarMapSwap.java  |  27 +-
     .../apache/juneau/transforms/DateLongSwap.java  |   2 +-
     .../apache/juneau/transforms/DateMapSwap.java   |   2 +-
     .../apache/juneau/transforms/ReaderSwap.java|  16 +-
     .../juneau/transforms/StringFormatSwap.java |   6 +-
     .../transforms/XMLGregorianCalendarSwap.java|   6 +-
     .../src/main/javadoc/overview.html  | 138 --
     .../examples/addressbook/CreatePerson.java  |   5 +-
     .../juneau/examples/addressbook/Person.java |  11 +-
     .../juneau/examples/rest/PetStoreResource.java  |   2 +-
     .../examples/rest/SystemPropertiesResource.java |  14 +-
     .../examples/rest/UrlEncodedFormResource.java   |   2 +-
     .../resources/DirectoryResource.java|   2 +-
     .../microservice/resources/LogsResource.java|   2 +-
     40 files changed, 1332 insertions(+), 362 deletions(-)
    --
    
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f5f5edfb/eclipse-preferences/user-dictionary.txt
    --
    diff --git a/eclipse-preferences/user-dictionary.txt 
    b/eclipse-preferences/user-dictionary.txt
    index 6401d9c..712d0c0 100644
    --- a/eclipse-preferences/user-dictionary.txt
    +++ b/eclipse-preferences/user-dictionary.txt
    @@ -483,3 +483,4 @@ hyperlinked
     bpx
     bpi
     tooltip
    +templated
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f5f5edfb/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
    --
    diff --git 
    a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
     
    b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
    index 9afaaf8..b8bcc2a 100644
    --- 
    a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
    +++ 
    b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/DynaBeanComboTest.java
    @@ -317,7 +317,8 @@ public class DynaBeanComboTest extends ComboRoundTripTest {
     
    @Bean(sort=true)
    public static class BeanWithDynaFieldSwapped {
    -   @BeanProperty(name="*", swap=CalendarSwap.ISO8601DTZ.class)
    +   @BeanProperty(name="*")
    +   @Swap(CalendarSwap.ISO8601DTZ.class)
    public Map f1 = new 
    LinkedHashMap();
     
    public BeanWithDynaFieldSwapped init() {
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f5f5edfb/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransformBeansTest.java
    --
    diff --git 
    a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/a/rttests/RoundTripTransfor

    [1/2] incubator-juneau git commit: Templated and per-media-type swaps.

    Repository: incubator-juneau
    Updated Branches:
      refs/heads/master 1bb80a053 -> f5f5edfb6
    
    
    http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/f5f5edfb/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
    --
    diff --git 
    a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
     
    b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
    index fa8b57f..36a1e71 100644
    --- 
    a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
    +++ 
    b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/transform/SurrogateSwap.java
    @@ -21,116 +21,7 @@ import org.apache.juneau.parser.*;
     import org.apache.juneau.serializer.*;
     
     /**
    - * Specialized {@link PojoSwap} for surrogate classes.
    - *
    - * 
    - * Surrogate classes are used in place of other classes during serialization.
    - * For example, you may want to use a surrogate class to change the names or 
    order of bean properties on a bean.
    - *
    - * 
    - * The following is an example of a surrogate class change changes a property 
    name:
    - * 
    - * public class SurrogateClass {
    - * public String surrogateField;  // New bean 
    property
    - *
    - * public SurrogateClass(NormalClass normalClass) {
    - * this.surrogateField = normalClass.normalField;
    - * }
    - * }
    - * 
    - *
    - * 
    - * Optionally, a public static method can be used to un-transform a class 
    during parsing:
    - * 
    - * public class SurrogateClass {
    - * ...
    - * public static NormalClass 
    toNormalClass(SurrogateClass surrogateClass) {
    - * return new 
    NormalClass(surrogateClass.transformedField);
    - * }
    - * }
    - * 
    - *
    - * 
    - * Surrogate classes must conform to the following:
    - * 
    - * 
    - * It must have a one or more public constructors that take in a 
    single parameter whose type is the normal types.
    - * (It is possible to define a class as a surrogate for multiple 
    class types by using multiple constructors with
    - * different parameter types).
    - * 
    - * It optionally can have a public static method that takes in a 
    single parameter whose type is the transformed
    - * type and returns an instance of the normal type.
    - * This is called the un-transform method.
    - * The method can be called anything.
    - * 
    - * If an un-transform method is present, the class must also 
    contain a no-arg constructor (so that the
    - * transformed class can be instantiated by the parser before 
    being converted into the normal class by the
    - * un-transform method).
    - * 
    - *
    - * 
    - * Surrogate classes are associated with serializers and parsers using the 
    {@link CoreObjectBuilder#pojoSwaps(Class...)}
    - * method.
    - * 
    - * @Test
    - * public void test() throws Exception {
    - * JsonSerializer s = new 
    JsonSerializerBuilder().simple().pojoSwaps(Surrogate.class).build();
    - * JsonParser p = new 
    JsonParserBuilder().pojoSwaps(Surrogate.class).build();
    - * String r;
    - * Normal n = Normal.create();
    - *
    - * r = s.serialize(n);
    - * assertEquals("{f2:'f1'}", r);
    - *
    - * n = p.parse(r, Normal.class);
    - * assertEquals("f1", n.f1);
    - * }
    - *
    - * // The normal class
    - * public class Normal {
    - * public String f1;
    - *
    - * public static Normal create() {
    - * Normal n = new Normal();
    - * n.f1 = "f1";
    - * return n;
    - * }
    - * }
    - *
    - * // The surrogate class
    - * public static class Surrogate {
    - * public String f2;
    - *
    - * // Surrogate constructor
    - * public Surrogate(Normal n) {
    - * f2 = n.f1;
    - * }
    - *
    - * // Constructor used during parsing (only needed if 
    un-transform method specified)
    - * public Surrogate() {}
    - *
    - * // Un-transform method (optional)
    - * public static Normal toNormal(Surrogate f) {
    - * Normal n = new Normal();
    - * n.f1 = f.f2;
    - * return n;
    - * }
    - * }
    - * 
    - *
    - * 
    - * It should be noted that a surrogate class is functionally equivalent to the 
    following {@link PojoSwap}
    - * implementation:
    - * 
    - * public static class SurrogateSwap extends 
    PojoSwap {
    - * public Surrogate swap(Normal n) throws 
    SerializeException {
    - * return new Surrogate(n);
    - * }
    - * public Normal unswap(Surrogate s, ClassMeta 
    hint) throws ParseException {
    - * return Surrogate.toNormal(s);
    - * }
    - * }
    - * 
    + * S