Repository: incubator-juneau-website
Updated Branches:
  refs/heads/asf-site 310e3f149 -> 756ffe72d


http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html
index 0026910..321fcef 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ArgsVar.html
@@ -56,18 +56,21 @@
 <span class="sourceLineNo">048</span>    */<a name="line.48"></a>
 <span class="sourceLineNo">049</span>   public static final String 
SESSION_args = "args";<a name="line.49"></a>
 <span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>   /**<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * Constructor.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   public ArgsVar() {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>      super("ARG");<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>   @Override /* Var */<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>   public String 
resolve(VarResolverSession session, String key) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      return 
session.getSessionObject(Args.class, SESSION_args).getArg(key);<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>   }<a name="line.61"></a>
-<span class="sourceLineNo">062</span>}<a name="line.62"></a>
+<span class="sourceLineNo">051</span>   /** The name of this variable. */<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>   public static final String NAME = 
"ARG";<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   /**<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * Constructor.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   public ArgsVar() {<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>      super(NAME);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>   @Override /* Var */<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>   public String 
resolve(VarResolverSession session, String key) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      return 
session.getSessionObject(Args.class, SESSION_args).getArg(key);<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>   }<a name="line.64"></a>
+<span class="sourceLineNo">065</span>}<a name="line.65"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
index de4654c..63c8ac8 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ConfigFileVar.html
@@ -57,18 +57,21 @@
 <span class="sourceLineNo">049</span>    */<a name="line.49"></a>
 <span class="sourceLineNo">050</span>   public static final String 
SESSION_config = "config";<a name="line.50"></a>
 <span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>   /**<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    * Constructor.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   public ConfigFileVar() {<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>      super("C");<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>   @Override /* Var */<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>   public String 
resolve(VarResolverSession session, String key) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      return 
session.getSessionObject(ConfigFile.class, SESSION_config).getString(key);<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>   }<a name="line.62"></a>
-<span class="sourceLineNo">063</span>}<a name="line.63"></a>
+<span class="sourceLineNo">052</span>   /** The name of this variable. */<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>   public static final String NAME = 
"C";<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>   /**<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    * Constructor.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    */<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   public ConfigFileVar() {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>      super(NAME);<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>   @Override /* Var */<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>   public String 
resolve(VarResolverSession session, String key) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      return 
session.getSessionObject(ConfigFile.class, SESSION_config).getString(key);<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>   }<a name="line.65"></a>
+<span class="sourceLineNo">066</span>}<a name="line.66"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html
index 68886ea..eaeb0c8 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/EnvVariablesVar.html
@@ -43,19 +43,22 @@
 <span class="sourceLineNo">035</span> */<a name="line.35"></a>
 <span class="sourceLineNo">036</span>public class EnvVariablesVar extends 
DefaultingVar {<a name="line.36"></a>
 <span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>   /**<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    * Constructor.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   public EnvVariablesVar() {<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>      super("E");<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   }<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>   @Override /* Var */<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span>   public String 
resolve(VarResolverSession session, String varVal) {<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      // Note that lookup is 
case-insensitive on windows.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      return System.getenv(varVal);<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>   }<a name="line.49"></a>
-<span class="sourceLineNo">050</span>}<a name="line.50"></a>
+<span class="sourceLineNo">038</span>   /** The name of this variable. */<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>   public static final String NAME = 
"E";<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>   /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    * Constructor.<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   public EnvVariablesVar() {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>      super(NAME);<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   }<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>   @Override /* Var */<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>   public String 
resolve(VarResolverSession session, String varVal) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      // Note that lookup is 
case-insensitive on windows.<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      return System.getenv(varVal);<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>   }<a name="line.52"></a>
+<span class="sourceLineNo">053</span>}<a name="line.53"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/IfVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/IfVar.html 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/IfVar.html
index ef7a396..efb1dc4 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/IfVar.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/IfVar.html
@@ -53,24 +53,27 @@
 <span class="sourceLineNo">045</span>*/<a name="line.45"></a>
 <span class="sourceLineNo">046</span>public class IfVar extends MultipartVar 
{<a name="line.46"></a>
 <span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>   /**<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    * Constructor.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    */<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   public IfVar() {<a name="line.51"></a>
-<span class="sourceLineNo">052</span>      super("IF");<a name="line.52"></a>
-<span class="sourceLineNo">053</span>   }<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>   @Override /* MultipartVar */<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>   public String 
resolve(VarResolverSession session, String[] args) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>      if (args.length &lt; 2 || 
args.length &gt; 3)<a name="line.57"></a>
-<span class="sourceLineNo">058</span>         illegalArg("Invalid number of 
arguments passed to $IF var.  Must be either $IF{booleanArg,thenValue} or 
$IF{booleanArg,thenValue,elseValue}");<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>      String b = args[0].toLowerCase();<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>      if ("1".equals(b) || "t".equals(b) 
|| "true".equals(b))<a name="line.61"></a>
-<span class="sourceLineNo">062</span>         return args[1];<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>      return args.length == 2 ? "" : 
args[2];<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   }<a name="line.64"></a>
-<span class="sourceLineNo">065</span>}<a name="line.65"></a>
+<span class="sourceLineNo">048</span>   /** The name of this variable. */<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>   public static final String NAME = 
"IF";<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>   /**<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    * Constructor.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    */<a name="line.53"></a>
+<span class="sourceLineNo">054</span>   public IfVar() {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>      super(NAME);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>   @Override /* MultipartVar */<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>   public String 
resolve(VarResolverSession session, String[] args) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      if (args.length &lt; 2 || 
args.length &gt; 3)<a name="line.60"></a>
+<span class="sourceLineNo">061</span>         illegalArg("Invalid number of 
arguments passed to $IF var.  Must be either $IF{booleanArg,thenValue} or 
$IF{booleanArg,thenValue,elseValue}");<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>      String b = args[0].toLowerCase();<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>      if ("1".equals(b) || "t".equals(b) 
|| "true".equals(b))<a name="line.64"></a>
+<span class="sourceLineNo">065</span>         return args[1];<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>      return args.length == 2 ? "" : 
args[2];<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>}<a name="line.68"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
index feece92..35a4211 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/ManifestFileVar.html
@@ -56,18 +56,21 @@
 <span class="sourceLineNo">048</span>    */<a name="line.48"></a>
 <span class="sourceLineNo">049</span>   public static final String 
SESSION_manifest = "manifest";<a name="line.49"></a>
 <span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>   /**<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    * Constructor.<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   public ManifestFileVar() {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>      super("MF");<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>   @Override /* Var */<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>   public String 
resolve(VarResolverSession session, String key) {<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      return 
session.getSessionObject(ManifestFile.class, 
SESSION_manifest).getString(key);<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   }<a name="line.61"></a>
-<span class="sourceLineNo">062</span>}<a name="line.62"></a>
+<span class="sourceLineNo">051</span>   /** The name of this variable. */<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>   public static final String NAME = 
"MF";<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>   /**<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    * Constructor.<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   public ManifestFileVar() {<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>      super(NAME);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>   @Override /* Var */<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>   public String 
resolve(VarResolverSession session, String key) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      return 
session.getSessionObject(ManifestFile.class, 
SESSION_manifest).getString(key);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   }<a name="line.64"></a>
+<span class="sourceLineNo">065</span>}<a name="line.65"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html
index 5da9675..cb9c528 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SwitchVar.html
@@ -54,34 +54,37 @@
 <span class="sourceLineNo">046</span> */<a name="line.46"></a>
 <span class="sourceLineNo">047</span>public class SwitchVar extends 
MultipartVar {<a name="line.47"></a>
 <span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>   /**<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    * Constructor.<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>   public SwitchVar() {<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>      super("SWITCH");<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>   }<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>   @Override /* MultipartVar */<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>   public String 
resolve(VarResolverSession session, String[] args) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>      if (args.length &lt; 3)<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>         illegalArg("Invalid number of 
arguments passed to $SWITCH var.  Must have 3 or more arguments.");<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>      String stringArg = args[0];<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>      for (int i = 1; i &lt; 
args.length;) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>         String pattern = args[i++];<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>         if (args.length == i)<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>            return pattern;  // We've 
reached an else.<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>         Pattern p = 
Pattern.compile(pattern.replace("*", ".*").replace("?", "."));<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>         if 
(p.matcher(stringArg).matches())<a name="line.68"></a>
-<span class="sourceLineNo">069</span>            return args[i];<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>         i++;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>      // Nothing matched and no else 
clause.<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      return "";<a name="line.74"></a>
-<span class="sourceLineNo">075</span>   }<a name="line.75"></a>
-<span class="sourceLineNo">076</span>}<a name="line.76"></a>
+<span class="sourceLineNo">049</span>   /** The name of this variable. */<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>   public static final String NAME = 
"SWITCH";<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>   /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    * Constructor.<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    */<a name="line.54"></a>
+<span class="sourceLineNo">055</span>   public SwitchVar() {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>      super(NAME);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>   @Override /* MultipartVar */<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>   public String 
resolve(VarResolverSession session, String[] args) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      if (args.length &lt; 3)<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>         illegalArg("Invalid number of 
arguments passed to $SWITCH var.  Must have 3 or more arguments.");<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>      String stringArg = args[0];<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>      for (int i = 1; i &lt; 
args.length;) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>         String pattern = args[i++];<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>         if (args.length == i)<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>            return pattern;  // We've 
reached an else.<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>         Pattern p = 
Pattern.compile(pattern.replace("*", ".*").replace("?", "."));<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>         if 
(p.matcher(stringArg).matches())<a name="line.71"></a>
+<span class="sourceLineNo">072</span>            return args[i];<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>         i++;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>      // Nothing matched and no else 
clause.<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      return "";<a name="line.77"></a>
+<span class="sourceLineNo">078</span>   }<a name="line.78"></a>
+<span class="sourceLineNo">079</span>}<a name="line.79"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html
 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html
index ebfdaa1..1cc53c8 100644
--- 
a/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html
+++ 
b/content/site/apidocs/src-html/org/apache/juneau/svl/vars/SystemPropertiesVar.html
@@ -43,13 +43,16 @@
 <span class="sourceLineNo">035</span> */<a name="line.35"></a>
 <span class="sourceLineNo">036</span>public class SystemPropertiesVar extends 
MapVar {<a name="line.36"></a>
 <span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>   /**<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    * Constructor.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>   public SystemPropertiesVar() {<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>      super("S", 
System.getProperties());<a name="line.42"></a>
-<span class="sourceLineNo">043</span>   }<a name="line.43"></a>
-<span class="sourceLineNo">044</span>}<a name="line.44"></a>
+<span class="sourceLineNo">038</span>   /** The name of this variable. */<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>   public static final String NAME = 
"S";<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>   /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    * Constructor.<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    */<a name="line.43"></a>
+<span class="sourceLineNo">044</span>   public SystemPropertiesVar() {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>      super(NAME, 
System.getProperties());<a name="line.45"></a>
+<span class="sourceLineNo">046</span>   }<a name="line.46"></a>
+<span class="sourceLineNo">047</span>}<a name="line.47"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/756ffe72/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html 
b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html
index df38c0f..51e680a 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/xml/XmlBeanMeta.html
@@ -36,8 +36,8 @@
 <span class="sourceLineNo">028</span>   private final 
Map&lt;String,BeanPropertyMeta&gt; elements;                     // Map of bean 
properties that are represented as XML elements.<a name="line.28"></a>
 <span class="sourceLineNo">029</span>   private final BeanPropertyMeta 
attrsProperty;                            // Bean property that contain XML 
attribute key/value pairs for this bean.<a name="line.29"></a>
 <span class="sourceLineNo">030</span>   private final 
Map&lt;String,BeanPropertyMeta&gt; collapsedProperties;          // Properties 
defined with @Xml.childName annotation.<a name="line.30"></a>
-<span class="sourceLineNo">031</span>   private BeanPropertyMeta 
contentProperty;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>   private XmlFormat contentFormat;<a 
name="line.32"></a>
+<span class="sourceLineNo">031</span>   private final BeanPropertyMeta 
contentProperty;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>   private final XmlFormat 
contentFormat;<a name="line.32"></a>
 <span class="sourceLineNo">033</span><a name="line.33"></a>
 <span class="sourceLineNo">034</span>   /**<a name="line.34"></a>
 <span class="sourceLineNo">035</span>    * Constructor.<a name="line.35"></a>
@@ -46,220 +46,231 @@
 <span class="sourceLineNo">038</span>    */<a name="line.38"></a>
 <span class="sourceLineNo">039</span>   public XmlBeanMeta(BeanMeta&lt;?&gt; 
beanMeta) {<a name="line.39"></a>
 <span class="sourceLineNo">040</span>      super(beanMeta);<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>      Class&lt;?&gt; c = 
beanMeta.getClassMeta().getInnerClass();<a name="line.41"></a>
-<span class="sourceLineNo">042</span>      Xml xml = 
c.getAnnotation(Xml.class);<a name="line.42"></a>
-<span class="sourceLineNo">043</span>      XmlFormat defaultFormat = null;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>      XmlFormat _contentFormat = 
DEFAULT;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>      if (xml != null) {<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>         XmlFormat xf = xml.format();<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>         if (xf == ATTRS)<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>            defaultFormat = 
XmlFormat.ATTR;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>         else if (xf.isOneOf(ELEMENTS, 
DEFAULT))<a name="line.50"></a>
-<span class="sourceLineNo">051</span>            defaultFormat = ELEMENT;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>         else if (xf == VOID) {<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>            _contentFormat = VOID;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>            defaultFormat = VOID;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>         }<a name="line.55"></a>
-<span class="sourceLineNo">056</span>         else<a name="line.56"></a>
-<span class="sourceLineNo">057</span>            throw new 
BeanRuntimeException(c, "Invalid format specified in @Xml annotation on bean: 
{0}.  Must be one of the following: DEFAULT,ATTRS,ELEMENTS,VOID", 
xml.format());<a name="line.57"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>      Class&lt;?&gt; c = 
beanMeta.getClassMeta().getInnerClass();<a name="line.42"></a>
+<span class="sourceLineNo">043</span>      XmlBeanMetaBuilder b = new 
XmlBeanMetaBuilder(beanMeta);<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>      attrs = 
Collections.unmodifiableMap(b.attrs);<a name="line.45"></a>
+<span class="sourceLineNo">046</span>      elements = 
Collections.unmodifiableMap(b.elements);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      attrsProperty = b.attrsProperty;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>      collapsedProperties = 
Collections.unmodifiableMap(b.collapsedProperties);<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      contentProperty = 
b.contentProperty;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      contentFormat = b.contentFormat;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>      // Do some validation.<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>      if (contentProperty != null || 
contentFormat == XmlFormat.VOID) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>         if (! elements.isEmpty())<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>            throw new 
BeanRuntimeException(c, "{0} and ELEMENT properties found on the same bean.  
These cannot be mixed.", contentFormat);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>         if (! 
collapsedProperties.isEmpty())<a name="line.56"></a>
+<span class="sourceLineNo">057</span>            throw new 
BeanRuntimeException(c, "{0} and COLLAPSED properties found on the same bean.  
These cannot be mixed.", contentFormat);<a name="line.57"></a>
 <span class="sourceLineNo">058</span>      }<a name="line.58"></a>
 <span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>      Map&lt;String,BeanPropertyMeta&gt; 
_attrs = new LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>      Map&lt;String,BeanPropertyMeta&gt; 
_elements = new LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>      BeanPropertyMeta _attrsProperty = 
null, _contentProperty = null;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>      Map&lt;String,BeanPropertyMeta&gt; 
_collapsedProperties = new LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>      for (BeanPropertyMeta p : 
beanMeta.getPropertyMetas()) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span>         XmlFormat xf = 
p.getExtendedMeta(XmlBeanPropertyMeta.class).getXmlFormat();<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>         ClassMeta&lt;?&gt; pcm = 
p.getClassMeta();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>         if (xf == ATTR) {<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>            _attrs.put(p.getName(), p);<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>         } else if (xf == ELEMENT) {<a 
name="line.70"></a>
-<span class="sourceLineNo">071</span>            _elements.put(p.getName(), 
p);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>         } else if (xf == COLLAPSED) {<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>            
_collapsedProperties.put(p.getName(), p);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>         } else if (xf == DEFAULT) {<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>            if (defaultFormat == ATTR)<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>               _attrs.put(p.getName(), 
p);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>            else<a name="line.77"></a>
-<span class="sourceLineNo">078</span>               _elements.put(p.getName(), 
p);<a name="line.78"></a>
-<span class="sourceLineNo">079</span>         } else if (xf == ATTRS) {<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>            if (_attrsProperty != null)<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>               throw new 
BeanRuntimeException(c, "Multiple instances of ATTRS properties defined on 
class.  Only one property can be designated as such.");<a name="line.81"></a>
-<span class="sourceLineNo">082</span>            if (! pcm.isMapOrBean())<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>               throw new 
BeanRuntimeException(c, "Invalid type for ATTRS property.  Only properties of 
type Map and bean can be used.");<a name="line.83"></a>
-<span class="sourceLineNo">084</span>            _attrsProperty = p;<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>         } else if (xf.isOneOf(ELEMENTS, 
MIXED, MIXED_PWS, TEXT, TEXT_PWS, XMLTEXT)) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>            if (xf.isOneOf(ELEMENTS, 
MIXED, MIXED_PWS) &amp;&amp; ! pcm.isCollectionOrArray())<a name="line.86"></a>
-<span class="sourceLineNo">087</span>               throw new 
BeanRuntimeException(c, "Invalid type for {0} property.  Only properties of 
type Collection and array can be used.", xf);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>            if (_contentProperty != null) 
{<a name="line.88"></a>
-<span class="sourceLineNo">089</span>               if (xf == 
_contentFormat)<a name="line.89"></a>
-<span class="sourceLineNo">090</span>                  throw new 
BeanRuntimeException(c, "Multiple instances of {0} properties defined on class. 
 Only one property can be designated as such.", xf);<a name="line.90"></a>
-<span class="sourceLineNo">091</span>               throw new 
BeanRuntimeException(c, "{0} and {1} properties found on the same bean.  Only 
one property can be designated as such.", _contentFormat, xf);<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>            }<a name="line.92"></a>
-<span class="sourceLineNo">093</span>            _contentProperty = p;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>            _contentFormat = xf;<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>         }<a name="line.95"></a>
-<span class="sourceLineNo">096</span>         // Look for any properties that 
are collections with @Xml.childName specified.<a name="line.96"></a>
-<span class="sourceLineNo">097</span>         String n = 
p.getExtendedMeta(XmlBeanPropertyMeta.class).getChildName();<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>         if (n != null) {<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>            if 
(_collapsedProperties.containsKey(n) &amp;&amp; _collapsedProperties.get(n) != 
p)<a name="line.99"></a>
-<span class="sourceLineNo">100</span>               throw new 
BeanRuntimeException(c, "Multiple properties found with the child name 
''{0}''.", n);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>            _collapsedProperties.put(n, 
p);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>         }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>      attrs = 
Collections.unmodifiableMap(_attrs);<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      elements = 
Collections.unmodifiableMap(_elements);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      attrsProperty = _attrsProperty;<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>      collapsedProperties = 
Collections.unmodifiableMap(_collapsedProperties);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      contentProperty = 
_contentProperty;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      contentFormat = _contentFormat;<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>      // Do some validation.<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>      if (contentProperty != null || 
contentFormat == XmlFormat.VOID) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>         if (! elements.isEmpty())<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>            throw new 
BeanRuntimeException(c, "{0} and ELEMENT properties found on the same bean.  
These cannot be mixed.", contentFormat);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>         if (! 
collapsedProperties.isEmpty())<a name="line.116"></a>
-<span class="sourceLineNo">117</span>            throw new 
BeanRuntimeException(c, "{0} and COLLAPSED properties found on the same bean.  
These cannot be mixed.", contentFormat);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>      if (! 
collapsedProperties.isEmpty()) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>         if (! 
Collections.disjoint(elements.keySet(), collapsedProperties.keySet()))<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>            throw new 
BeanRuntimeException(c, "Child element name conflicts found with another 
property.");<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>   }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>   /**<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    * The list of properties that should 
be rendered as XML attributes.<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    *<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    * @return Map of property names to 
property metadata.<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    */<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   protected 
Map&lt;String,BeanPropertyMeta&gt; getAttrProperties() {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      return attrs;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>   /**<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    * The list of names of properties 
that should be rendered as XML attributes.<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    *<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    * @return Set of property names.<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    */<a name="line.139"></a>
-<span class="sourceLineNo">140</span>   protected Set&lt;String&gt; 
getAttrPropertyNames() {<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return attrs.keySet();<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>   }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>   /**<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    * The list of properties that should 
be rendered as child elements.<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    *<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    * @return Map of property names to 
property metadata.<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    */<a name="line.148"></a>
-<span class="sourceLineNo">149</span>   protected 
Map&lt;String,BeanPropertyMeta&gt; getElementProperties() {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      return elements;<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>   }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>   /**<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    * The list of names of properties 
that should be rendered as child elements.<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    *<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    * @return Set of property names.<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>    */<a name="line.157"></a>
-<span class="sourceLineNo">158</span>   protected Set&lt;String&gt; 
getElementPropertyNames() {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      return elements.keySet();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>   }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>   /**<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    * The list of properties that should 
be rendered as collapsed child elements.<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    * See {@link Xml#childName()}<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>    *<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    * @return Map of property names to 
property metadata.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    */<a name="line.167"></a>
-<span class="sourceLineNo">168</span>   protected 
Map&lt;String,BeanPropertyMeta&gt; getCollapsedProperties() {<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>      return collapsedProperties;<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>   }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>   /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    * The list of names of properties 
that should be rendered as collapsed child elements.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    *<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    * @return Set of property names.<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>    */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>   protected Set&lt;String&gt; 
getCollapsedPropertyNames() {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      return 
collapsedProperties.keySet();<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>   /**<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    * The property that returns a map of 
XML attributes as key/value pairs.<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    *<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    * @return The bean property metadata, 
or &lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>   protected BeanPropertyMeta 
getAttrsProperty() {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      return attrsProperty;<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>   }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span>   /**<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    * The name of the property that 
returns a map of XML attributes as key/value pairs.<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    *<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    * @return The bean property name, or 
&lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.193"></a>
-<span class="sourceLineNo">194</span>    */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>   protected String 
getAttrsPropertyName() {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      return attrsProperty == null ? null 
: attrsProperty.getName();<a name="line.196"></a>
-<span class="sourceLineNo">197</span>   }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>   /**<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    * The property that represents the 
inner XML content of this bean.<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    *<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    * @return The bean property metadata, 
or &lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>   protected BeanPropertyMeta 
getContentProperty() {<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      return contentProperty;<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>   }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>   /**<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    * The name of the property that 
represents the inner XML content of this bean.<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    *<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    * @return The bean property name, or 
&lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    */<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   protected String 
getContentPropertyName() {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      return contentProperty == null ? 
null : contentProperty.getName();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span>   /**<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    * Returns the format of the inner XML 
content of this bean.<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    * &lt;p&gt;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    * Can be one of the following:<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>    * &lt;ul&gt;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    *    &lt;li&gt;{@link 
XmlFormat#ELEMENTS}<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    *    &lt;li&gt;{@link 
XmlFormat#MIXED}<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    *    &lt;li&gt;{@link 
XmlFormat#MIXED_PWS}<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    *    &lt;li&gt;{@link 
XmlFormat#TEXT}<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    *    &lt;li&gt;{@link 
XmlFormat#TEXT_PWS}<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    *    &lt;li&gt;{@link 
XmlFormat#XMLTEXT}<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    *    &lt;li&gt;{@link 
XmlFormat#VOID}<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    *    
&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    * &lt;/ul&gt;<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    *<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    * @return The format of the inner XML 
content of this bean.<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    */<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   protected XmlFormat getContentFormat() 
{<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      return contentFormat;<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>   }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span>   /**<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    * Returns bean property meta with the 
specified name.<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    * This is identical to calling {@link 
BeanMeta#getPropertyMeta(String)} except it first retrieves<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    *    the bean property meta based on 
the child name (e.g. a property whose name is "people", but whose child name is 
"person").<a name="line.241"></a>
+<span class="sourceLineNo">060</span>      if (! 
collapsedProperties.isEmpty()) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>         if (! 
Collections.disjoint(elements.keySet(), collapsedProperties.keySet()))<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>            throw new 
BeanRuntimeException(c, "Child element name conflicts found with another 
property.");<a name="line.62"></a>
+<span class="sourceLineNo">063</span>      }<a name="line.63"></a>
+<span class="sourceLineNo">064</span>   }<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span>   private static class 
XmlBeanMetaBuilder {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>      
Map&lt;String,BeanPropertyMeta&gt;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>         attrs = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;(),<a name="line.68"></a>
+<span class="sourceLineNo">069</span>         elements = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;(),<a name="line.69"></a>
+<span class="sourceLineNo">070</span>         collapsedProperties = new 
LinkedHashMap&lt;String,BeanPropertyMeta&gt;();<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      BeanPropertyMeta<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>         attrsProperty,<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>         contentProperty;<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>      XmlFormat contentFormat = 
DEFAULT;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>      
XmlBeanMetaBuilder(BeanMeta&lt;?&gt; beanMeta) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>         Class&lt;?&gt; c = 
beanMeta.getClassMeta().getInnerClass();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>         Xml xml = 
c.getAnnotation(Xml.class);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>         XmlFormat defaultFormat = 
null;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>         if (xml != null) {<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>            XmlFormat xf = 
xml.format();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>            if (xf == ATTRS)<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>               defaultFormat = 
XmlFormat.ATTR;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>            else if (xf.isOneOf(ELEMENTS, 
DEFAULT))<a name="line.85"></a>
+<span class="sourceLineNo">086</span>               defaultFormat = ELEMENT;<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>            else if (xf == VOID) {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>               contentFormat = VOID;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>               defaultFormat = VOID;<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>            }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>            else<a name="line.91"></a>
+<span class="sourceLineNo">092</span>               throw new 
BeanRuntimeException(c, "Invalid format specified in @Xml annotation on bean: 
{0}.  Must be one of the following: DEFAULT,ATTRS,ELEMENTS,VOID", 
xml.format());<a name="line.92"></a>
+<span class="sourceLineNo">093</span>         }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>         for (BeanPropertyMeta p : 
beanMeta.getPropertyMetas()) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>            XmlFormat xf = 
p.getExtendedMeta(XmlBeanPropertyMeta.class).getXmlFormat();<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>            ClassMeta&lt;?&gt; pcm = 
p.getClassMeta();<a name="line.97"></a>
+<span class="sourceLineNo">098</span>            if (xf == ATTR) {<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>               attrs.put(p.getName(), 
p);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>            } else if (xf == ELEMENT) {<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>               elements.put(p.getName(), 
p);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>            } else if (xf == COLLAPSED) 
{<a name="line.102"></a>
+<span class="sourceLineNo">103</span>               
collapsedProperties.put(p.getName(), p);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            } else if (xf == DEFAULT) {<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>               if (defaultFormat == 
ATTR)<a name="line.105"></a>
+<span class="sourceLineNo">106</span>                  attrs.put(p.getName(), 
p);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>               else<a name="line.107"></a>
+<span class="sourceLineNo">108</span>                  
elements.put(p.getName(), p);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>            } else if (xf == ATTRS) {<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>               if (attrsProperty != 
null)<a name="line.110"></a>
+<span class="sourceLineNo">111</span>                  throw new 
BeanRuntimeException(c, "Multiple instances of ATTRS properties defined on 
class.  Only one property can be designated as such.");<a name="line.111"></a>
+<span class="sourceLineNo">112</span>               if (! pcm.isMapOrBean())<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>                  throw new 
BeanRuntimeException(c, "Invalid type for ATTRS property.  Only properties of 
type Map and bean can be used.");<a name="line.113"></a>
+<span class="sourceLineNo">114</span>               attrsProperty = p;<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>            } else if 
(xf.isOneOf(ELEMENTS, MIXED, MIXED_PWS, TEXT, TEXT_PWS, XMLTEXT)) {<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>               if (xf.isOneOf(ELEMENTS, 
MIXED, MIXED_PWS) &amp;&amp; ! pcm.isCollectionOrArray())<a name="line.116"></a>
+<span class="sourceLineNo">117</span>                  throw new 
BeanRuntimeException(c, "Invalid type for {0} property.  Only properties of 
type Collection and array can be used.", xf);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>               if (contentProperty != 
null) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>                  if (xf == 
contentFormat)<a name="line.119"></a>
+<span class="sourceLineNo">120</span>                     throw new 
BeanRuntimeException(c, "Multiple instances of {0} properties defined on class. 
 Only one property can be designated as such.", xf);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>                  throw new 
BeanRuntimeException(c, "{0} and {1} properties found on the same bean.  Only 
one property can be designated as such.", contentFormat, xf);<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>               }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>               contentProperty = p;<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>               contentFormat = xf;<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>            }<a name="line.125"></a>
+<span class="sourceLineNo">126</span>            // Look for any properties 
that are collections with @Xml.childName specified.<a name="line.126"></a>
+<span class="sourceLineNo">127</span>            String n = 
p.getExtendedMeta(XmlBeanPropertyMeta.class).getChildName();<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>            if (n != null) {<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>               if 
(collapsedProperties.containsKey(n) &amp;&amp; collapsedProperties.get(n) != 
p)<a name="line.129"></a>
+<span class="sourceLineNo">130</span>                  throw new 
BeanRuntimeException(c, "Multiple properties found with the child name 
''{0}''.", n);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>               collapsedProperties.put(n, 
p);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>         }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>   /**<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    * The list of properties that should 
be rendered as XML attributes.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    *<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    * @return Map of property names to 
property metadata.<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   protected 
Map&lt;String,BeanPropertyMeta&gt; getAttrProperties() {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      return attrs;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>   /**<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    * The list of names of properties 
that should be rendered as XML attributes.<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    *<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    * @return Set of property names.<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    */<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   protected Set&lt;String&gt; 
getAttrPropertyNames() {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      return attrs.keySet();<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>   }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>   /**<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    * The list of properties that should 
be rendered as child elements.<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    *<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    * @return Map of property names to 
property metadata.<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    */<a name="line.159"></a>
+<span class="sourceLineNo">160</span>   protected 
Map&lt;String,BeanPropertyMeta&gt; getElementProperties() {<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>      return elements;<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>   }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>   /**<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    * The list of names of properties 
that should be rendered as child elements.<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    *<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    * @return Set of property names.<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>    */<a name="line.168"></a>
+<span class="sourceLineNo">169</span>   protected Set&lt;String&gt; 
getElementPropertyNames() {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      return elements.keySet();<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>   }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span>   /**<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    * The list of properties that should 
be rendered as collapsed child elements.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    * See {@link Xml#childName()}<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>    *<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    * @return Map of property names to 
property metadata.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    */<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   protected 
Map&lt;String,BeanPropertyMeta&gt; getCollapsedProperties() {<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      return collapsedProperties;<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>   }<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>   /**<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    * The list of names of properties 
that should be rendered as collapsed child elements.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    *<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    * @return Set of property names.<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>    */<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   protected Set&lt;String&gt; 
getCollapsedPropertyNames() {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>      return 
collapsedProperties.keySet();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>   }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>   /**<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    * The property that returns a map of 
XML attributes as key/value pairs.<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    *<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    * @return The bean property metadata, 
or &lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    */<a name="line.196"></a>
+<span class="sourceLineNo">197</span>   protected BeanPropertyMeta 
getAttrsProperty() {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      return attrsProperty;<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>   }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>   /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    * The name of the property that 
returns a map of XML attributes as key/value pairs.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    *<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    * @return The bean property name, or 
&lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    */<a name="line.205"></a>
+<span class="sourceLineNo">206</span>   protected String 
getAttrsPropertyName() {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      return attrsProperty == null ? null 
: attrsProperty.getName();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   }<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span>   /**<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    * The property that represents the 
inner XML content of this bean.<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    *<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    * @return The bean property metadata, 
or &lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    */<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   protected BeanPropertyMeta 
getContentProperty() {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return contentProperty;<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>   }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span>   /**<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    * The name of the property that 
represents the inner XML content of this bean.<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    *<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    * @return The bean property name, or 
&lt;jk&gt;null&lt;/jk&gt; if there is no such method.<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    */<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   protected String 
getContentPropertyName() {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      return contentProperty == null ? 
null : contentProperty.getName();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>   /**<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    * Returns the format of the inner XML 
content of this bean.<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    * &lt;p&gt;<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    * Can be one of the following:<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>    * &lt;ul&gt;<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    *    &lt;li&gt;{@link 
XmlFormat#ELEMENTS}<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    *    &lt;li&gt;{@link 
XmlFormat#MIXED}<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    *    &lt;li&gt;{@link 
XmlFormat#MIXED_PWS}<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    *    &lt;li&gt;{@link 
XmlFormat#TEXT}<a name="line.236"></a>
+<span class="sourceLineNo">237</span>    *    &lt;li&gt;{@link 
XmlFormat#TEXT_PWS}<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    *    &lt;li&gt;{@link 
XmlFormat#XMLTEXT}<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    *    &lt;li&gt;{@link 
XmlFormat#VOID}<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    *    
&lt;li&gt;&lt;jk&gt;null&lt;/jk&gt;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    * &lt;/ul&gt;<a name="line.241"></a>
 <span class="sourceLineNo">242</span>    *<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    * @param fieldName The bean property 
name.<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    * @return The property metadata.<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>    */<a name="line.245"></a>
-<span class="sourceLineNo">246</span>   protected BeanPropertyMeta 
getPropertyMeta(String fieldName) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      if (collapsedProperties != null) 
{<a name="line.247"></a>
-<span class="sourceLineNo">248</span>         BeanPropertyMeta bpm = 
collapsedProperties.get(fieldName);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>         if (bpm != null)<a 
name="line.249"></a>
-<span class="sourceLineNo">250</span>            return bpm;<a 
name="line.250"></a>
-<span class="sourceLineNo">251</span>      }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      return 
getBeanMeta().getPropertyMeta(fieldName);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   }<a name="line.253"></a>
-<span class="sourceLineNo">254</span>}<a name="line.254"></a>
+<span class="sourceLineNo">243</span>    * @return The format of the inner XML 
content of this bean.<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    */<a name="line.244"></a>
+<span class="sourceLineNo">245</span>   protected XmlFormat getContentFormat() 
{<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      return contentFormat;<a 
name="line.246"></a>
+<span class="sourceLineNo">247</span>   }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>   /**<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    * Returns bean property meta with the 
specified name.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    * This is identical to calling {@link 
BeanMeta#getPropertyMeta(String)} except it first retrieves<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>    *    the bean property meta based on 
the child name (e.g. a property whose name is "people", but whose child name is 
"person").<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    *<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    * @param fieldName The bean property 
name.<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    * @return The property metadata.<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>    */<a name="line.256"></a>
+<span class="sourceLineNo">257</span>   protected BeanPropertyMeta 
getPropertyMeta(String fieldName) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      if (collapsedProperties != null) 
{<a name="line.258"></a>
+<span class="sourceLineNo">259</span>         BeanPropertyMeta bpm = 
collapsedProperties.get(fieldName);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>         if (bpm != null)<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>            return bpm;<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>      }<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      return 
getBeanMeta().getPropertyMeta(fieldName);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   }<a name="line.264"></a>
+<span class="sourceLineNo">265</span>}<a name="line.265"></a>
 
 
 

Reply via email to