http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.HostVerify.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.HostVerify.html b/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.HostVerify.html index 2440051..1dca3a6 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.HostVerify.html +++ b/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.HostVerify.html @@ -70,131 +70,128 @@ <span class="sourceLineNo">062</span> * The default value is <jk>"SSL_TLS,TLS,SSL"</js> unless overridden by one of the following<a name="line.62"></a> <span class="sourceLineNo">063</span> * system properties:<a name="line.63"></a> <span class="sourceLineNo">064</span> * <ul><a name="line.64"></a> -<span class="sourceLineNo">065</span> * <li><js>"com.ibm.team.repository.transport.client.protocol"</js><a name="line.65"></a> -<span class="sourceLineNo">066</span> * <li><js>"transport.client.protocol"</js><a name="line.66"></a> -<span class="sourceLineNo">067</span> * </ul><a name="line.67"></a> -<span class="sourceLineNo">068</span> * <p><a name="line.68"></a> -<span class="sourceLineNo">069</span> * Subclasses can override this method to provide their own logic for determining default supported protocols.<a name="line.69"></a> -<span class="sourceLineNo">070</span> *<a name="line.70"></a> -<span class="sourceLineNo">071</span> * @return The comma-delimited list of supported protocols.<a name="line.71"></a> -<span class="sourceLineNo">072</span> */<a name="line.72"></a> -<span class="sourceLineNo">073</span> protected String getDefaultProtocols() {<a name="line.73"></a> -<span class="sourceLineNo">074</span> String sp = System.getProperty("com.ibm.team.repository.transport.client.protocol");<a name="line.74"></a> -<span class="sourceLineNo">075</span> if (StringUtils.isEmpty(sp))<a name="line.75"></a> -<span class="sourceLineNo">076</span> sp = System.getProperty("transport.client.protocol");<a name="line.76"></a> -<span class="sourceLineNo">077</span> if (StringUtils.isEmpty(sp))<a name="line.77"></a> -<span class="sourceLineNo">078</span> sp = "SSL_TLS,TLS,SSL";<a name="line.78"></a> -<span class="sourceLineNo">079</span> return sp;<a name="line.79"></a> -<span class="sourceLineNo">080</span> }<a name="line.80"></a> -<span class="sourceLineNo">081</span><a name="line.81"></a> -<span class="sourceLineNo">082</span><a name="line.82"></a> -<span class="sourceLineNo">083</span> //--------------------------------------------------------------------------------<a name="line.83"></a> -<span class="sourceLineNo">084</span> // Bean properties<a name="line.84"></a> -<span class="sourceLineNo">085</span> //--------------------------------------------------------------------------------<a name="line.85"></a> -<span class="sourceLineNo">086</span><a name="line.86"></a> -<span class="sourceLineNo">087</span> /**<a name="line.87"></a> -<span class="sourceLineNo">088</span> * Bean property getter: <property>protocols</property>.<a name="line.88"></a> -<span class="sourceLineNo">089</span> *<a name="line.89"></a> -<span class="sourceLineNo">090</span> * @return The value of the <property>protocols</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.90"></a> -<span class="sourceLineNo">091</span> */<a name="line.91"></a> -<span class="sourceLineNo">092</span> public String getProtocols() {<a name="line.92"></a> -<span class="sourceLineNo">093</span> return protocols;<a name="line.93"></a> -<span class="sourceLineNo">094</span> }<a name="line.94"></a> -<span class="sourceLineNo">095</span><a name="line.95"></a> -<span class="sourceLineNo">096</span> /**<a name="line.96"></a> -<span class="sourceLineNo">097</span> * Bean property setter: <property>protocols</property>.<a name="line.97"></a> -<span class="sourceLineNo">098</span> *<a name="line.98"></a> -<span class="sourceLineNo">099</span> * @param protocols The new value for the <property>properties</property> property on this bean.<a name="line.99"></a> -<span class="sourceLineNo">100</span> * @return This object (for method chaining).<a name="line.100"></a> -<span class="sourceLineNo">101</span> */<a name="line.101"></a> -<span class="sourceLineNo">102</span> public SSLOpts setProtocols(String protocols) {<a name="line.102"></a> -<span class="sourceLineNo">103</span> this.protocols = protocols;<a name="line.103"></a> -<span class="sourceLineNo">104</span> return this;<a name="line.104"></a> -<span class="sourceLineNo">105</span> }<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> /**<a name="line.107"></a> -<span class="sourceLineNo">108</span> * Bean property getter: <property>certValidate</property>.<a name="line.108"></a> -<span class="sourceLineNo">109</span> *<a name="line.109"></a> -<span class="sourceLineNo">110</span> * @return The value of the <property>certValidate</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.110"></a> -<span class="sourceLineNo">111</span> */<a name="line.111"></a> -<span class="sourceLineNo">112</span> public CertValidate getCertValidate() {<a name="line.112"></a> -<span class="sourceLineNo">113</span> return certValidate;<a name="line.113"></a> -<span class="sourceLineNo">114</span> }<a name="line.114"></a> -<span class="sourceLineNo">115</span><a name="line.115"></a> -<span class="sourceLineNo">116</span> /**<a name="line.116"></a> -<span class="sourceLineNo">117</span> * Bean property setter: <property>certValidate</property>.<a name="line.117"></a> -<span class="sourceLineNo">118</span> *<a name="line.118"></a> -<span class="sourceLineNo">119</span> * @param certValidate The new value for the <property>properties</property> property on this bean.<a name="line.119"></a> -<span class="sourceLineNo">120</span> * @return This object (for method chaining).<a name="line.120"></a> -<span class="sourceLineNo">121</span> */<a name="line.121"></a> -<span class="sourceLineNo">122</span> public SSLOpts setCertValidate(CertValidate certValidate) {<a name="line.122"></a> -<span class="sourceLineNo">123</span> this.certValidate = certValidate;<a name="line.123"></a> -<span class="sourceLineNo">124</span> return this;<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> /**<a name="line.127"></a> -<span class="sourceLineNo">128</span> * Bean property getter: <property>hostVerify</property>.<a name="line.128"></a> -<span class="sourceLineNo">129</span> *<a name="line.129"></a> -<span class="sourceLineNo">130</span> * @return The value of the <property>hostVerify</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.130"></a> -<span class="sourceLineNo">131</span> */<a name="line.131"></a> -<span class="sourceLineNo">132</span> public HostVerify getHostVerify() {<a name="line.132"></a> -<span class="sourceLineNo">133</span> return hostVerify;<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> * Bean property setter: <property>hostVerify</property>.<a name="line.137"></a> -<span class="sourceLineNo">138</span> *<a name="line.138"></a> -<span class="sourceLineNo">139</span> * @param hostVerify The new value for the <property>properties</property> property on this bean.<a name="line.139"></a> -<span class="sourceLineNo">140</span> * @return This object (for method chaining).<a name="line.140"></a> -<span class="sourceLineNo">141</span> */<a name="line.141"></a> -<span class="sourceLineNo">142</span> public SSLOpts setHostVerify(HostVerify hostVerify) {<a name="line.142"></a> -<span class="sourceLineNo">143</span> this.hostVerify = hostVerify;<a name="line.143"></a> -<span class="sourceLineNo">144</span> return this;<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><a name="line.147"></a> -<span class="sourceLineNo">148</span> //--------------------------------------------------------------------------------<a name="line.148"></a> -<span class="sourceLineNo">149</span> // Enums<a name="line.149"></a> -<span class="sourceLineNo">150</span> //--------------------------------------------------------------------------------<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> * Certificate validation options.<a name="line.153"></a> -<span class="sourceLineNo">154</span> * <p><a name="line.154"></a> -<span class="sourceLineNo">155</span> * Used as enum for {@link SSLOpts#getCertValidate()} property.<a name="line.155"></a> -<span class="sourceLineNo">156</span> */<a name="line.156"></a> -<span class="sourceLineNo">157</span> @SuppressWarnings("hiding")<a name="line.157"></a> -<span class="sourceLineNo">158</span> public static enum CertValidate {<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> /**<a name="line.160"></a> -<span class="sourceLineNo">161</span> * Verify that the certificate is valid, but allow for self-signed certificates.<a name="line.161"></a> -<span class="sourceLineNo">162</span> */<a name="line.162"></a> -<span class="sourceLineNo">163</span> LAX,<a name="line.163"></a> -<span class="sourceLineNo">164</span><a name="line.164"></a> -<span class="sourceLineNo">165</span> /**<a name="line.165"></a> -<span class="sourceLineNo">166</span> * Do normal certificate chain validation.<a name="line.166"></a> -<span class="sourceLineNo">167</span> */<a name="line.167"></a> -<span class="sourceLineNo">168</span> DEFAULT<a name="line.168"></a> -<span class="sourceLineNo">169</span> }<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> * Certificate host verification options.<a name="line.172"></a> -<span class="sourceLineNo">173</span> * <p><a name="line.173"></a> -<span class="sourceLineNo">174</span> * Used as enum for {@link SSLOpts#getHostVerify()} property.<a name="line.174"></a> -<span class="sourceLineNo">175</span> */<a name="line.175"></a> -<span class="sourceLineNo">176</span> @SuppressWarnings("hiding")<a name="line.176"></a> -<span class="sourceLineNo">177</span> public enum HostVerify {<a name="line.177"></a> -<span class="sourceLineNo">178</span><a name="line.178"></a> -<span class="sourceLineNo">179</span> /**<a name="line.179"></a> -<span class="sourceLineNo">180</span> * Don't verify the hostname in the certificate.<a name="line.180"></a> -<span class="sourceLineNo">181</span> */<a name="line.181"></a> -<span class="sourceLineNo">182</span> LAX,<a name="line.182"></a> -<span class="sourceLineNo">183</span><a name="line.183"></a> -<span class="sourceLineNo">184</span> /**<a name="line.184"></a> -<span class="sourceLineNo">185</span> * Do normal hostname verification.<a name="line.185"></a> -<span class="sourceLineNo">186</span> */<a name="line.186"></a> -<span class="sourceLineNo">187</span> DEFAULT<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">065</span> * <li><js>"transport.client.protocol"</js><a name="line.65"></a> +<span class="sourceLineNo">066</span> * </ul><a name="line.66"></a> +<span class="sourceLineNo">067</span> * <p><a name="line.67"></a> +<span class="sourceLineNo">068</span> * Subclasses can override this method to provide their own logic for determining default supported protocols.<a name="line.68"></a> +<span class="sourceLineNo">069</span> *<a name="line.69"></a> +<span class="sourceLineNo">070</span> * @return The comma-delimited list of supported protocols.<a name="line.70"></a> +<span class="sourceLineNo">071</span> */<a name="line.71"></a> +<span class="sourceLineNo">072</span> protected String getDefaultProtocols() {<a name="line.72"></a> +<span class="sourceLineNo">073</span> String sp = System.getProperty("transport.client.protocol");<a name="line.73"></a> +<span class="sourceLineNo">074</span> if (StringUtils.isEmpty(sp))<a name="line.74"></a> +<span class="sourceLineNo">075</span> sp = "SSL_TLS,TLS,SSL";<a name="line.75"></a> +<span class="sourceLineNo">076</span> return sp;<a name="line.76"></a> +<span class="sourceLineNo">077</span> }<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> +<span class="sourceLineNo">080</span> //--------------------------------------------------------------------------------<a name="line.80"></a> +<span class="sourceLineNo">081</span> // Bean properties<a name="line.81"></a> +<span class="sourceLineNo">082</span> //--------------------------------------------------------------------------------<a name="line.82"></a> +<span class="sourceLineNo">083</span><a name="line.83"></a> +<span class="sourceLineNo">084</span> /**<a name="line.84"></a> +<span class="sourceLineNo">085</span> * Bean property getter: <property>protocols</property>.<a name="line.85"></a> +<span class="sourceLineNo">086</span> *<a name="line.86"></a> +<span class="sourceLineNo">087</span> * @return The value of the <property>protocols</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.87"></a> +<span class="sourceLineNo">088</span> */<a name="line.88"></a> +<span class="sourceLineNo">089</span> public String getProtocols() {<a name="line.89"></a> +<span class="sourceLineNo">090</span> return protocols;<a name="line.90"></a> +<span class="sourceLineNo">091</span> }<a name="line.91"></a> +<span class="sourceLineNo">092</span><a name="line.92"></a> +<span class="sourceLineNo">093</span> /**<a name="line.93"></a> +<span class="sourceLineNo">094</span> * Bean property setter: <property>protocols</property>.<a name="line.94"></a> +<span class="sourceLineNo">095</span> *<a name="line.95"></a> +<span class="sourceLineNo">096</span> * @param protocols The new value for the <property>properties</property> property on this bean.<a name="line.96"></a> +<span class="sourceLineNo">097</span> * @return This object (for method chaining).<a name="line.97"></a> +<span class="sourceLineNo">098</span> */<a name="line.98"></a> +<span class="sourceLineNo">099</span> public SSLOpts setProtocols(String protocols) {<a name="line.99"></a> +<span class="sourceLineNo">100</span> this.protocols = protocols;<a name="line.100"></a> +<span class="sourceLineNo">101</span> return this;<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> * Bean property getter: <property>certValidate</property>.<a name="line.105"></a> +<span class="sourceLineNo">106</span> *<a name="line.106"></a> +<span class="sourceLineNo">107</span> * @return The value of the <property>certValidate</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.107"></a> +<span class="sourceLineNo">108</span> */<a name="line.108"></a> +<span class="sourceLineNo">109</span> public CertValidate getCertValidate() {<a name="line.109"></a> +<span class="sourceLineNo">110</span> return certValidate;<a name="line.110"></a> +<span class="sourceLineNo">111</span> }<a name="line.111"></a> +<span class="sourceLineNo">112</span><a name="line.112"></a> +<span class="sourceLineNo">113</span> /**<a name="line.113"></a> +<span class="sourceLineNo">114</span> * Bean property setter: <property>certValidate</property>.<a name="line.114"></a> +<span class="sourceLineNo">115</span> *<a name="line.115"></a> +<span class="sourceLineNo">116</span> * @param certValidate The new value for the <property>properties</property> property on this bean.<a name="line.116"></a> +<span class="sourceLineNo">117</span> * @return This object (for method chaining).<a name="line.117"></a> +<span class="sourceLineNo">118</span> */<a name="line.118"></a> +<span class="sourceLineNo">119</span> public SSLOpts setCertValidate(CertValidate certValidate) {<a name="line.119"></a> +<span class="sourceLineNo">120</span> this.certValidate = certValidate;<a name="line.120"></a> +<span class="sourceLineNo">121</span> return this;<a name="line.121"></a> +<span class="sourceLineNo">122</span> }<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> * Bean property getter: <property>hostVerify</property>.<a name="line.125"></a> +<span class="sourceLineNo">126</span> *<a name="line.126"></a> +<span class="sourceLineNo">127</span> * @return The value of the <property>hostVerify</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.127"></a> +<span class="sourceLineNo">128</span> */<a name="line.128"></a> +<span class="sourceLineNo">129</span> public HostVerify getHostVerify() {<a name="line.129"></a> +<span class="sourceLineNo">130</span> return hostVerify;<a name="line.130"></a> +<span class="sourceLineNo">131</span> }<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> * Bean property setter: <property>hostVerify</property>.<a name="line.134"></a> +<span class="sourceLineNo">135</span> *<a name="line.135"></a> +<span class="sourceLineNo">136</span> * @param hostVerify The new value for the <property>properties</property> property on this bean.<a name="line.136"></a> +<span class="sourceLineNo">137</span> * @return This object (for method chaining).<a name="line.137"></a> +<span class="sourceLineNo">138</span> */<a name="line.138"></a> +<span class="sourceLineNo">139</span> public SSLOpts setHostVerify(HostVerify hostVerify) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> this.hostVerify = hostVerify;<a name="line.140"></a> +<span class="sourceLineNo">141</span> return this;<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> //--------------------------------------------------------------------------------<a name="line.145"></a> +<span class="sourceLineNo">146</span> // Enums<a name="line.146"></a> +<span class="sourceLineNo">147</span> //--------------------------------------------------------------------------------<a name="line.147"></a> +<span class="sourceLineNo">148</span><a name="line.148"></a> +<span class="sourceLineNo">149</span> /**<a name="line.149"></a> +<span class="sourceLineNo">150</span> * Certificate validation options.<a name="line.150"></a> +<span class="sourceLineNo">151</span> * <p><a name="line.151"></a> +<span class="sourceLineNo">152</span> * Used as enum for {@link SSLOpts#getCertValidate()} property.<a name="line.152"></a> +<span class="sourceLineNo">153</span> */<a name="line.153"></a> +<span class="sourceLineNo">154</span> @SuppressWarnings("hiding")<a name="line.154"></a> +<span class="sourceLineNo">155</span> public static enum CertValidate {<a name="line.155"></a> +<span class="sourceLineNo">156</span><a name="line.156"></a> +<span class="sourceLineNo">157</span> /**<a name="line.157"></a> +<span class="sourceLineNo">158</span> * Verify that the certificate is valid, but allow for self-signed certificates.<a name="line.158"></a> +<span class="sourceLineNo">159</span> */<a name="line.159"></a> +<span class="sourceLineNo">160</span> LAX,<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> * Do normal certificate chain validation.<a name="line.163"></a> +<span class="sourceLineNo">164</span> */<a name="line.164"></a> +<span class="sourceLineNo">165</span> DEFAULT<a name="line.165"></a> +<span class="sourceLineNo">166</span> }<a name="line.166"></a> +<span class="sourceLineNo">167</span><a name="line.167"></a> +<span class="sourceLineNo">168</span> /**<a name="line.168"></a> +<span class="sourceLineNo">169</span> * Certificate host verification options.<a name="line.169"></a> +<span class="sourceLineNo">170</span> * <p><a name="line.170"></a> +<span class="sourceLineNo">171</span> * Used as enum for {@link SSLOpts#getHostVerify()} property.<a name="line.171"></a> +<span class="sourceLineNo">172</span> */<a name="line.172"></a> +<span class="sourceLineNo">173</span> @SuppressWarnings("hiding")<a name="line.173"></a> +<span class="sourceLineNo">174</span> public enum HostVerify {<a name="line.174"></a> +<span class="sourceLineNo">175</span><a name="line.175"></a> +<span class="sourceLineNo">176</span> /**<a name="line.176"></a> +<span class="sourceLineNo">177</span> * Don't verify the hostname in the certificate.<a name="line.177"></a> +<span class="sourceLineNo">178</span> */<a name="line.178"></a> +<span class="sourceLineNo">179</span> LAX,<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> * Do normal hostname verification.<a name="line.182"></a> +<span class="sourceLineNo">183</span> */<a name="line.183"></a> +<span class="sourceLineNo">184</span> DEFAULT<a name="line.184"></a> +<span class="sourceLineNo">185</span> }<a name="line.185"></a> +<span class="sourceLineNo">186</span>}<a name="line.186"></a>
http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.html b/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.html index 2440051..1dca3a6 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.html +++ b/content/site/apidocs/src-html/org/apache/juneau/client/SSLOpts.html @@ -70,131 +70,128 @@ <span class="sourceLineNo">062</span> * The default value is <jk>"SSL_TLS,TLS,SSL"</js> unless overridden by one of the following<a name="line.62"></a> <span class="sourceLineNo">063</span> * system properties:<a name="line.63"></a> <span class="sourceLineNo">064</span> * <ul><a name="line.64"></a> -<span class="sourceLineNo">065</span> * <li><js>"com.ibm.team.repository.transport.client.protocol"</js><a name="line.65"></a> -<span class="sourceLineNo">066</span> * <li><js>"transport.client.protocol"</js><a name="line.66"></a> -<span class="sourceLineNo">067</span> * </ul><a name="line.67"></a> -<span class="sourceLineNo">068</span> * <p><a name="line.68"></a> -<span class="sourceLineNo">069</span> * Subclasses can override this method to provide their own logic for determining default supported protocols.<a name="line.69"></a> -<span class="sourceLineNo">070</span> *<a name="line.70"></a> -<span class="sourceLineNo">071</span> * @return The comma-delimited list of supported protocols.<a name="line.71"></a> -<span class="sourceLineNo">072</span> */<a name="line.72"></a> -<span class="sourceLineNo">073</span> protected String getDefaultProtocols() {<a name="line.73"></a> -<span class="sourceLineNo">074</span> String sp = System.getProperty("com.ibm.team.repository.transport.client.protocol");<a name="line.74"></a> -<span class="sourceLineNo">075</span> if (StringUtils.isEmpty(sp))<a name="line.75"></a> -<span class="sourceLineNo">076</span> sp = System.getProperty("transport.client.protocol");<a name="line.76"></a> -<span class="sourceLineNo">077</span> if (StringUtils.isEmpty(sp))<a name="line.77"></a> -<span class="sourceLineNo">078</span> sp = "SSL_TLS,TLS,SSL";<a name="line.78"></a> -<span class="sourceLineNo">079</span> return sp;<a name="line.79"></a> -<span class="sourceLineNo">080</span> }<a name="line.80"></a> -<span class="sourceLineNo">081</span><a name="line.81"></a> -<span class="sourceLineNo">082</span><a name="line.82"></a> -<span class="sourceLineNo">083</span> //--------------------------------------------------------------------------------<a name="line.83"></a> -<span class="sourceLineNo">084</span> // Bean properties<a name="line.84"></a> -<span class="sourceLineNo">085</span> //--------------------------------------------------------------------------------<a name="line.85"></a> -<span class="sourceLineNo">086</span><a name="line.86"></a> -<span class="sourceLineNo">087</span> /**<a name="line.87"></a> -<span class="sourceLineNo">088</span> * Bean property getter: <property>protocols</property>.<a name="line.88"></a> -<span class="sourceLineNo">089</span> *<a name="line.89"></a> -<span class="sourceLineNo">090</span> * @return The value of the <property>protocols</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.90"></a> -<span class="sourceLineNo">091</span> */<a name="line.91"></a> -<span class="sourceLineNo">092</span> public String getProtocols() {<a name="line.92"></a> -<span class="sourceLineNo">093</span> return protocols;<a name="line.93"></a> -<span class="sourceLineNo">094</span> }<a name="line.94"></a> -<span class="sourceLineNo">095</span><a name="line.95"></a> -<span class="sourceLineNo">096</span> /**<a name="line.96"></a> -<span class="sourceLineNo">097</span> * Bean property setter: <property>protocols</property>.<a name="line.97"></a> -<span class="sourceLineNo">098</span> *<a name="line.98"></a> -<span class="sourceLineNo">099</span> * @param protocols The new value for the <property>properties</property> property on this bean.<a name="line.99"></a> -<span class="sourceLineNo">100</span> * @return This object (for method chaining).<a name="line.100"></a> -<span class="sourceLineNo">101</span> */<a name="line.101"></a> -<span class="sourceLineNo">102</span> public SSLOpts setProtocols(String protocols) {<a name="line.102"></a> -<span class="sourceLineNo">103</span> this.protocols = protocols;<a name="line.103"></a> -<span class="sourceLineNo">104</span> return this;<a name="line.104"></a> -<span class="sourceLineNo">105</span> }<a name="line.105"></a> -<span class="sourceLineNo">106</span><a name="line.106"></a> -<span class="sourceLineNo">107</span> /**<a name="line.107"></a> -<span class="sourceLineNo">108</span> * Bean property getter: <property>certValidate</property>.<a name="line.108"></a> -<span class="sourceLineNo">109</span> *<a name="line.109"></a> -<span class="sourceLineNo">110</span> * @return The value of the <property>certValidate</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.110"></a> -<span class="sourceLineNo">111</span> */<a name="line.111"></a> -<span class="sourceLineNo">112</span> public CertValidate getCertValidate() {<a name="line.112"></a> -<span class="sourceLineNo">113</span> return certValidate;<a name="line.113"></a> -<span class="sourceLineNo">114</span> }<a name="line.114"></a> -<span class="sourceLineNo">115</span><a name="line.115"></a> -<span class="sourceLineNo">116</span> /**<a name="line.116"></a> -<span class="sourceLineNo">117</span> * Bean property setter: <property>certValidate</property>.<a name="line.117"></a> -<span class="sourceLineNo">118</span> *<a name="line.118"></a> -<span class="sourceLineNo">119</span> * @param certValidate The new value for the <property>properties</property> property on this bean.<a name="line.119"></a> -<span class="sourceLineNo">120</span> * @return This object (for method chaining).<a name="line.120"></a> -<span class="sourceLineNo">121</span> */<a name="line.121"></a> -<span class="sourceLineNo">122</span> public SSLOpts setCertValidate(CertValidate certValidate) {<a name="line.122"></a> -<span class="sourceLineNo">123</span> this.certValidate = certValidate;<a name="line.123"></a> -<span class="sourceLineNo">124</span> return this;<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> /**<a name="line.127"></a> -<span class="sourceLineNo">128</span> * Bean property getter: <property>hostVerify</property>.<a name="line.128"></a> -<span class="sourceLineNo">129</span> *<a name="line.129"></a> -<span class="sourceLineNo">130</span> * @return The value of the <property>hostVerify</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.130"></a> -<span class="sourceLineNo">131</span> */<a name="line.131"></a> -<span class="sourceLineNo">132</span> public HostVerify getHostVerify() {<a name="line.132"></a> -<span class="sourceLineNo">133</span> return hostVerify;<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> * Bean property setter: <property>hostVerify</property>.<a name="line.137"></a> -<span class="sourceLineNo">138</span> *<a name="line.138"></a> -<span class="sourceLineNo">139</span> * @param hostVerify The new value for the <property>properties</property> property on this bean.<a name="line.139"></a> -<span class="sourceLineNo">140</span> * @return This object (for method chaining).<a name="line.140"></a> -<span class="sourceLineNo">141</span> */<a name="line.141"></a> -<span class="sourceLineNo">142</span> public SSLOpts setHostVerify(HostVerify hostVerify) {<a name="line.142"></a> -<span class="sourceLineNo">143</span> this.hostVerify = hostVerify;<a name="line.143"></a> -<span class="sourceLineNo">144</span> return this;<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><a name="line.147"></a> -<span class="sourceLineNo">148</span> //--------------------------------------------------------------------------------<a name="line.148"></a> -<span class="sourceLineNo">149</span> // Enums<a name="line.149"></a> -<span class="sourceLineNo">150</span> //--------------------------------------------------------------------------------<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> * Certificate validation options.<a name="line.153"></a> -<span class="sourceLineNo">154</span> * <p><a name="line.154"></a> -<span class="sourceLineNo">155</span> * Used as enum for {@link SSLOpts#getCertValidate()} property.<a name="line.155"></a> -<span class="sourceLineNo">156</span> */<a name="line.156"></a> -<span class="sourceLineNo">157</span> @SuppressWarnings("hiding")<a name="line.157"></a> -<span class="sourceLineNo">158</span> public static enum CertValidate {<a name="line.158"></a> -<span class="sourceLineNo">159</span><a name="line.159"></a> -<span class="sourceLineNo">160</span> /**<a name="line.160"></a> -<span class="sourceLineNo">161</span> * Verify that the certificate is valid, but allow for self-signed certificates.<a name="line.161"></a> -<span class="sourceLineNo">162</span> */<a name="line.162"></a> -<span class="sourceLineNo">163</span> LAX,<a name="line.163"></a> -<span class="sourceLineNo">164</span><a name="line.164"></a> -<span class="sourceLineNo">165</span> /**<a name="line.165"></a> -<span class="sourceLineNo">166</span> * Do normal certificate chain validation.<a name="line.166"></a> -<span class="sourceLineNo">167</span> */<a name="line.167"></a> -<span class="sourceLineNo">168</span> DEFAULT<a name="line.168"></a> -<span class="sourceLineNo">169</span> }<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> * Certificate host verification options.<a name="line.172"></a> -<span class="sourceLineNo">173</span> * <p><a name="line.173"></a> -<span class="sourceLineNo">174</span> * Used as enum for {@link SSLOpts#getHostVerify()} property.<a name="line.174"></a> -<span class="sourceLineNo">175</span> */<a name="line.175"></a> -<span class="sourceLineNo">176</span> @SuppressWarnings("hiding")<a name="line.176"></a> -<span class="sourceLineNo">177</span> public enum HostVerify {<a name="line.177"></a> -<span class="sourceLineNo">178</span><a name="line.178"></a> -<span class="sourceLineNo">179</span> /**<a name="line.179"></a> -<span class="sourceLineNo">180</span> * Don't verify the hostname in the certificate.<a name="line.180"></a> -<span class="sourceLineNo">181</span> */<a name="line.181"></a> -<span class="sourceLineNo">182</span> LAX,<a name="line.182"></a> -<span class="sourceLineNo">183</span><a name="line.183"></a> -<span class="sourceLineNo">184</span> /**<a name="line.184"></a> -<span class="sourceLineNo">185</span> * Do normal hostname verification.<a name="line.185"></a> -<span class="sourceLineNo">186</span> */<a name="line.186"></a> -<span class="sourceLineNo">187</span> DEFAULT<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">065</span> * <li><js>"transport.client.protocol"</js><a name="line.65"></a> +<span class="sourceLineNo">066</span> * </ul><a name="line.66"></a> +<span class="sourceLineNo">067</span> * <p><a name="line.67"></a> +<span class="sourceLineNo">068</span> * Subclasses can override this method to provide their own logic for determining default supported protocols.<a name="line.68"></a> +<span class="sourceLineNo">069</span> *<a name="line.69"></a> +<span class="sourceLineNo">070</span> * @return The comma-delimited list of supported protocols.<a name="line.70"></a> +<span class="sourceLineNo">071</span> */<a name="line.71"></a> +<span class="sourceLineNo">072</span> protected String getDefaultProtocols() {<a name="line.72"></a> +<span class="sourceLineNo">073</span> String sp = System.getProperty("transport.client.protocol");<a name="line.73"></a> +<span class="sourceLineNo">074</span> if (StringUtils.isEmpty(sp))<a name="line.74"></a> +<span class="sourceLineNo">075</span> sp = "SSL_TLS,TLS,SSL";<a name="line.75"></a> +<span class="sourceLineNo">076</span> return sp;<a name="line.76"></a> +<span class="sourceLineNo">077</span> }<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> +<span class="sourceLineNo">080</span> //--------------------------------------------------------------------------------<a name="line.80"></a> +<span class="sourceLineNo">081</span> // Bean properties<a name="line.81"></a> +<span class="sourceLineNo">082</span> //--------------------------------------------------------------------------------<a name="line.82"></a> +<span class="sourceLineNo">083</span><a name="line.83"></a> +<span class="sourceLineNo">084</span> /**<a name="line.84"></a> +<span class="sourceLineNo">085</span> * Bean property getter: <property>protocols</property>.<a name="line.85"></a> +<span class="sourceLineNo">086</span> *<a name="line.86"></a> +<span class="sourceLineNo">087</span> * @return The value of the <property>protocols</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.87"></a> +<span class="sourceLineNo">088</span> */<a name="line.88"></a> +<span class="sourceLineNo">089</span> public String getProtocols() {<a name="line.89"></a> +<span class="sourceLineNo">090</span> return protocols;<a name="line.90"></a> +<span class="sourceLineNo">091</span> }<a name="line.91"></a> +<span class="sourceLineNo">092</span><a name="line.92"></a> +<span class="sourceLineNo">093</span> /**<a name="line.93"></a> +<span class="sourceLineNo">094</span> * Bean property setter: <property>protocols</property>.<a name="line.94"></a> +<span class="sourceLineNo">095</span> *<a name="line.95"></a> +<span class="sourceLineNo">096</span> * @param protocols The new value for the <property>properties</property> property on this bean.<a name="line.96"></a> +<span class="sourceLineNo">097</span> * @return This object (for method chaining).<a name="line.97"></a> +<span class="sourceLineNo">098</span> */<a name="line.98"></a> +<span class="sourceLineNo">099</span> public SSLOpts setProtocols(String protocols) {<a name="line.99"></a> +<span class="sourceLineNo">100</span> this.protocols = protocols;<a name="line.100"></a> +<span class="sourceLineNo">101</span> return this;<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> * Bean property getter: <property>certValidate</property>.<a name="line.105"></a> +<span class="sourceLineNo">106</span> *<a name="line.106"></a> +<span class="sourceLineNo">107</span> * @return The value of the <property>certValidate</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.107"></a> +<span class="sourceLineNo">108</span> */<a name="line.108"></a> +<span class="sourceLineNo">109</span> public CertValidate getCertValidate() {<a name="line.109"></a> +<span class="sourceLineNo">110</span> return certValidate;<a name="line.110"></a> +<span class="sourceLineNo">111</span> }<a name="line.111"></a> +<span class="sourceLineNo">112</span><a name="line.112"></a> +<span class="sourceLineNo">113</span> /**<a name="line.113"></a> +<span class="sourceLineNo">114</span> * Bean property setter: <property>certValidate</property>.<a name="line.114"></a> +<span class="sourceLineNo">115</span> *<a name="line.115"></a> +<span class="sourceLineNo">116</span> * @param certValidate The new value for the <property>properties</property> property on this bean.<a name="line.116"></a> +<span class="sourceLineNo">117</span> * @return This object (for method chaining).<a name="line.117"></a> +<span class="sourceLineNo">118</span> */<a name="line.118"></a> +<span class="sourceLineNo">119</span> public SSLOpts setCertValidate(CertValidate certValidate) {<a name="line.119"></a> +<span class="sourceLineNo">120</span> this.certValidate = certValidate;<a name="line.120"></a> +<span class="sourceLineNo">121</span> return this;<a name="line.121"></a> +<span class="sourceLineNo">122</span> }<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> * Bean property getter: <property>hostVerify</property>.<a name="line.125"></a> +<span class="sourceLineNo">126</span> *<a name="line.126"></a> +<span class="sourceLineNo">127</span> * @return The value of the <property>hostVerify</property> property on this bean, or <jk>null</jk> if it is not set.<a name="line.127"></a> +<span class="sourceLineNo">128</span> */<a name="line.128"></a> +<span class="sourceLineNo">129</span> public HostVerify getHostVerify() {<a name="line.129"></a> +<span class="sourceLineNo">130</span> return hostVerify;<a name="line.130"></a> +<span class="sourceLineNo">131</span> }<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> * Bean property setter: <property>hostVerify</property>.<a name="line.134"></a> +<span class="sourceLineNo">135</span> *<a name="line.135"></a> +<span class="sourceLineNo">136</span> * @param hostVerify The new value for the <property>properties</property> property on this bean.<a name="line.136"></a> +<span class="sourceLineNo">137</span> * @return This object (for method chaining).<a name="line.137"></a> +<span class="sourceLineNo">138</span> */<a name="line.138"></a> +<span class="sourceLineNo">139</span> public SSLOpts setHostVerify(HostVerify hostVerify) {<a name="line.139"></a> +<span class="sourceLineNo">140</span> this.hostVerify = hostVerify;<a name="line.140"></a> +<span class="sourceLineNo">141</span> return this;<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> //--------------------------------------------------------------------------------<a name="line.145"></a> +<span class="sourceLineNo">146</span> // Enums<a name="line.146"></a> +<span class="sourceLineNo">147</span> //--------------------------------------------------------------------------------<a name="line.147"></a> +<span class="sourceLineNo">148</span><a name="line.148"></a> +<span class="sourceLineNo">149</span> /**<a name="line.149"></a> +<span class="sourceLineNo">150</span> * Certificate validation options.<a name="line.150"></a> +<span class="sourceLineNo">151</span> * <p><a name="line.151"></a> +<span class="sourceLineNo">152</span> * Used as enum for {@link SSLOpts#getCertValidate()} property.<a name="line.152"></a> +<span class="sourceLineNo">153</span> */<a name="line.153"></a> +<span class="sourceLineNo">154</span> @SuppressWarnings("hiding")<a name="line.154"></a> +<span class="sourceLineNo">155</span> public static enum CertValidate {<a name="line.155"></a> +<span class="sourceLineNo">156</span><a name="line.156"></a> +<span class="sourceLineNo">157</span> /**<a name="line.157"></a> +<span class="sourceLineNo">158</span> * Verify that the certificate is valid, but allow for self-signed certificates.<a name="line.158"></a> +<span class="sourceLineNo">159</span> */<a name="line.159"></a> +<span class="sourceLineNo">160</span> LAX,<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> * Do normal certificate chain validation.<a name="line.163"></a> +<span class="sourceLineNo">164</span> */<a name="line.164"></a> +<span class="sourceLineNo">165</span> DEFAULT<a name="line.165"></a> +<span class="sourceLineNo">166</span> }<a name="line.166"></a> +<span class="sourceLineNo">167</span><a name="line.167"></a> +<span class="sourceLineNo">168</span> /**<a name="line.168"></a> +<span class="sourceLineNo">169</span> * Certificate host verification options.<a name="line.169"></a> +<span class="sourceLineNo">170</span> * <p><a name="line.170"></a> +<span class="sourceLineNo">171</span> * Used as enum for {@link SSLOpts#getHostVerify()} property.<a name="line.171"></a> +<span class="sourceLineNo">172</span> */<a name="line.172"></a> +<span class="sourceLineNo">173</span> @SuppressWarnings("hiding")<a name="line.173"></a> +<span class="sourceLineNo">174</span> public enum HostVerify {<a name="line.174"></a> +<span class="sourceLineNo">175</span><a name="line.175"></a> +<span class="sourceLineNo">176</span> /**<a name="line.176"></a> +<span class="sourceLineNo">177</span> * Don't verify the hostname in the certificate.<a name="line.177"></a> +<span class="sourceLineNo">178</span> */<a name="line.178"></a> +<span class="sourceLineNo">179</span> LAX,<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> * Do normal hostname verification.<a name="line.182"></a> +<span class="sourceLineNo">183</span> */<a name="line.183"></a> +<span class="sourceLineNo">184</span> DEFAULT<a name="line.184"></a> +<span class="sourceLineNo">185</span> }<a name="line.185"></a> +<span class="sourceLineNo">186</span>}<a name="line.186"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html index e70aa45..d3e6ae8 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html +++ b/content/site/apidocs/src-html/org/apache/juneau/html/HtmlDocSerializer.html @@ -58,122 +58,190 @@ <span class="sourceLineNo">050</span> * @author James Bognar ([email protected])<a name="line.50"></a> <span class="sourceLineNo">051</span> */<a name="line.51"></a> <span class="sourceLineNo">052</span>@Produces("text/html")<a name="line.52"></a> -<span class="sourceLineNo">053</span>public class HtmlDocSerializer extends HtmlStrippedDocSerializer {<a name="line.53"></a> -<span class="sourceLineNo">054</span><a name="line.54"></a> -<span class="sourceLineNo">055</span> // Properties defined in RestServletProperties<a name="line.55"></a> -<span class="sourceLineNo">056</span> private static final String<a name="line.56"></a> -<span class="sourceLineNo">057</span> REST_method = "RestServlet.method",<a name="line.57"></a> -<span class="sourceLineNo">058</span> REST_relativeServletURI = "RestServlet.relativeServletURI";<a name="line.58"></a> -<span class="sourceLineNo">059</span><a name="line.59"></a> +<span class="sourceLineNo">053</span>@SuppressWarnings("hiding")<a name="line.53"></a> +<span class="sourceLineNo">054</span>public class HtmlDocSerializer extends HtmlStrippedDocSerializer {<a name="line.54"></a> +<span class="sourceLineNo">055</span><a name="line.55"></a> +<span class="sourceLineNo">056</span> // Properties defined in RestServletProperties<a name="line.56"></a> +<span class="sourceLineNo">057</span> private static final String<a name="line.57"></a> +<span class="sourceLineNo">058</span> REST_method = "RestServlet.method",<a name="line.58"></a> +<span class="sourceLineNo">059</span> REST_relativeServletURI = "RestServlet.relativeServletURI";<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> // Overridden methods<a name="line.62"></a> -<span class="sourceLineNo">063</span> //--------------------------------------------------------------------------------<a name="line.63"></a> +<span class="sourceLineNo">061</span><a name="line.61"></a> +<span class="sourceLineNo">062</span> /** Default serializer, all default settings. */<a name="line.62"></a> +<span class="sourceLineNo">063</span> public static final HtmlDocSerializer DEFAULT = new HtmlDocSerializer().lock();<a name="line.63"></a> <span class="sourceLineNo">064</span><a name="line.64"></a> -<span class="sourceLineNo">065</span> @Override /* Serializer */<a name="line.65"></a> -<span class="sourceLineNo">066</span> public HtmlDocSerializerSession createSession(Object output, ObjectMap properties, Method javaMethod) {<a name="line.66"></a> -<span class="sourceLineNo">067</span> return new HtmlDocSerializerSession(getContext(HtmlDocSerializerContext.class), getBeanContext(), output, properties, javaMethod);<a name="line.67"></a> -<span class="sourceLineNo">068</span> }<a name="line.68"></a> -<span class="sourceLineNo">069</span><a name="line.69"></a> -<span class="sourceLineNo">070</span> @Override /* Serializer */<a name="line.70"></a> -<span class="sourceLineNo">071</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.71"></a> -<span class="sourceLineNo">072</span><a name="line.72"></a> -<span class="sourceLineNo">073</span> HtmlDocSerializerSession s = (HtmlDocSerializerSession)session;<a name="line.73"></a> -<span class="sourceLineNo">074</span> HtmlWriter w = s.getWriter();<a name="line.74"></a> -<span class="sourceLineNo">075</span><a name="line.75"></a> -<span class="sourceLineNo">076</span> ObjectMap properties = s.getProperties();<a name="line.76"></a> -<span class="sourceLineNo">077</span><a name="line.77"></a> -<span class="sourceLineNo">078</span> boolean isOptionsPage = properties.containsKey(REST_method) && properties.getString(REST_method).equalsIgnoreCase("OPTIONS");<a name="line.78"></a> +<span class="sourceLineNo">065</span> //--------------------------------------------------------------------------------<a name="line.65"></a> +<span class="sourceLineNo">066</span> // Overridden methods<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> +<span class="sourceLineNo">069</span> @Override /* Serializer */<a name="line.69"></a> +<span class="sourceLineNo">070</span> public HtmlDocSerializerSession createSession(Object output, ObjectMap properties, Method javaMethod) {<a name="line.70"></a> +<span class="sourceLineNo">071</span> return new HtmlDocSerializerSession(getContext(HtmlDocSerializerContext.class), getBeanContext(), output, properties, javaMethod);<a name="line.71"></a> +<span class="sourceLineNo">072</span> }<a name="line.72"></a> +<span class="sourceLineNo">073</span><a name="line.73"></a> +<span class="sourceLineNo">074</span> @Override /* Serializer */<a name="line.74"></a> +<span class="sourceLineNo">075</span> protected void doSerialize(SerializerSession session, Object o) throws Exception {<a name="line.75"></a> +<span class="sourceLineNo">076</span><a name="line.76"></a> +<span class="sourceLineNo">077</span> HtmlDocSerializerSession s = (HtmlDocSerializerSession)session;<a name="line.77"></a> +<span class="sourceLineNo">078</span> HtmlWriter w = s.getWriter();<a name="line.78"></a> <span class="sourceLineNo">079</span><a name="line.79"></a> -<span class="sourceLineNo">080</span> // Render the header.<a name="line.80"></a> -<span class="sourceLineNo">081</span> w.sTag("html").nl();<a name="line.81"></a> -<span class="sourceLineNo">082</span> w.sTag("head").nl();<a name="line.82"></a> +<span class="sourceLineNo">080</span> ObjectMap properties = s.getProperties();<a name="line.80"></a> +<span class="sourceLineNo">081</span><a name="line.81"></a> +<span class="sourceLineNo">082</span> boolean isOptionsPage = properties.containsKey(REST_method) && properties.getString(REST_method).equalsIgnoreCase("OPTIONS");<a name="line.82"></a> <span class="sourceLineNo">083</span><a name="line.83"></a> -<span class="sourceLineNo">084</span> String cssUrl = s.getCssUrl();<a name="line.84"></a> -<span class="sourceLineNo">085</span> if (cssUrl == null)<a name="line.85"></a> -<span class="sourceLineNo">086</span> cssUrl = properties.getString(REST_relativeServletURI) + "/style.css";<a name="line.86"></a> +<span class="sourceLineNo">084</span> // Render the header.<a name="line.84"></a> +<span class="sourceLineNo">085</span> w.sTag("html").nl();<a name="line.85"></a> +<span class="sourceLineNo">086</span> w.sTag("head").nl();<a name="line.86"></a> <span class="sourceLineNo">087</span><a name="line.87"></a> -<span class="sourceLineNo">088</span> w.oTag(1, "style")<a name="line.88"></a> -<span class="sourceLineNo">089</span> .attr("type", "text/css")<a name="line.89"></a> -<span class="sourceLineNo">090</span> .appendln(">")<a name="line.90"></a> -<span class="sourceLineNo">091</span> .append(2, "@import ").q().append(cssUrl).q().appendln(";");<a name="line.91"></a> -<span class="sourceLineNo">092</span> if (s.isNoWrap())<a name="line.92"></a> -<span class="sourceLineNo">093</span> w.appendln("\n* {white-space:nowrap;}");<a name="line.93"></a> -<span class="sourceLineNo">094</span> if (s.getCssImports() != null)<a name="line.94"></a> -<span class="sourceLineNo">095</span> for (String cssImport : s.getCssImports())<a name="line.95"></a> -<span class="sourceLineNo">096</span> w.append(2, "@import ").q().append(cssImport).q().appendln(";");<a name="line.96"></a> -<span class="sourceLineNo">097</span> w.eTag(1, "style").nl();<a name="line.97"></a> -<span class="sourceLineNo">098</span> w.eTag("head").nl();<a name="line.98"></a> -<span class="sourceLineNo">099</span> w.sTag("body").nl();<a name="line.99"></a> -<span class="sourceLineNo">100</span> // Write the title of the page.<a name="line.100"></a> -<span class="sourceLineNo">101</span> String title = s.getTitle();<a name="line.101"></a> -<span class="sourceLineNo">102</span> if (title == null && isOptionsPage)<a name="line.102"></a> -<span class="sourceLineNo">103</span> title = "Options";<a name="line.103"></a> -<span class="sourceLineNo">104</span> String description = s.getDescription();<a name="line.104"></a> -<span class="sourceLineNo">105</span> if (title != null)<a name="line.105"></a> -<span class="sourceLineNo">106</span> w.oTag(1, "h3").attr("class", "title").append('>').encodeText(title).eTag("h3").nl();<a name="line.106"></a> -<span class="sourceLineNo">107</span> if (description != null)<a name="line.107"></a> -<span class="sourceLineNo">108</span> w.oTag(1, "h5").attr("class", "description").append('>').encodeText(description).eTag("h5").nl();<a name="line.108"></a> -<span class="sourceLineNo">109</span><a name="line.109"></a> -<span class="sourceLineNo">110</span> // Write the action links that render above the results.<a name="line.110"></a> -<span class="sourceLineNo">111</span> List<Link> actions = new LinkedList<Link>();<a name="line.111"></a> -<span class="sourceLineNo">112</span><a name="line.112"></a> -<span class="sourceLineNo">113</span> // If this is an OPTIONS request, provide a 'back' link to return to the GET request page.<a name="line.113"></a> -<span class="sourceLineNo">114</span> if (! isOptionsPage) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> Map<String,String> htmlLinks = s.getLinks();<a name="line.115"></a> -<span class="sourceLineNo">116</span> if (htmlLinks != null) {<a name="line.116"></a> -<span class="sourceLineNo">117</span> for (Map.Entry<String,String> e : htmlLinks.entrySet()) {<a name="line.117"></a> -<span class="sourceLineNo">118</span> String uri = e.getValue();<a name="line.118"></a> -<span class="sourceLineNo">119</span> if (uri.indexOf("://") == -1 && ! StringUtils.startsWith(uri, '/')) {<a name="line.119"></a> -<span class="sourceLineNo">120</span> StringBuilder sb = new StringBuilder(properties.getString(REST_relativeServletURI));<a name="line.120"></a> -<span class="sourceLineNo">121</span> if (! (uri.isEmpty() || uri.charAt(0) == '?' || uri.charAt(0) == '/'))<a name="line.121"></a> -<span class="sourceLineNo">122</span> sb.append('/');<a name="line.122"></a> -<span class="sourceLineNo">123</span> sb.append(uri);<a name="line.123"></a> -<span class="sourceLineNo">124</span> uri = sb.toString();<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> actions.add(new Link(e.getKey(), uri));<a name="line.127"></a> -<span class="sourceLineNo">128</span> }<a name="line.128"></a> -<span class="sourceLineNo">129</span> }<a name="line.129"></a> -<span class="sourceLineNo">130</span> }<a name="line.130"></a> -<span class="sourceLineNo">131</span><a name="line.131"></a> -<span class="sourceLineNo">132</span> if (actions.size() > 0) {<a name="line.132"></a> -<span class="sourceLineNo">133</span> w.oTag(1, "p").attr("class", "links").append('>').nl();<a name="line.133"></a> -<span class="sourceLineNo">134</span> for (Iterator<Link> i = actions.iterator(); i.hasNext();) {<a name="line.134"></a> -<span class="sourceLineNo">135</span> Link h = i.next();<a name="line.135"></a> -<span class="sourceLineNo">136</span> w.oTag(2, "a").attr("class", "link").attr("href", h.getHref(), true).append('>').append(h.getName()).eTag("a").nl();<a name="line.136"></a> -<span class="sourceLineNo">137</span> if (i.hasNext())<a name="line.137"></a> -<span class="sourceLineNo">138</span> w.append(3, " - ").nl();<a name="line.138"></a> -<span class="sourceLineNo">139</span> }<a name="line.139"></a> -<span class="sourceLineNo">140</span> w.eTag(1, "p").nl();<a name="line.140"></a> -<span class="sourceLineNo">141</span> }<a name="line.141"></a> -<span class="sourceLineNo">142</span><a name="line.142"></a> -<span class="sourceLineNo">143</span> s.indent = 3;<a name="line.143"></a> -<span class="sourceLineNo">144</span><a name="line.144"></a> -<span class="sourceLineNo">145</span> // To allow for page formatting using CSS, we encapsulate the data inside two div tags:<a name="line.145"></a> -<span class="sourceLineNo">146</span> // <div class='outerdata'><div class='data' id='data'>...</div></div><a name="line.146"></a> -<span class="sourceLineNo">147</span> w.oTag(1, "div").attr("class","outerdata").append('>').nl();<a name="line.147"></a> -<span class="sourceLineNo">148</span> w.oTag(2, "div").attr("class","data").attr("id", "data").append('>').nl();<a name="line.148"></a> -<span class="sourceLineNo">149</span> if (isEmptyList(o))<a name="line.149"></a> -<span class="sourceLineNo">150</span> w.oTag(3, "p").append('>').append("no results").eTag("p");<a name="line.150"></a> -<span class="sourceLineNo">151</span> else<a name="line.151"></a> -<span class="sourceLineNo">152</span> super.doSerialize(s, o);<a name="line.152"></a> -<span class="sourceLineNo">153</span> w.eTag(2, "div").nl();<a name="line.153"></a> -<span class="sourceLineNo">154</span> w.eTag(1, "div").nl();<a name="line.154"></a> -<span class="sourceLineNo">155</span><a name="line.155"></a> -<span class="sourceLineNo">156</span> w.eTag("body").nl().eTag("html").nl();<a name="line.156"></a> -<span class="sourceLineNo">157</span> }<a name="line.157"></a> -<span class="sourceLineNo">158</span><a name="line.158"></a> -<span class="sourceLineNo">159</span> private boolean isEmptyList(Object o) {<a name="line.159"></a> -<span class="sourceLineNo">160</span> if (o == null)<a name="line.160"></a> -<span class="sourceLineNo">161</span> return false;<a name="line.161"></a> -<span class="sourceLineNo">162</span> if (o instanceof Collection && ((Collection<?>)o).size() == 0)<a name="line.162"></a> -<span class="sourceLineNo">163</span> return true;<a name="line.163"></a> -<span class="sourceLineNo">164</span> if (o.getClass().isArray() && Array.getLength(o) == 0)<a name="line.164"></a> -<span class="sourceLineNo">165</span> return true;<a name="line.165"></a> -<span class="sourceLineNo">166</span> return false;<a name="line.166"></a> -<span class="sourceLineNo">167</span> }<a name="line.167"></a> -<span class="sourceLineNo">168</span>}<a name="line.168"></a> +<span class="sourceLineNo">088</span> String cssUrl = s.getCssUrl();<a name="line.88"></a> +<span class="sourceLineNo">089</span> if (cssUrl == null)<a name="line.89"></a> +<span class="sourceLineNo">090</span> cssUrl = properties.getString(REST_relativeServletURI) + "/style.css";<a name="line.90"></a> +<span class="sourceLineNo">091</span><a name="line.91"></a> +<span class="sourceLineNo">092</span> w.oTag(1, "style")<a name="line.92"></a> +<span class="sourceLineNo">093</span> .attr("type", "text/css")<a name="line.93"></a> +<span class="sourceLineNo">094</span> .appendln(">")<a name="line.94"></a> +<span class="sourceLineNo">095</span> .append(2, "@import ").q().append(cssUrl).q().appendln(";");<a name="line.95"></a> +<span class="sourceLineNo">096</span> if (s.isNoWrap())<a name="line.96"></a> +<span class="sourceLineNo">097</span> w.appendln("\n* {white-space:nowrap;}");<a name="line.97"></a> +<span class="sourceLineNo">098</span> if (s.getCssImports() != null)<a name="line.98"></a> +<span class="sourceLineNo">099</span> for (String cssImport : s.getCssImports())<a name="line.99"></a> +<span class="sourceLineNo">100</span> w.append(2, "@import ").q().append(cssImport).q().appendln(";");<a name="line.100"></a> +<span class="sourceLineNo">101</span> w.eTag(1, "style").nl();<a name="line.101"></a> +<span class="sourceLineNo">102</span> w.eTag("head").nl();<a name="line.102"></a> +<span class="sourceLineNo">103</span> w.sTag("body").nl();<a name="line.103"></a> +<span class="sourceLineNo">104</span> // Write the title of the page.<a name="line.104"></a> +<span class="sourceLineNo">105</span> String title = s.getTitle();<a name="line.105"></a> +<span class="sourceLineNo">106</span> if (title == null && isOptionsPage)<a name="line.106"></a> +<span class="sourceLineNo">107</span> title = "Options";<a name="line.107"></a> +<span class="sourceLineNo">108</span> String description = s.getDescription();<a name="line.108"></a> +<span class="sourceLineNo">109</span> if (title != null)<a name="line.109"></a> +<span class="sourceLineNo">110</span> w.oTag(1, "h3").attr("class", "title").append('>').encodeText(title).eTag("h3").nl();<a name="line.110"></a> +<span class="sourceLineNo">111</span> if (description != null)<a name="line.111"></a> +<span class="sourceLineNo">112</span> w.oTag(1, "h5").attr("class", "description").append('>').encodeText(description).eTag("h5").nl();<a name="line.112"></a> +<span class="sourceLineNo">113</span><a name="line.113"></a> +<span class="sourceLineNo">114</span> // Write the action links that render above the results.<a name="line.114"></a> +<span class="sourceLineNo">115</span> List<Link> actions = new LinkedList<Link>();<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> // If this is an OPTIONS request, provide a 'back' link to return to the GET request page.<a name="line.117"></a> +<span class="sourceLineNo">118</span> if (! isOptionsPage) {<a name="line.118"></a> +<span class="sourceLineNo">119</span> Map<String,String> htmlLinks = s.getLinks();<a name="line.119"></a> +<span class="sourceLineNo">120</span> if (htmlLinks != null) {<a name="line.120"></a> +<span class="sourceLineNo">121</span> for (Map.Entry<String,String> e : htmlLinks.entrySet()) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> String uri = e.getValue();<a name="line.122"></a> +<span class="sourceLineNo">123</span> if (uri.indexOf("://") == -1 && ! StringUtils.startsWith(uri, '/')) {<a name="line.123"></a> +<span class="sourceLineNo">124</span> StringBuilder sb = new StringBuilder(properties.getString(REST_relativeServletURI));<a name="line.124"></a> +<span class="sourceLineNo">125</span> if (! (uri.isEmpty() || uri.charAt(0) == '?' || uri.charAt(0) == '/'))<a name="line.125"></a> +<span class="sourceLineNo">126</span> sb.append('/');<a name="line.126"></a> +<span class="sourceLineNo">127</span> sb.append(uri);<a name="line.127"></a> +<span class="sourceLineNo">128</span> uri = sb.toString();<a name="line.128"></a> +<span class="sourceLineNo">129</span> }<a name="line.129"></a> +<span class="sourceLineNo">130</span><a name="line.130"></a> +<span class="sourceLineNo">131</span> actions.add(new Link(e.getKey(), uri));<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> if (actions.size() > 0) {<a name="line.136"></a> +<span class="sourceLineNo">137</span> w.oTag(1, "p").attr("class", "links").append('>').nl();<a name="line.137"></a> +<span class="sourceLineNo">138</span> for (Iterator<Link> i = actions.iterator(); i.hasNext();) {<a name="line.138"></a> +<span class="sourceLineNo">139</span> Link h = i.next();<a name="line.139"></a> +<span class="sourceLineNo">140</span> w.oTag(2, "a").attr("class", "link").attr("href", h.getHref(), true).append('>').append(h.getName()).eTag("a").nl();<a name="line.140"></a> +<span class="sourceLineNo">141</span> if (i.hasNext())<a name="line.141"></a> +<span class="sourceLineNo">142</span> w.append(3, " - ").nl();<a name="line.142"></a> +<span class="sourceLineNo">143</span> }<a name="line.143"></a> +<span class="sourceLineNo">144</span> w.eTag(1, "p").nl();<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> s.indent = 3;<a name="line.147"></a> +<span class="sourceLineNo">148</span><a name="line.148"></a> +<span class="sourceLineNo">149</span> // To allow for page formatting using CSS, we encapsulate the data inside two div tags:<a name="line.149"></a> +<span class="sourceLineNo">150</span> // <div class='outerdata'><div class='data' id='data'>...</div></div><a name="line.150"></a> +<span class="sourceLineNo">151</span> w.oTag(1, "div").attr("class","outerdata").append('>').nl();<a name="line.151"></a> +<span class="sourceLineNo">152</span> w.oTag(2, "div").attr("class","data").attr("id", "data").append('>').nl();<a name="line.152"></a> +<span class="sourceLineNo">153</span> if (isEmptyList(o))<a name="line.153"></a> +<span class="sourceLineNo">154</span> w.oTag(3, "p").append('>').append("no results").eTag("p");<a name="line.154"></a> +<span class="sourceLineNo">155</span> else<a name="line.155"></a> +<span class="sourceLineNo">156</span> super.doSerialize(s, o);<a name="line.156"></a> +<span class="sourceLineNo">157</span> w.eTag(2, "div").nl();<a name="line.157"></a> +<span class="sourceLineNo">158</span> w.eTag(1, "div").nl();<a name="line.158"></a> +<span class="sourceLineNo">159</span><a name="line.159"></a> +<span class="sourceLineNo">160</span> w.eTag("body").nl().eTag("html").nl();<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> private boolean isEmptyList(Object o) {<a name="line.163"></a> +<span class="sourceLineNo">164</span> if (o == null)<a name="line.164"></a> +<span class="sourceLineNo">165</span> return false;<a name="line.165"></a> +<span class="sourceLineNo">166</span> if (o instanceof Collection && ((Collection<?>)o).size() == 0)<a name="line.166"></a> +<span class="sourceLineNo">167</span> return true;<a name="line.167"></a> +<span class="sourceLineNo">168</span> if (o.getClass().isArray() && Array.getLength(o) == 0)<a name="line.168"></a> +<span class="sourceLineNo">169</span> return true;<a name="line.169"></a> +<span class="sourceLineNo">170</span> return false;<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> // Overridden methods<a name="line.174"></a> +<span class="sourceLineNo">175</span> //--------------------------------------------------------------------------------<a name="line.175"></a> +<span class="sourceLineNo">176</span><a name="line.176"></a> +<span class="sourceLineNo">177</span> @Override /* CoreApi */<a name="line.177"></a> +<span class="sourceLineNo">178</span> public HtmlDocSerializer setProperty(String property, Object value) throws LockedException {<a name="line.178"></a> +<span class="sourceLineNo">179</span> super.setProperty(property, value);<a name="line.179"></a> +<span class="sourceLineNo">180</span> return this;<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> @Override /* CoreApi */<a name="line.183"></a> +<span class="sourceLineNo">184</span> public HtmlDocSerializer setProperties(ObjectMap properties) throws LockedException {<a name="line.184"></a> +<span class="sourceLineNo">185</span> super.setProperties(properties);<a name="line.185"></a> +<span class="sourceLineNo">186</span> return this;<a name="line.186"></a> +<span class="sourceLineNo">187</span> }<a name="line.187"></a> +<span class="sourceLineNo">188</span><a name="line.188"></a> +<span class="sourceLineNo">189</span> @Override /* CoreApi */<a name="line.189"></a> +<span class="sourceLineNo">190</span> public HtmlDocSerializer addNotBeanClasses(Class<?>...classes) throws LockedException {<a name="line.190"></a> +<span class="sourceLineNo">191</span> super.addNotBeanClasses(classes);<a name="line.191"></a> +<span class="sourceLineNo">192</span> return this;<a name="line.192"></a> +<span class="sourceLineNo">193</span> }<a name="line.193"></a> +<span class="sourceLineNo">194</span><a name="line.194"></a> +<span class="sourceLineNo">195</span> @Override /* CoreApi */<a name="line.195"></a> +<span class="sourceLineNo">196</span> public HtmlDocSerializer addBeanFilters(Class<?>...classes) throws LockedException {<a name="line.196"></a> +<span class="sourceLineNo">197</span> super.addBeanFilters(classes);<a name="line.197"></a> +<span class="sourceLineNo">198</span> return this;<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> @Override /* CoreApi */<a name="line.201"></a> +<span class="sourceLineNo">202</span> public HtmlDocSerializer addPojoSwaps(Class<?>...classes) throws LockedException {<a name="line.202"></a> +<span class="sourceLineNo">203</span> super.addPojoSwaps(classes);<a name="line.203"></a> +<span class="sourceLineNo">204</span> return this;<a name="line.204"></a> +<span class="sourceLineNo">205</span> }<a name="line.205"></a> +<span class="sourceLineNo">206</span><a name="line.206"></a> +<span class="sourceLineNo">207</span> @Override /* CoreApi */<a name="line.207"></a> +<span class="sourceLineNo">208</span> public HtmlDocSerializer addToDictionary(Class<?>...classes) throws LockedException {<a name="line.208"></a> +<span class="sourceLineNo">209</span> super.addToDictionary(classes);<a name="line.209"></a> +<span class="sourceLineNo">210</span> return this;<a name="line.210"></a> +<span class="sourceLineNo">211</span> }<a name="line.211"></a> +<span class="sourceLineNo">212</span><a name="line.212"></a> +<span class="sourceLineNo">213</span> @Override /* CoreApi */<a name="line.213"></a> +<span class="sourceLineNo">214</span> public <T> HtmlDocSerializer addImplClass(Class<T> interfaceClass, Class<? extends T> implClass) throws LockedException {<a name="line.214"></a> +<span class="sourceLineNo">215</span> super.addImplClass(interfaceClass, implClass);<a name="line.215"></a> +<span class="sourceLineNo">216</span> return this;<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> @Override /* CoreApi */<a name="line.219"></a> +<span class="sourceLineNo">220</span> public HtmlDocSerializer setClassLoader(ClassLoader classLoader) throws LockedException {<a name="line.220"></a> +<span class="sourceLineNo">221</span> super.setClassLoader(classLoader);<a name="line.221"></a> +<span class="sourceLineNo">222</span> return this;<a name="line.222"></a> +<span class="sourceLineNo">223</span> }<a name="line.223"></a> +<span class="sourceLineNo">224</span><a name="line.224"></a> +<span class="sourceLineNo">225</span> @Override /* Lockable */<a name="line.225"></a> +<span class="sourceLineNo">226</span> public HtmlDocSerializer lock() {<a name="line.226"></a> +<span class="sourceLineNo">227</span> super.lock();<a name="line.227"></a> +<span class="sourceLineNo">228</span> return this;<a name="line.228"></a> +<span class="sourceLineNo">229</span> }<a name="line.229"></a> +<span class="sourceLineNo">230</span><a name="line.230"></a> +<span class="sourceLineNo">231</span> @Override /* Lockable */<a name="line.231"></a> +<span class="sourceLineNo">232</span> public HtmlDocSerializer clone() {<a name="line.232"></a> +<span class="sourceLineNo">233</span> HtmlDocSerializer c = (HtmlDocSerializer)super.clone();<a name="line.233"></a> +<span class="sourceLineNo">234</span> return c;<a name="line.234"></a> +<span class="sourceLineNo">235</span> }<a name="line.235"></a> +<span class="sourceLineNo">236</span>}<a name="line.236"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html index 7732a2f..ad8c97c 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html +++ b/content/site/apidocs/src-html/org/apache/juneau/ini/ConfigMgr.html @@ -176,7 +176,7 @@ <span class="sourceLineNo">168</span> * Delete all configuration files registered with this config manager.<a name="line.168"></a> <span class="sourceLineNo">169</span> */<a name="line.169"></a> <span class="sourceLineNo">170</span> public void deleteAll() {<a name="line.170"></a> -<span class="sourceLineNo">171</span> for (File f : configs.keySet())<a name="line.171"></a> +<span class="sourceLineNo">171</span> for (File f : Collections.list(configs.keys())) // Don't use keySet(), otherwise fails on Java 6/7 if compiled using Java 8.<a name="line.171"></a> <span class="sourceLineNo">172</span> FileUtils.delete(f);<a name="line.172"></a> <span class="sourceLineNo">173</span> files.clear();<a name="line.173"></a> <span class="sourceLineNo">174</span> configs.clear();<a name="line.174"></a> http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/02c10736/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html ---------------------------------------------------------------------- diff --git a/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html b/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html index 773ca54..96d7883 100644 --- a/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html +++ b/content/site/apidocs/src-html/org/apache/juneau/internal/FileUtils.html @@ -215,31 +215,35 @@ <span class="sourceLineNo">207</span> ext = getExtension(fileName);<a name="line.207"></a> <span class="sourceLineNo">208</span> return baseName + "_" + l2.toString() + (ext.isEmpty() ? "" : ('.' + ext));<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> }<a name="line.211"></a> -<span class="sourceLineNo">212</span> };<a name="line.212"></a> -<span class="sourceLineNo">213</span> }<a name="line.213"></a> -<span class="sourceLineNo">214</span><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> * Returns the candidate locales for the specified locale.<a name="line.217"></a> -<span class="sourceLineNo">218</span> * <p><a name="line.218"></a> -<span class="sourceLineNo">219</span> * For example, if <code>locale</code> is <js>"ja_JP"</js>, then this method will return:<a name="line.219"></a> -<span class="sourceLineNo">220</span> * <ol><a name="line.220"></a> -<span class="sourceLineNo">221</span> * <li><js>"ja_JP"</js><a name="line.221"></a> -<span class="sourceLineNo">222</span> * <li><js>"ja"</js><a name="line.222"></a> -<span class="sourceLineNo">223</span> * <li><js>""</js><a name="line.223"></a> -<span class="sourceLineNo">224</span> * </ol><a name="line.224"></a> -<span class="sourceLineNo">225</span> *<a name="line.225"></a> -<span class="sourceLineNo">226</span> * @param locale The locale to get the list of candidate locales for.<a name="line.226"></a> -<span class="sourceLineNo">227</span> * @return The list of candidate locales.<a name="line.227"></a> -<span class="sourceLineNo">228</span> */<a name="line.228"></a> -<span class="sourceLineNo">229</span> public static List<Locale> getCandidateLocales(Locale locale) {<a name="line.229"></a> -<span class="sourceLineNo">230</span> if (locale == null)<a name="line.230"></a> -<span class="sourceLineNo">231</span> return ROOT_LOCALE;<a name="line.231"></a> -<span class="sourceLineNo">232</span> return RB_CONTROL.getCandidateLocales("", locale);<a name="line.232"></a> -<span class="sourceLineNo">233</span> }<a name="line.233"></a> -<span class="sourceLineNo">234</span>}<a name="line.234"></a> +<span class="sourceLineNo">210</span> @Override<a name="line.210"></a> +<span class="sourceLineNo">211</span> public void remove() {<a name="line.211"></a> +<span class="sourceLineNo">212</span> throw new UnsupportedOperationException();<a name="line.212"></a> +<span class="sourceLineNo">213</span> }<a name="line.213"></a> +<span class="sourceLineNo">214</span> };<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><a name="line.218"></a> +<span class="sourceLineNo">219</span><a name="line.219"></a> +<span class="sourceLineNo">220</span> /**<a name="line.220"></a> +<span class="sourceLineNo">221</span> * Returns the candidate locales for the specified locale.<a name="line.221"></a> +<span class="sourceLineNo">222</span> * <p><a name="line.222"></a> +<span class="sourceLineNo">223</span> * For example, if <code>locale</code> is <js>"ja_JP"</js>, then this method will return:<a name="line.223"></a> +<span class="sourceLineNo">224</span> * <ol><a name="line.224"></a> +<span class="sourceLineNo">225</span> * <li><js>"ja_JP"</js><a name="line.225"></a> +<span class="sourceLineNo">226</span> * <li><js>"ja"</js><a name="line.226"></a> +<span class="sourceLineNo">227</span> * <li><js>""</js><a name="line.227"></a> +<span class="sourceLineNo">228</span> * </ol><a name="line.228"></a> +<span class="sourceLineNo">229</span> *<a name="line.229"></a> +<span class="sourceLineNo">230</span> * @param locale The locale to get the list of candidate locales for.<a name="line.230"></a> +<span class="sourceLineNo">231</span> * @return The list of candidate locales.<a name="line.231"></a> +<span class="sourceLineNo">232</span> */<a name="line.232"></a> +<span class="sourceLineNo">233</span> public static List<Locale> getCandidateLocales(Locale locale) {<a name="line.233"></a> +<span class="sourceLineNo">234</span> if (locale == null)<a name="line.234"></a> +<span class="sourceLineNo">235</span> return ROOT_LOCALE;<a name="line.235"></a> +<span class="sourceLineNo">236</span> return RB_CONTROL.getCandidateLocales("", locale);<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>
