http://git-wip-us.apache.org/repos/asf/incubator-juneau-website/blob/236aea45/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
----------------------------------------------------------------------
diff --git 
a/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html 
b/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
index 8478a82..fe2e718 100644
--- a/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
+++ b/content/site/apidocs/src-html/org/apache/juneau/rest/RestContext.html
@@ -349,1081 +349,1144 @@
 <span class="sourceLineNo">341</span>   @SuppressWarnings("unchecked")<a 
name="line.341"></a>
 <span class="sourceLineNo">342</span>   public RestContext(Object resource, 
RestConfig config) throws Exception {<a name="line.342"></a>
 <span class="sourceLineNo">343</span>      super(null);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>         this.resource = resource;<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>         this.config = config;<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span><a name="line.347"></a>
-<span class="sourceLineNo">348</span>         Builder b = new 
Builder(resource, config);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>         this.allowHeaderParams = 
b.allowHeaderParams;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>         this.allowBodyParam = 
b.allowBodyParam;<a name="line.350"></a>
-<span class="sourceLineNo">351</span>         this.renderResponseStackTraces = 
b.renderResponseStackTraces;<a name="line.351"></a>
-<span class="sourceLineNo">352</span>         this.useStackTraceHashes = 
b.useStackTraceHashes;<a name="line.352"></a>
-<span class="sourceLineNo">353</span>         this.allowMethodParams = 
Collections.unmodifiableSet(b.allowMethodParams);<a name="line.353"></a>
-<span class="sourceLineNo">354</span>         this.defaultCharset = 
b.defaultCharset;<a name="line.354"></a>
-<span class="sourceLineNo">355</span>         this.paramFormat = 
b.paramFormat;<a name="line.355"></a>
-<span class="sourceLineNo">356</span>         this.varResolver = 
b.varResolver;<a name="line.356"></a>
-<span class="sourceLineNo">357</span>         this.configFile = 
b.configFile;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>         this.properties = 
b.properties;<a name="line.358"></a>
-<span class="sourceLineNo">359</span>         this.beanFilters = 
b.beanFilters;<a name="line.359"></a>
-<span class="sourceLineNo">360</span>         this.pojoSwaps = b.pojoSwaps;<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>         this.serializers = 
b.serializers;<a name="line.361"></a>
-<span class="sourceLineNo">362</span>         this.parsers = b.parsers;<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>         this.urlEncodingSerializer = 
b.urlEncodingSerializer;<a name="line.363"></a>
-<span class="sourceLineNo">364</span>         this.urlEncodingParser = 
b.urlEncodingParser;<a name="line.364"></a>
-<span class="sourceLineNo">365</span>         this.encoders = b.encoders;<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>         this.supportedContentTypes = 
ArrayUtils.toObjectArray(b.supportedContentTypes, MediaType.class);<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>         this.supportedAcceptTypes = 
ArrayUtils.toObjectArray(b.supportedAcceptTypes, MediaType.class);<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>         this.clientVersionHeader = 
b.clientVersionHeader;<a name="line.368"></a>
-<span class="sourceLineNo">369</span>         this.defaultRequestHeaders = 
Collections.unmodifiableMap(b.defaultRequestHeaders);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>         this.defaultResponseHeaders = 
Collections.unmodifiableMap(b.defaultResponseHeaders);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>         this.beanContext = 
b.beanContext;<a name="line.371"></a>
-<span class="sourceLineNo">372</span>         this.converters = 
b.converters.toArray(new RestConverter[b.converters.size()]);<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>         this.guards = 
b.guards.toArray(new RestGuard[b.guards.size()]);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>         this.responseHandlers = 
ArrayUtils.toObjectArray(b.responseHandlers, ResponseHandler.class);<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>         this.mimetypesFileTypeMap = 
b.mimetypesFileTypeMap;<a name="line.375"></a>
-<span class="sourceLineNo">376</span>         this.styleSheet = 
b.styleSheet;<a name="line.376"></a>
-<span class="sourceLineNo">377</span>         this.favIcon = b.favIcon;<a 
name="line.377"></a>
-<span class="sourceLineNo">378</span>         this.staticFilesMap = 
Collections.unmodifiableMap(b.staticFilesMap);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>         this.staticFilesPrefixes = 
b.staticFilesPrefixes;<a name="line.379"></a>
-<span class="sourceLineNo">380</span>         this.msgs = b.messageBundle;<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>         this.childResources = 
Collections.synchronizedMap(new LinkedHashMap&lt;String,RestContext&gt;());  // 
Not unmodifiable on purpose so that children can be replaced.<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>         this.logger = b.logger;<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>         this.fullPath = b.fullPath;<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>         
//----------------------------------------------------------------------------------------------------<a
 name="line.385"></a>
-<span class="sourceLineNo">386</span>         // Initialize the child 
resources.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>         // Done after initializing 
fields above since we pass this object to the child resources.<a 
name="line.387"></a>
-<span class="sourceLineNo">388</span>         
//----------------------------------------------------------------------------------------------------<a
 name="line.388"></a>
-<span class="sourceLineNo">389</span>         List&lt;String&gt; methodsFound 
= new LinkedList&lt;String&gt;();   // Temporary to help debug transient 
duplicate method issue.<a name="line.389"></a>
-<span class="sourceLineNo">390</span>         
Map&lt;String,CallRouter.Builder&gt; routers = new 
LinkedHashMap&lt;String,CallRouter.Builder&gt;();<a name="line.390"></a>
-<span class="sourceLineNo">391</span>         Map&lt;String,CallMethod&gt; 
_javaRestMethods = new LinkedHashMap&lt;String,CallMethod&gt;();<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>         for (java.lang.reflect.Method 
method : resource.getClass().getMethods()) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>            if 
(method.isAnnotationPresent(RestMethod.class)) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>               RestMethod a = 
method.getAnnotation(RestMethod.class);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>               
methodsFound.add(method.getName() + "," + a.name() + "," + a.path());<a 
name="line.395"></a>
-<span class="sourceLineNo">396</span>               try {<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span>                  if (! 
Modifier.isPublic(method.getModifiers()))<a name="line.397"></a>
-<span class="sourceLineNo">398</span>                     throw new 
RestServletException("@RestMethod method {0}.{1} must be defined as public.", 
this.getClass().getName(), method.getName());<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>                  CallMethod sm = new 
CallMethod(resource, method, this);<a name="line.400"></a>
-<span class="sourceLineNo">401</span>                  
_javaRestMethods.put(method.getName(), sm);<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span>                  String httpMethod = 
sm.getHttpMethod();<a name="line.403"></a>
-<span class="sourceLineNo">404</span>                  if (! 
routers.containsKey(httpMethod))<a name="line.404"></a>
-<span class="sourceLineNo">405</span>                     
routers.put(httpMethod, new CallRouter.Builder(httpMethod));<a 
name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>                  
routers.get(httpMethod).add(sm);<a name="line.407"></a>
+<span class="sourceLineNo">344</span>      RestException _initException = 
null;<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      try {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>         this.resource = resource;<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>         this.config = config;<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>         Builder b = new 
Builder(resource, config);<a name="line.349"></a>
+<span class="sourceLineNo">350</span>         this.allowHeaderParams = 
b.allowHeaderParams;<a name="line.350"></a>
+<span class="sourceLineNo">351</span>         this.allowBodyParam = 
b.allowBodyParam;<a name="line.351"></a>
+<span class="sourceLineNo">352</span>         this.renderResponseStackTraces = 
b.renderResponseStackTraces;<a name="line.352"></a>
+<span class="sourceLineNo">353</span>         this.useStackTraceHashes = 
b.useStackTraceHashes;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>         this.allowMethodParams = 
Collections.unmodifiableSet(b.allowMethodParams);<a name="line.354"></a>
+<span class="sourceLineNo">355</span>         this.defaultCharset = 
b.defaultCharset;<a name="line.355"></a>
+<span class="sourceLineNo">356</span>         this.paramFormat = 
b.paramFormat;<a name="line.356"></a>
+<span class="sourceLineNo">357</span>         this.varResolver = 
b.varResolver;<a name="line.357"></a>
+<span class="sourceLineNo">358</span>         this.configFile = 
b.configFile;<a name="line.358"></a>
+<span class="sourceLineNo">359</span>         this.properties = 
b.properties;<a name="line.359"></a>
+<span class="sourceLineNo">360</span>         this.beanFilters = 
b.beanFilters;<a name="line.360"></a>
+<span class="sourceLineNo">361</span>         this.pojoSwaps = b.pojoSwaps;<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>         this.serializers = 
b.serializers;<a name="line.362"></a>
+<span class="sourceLineNo">363</span>         this.parsers = b.parsers;<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span>         this.urlEncodingSerializer = 
b.urlEncodingSerializer;<a name="line.364"></a>
+<span class="sourceLineNo">365</span>         this.urlEncodingParser = 
b.urlEncodingParser;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>         this.encoders = b.encoders;<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>         this.supportedContentTypes = 
ArrayUtils.toObjectArray(b.supportedContentTypes, MediaType.class);<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>         this.supportedAcceptTypes = 
ArrayUtils.toObjectArray(b.supportedAcceptTypes, MediaType.class);<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>         this.clientVersionHeader = 
b.clientVersionHeader;<a name="line.369"></a>
+<span class="sourceLineNo">370</span>         this.defaultRequestHeaders = 
Collections.unmodifiableMap(b.defaultRequestHeaders);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>         this.defaultResponseHeaders = 
Collections.unmodifiableMap(b.defaultResponseHeaders);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>         this.beanContext = 
b.beanContext;<a name="line.372"></a>
+<span class="sourceLineNo">373</span>         this.converters = 
b.converters.toArray(new RestConverter[b.converters.size()]);<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>         this.guards = 
b.guards.toArray(new RestGuard[b.guards.size()]);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>         this.responseHandlers = 
ArrayUtils.toObjectArray(b.responseHandlers, ResponseHandler.class);<a 
name="line.375"></a>
+<span class="sourceLineNo">376</span>         this.mimetypesFileTypeMap = 
b.mimetypesFileTypeMap;<a name="line.376"></a>
+<span class="sourceLineNo">377</span>         this.styleSheet = 
b.styleSheet;<a name="line.377"></a>
+<span class="sourceLineNo">378</span>         this.favIcon = b.favIcon;<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>         this.staticFilesMap = 
Collections.unmodifiableMap(b.staticFilesMap);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>         this.staticFilesPrefixes = 
b.staticFilesPrefixes;<a name="line.380"></a>
+<span class="sourceLineNo">381</span>         this.msgs = b.messageBundle;<a 
name="line.381"></a>
+<span class="sourceLineNo">382</span>         this.childResources = 
Collections.synchronizedMap(new LinkedHashMap&lt;String,RestContext&gt;());  // 
Not unmodifiable on purpose so that children can be replaced.<a 
name="line.382"></a>
+<span class="sourceLineNo">383</span>         this.logger = b.logger;<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>         this.fullPath = b.fullPath;<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>         
//----------------------------------------------------------------------------------------------------<a
 name="line.386"></a>
+<span class="sourceLineNo">387</span>         // Initialize the child 
resources.<a name="line.387"></a>
+<span class="sourceLineNo">388</span>         // Done after initializing 
fields above since we pass this object to the child resources.<a 
name="line.388"></a>
+<span class="sourceLineNo">389</span>         
//----------------------------------------------------------------------------------------------------<a
 name="line.389"></a>
+<span class="sourceLineNo">390</span>         List&lt;String&gt; methodsFound 
= new LinkedList&lt;String&gt;();   // Temporary to help debug transient 
duplicate method issue.<a name="line.390"></a>
+<span class="sourceLineNo">391</span>         
Map&lt;String,CallRouter.Builder&gt; routers = new 
LinkedHashMap&lt;String,CallRouter.Builder&gt;();<a name="line.391"></a>
+<span class="sourceLineNo">392</span>         Map&lt;String,CallMethod&gt; 
_javaRestMethods = new LinkedHashMap&lt;String,CallMethod&gt;();<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>         for (java.lang.reflect.Method 
method : resource.getClass().getMethods()) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>            if 
(method.isAnnotationPresent(RestMethod.class)) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>               RestMethod a = 
method.getAnnotation(RestMethod.class);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>               
methodsFound.add(method.getName() + "," + a.name() + "," + a.path());<a 
name="line.396"></a>
+<span class="sourceLineNo">397</span>               try {<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>                  if (! 
Modifier.isPublic(method.getModifiers()))<a name="line.398"></a>
+<span class="sourceLineNo">399</span>                     throw new 
RestServletException("@RestMethod method {0}.{1} must be defined as public.", 
this.getClass().getName(), method.getName());<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>                  CallMethod sm = new 
CallMethod(resource, method, this);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>                  String httpMethod = 
sm.getHttpMethod();<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span>                  // PROXY is a special 
case where a method returns an interface that we<a name="line.404"></a>
+<span class="sourceLineNo">405</span>                  // can perform REST 
calls against.<a name="line.405"></a>
+<span class="sourceLineNo">406</span>                  // We override the 
CallMethod.invoke() method to insert our logic.<a name="line.406"></a>
+<span class="sourceLineNo">407</span>                  if 
("PROXY".equals(httpMethod)) {<a name="line.407"></a>
 <span class="sourceLineNo">408</span><a name="line.408"></a>
-<span class="sourceLineNo">409</span>               } catch 
(RestServletException e) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>                  throw new 
RestServletException("Problem occurred trying to serialize methods on class 
{0}, methods={1}", this.getClass().getName(), 
JsonSerializer.DEFAULT_LAX.serialize(methodsFound)).initCause(e);<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>               }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>            }<a name="line.412"></a>
-<span class="sourceLineNo">413</span>         }<a name="line.413"></a>
-<span class="sourceLineNo">414</span>         this.callMethods = 
Collections.unmodifiableMap(_javaRestMethods);<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>         Map&lt;String,CallRouter&gt; 
_callRouters = new LinkedHashMap&lt;String,CallRouter&gt;();<a 
name="line.416"></a>
-<span class="sourceLineNo">417</span>         for (CallRouter.Builder crb : 
routers.values())<a name="line.417"></a>
-<span class="sourceLineNo">418</span>            
_callRouters.put(crb.getHttpMethodName(), crb.build());<a name="line.418"></a>
-<span class="sourceLineNo">419</span>         this.callRouters = 
Collections.unmodifiableMap(_callRouters);<a name="line.419"></a>
+<span class="sourceLineNo">409</span>                     final 
ClassMeta&lt;?&gt; interfaceClass = 
beanContext.getClassMeta(method.getGenericReturnType());<a name="line.409"></a>
+<span class="sourceLineNo">410</span>                     sm = new 
CallMethod(resource, method, this) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>                        @Override<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>                        int invoke(String 
pathInfo, RestRequest req, RestResponse res) throws RestException {<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>                           int rc = 
super.invoke(pathInfo, req, res);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>                           if (rc != 
SC_OK)<a name="line.416"></a>
+<span class="sourceLineNo">417</span>                              return 
rc;<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>                           final Object o 
= res.getOutput();<a name="line.419"></a>
 <span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>         // Initialize our child 
resources.<a name="line.421"></a>
-<span class="sourceLineNo">422</span>         RestResourceResolver rrr = 
resolve(RestResourceResolver.class, config.resourceResolver);<a 
name="line.422"></a>
-<span class="sourceLineNo">423</span>         for (Object o : 
config.childResources) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>            String path = null;<a 
name="line.424"></a>
-<span class="sourceLineNo">425</span>            Object r = null;<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>            if (o instanceof Pair) {<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>               Pair&lt;String,Object&gt; 
p = (Pair&lt;String,Object&gt;)o;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>               path = p.first();<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>               r = p.second();<a 
name="line.429"></a>
-<span class="sourceLineNo">430</span>            } else if (o instanceof 
Class&lt;?&gt;) {<a name="line.430"></a>
-<span class="sourceLineNo">431</span>               Class&lt;?&gt; c = 
(Class&lt;?&gt;)o;<a name="line.431"></a>
-<span class="sourceLineNo">432</span>               r = c;<a 
name="line.432"></a>
-<span class="sourceLineNo">433</span>            } else {<a 
name="line.433"></a>
-<span class="sourceLineNo">434</span>               r = o;<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>            }<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>            RestConfig childConfig = 
null;<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span>            if (o instanceof Class) {<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span>               Class&lt;?&gt; oc = 
(Class&lt;?&gt;)o;<a name="line.440"></a>
-<span class="sourceLineNo">441</span>               childConfig = new 
RestConfig(config.inner, oc, this);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>               r = rrr.resolve(oc, 
childConfig);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>            } else {<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>               r = o;<a 
name="line.444"></a>
-<span class="sourceLineNo">445</span>               childConfig = new 
RestConfig(config.inner, o.getClass(), this);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>            }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>            if (r instanceof RestServlet) 
{<a name="line.448"></a>
-<span class="sourceLineNo">449</span>               RestServlet rs = 
(RestServlet)r;<a name="line.449"></a>
-<span class="sourceLineNo">450</span>               rs.init(childConfig);<a 
name="line.450"></a>
-<span class="sourceLineNo">451</span>               path = childConfig.path;<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>               childResources.put(path, 
rs.getContext());<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            } else {<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span>               // Call the 
init(RestConfig) method.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>               java.lang.reflect.Method 
m2 = ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, 
RestConfig.class);<a name="line.456"></a>
-<span class="sourceLineNo">457</span>               if (m2 != null)<a 
name="line.457"></a>
-<span class="sourceLineNo">458</span>                  m2.invoke(r, 
childConfig);<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>               RestContext rc2 = new 
RestContext(r, childConfig);<a name="line.460"></a>
+<span class="sourceLineNo">421</span>                           if 
("GET".equals(req.getMethod())) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>                              
res.setOutput(ClassUtils.getMethodInfo(interfaceClass.getProxyableMethods().values()));<a
 name="line.422"></a>
+<span class="sourceLineNo">423</span>                              return 
SC_OK;<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>                           } else if 
("POST".equals(req.getMethod())) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>                              if 
(pathInfo.indexOf('/') != -1)<a name="line.426"></a>
+<span class="sourceLineNo">427</span>                                 pathInfo 
= pathInfo.substring(pathInfo.lastIndexOf('/')+1);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>                              pathInfo = 
RestUtils.decode(pathInfo);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>                              
java.lang.reflect.Method m = 
interfaceClass.getProxyableMethods().get(pathInfo);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>                              if (m != 
null) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>                                 try {<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>                                    // 
Parse the args and invoke the method.<a name="line.432"></a>
+<span class="sourceLineNo">433</span>                                    
Parser p = req.getParser();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>                                    
Object input = p.isReaderParser() ? req.getReader() : req.getInputStream();<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>                                    
Object output = null;<a name="line.435"></a>
+<span class="sourceLineNo">436</span>                                    try 
{<a name="line.436"></a>
+<span class="sourceLineNo">437</span>                                       
output = m.invoke(o, p.parseArgs(input, m.getGenericParameterTypes()));<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>                                    } 
catch (InvocationTargetException e) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span>                                       
res.setHeader("Exception-Name", e.getCause().getClass().getName());<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>                                       
res.setHeader("Exception-Message", e.getCause().getMessage());<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span>                                       
throw e;<a name="line.441"></a>
+<span class="sourceLineNo">442</span>                                    } 
catch (Exception e) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>                                       
res.setHeader("Exception-Name", e.getClass().getName());<a name="line.443"></a>
+<span class="sourceLineNo">444</span>                                       
res.setHeader("Exception-Message", e.getCause().getMessage());<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>                                       
throw e;<a name="line.445"></a>
+<span class="sourceLineNo">446</span>                                    }<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>                                    
res.setOutput(output);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>                                    
return SC_OK;<a name="line.448"></a>
+<span class="sourceLineNo">449</span>                                 } catch 
(Exception e) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span>                                    throw 
new RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>                                 }<a 
name="line.451"></a>
+<span class="sourceLineNo">452</span>                              }<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>                           }<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>                           return 
SC_NOT_FOUND;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>                        }<a 
name="line.455"></a>
+<span class="sourceLineNo">456</span>                     };<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span>                     
_javaRestMethods.put(method.getName(), sm);<a name="line.458"></a>
+<span class="sourceLineNo">459</span>                     addToRouter(routers, 
"GET", sm);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>                     addToRouter(routers, 
"POST", sm);<a name="line.460"></a>
 <span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span>               // Call the 
init(RestContext) method.<a name="line.462"></a>
-<span class="sourceLineNo">463</span>               m2 = 
ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, 
RestContext.class);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>               if (m2 != null)<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>                  m2.invoke(r, rc2);<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span><a name="line.466"></a>
-<span class="sourceLineNo">467</span>               path = childConfig.path;<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>               childResources.put(path, 
rc2);<a name="line.468"></a>
+<span class="sourceLineNo">462</span>                  } else {<a 
name="line.462"></a>
+<span class="sourceLineNo">463</span>                     
_javaRestMethods.put(method.getName(), sm);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>                     addToRouter(routers, 
httpMethod, sm);<a name="line.464"></a>
+<span class="sourceLineNo">465</span>                  }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>               } catch 
(RestServletException e) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span>                  throw new 
RestServletException("Problem occurred trying to serialize methods on class 
{0}, methods={1}", this.getClass().getName(), 
JsonSerializer.DEFAULT_LAX.serialize(methodsFound)).initCause(e);<a 
name="line.467"></a>
+<span class="sourceLineNo">468</span>               }<a name="line.468"></a>
 <span class="sourceLineNo">469</span>            }<a name="line.469"></a>
 <span class="sourceLineNo">470</span>         }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>         callHandler = config.callHandler 
== null ? new RestCallHandler(this) : resolve(RestCallHandler.class, 
config.callHandler, this);<a name="line.472"></a>
-<span class="sourceLineNo">473</span>         infoProvider = 
config.infoProvider == null ? new RestInfoProvider(this) : 
resolve(RestInfoProvider.class, config.infoProvider, this);<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>      } catch (RestException e) {<a 
name="line.475"></a>
-<span class="sourceLineNo">476</span>         initException = e;<a 
name="line.476"></a>
-<span class="sourceLineNo">477</span>         throw e;<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      } catch (Exception e) {<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>         initException = new 
RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>         throw e;<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      }<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      initException = null;<a 
name="line.482"></a>
-<span class="sourceLineNo">483</span>   }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>   private static class Builder {<a 
name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>      boolean allowHeaderParams, 
allowBodyParam, renderResponseStackTraces, useStackTraceHashes;<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>      VarResolver varResolver;<a 
name="line.488"></a>
-<span class="sourceLineNo">489</span>      ConfigFile configFile;<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>      ObjectMap properties;<a 
name="line.490"></a>
-<span class="sourceLineNo">491</span>      Class&lt;?&gt;[] beanFilters;<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>      Class&lt;?&gt;[] pojoSwaps;<a 
name="line.492"></a>
-<span class="sourceLineNo">493</span>      SerializerGroup serializers;<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>      ParserGroup parsers;<a 
name="line.494"></a>
-<span class="sourceLineNo">495</span>      UrlEncodingSerializer 
urlEncodingSerializer;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      UrlEncodingParser 
urlEncodingParser;<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      EncoderGroup encoders;<a 
name="line.497"></a>
-<span class="sourceLineNo">498</span>      String clientVersionHeader = "", 
defaultCharset, paramFormat;<a name="line.498"></a>
-<span class="sourceLineNo">499</span>      List&lt;MediaType&gt; 
supportedContentTypes, supportedAcceptTypes;<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      Map&lt;String,String&gt; 
defaultRequestHeaders = new 
TreeMap&lt;String,String&gt;(String.CASE_INSENSITIVE_ORDER);<a 
name="line.500"></a>
-<span class="sourceLineNo">501</span>      Map&lt;String,Object&gt; 
defaultResponseHeaders;<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      BeanContext beanContext;<a 
name="line.502"></a>
-<span class="sourceLineNo">503</span>      List&lt;RestConverter&gt; 
converters = new ArrayList&lt;RestConverter&gt;();<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      List&lt;RestGuard&gt; guards = new 
ArrayList&lt;RestGuard&gt;();<a name="line.504"></a>
-<span class="sourceLineNo">505</span>      List&lt;ResponseHandler&gt; 
responseHandlers = new ArrayList&lt;ResponseHandler&gt;();<a 
name="line.505"></a>
-<span class="sourceLineNo">506</span>      MimetypesFileTypeMap 
mimetypesFileTypeMap;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      StreamResource styleSheet, 
favIcon;<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      Map&lt;String,String&gt; 
staticFilesMap;<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      String[] staticFilesPrefixes;<a 
name="line.509"></a>
-<span class="sourceLineNo">510</span>      MessageBundle messageBundle;<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>      Set&lt;String&gt; allowMethodParams 
= new LinkedHashSet&lt;String&gt;();<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      RestLogger logger;<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      String fullPath;<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span><a name="line.514"></a>
-<span class="sourceLineNo">515</span>      @SuppressWarnings("unchecked")<a 
name="line.515"></a>
-<span class="sourceLineNo">516</span>      private Builder(Object resource, 
RestConfig sc) throws Exception {<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>         PropertyStore ps = 
sc.createPropertyStore();<a name="line.518"></a>
-<span class="sourceLineNo">519</span><a name="line.519"></a>
-<span class="sourceLineNo">520</span>         
LinkedHashMap&lt;Class&lt;?&gt;,RestResource&gt; 
restResourceAnnotationsChildFirst = 
ReflectionUtils.findAnnotationsMap(RestResource.class, resource.getClass());<a 
name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span>         allowHeaderParams = 
ps.getProperty(REST_allowHeaderParams, boolean.class, true);<a 
name="line.522"></a>
-<span class="sourceLineNo">523</span>         allowBodyParam = 
ps.getProperty(REST_allowBodyParam, boolean.class, true);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>         renderResponseStackTraces = 
ps.getProperty(REST_renderResponseStackTraces, boolean.class, false);<a 
name="line.524"></a>
-<span class="sourceLineNo">525</span>         useStackTraceHashes = 
ps.getProperty(REST_useStackTraceHashes, boolean.class, true);<a 
name="line.525"></a>
-<span class="sourceLineNo">526</span>         defaultCharset = 
ps.getProperty(REST_defaultCharset, String.class, "utf-8");<a 
name="line.526"></a>
-<span class="sourceLineNo">527</span>         paramFormat = 
ps.getProperty(REST_paramFormat, String.class, "");<a name="line.527"></a>
+<span class="sourceLineNo">471</span>         this.callMethods = 
Collections.unmodifiableMap(_javaRestMethods);<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span>         Map&lt;String,CallRouter&gt; 
_callRouters = new LinkedHashMap&lt;String,CallRouter&gt;();<a 
name="line.473"></a>
+<span class="sourceLineNo">474</span>         for (CallRouter.Builder crb : 
routers.values())<a name="line.474"></a>
+<span class="sourceLineNo">475</span>            
_callRouters.put(crb.getHttpMethodName(), crb.build());<a name="line.475"></a>
+<span class="sourceLineNo">476</span>         this.callRouters = 
Collections.unmodifiableMap(_callRouters);<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>         // Initialize our child 
resources.<a name="line.478"></a>
+<span class="sourceLineNo">479</span>         RestResourceResolver rrr = 
resolve(RestResourceResolver.class, config.resourceResolver);<a 
name="line.479"></a>
+<span class="sourceLineNo">480</span>         for (Object o : 
config.childResources) {<a name="line.480"></a>
+<span class="sourceLineNo">481</span>            String path = null;<a 
name="line.481"></a>
+<span class="sourceLineNo">482</span>            Object r = null;<a 
name="line.482"></a>
+<span class="sourceLineNo">483</span>            if (o instanceof Pair) {<a 
name="line.483"></a>
+<span class="sourceLineNo">484</span>               Pair&lt;String,Object&gt; 
p = (Pair&lt;String,Object&gt;)o;<a name="line.484"></a>
+<span class="sourceLineNo">485</span>               path = p.first();<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>               r = p.second();<a 
name="line.486"></a>
+<span class="sourceLineNo">487</span>            } else if (o instanceof 
Class&lt;?&gt;) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>               Class&lt;?&gt; c = 
(Class&lt;?&gt;)o;<a name="line.488"></a>
+<span class="sourceLineNo">489</span>               r = c;<a 
name="line.489"></a>
+<span class="sourceLineNo">490</span>            } else {<a 
name="line.490"></a>
+<span class="sourceLineNo">491</span>               r = o;<a 
name="line.491"></a>
+<span class="sourceLineNo">492</span>            }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span>            RestConfig childConfig = 
null;<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span>            if (o instanceof Class) {<a 
name="line.496"></a>
+<span class="sourceLineNo">497</span>               Class&lt;?&gt; oc = 
(Class&lt;?&gt;)o;<a name="line.497"></a>
+<span class="sourceLineNo">498</span>               childConfig = new 
RestConfig(config.inner, oc, this);<a name="line.498"></a>
+<span class="sourceLineNo">499</span>               r = rrr.resolve(oc, 
childConfig);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>            } else {<a 
name="line.500"></a>
+<span class="sourceLineNo">501</span>               r = o;<a 
name="line.501"></a>
+<span class="sourceLineNo">502</span>               childConfig = new 
RestConfig(config.inner, o.getClass(), this);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>            }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>            if (r instanceof RestServlet) 
{<a name="line.505"></a>
+<span class="sourceLineNo">506</span>               RestServlet rs = 
(RestServlet)r;<a name="line.506"></a>
+<span class="sourceLineNo">507</span>               rs.init(childConfig);<a 
name="line.507"></a>
+<span class="sourceLineNo">508</span>               path = childConfig.path;<a 
name="line.508"></a>
+<span class="sourceLineNo">509</span>               childResources.put(path, 
rs.getContext());<a name="line.509"></a>
+<span class="sourceLineNo">510</span>            } else {<a 
name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>               // Call the 
init(RestConfig) method.<a name="line.512"></a>
+<span class="sourceLineNo">513</span>               java.lang.reflect.Method 
m2 = ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, 
RestConfig.class);<a name="line.513"></a>
+<span class="sourceLineNo">514</span>               if (m2 != null)<a 
name="line.514"></a>
+<span class="sourceLineNo">515</span>                  m2.invoke(r, 
childConfig);<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span>               RestContext rc2 = new 
RestContext(r, childConfig);<a name="line.517"></a>
+<span class="sourceLineNo">518</span><a name="line.518"></a>
+<span class="sourceLineNo">519</span>               // Call the 
init(RestContext) method.<a name="line.519"></a>
+<span class="sourceLineNo">520</span>               m2 = 
ClassUtils.findPublicMethod(r.getClass(), "init", Void.class, 
RestContext.class);<a name="line.520"></a>
+<span class="sourceLineNo">521</span>               if (m2 != null)<a 
name="line.521"></a>
+<span class="sourceLineNo">522</span>                  m2.invoke(r, rc2);<a 
name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span>               path = childConfig.path;<a 
name="line.524"></a>
+<span class="sourceLineNo">525</span>               childResources.put(path, 
rc2);<a name="line.525"></a>
+<span class="sourceLineNo">526</span>            }<a name="line.526"></a>
+<span class="sourceLineNo">527</span>         }<a name="line.527"></a>
 <span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>         for (String m : 
StringUtils.split(ps.getProperty(REST_allowMethodParam, String.class, ""), 
','))<a name="line.529"></a>
-<span class="sourceLineNo">530</span>            if (m.equals("true"))  // For 
backwards compatibility when this was a boolean field.<a name="line.530"></a>
-<span class="sourceLineNo">531</span>               
allowMethodParams.add("*");<a name="line.531"></a>
-<span class="sourceLineNo">532</span>            else<a name="line.532"></a>
-<span class="sourceLineNo">533</span>               
allowMethodParams.add(m.toUpperCase());<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span>         varResolver = 
sc.varResolverBuilder<a name="line.535"></a>
-<span class="sourceLineNo">536</span>            .vars(LocalizationVar.class, 
RequestVar.class, SerializedRequestAttrVar.class, ServletInitParamVar.class, 
UrlEncodeVar.class)<a name="line.536"></a>
-<span class="sourceLineNo">537</span>            .build()<a 
name="line.537"></a>
-<span class="sourceLineNo">538</span>         ;<a name="line.538"></a>
-<span class="sourceLineNo">539</span>         configFile = 
sc.configFile.getResolving(this.varResolver);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>         properties = sc.properties;<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>         
Collections.reverse(sc.beanFilters);<a name="line.541"></a>
-<span class="sourceLineNo">542</span>         
Collections.reverse(sc.pojoSwaps);<a name="line.542"></a>
-<span class="sourceLineNo">543</span>         beanFilters = 
ArrayUtils.toObjectArray(sc.beanFilters, Class.class);<a name="line.543"></a>
-<span class="sourceLineNo">544</span>         pojoSwaps = 
ArrayUtils.toObjectArray(sc.pojoSwaps, Class.class);<a name="line.544"></a>
-<span class="sourceLineNo">545</span>         clientVersionHeader = 
sc.clientVersionHeader;<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>         // Find resource resource bundle 
location.<a name="line.547"></a>
-<span class="sourceLineNo">548</span>         for 
(Map.Entry&lt;Class&lt;?&gt;,RestResource&gt; e : 
restResourceAnnotationsChildFirst.entrySet()) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span>            Class&lt;?&gt; c = 
e.getKey();<a name="line.549"></a>
-<span class="sourceLineNo">550</span>            RestResource r = 
e.getValue();<a name="line.550"></a>
-<span class="sourceLineNo">551</span>            if (! r.messages().isEmpty()) 
{<a name="line.551"></a>
-<span class="sourceLineNo">552</span>               if (messageBundle == 
null)<a name="line.552"></a>
-<span class="sourceLineNo">553</span>                  messageBundle = new 
MessageBundle(c, r.messages());<a name="line.553"></a>
-<span class="sourceLineNo">554</span>               else<a name="line.554"></a>
-<span class="sourceLineNo">555</span>                  
messageBundle.addSearchPath(c, r.messages());<a name="line.555"></a>
-<span class="sourceLineNo">556</span>            }<a name="line.556"></a>
-<span class="sourceLineNo">557</span>         }<a name="line.557"></a>
-<span class="sourceLineNo">558</span><a name="line.558"></a>
-<span class="sourceLineNo">559</span>         if (messageBundle == null)<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>            messageBundle = new 
MessageBundle(resource.getClass(), "");<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span>         
ps.addBeanFilters(beanFilters).addPojoSwaps(pojoSwaps).setProperties(properties);<a
 name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>         serializers = 
sc.serializers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a
 name="line.564"></a>
-<span class="sourceLineNo">565</span>         parsers = 
sc.parsers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a
 name="line.565"></a>
-<span class="sourceLineNo">566</span>         urlEncodingSerializer = new 
UrlEncodingSerializer(ps);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>         urlEncodingParser = new 
UrlEncodingParser(ps);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>         encoders = 
sc.encoders.build();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>         supportedContentTypes = 
sc.supportedContentTypes != null ? sc.supportedContentTypes : 
serializers.getSupportedMediaTypes();<a name="line.569"></a>
-<span class="sourceLineNo">570</span>         supportedAcceptTypes = 
sc.supportedAcceptTypes != null ? sc.supportedAcceptTypes : 
parsers.getSupportedMediaTypes();<a name="line.570"></a>
-<span class="sourceLineNo">571</span>         
defaultRequestHeaders.putAll(sc.defaultRequestHeaders);<a name="line.571"></a>
-<span class="sourceLineNo">572</span>         defaultResponseHeaders = 
Collections.unmodifiableMap(new 
LinkedHashMap&lt;String,Object&gt;(sc.defaultResponseHeaders));<a 
name="line.572"></a>
-<span class="sourceLineNo">573</span>         beanContext = 
ps.getBeanContext();<a name="line.573"></a>
-<span class="sourceLineNo">574</span><a name="line.574"></a>
-<span class="sourceLineNo">575</span>         for (Object o : sc.converters)<a 
name="line.575"></a>
-<span class="sourceLineNo">576</span>            
converters.add(resolve(RestConverter.class, o));<a name="line.576"></a>
-<span class="sourceLineNo">577</span><a name="line.577"></a>
-<span class="sourceLineNo">578</span>         for (Object o : sc.guards)<a 
name="line.578"></a>
-<span class="sourceLineNo">579</span>            
guards.add(resolve(RestGuard.class, o));<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span>         for (Object o : 
sc.responseHandlers)<a name="line.581"></a>
-<span class="sourceLineNo">582</span>            
responseHandlers.add(resolve(ResponseHandler.class, o));<a name="line.582"></a>
+<span class="sourceLineNo">529</span>         callHandler = config.callHandler 
== null ? new RestCallHandler(this) : resolve(RestCallHandler.class, 
config.callHandler, this);<a name="line.529"></a>
+<span class="sourceLineNo">530</span>         infoProvider = 
config.infoProvider == null ? new RestInfoProvider(this) : 
resolve(RestInfoProvider.class, config.infoProvider, this);<a 
name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span>      } catch (RestException e) {<a 
name="line.532"></a>
+<span class="sourceLineNo">533</span>         _initException = e;<a 
name="line.533"></a>
+<span class="sourceLineNo">534</span>         throw e;<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      } catch (Exception e) {<a 
name="line.535"></a>
+<span class="sourceLineNo">536</span>         _initException = new 
RestException(SC_INTERNAL_SERVER_ERROR, e);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>         throw e;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      } finally {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>         initException = 
_initException;<a name="line.539"></a>
+<span class="sourceLineNo">540</span>      }<a name="line.540"></a>
+<span class="sourceLineNo">541</span>   }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span>   private static void 
addToRouter(Map&lt;String, CallRouter.Builder&gt; routers, String 
httpMethodName, CallMethod cm) throws RestServletException {<a 
name="line.543"></a>
+<span class="sourceLineNo">544</span>      if (! 
routers.containsKey(httpMethodName))<a name="line.544"></a>
+<span class="sourceLineNo">545</span>         routers.put(httpMethodName, new 
CallRouter.Builder(httpMethodName));<a name="line.545"></a>
+<span class="sourceLineNo">546</span>      
routers.get(httpMethodName).add(cm);<a name="line.546"></a>
+<span class="sourceLineNo">547</span>   }<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span>   private static class Builder {<a 
name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span>      boolean allowHeaderParams, 
allowBodyParam, renderResponseStackTraces, useStackTraceHashes;<a 
name="line.551"></a>
+<span class="sourceLineNo">552</span>      VarResolver varResolver;<a 
name="line.552"></a>
+<span class="sourceLineNo">553</span>      ConfigFile configFile;<a 
name="line.553"></a>
+<span class="sourceLineNo">554</span>      ObjectMap properties;<a 
name="line.554"></a>
+<span class="sourceLineNo">555</span>      Class&lt;?&gt;[] beanFilters;<a 
name="line.555"></a>
+<span class="sourceLineNo">556</span>      Class&lt;?&gt;[] pojoSwaps;<a 
name="line.556"></a>
+<span class="sourceLineNo">557</span>      SerializerGroup serializers;<a 
name="line.557"></a>
+<span class="sourceLineNo">558</span>      ParserGroup parsers;<a 
name="line.558"></a>
+<span class="sourceLineNo">559</span>      UrlEncodingSerializer 
urlEncodingSerializer;<a name="line.559"></a>
+<span class="sourceLineNo">560</span>      UrlEncodingParser 
urlEncodingParser;<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      EncoderGroup encoders;<a 
name="line.561"></a>
+<span class="sourceLineNo">562</span>      String clientVersionHeader = "", 
defaultCharset, paramFormat;<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      List&lt;MediaType&gt; 
supportedContentTypes, supportedAcceptTypes;<a name="line.563"></a>
+<span class="sourceLineNo">564</span>      Map&lt;String,String&gt; 
defaultRequestHeaders = new 
TreeMap&lt;String,String&gt;(String.CASE_INSENSITIVE_ORDER);<a 
name="line.564"></a>
+<span class="sourceLineNo">565</span>      Map&lt;String,Object&gt; 
defaultResponseHeaders;<a name="line.565"></a>
+<span class="sourceLineNo">566</span>      BeanContext beanContext;<a 
name="line.566"></a>
+<span class="sourceLineNo">567</span>      List&lt;RestConverter&gt; 
converters = new ArrayList&lt;RestConverter&gt;();<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      List&lt;RestGuard&gt; guards = new 
ArrayList&lt;RestGuard&gt;();<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      List&lt;ResponseHandler&gt; 
responseHandlers = new ArrayList&lt;ResponseHandler&gt;();<a 
name="line.569"></a>
+<span class="sourceLineNo">570</span>      MimetypesFileTypeMap 
mimetypesFileTypeMap;<a name="line.570"></a>
+<span class="sourceLineNo">571</span>      StreamResource styleSheet, 
favIcon;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      Map&lt;String,String&gt; 
staticFilesMap;<a name="line.572"></a>
+<span class="sourceLineNo">573</span>      String[] staticFilesPrefixes;<a 
name="line.573"></a>
+<span class="sourceLineNo">574</span>      MessageBundle messageBundle;<a 
name="line.574"></a>
+<span class="sourceLineNo">575</span>      Set&lt;String&gt; allowMethodParams 
= new LinkedHashSet&lt;String&gt;();<a name="line.575"></a>
+<span class="sourceLineNo">576</span>      RestLogger logger;<a 
name="line.576"></a>
+<span class="sourceLineNo">577</span>      String fullPath;<a 
name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span>      @SuppressWarnings("unchecked")<a 
name="line.579"></a>
+<span class="sourceLineNo">580</span>      private Builder(Object resource, 
RestConfig sc) throws Exception {<a name="line.580"></a>
+<span class="sourceLineNo">581</span><a name="line.581"></a>
+<span class="sourceLineNo">582</span>         PropertyStore ps = 
sc.createPropertyStore();<a name="line.582"></a>
 <span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span>         mimetypesFileTypeMap = 
sc.mimeTypes;<a name="line.584"></a>
+<span class="sourceLineNo">584</span>         
LinkedHashMap&lt;Class&lt;?&gt;,RestResource&gt; 
restResourceAnnotationsChildFirst = 
ReflectionUtils.findAnnotationsMap(RestResource.class, resource.getClass());<a 
name="line.584"></a>
 <span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>         VarResolver vr = 
sc.getVarResolverBuilder().build();<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>         if (sc.styleSheets != null) {<a 
name="line.588"></a>
-<span class="sourceLineNo">589</span>            List&lt;InputStream&gt; 
contents = new ArrayList&lt;InputStream&gt;();<a name="line.589"></a>
-<span class="sourceLineNo">590</span>            for (Object o : 
sc.styleSheets) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>               if (o instanceof Pair) {<a 
name="line.591"></a>
-<span class="sourceLineNo">592</span>                  
Pair&lt;Class&lt;?&gt;,String&gt; p = (Pair&lt;Class&lt;?&gt;,String&gt;)o;<a 
name="line.592"></a>
-<span class="sourceLineNo">593</span>                  for (String path : 
StringUtils.split(vr.resolve(StringUtils.toString(p.second())), ','))<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>                     if 
(path.startsWith("file://"))<a name="line.594"></a>
-<span class="sourceLineNo">595</span>                        contents.add(new 
FileInputStream(path));<a name="line.595"></a>
-<span class="sourceLineNo">596</span>                     else<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>                        
contents.add(ReflectionUtils.getResource(p.first(), path));<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>               } else {<a 
name="line.598"></a>
-<span class="sourceLineNo">599</span>                  
contents.add(IOUtils.toInputStream(o));<a name="line.599"></a>
-<span class="sourceLineNo">600</span>               }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>            }<a name="line.601"></a>
-<span class="sourceLineNo">602</span>            styleSheet = new 
StreamResource(MediaType.forString("text/css"), contents.toArray());<a 
name="line.602"></a>
-<span class="sourceLineNo">603</span>         }<a name="line.603"></a>
-<span class="sourceLineNo">604</span><a name="line.604"></a>
-<span class="sourceLineNo">605</span>         if (sc.favIcon != null) {<a 
name="line.605"></a>
-<span class="sourceLineNo">606</span>            Object o = sc.favIcon;<a 
name="line.606"></a>
-<span class="sourceLineNo">607</span>            InputStream is = null;<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>            if (o instanceof Pair) {<a 
name="line.608"></a>
-<span class="sourceLineNo">609</span>               
Pair&lt;Class&lt;?&gt;,String&gt; p = (Pair&lt;Class&lt;?&gt;,String&gt;)o;<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>               is = 
ReflectionUtils.getResource(p.first(), vr.resolve(p.second()));<a 
name="line.610"></a>
-<span class="sourceLineNo">611</span>            } else {<a 
name="line.611"></a>
-<span class="sourceLineNo">612</span>               is = 
IOUtils.toInputStream(o);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>            }<a name="line.613"></a>
-<span class="sourceLineNo">614</span>            if (is != null)<a 
name="line.614"></a>
-<span class="sourceLineNo">615</span>               favIcon = new 
StreamResource(MediaType.forString("image/x-icon"), is);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>         }<a name="line.616"></a>
-<span class="sourceLineNo">617</span><a name="line.617"></a>
-<span class="sourceLineNo">618</span>         staticFilesMap = new 
LinkedHashMap&lt;String,String&gt;();<a name="line.618"></a>
-<span class="sourceLineNo">619</span>         if (sc.staticFiles != null) {<a 
name="line.619"></a>
-<span class="sourceLineNo">620</span>            for (Object o : 
sc.staticFiles) {<a name="line.620"></a>
-<span class="sourceLineNo">621</span>               if (o instanceof Pair) {<a 
name="line.621"></a>
-<span class="sourceLineNo">622</span>                  
Pair&lt;Class&lt;?&gt;,String&gt; p = (Pair&lt;Class&lt;?&gt;,String&gt;)o;<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>                  // TODO - Currently 
doesn't take parent class location into account.<a name="line.623"></a>
-<span class="sourceLineNo">624</span>                  
staticFilesMap.putAll(JsonParser.DEFAULT.parse(vr.resolve(p.second()), 
LinkedHashMap.class));<a name="line.624"></a>
-<span class="sourceLineNo">625</span>               } else {<a 
name="line.625"></a>
-<span class="sourceLineNo">626</span>                  throw new 
RuntimeException("TODO");<a name="line.626"></a>
-<span class="sourceLineNo">627</span>               }<a name="line.627"></a>
-<span class="sourceLineNo">628</span>            }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>         }<a name="line.629"></a>
-<span class="sourceLineNo">630</span>         staticFilesPrefixes = 
staticFilesMap.keySet().toArray(new String[0]);<a name="line.630"></a>
-<span class="sourceLineNo">631</span><a name="line.631"></a>
-<span class="sourceLineNo">632</span>         logger = sc.logger == null ? new 
RestLogger.NoOp() : resolve(RestLogger.class, sc.logger);<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span>         fullPath = (sc.parentContext == 
null ? "" : (sc.parentContext.fullPath + '/')) + sc.path;<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      }<a name="line.635"></a>
-<span class="sourceLineNo">636</span>   }<a name="line.636"></a>
-<span class="sourceLineNo">637</span><a name="line.637"></a>
-<span class="sourceLineNo">638</span>   /**<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    * Returns the variable resolver for 
this servlet.<a name="line.639"></a>
-<span class="sourceLineNo">640</span>    * &lt;p&gt;<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    * Variable resolvers are used to 
replace variables in property values.<a name="line.641"></a>
-<span class="sourceLineNo">642</span>    * &lt;/p&gt;<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    * &lt;h6 
class='figure'&gt;Example:&lt;/h6&gt;<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    * &lt;p class='bcode'&gt;<a 
name="line.644"></a>
-<span class="sourceLineNo">645</span>    *    
&lt;ja&gt;@RestResource&lt;/ja&gt;(<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    *       
messages=&lt;js&gt;"nls/Messages"&lt;/js&gt;,<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    *       properties={<a 
name="line.647"></a>
-<span class="sourceLineNo">648</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;js&gt;"title"&lt;/js&gt;,value=&lt;js&gt;"$L{title}"&lt;/js&gt;),
  &lt;jc&gt;// Localized variable in Messages.properties&lt;/jc&gt;<a 
name="line.648"></a>
-<span class="sourceLineNo">649</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;js&gt;"javaVendor"&lt;/js&gt;,value=&lt;js&gt;"$S{java.vendor,Oracle}"&lt;/js&gt;),
  &lt;jc&gt;// System property with default value&lt;/jc&gt;<a 
name="line.649"></a>
-<span class="sourceLineNo">650</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;js&gt;"foo"&lt;/js&gt;,value=&lt;js&gt;"bar"&lt;/js&gt;),<a
 name="line.650"></a>
-<span class="sourceLineNo">651</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;js&gt;"bar"&lt;/js&gt;,value=&lt;js&gt;"baz"&lt;/js&gt;),<a
 name="line.651"></a>
-<span class="sourceLineNo">652</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;js&gt;"v1"&lt;/js&gt;,value=&lt;js&gt;"$R{foo}"&lt;/js&gt;),
  &lt;jc&gt;// Request variable. value="bar"&lt;/jc&gt;<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(name=&lt;js&gt;"v2"&lt;/js&gt;,value=&lt;js&gt;"$R{$R{foo}}"&lt;/js&gt;)
  &lt;jc&gt;// Nested request variable. value="baz"&lt;/jc&gt;<a 
name="line.653"></a>
-<span class="sourceLineNo">654</span>    *       }<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    *    )<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    *    &lt;jk&gt;public 
class&lt;/jk&gt; MyRestResource &lt;jk&gt;extends&lt;/jk&gt; RestServletDefault 
{<a name="line.656"></a>
-<span class="sourceLineNo">657</span>    * &lt;/p&gt;<a name="line.657"></a>
-<span class="sourceLineNo">658</span>    * &lt;p&gt;<a name="line.658"></a>
-<span class="sourceLineNo">659</span>    * A typical usage pattern is using 
variables for resolving URL links when rendering HTML:<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    * &lt;/p&gt;<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    * &lt;p class='bcode'&gt;<a 
name="line.661"></a>
-<span class="sourceLineNo">662</span>    *    
&lt;ja&gt;@RestMethod&lt;/ja&gt;(<a name="line.662"></a>
-<span class="sourceLineNo">663</span>    *       
name=&lt;js&gt;"GET"&lt;/js&gt;, path=&lt;js&gt;"/{name}/*"&lt;/js&gt;,<a 
name="line.663"></a>
-<span class="sourceLineNo">664</span>    *       properties={<a 
name="line.664"></a>
-<span class="sourceLineNo">665</span>    *          
&lt;ja&gt;@Property&lt;/ja&gt;(<a name="line.665"></a>
-<span class="sourceLineNo">666</span>    *             
name=&lt;jsf&gt;HTMLDOC_links&lt;/jsf&gt;,<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    *             
value=&lt;js&gt;"{up:'$R{requestParentURI}', options:'?method=OPTIONS', 
editLevel:'$R{servletURI}/editLevel?logger=$R{attribute.name}'}"&lt;/js&gt;<a 
name="line.667"></a>
-<span class="sourceLineNo">668</span>    *          )<a name="line.668"></a>
-<span class="sourceLineNo">669</span>    *       }<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    *    )<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    *    &lt;jk&gt;public&lt;/jk&gt; 
LoggerEntry getLogger(RestRequest req, &lt;ja&gt;@Path&lt;/ja&gt; String name) 
&lt;jk&gt;throws&lt;/jk&gt; Exception {<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    * &lt;/p&gt;<a name="line.672"></a>
-<span class="sourceLineNo">673</span>    * &lt;p&gt;<a name="line.673"></a>
-<span class="sourceLineNo">674</span>    * Calls to 
&lt;code&gt;req.getProperties().getString(&lt;js&gt;"key"&lt;/js&gt;)&lt;/code&gt;
 returns strings with variables resolved.<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    *<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    * @return The var resolver in use by 
this resource.<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    */<a name="line.677"></a>
-<span class="sourceLineNo">678</span>   public VarResolver getVarResolver() 
{<a name="line.678"></a>
-<span class="sourceLineNo">679</span>      return varResolver;<a 
name="line.679"></a>
-<span class="sourceLineNo">680</span>   }<a name="line.680"></a>
+<span class="sourceLineNo">586</span>         allowHeaderParams = 
ps.getProperty(REST_allowHeaderParams, boolean.class, true);<a 
name="line.586"></a>
+<span class="sourceLineNo">587</span>         allowBodyParam = 
ps.getProperty(REST_allowBodyParam, boolean.class, true);<a name="line.587"></a>
+<span class="sourceLineNo">588</span>         renderResponseStackTraces = 
ps.getProperty(REST_renderResponseStackTraces, boolean.class, false);<a 
name="line.588"></a>
+<span class="sourceLineNo">589</span>         useStackTraceHashes = 
ps.getProperty(REST_useStackTraceHashes, boolean.class, true);<a 
name="line.589"></a>
+<span class="sourceLineNo">590</span>         defaultCharset = 
ps.getProperty(REST_defaultCharset, String.class, "utf-8");<a 
name="line.590"></a>
+<span class="sourceLineNo">591</span>         paramFormat = 
ps.getProperty(REST_paramFormat, String.class, "");<a name="line.591"></a>
+<span class="sourceLineNo">592</span><a name="line.592"></a>
+<span class="sourceLineNo">593</span>         for (String m : 
StringUtils.split(ps.getProperty(REST_allowMethodParam, String.class, ""), 
','))<a name="line.593"></a>
+<span class="sourceLineNo">594</span>            if (m.equals("true"))  // For 
backwards compatibility when this was a boolean field.<a name="line.594"></a>
+<span class="sourceLineNo">595</span>               
allowMethodParams.add("*");<a name="line.595"></a>
+<span class="sourceLineNo">596</span>            else<a name="line.596"></a>
+<span class="sourceLineNo">597</span>               
allowMethodParams.add(m.toUpperCase());<a name="line.597"></a>
+<span class="sourceLineNo">598</span><a name="line.598"></a>
+<span class="sourceLineNo">599</span>         varResolver = 
sc.varResolverBuilder<a name="line.599"></a>
+<span class="sourceLineNo">600</span>            .vars(LocalizationVar.class, 
RequestVar.class, SerializedRequestAttrVar.class, ServletInitParamVar.class, 
UrlEncodeVar.class)<a name="line.600"></a>
+<span class="sourceLineNo">601</span>            .build()<a 
name="line.601"></a>
+<span class="sourceLineNo">602</span>         ;<a name="line.602"></a>
+<span class="sourceLineNo">603</span>         configFile = 
sc.configFile.getResolving(this.varResolver);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>         properties = sc.properties;<a 
name="line.604"></a>
+<span class="sourceLineNo">605</span>         
Collections.reverse(sc.beanFilters);<a name="line.605"></a>
+<span class="sourceLineNo">606</span>         
Collections.reverse(sc.pojoSwaps);<a name="line.606"></a>
+<span class="sourceLineNo">607</span>         beanFilters = 
ArrayUtils.toObjectArray(sc.beanFilters, Class.class);<a name="line.607"></a>
+<span class="sourceLineNo">608</span>         pojoSwaps = 
ArrayUtils.toObjectArray(sc.pojoSwaps, Class.class);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>         clientVersionHeader = 
sc.clientVersionHeader;<a name="line.609"></a>
+<span class="sourceLineNo">610</span><a name="line.610"></a>
+<span class="sourceLineNo">611</span>         // Find resource resource bundle 
location.<a name="line.611"></a>
+<span class="sourceLineNo">612</span>         for 
(Map.Entry&lt;Class&lt;?&gt;,RestResource&gt; e : 
restResourceAnnotationsChildFirst.entrySet()) {<a name="line.612"></a>
+<span class="sourceLineNo">613</span>            Class&lt;?&gt; c = 
e.getKey();<a name="line.613"></a>
+<span class="sourceLineNo">614</span>            RestResource r = 
e.getValue();<a name="line.614"></a>
+<span class="sourceLineNo">615</span>            if (! r.messages().isEmpty()) 
{<a name="line.615"></a>
+<span class="sourceLineNo">616</span>               if (messageBundle == 
null)<a name="line.616"></a>
+<span class="sourceLineNo">617</span>                  messageBundle = new 
MessageBundle(c, r.messages());<a name="line.617"></a>
+<span class="sourceLineNo">618</span>               else<a name="line.618"></a>
+<span class="sourceLineNo">619</span>                  
messageBundle.addSearchPath(c, r.messages());<a name="line.619"></a>
+<span class="sourceLineNo">620</span>            }<a name="line.620"></a>
+<span class="sourceLineNo">621</span>         }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span>         if (messageBundle == null)<a 
name="line.623"></a>
+<span class="sourceLineNo">624</span>            messageBundle = new 
MessageBundle(resource.getClass(), "");<a name="line.624"></a>
+<span class="sourceLineNo">625</span><a name="line.625"></a>
+<span class="sourceLineNo">626</span>         
ps.addBeanFilters(beanFilters).addPojoSwaps(pojoSwaps).setProperties(properties);<a
 name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span>         serializers = 
sc.serializers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a
 name="line.628"></a>
+<span class="sourceLineNo">629</span>         parsers = 
sc.parsers.beanFilters(beanFilters).pojoSwaps(pojoSwaps).properties(properties).build();<a
 name="line.629"></a>
+<span class="sourceLineNo">630</span>         urlEncodingSerializer = new 
UrlEncodingSerializer(ps);<a name="line.630"></a>
+<span class="sourceLineNo">631</span>         urlEncodingParser = new 
UrlEncodingParser(ps);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>         encoders = 
sc.encoders.build();<a name="line.632"></a>
+<span class="sourceLineNo">633</span>         supportedContentTypes = 
sc.supportedContentTypes != null ? sc.supportedContentTypes : 
serializers.getSupportedMediaTypes();<a name="line.633"></a>
+<span class="sourceLineNo">634</span>         supportedAcceptTypes = 
sc.supportedAcceptTypes != null ? sc.supportedAcceptTypes : 
parsers.getSupportedMediaTypes();<a name="line.634"></a>
+<span class="sourceLineNo">635</span>         
defaultRequestHeaders.putAll(sc.defaultRequestHeaders);<a name="line.635"></a>
+<span class="sourceLineNo">636</span>         defaultResponseHeaders = 
Collections.unmodifiableMap(new 
LinkedHashMap&lt;String,Object&gt;(sc.defaultResponseHeaders));<a 
name="line.636"></a>
+<span class="sourceLineNo">637</span>         beanContext = 
ps.getBeanContext();<a name="line.637"></a>
+<span class="sourceLineNo">638</span><a name="line.638"></a>
+<span class="sourceLineNo">639</span>         for (Object o : sc.converters)<a 
name="line.639"></a>
+<span class="sourceLineNo">640</span>            
converters.add(resolve(RestConverter.class, o));<a name="line.640"></a>
+<span class="sourceLineNo">641</span><a name="line.641"></a>
+<span class="sourceLineNo">642</span>         for (Object o : sc.guards)<a 
name="line.642"></a>
+<span class="sourceLineNo">643</span>            
guards.add(resolve(RestGuard.class, o));<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span>         for (Object o : 
sc.responseHandlers)<a name="line.645"></a>
+<span class="sourceLineNo">646</span>            
responseHandlers.add(resolve(ResponseHandler.class, o));<a name="line.646"></a>
+<span class="sourceLineNo">647</span><a name="line.647"></a>
+<span class="sourceLineNo">648</span>         mimetypesFileTypeMap = 
sc.mimeTypes;<a name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span>         VarResolver vr = 
sc.getVarResolverBuilder().build();<a name="line.650"></a>
+<span class="sourceLineNo">651</span><a name="line.651"></a>
+<span class="sourceLineNo">652</span>         if (sc.styleSheets != null) {<a 
name="line.652"></a>
+<span class="sourceLineNo">653</span>            List&lt;InputStream&gt; 
contents = new ArrayList&lt;InputStream&gt;();<a name="line.653"></a>
+<span class="sourceLineNo">654</span>            for (Object o : 
sc.styleSheets) {<a name="line.654"></a>
+<span class="sourceLineNo">655</span>               if (o instanceof Pair) {<a 
name="line.655"></a>
+<span class="sourceLineNo">656</span>                  
Pair&lt;Class&lt;?&gt;,String&gt; p = (Pair&lt;Class&lt;?&gt;,String&gt;)o;<a 
name="line.656"></a>
+<span class="sourceLineNo">657</span>                  for (String path : 
StringUtils.split(vr.resolve(StringUtils.toString(p.second())), ','))<a 
name="line.657"></a>
+<span class="sourceLineNo">658</span>                     if 
(path.startsWith("file://"))<a name="line.658"></a>
+<span class="sourceLineNo">659</span>                        contents.add(new 
FileInputStream(path));<a name="line.659"></a>
+<span class="sourceLineNo">660</span>                     else<a 
name="line.660"></a>
+<span class="sourceLineNo">661</span>                        
contents.add(ReflectionUtils.getResource(p.first(), path));<a 
name="line.661"></a>
+<span class="sourceLineNo">662</span>               } else {<a 
name="line.662"></a>
+<span class="sourceLineNo">663</span>                  
contents.add(IOUtils.toInputStream(o));<a name="line.663"></a>
+<span class="sourceLineNo">664</span>               }<a name="line.664"></a>
+<span class="sourceLineNo">665</span>            }<a name="line.665"></a>
+<span class="sourceLineNo">666</span>            styleSheet = new 
StreamResource(MediaType.forString("text/css"), contents.toArray());<a 
name="line.666"></a>
+<span class="sourceLineNo">667</span>         }<a name="line.667"></a>
+<span class="sourceLineNo">668</span><a name="line.668"></a>
+<span class="sourceLineNo">669</span>         if (sc.favIcon != null) {<a 
name="line.669"></a>
+<span class="sourceLineNo">670</span>            Object o = sc.favIcon;<a 
name="line.670"></a>
+<span class="sourceLineNo">671</span>            InputStream is = null;<a 
name="line.671"></a>
+<span class="sourceLineNo">672</span>            if (o instanceof Pair) {<a 
name="line.672"></a>
+<span class="sourceLineNo">673</span>               
Pair&lt;Class&lt;?&gt;,String&gt; p = (Pair&lt;Class&lt;?&gt;,String&gt;)o;<a 
name="line.673"></a>
+<span class="sourceLineNo">674</span>               is = 
ReflectionUtils.getResource(p.first(), vr.resolve(p.second()));<a 
name="line.674"></a>
+<span class="sourceLineNo">675</span>            } else {<a 
name="line.675"></a>
+<span class="sourceLineNo">676</span>               is = 
IOUtils.toInputStream(o);<a name="line.676"></a>
+<span class="sourceLineNo">677</span>            }<a name="line.677"></a>
+<span class="sourceLineNo">678</span>            if (is != null)<a 
name="line.678"></a>
+<span class="sourceLineNo">679</span>               favIcon = new 
StreamResource(MediaType.forString("image/x-icon"), is);<a name="line.679"></a>
+<span class="sourceLineNo">680</span>         }<a name="line.680"></a>
 <span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span>   /**<a name="line.682"></a>
-<span class="sourceLineNo">683</span>    * Returns the config file associated 
with this servlet.<a name="line.683"></a>
-<span class="sourceLineNo">684</span>    * &lt;p&gt;<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    * The config file is identified via 
one of the following:<a name="line.685"></a>
-<span class="sourceLineNo">686</span>    * &lt;ul&gt;<a name="line.686"></a>
-<span class="sourceLineNo">687</span>    *    &lt;li&gt;{@link 
RestResource#config() @RestResource.config()} annotation.<a name="line.687"></a>
-<span class="sourceLineNo">688</span>    *    &lt;li&gt;{@link 
RestConfig#setConfigFile(ConfigFile)} method.<a name="line.688"></a>
-<span class="sourceLineNo">689</span>    * &lt;/ul&gt;<a name="line.689"></a>
-<span class="sourceLineNo">690</span>    *<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    * @return The resolving config file 
associated with this servlet.  Never &lt;jk&gt;null&lt;/jk&gt;.<a 
name="line.691"></a>
-<span class="sourceLineNo">692</span>    */<a name="line.692"></a>
-<span class="sourceLineNo">693</span>   public ConfigFile getConfigFile() {<a 
name="line.693"></a>
-<span class="sourceLineNo">694</span>      return configFile;<a 
name="line.694"></a>
-<span class="sourceLineNo">695</span>   }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span>   /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span>    * Resolve a static resource file.<a 
name="line.698"></a>
-<span class="sourceLineNo">699</span>    * &lt;p&gt;<a name="line.699"></a>
-<span class="sourceLineNo">700</span>    * The location of static resources 
are defined via one of the following:<a name="line.700"></a>
-<span class="sourceLineNo">701</span>    * &lt;ul&gt;<a name="line.701"></a>
-<span class="sourceLineNo">702</span>    *    &lt;li&gt;{@link 
RestResource#staticFiles() @RestResource.staticFiles()} annotation.<a 
name="line.702"></a>
-<span class="sourceLineNo">703</span>    *    &lt;li&gt;{@link 
RestConfig#addStaticFiles(Class, String)} method.<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    * &lt;/ul&gt;<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    *<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    * @param pathInfo The unencoded path 
info.<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    * @return The resource, or 
&lt;jk&gt;null&lt;/jk&gt; if the resource could not be resolved.<a 
name="line.707"></a>
-<span class="sourceLineNo">708</span>    * @throws IOException<a 
name="line.708"></a>
-<span class="sourceLineNo">709</span>    */<a name="line.709"></a>
-<span class="sourceLineNo">710</span>   public StreamResource 
resolveStaticFile(String pathInfo) throws IOException {<a name="line.710"></a>
-<span class="sourceLineNo">711</span>      if (! 
staticFilesCache.containsKey(pathInfo)) {<a name="line.711"></a>
-<span class="sourceLineNo">712</span>         String p = 
RestUtils.decode(RestUtils.trimSlashes(pathInfo));<a name="line.712"></a>
-<span class="sourceLineNo">713</span>         if (p.indexOf("..") != -1)<a 
name="line.713"></a>
-<span class="sourceLineNo">714</span>            throw new 
RestException(SC_NOT_FOUND, "Invalid path");<a name="line.714"></a>
-<span class="sourceLineNo">715</span>         for 
(Map.Entry&lt;String,String&gt; e : staticFilesMap.entrySet()) {<a 
name="line.715"></a>
-<span class="sourceLineNo">716</span>            String key = 
RestUtils.trimSlashes(e.getKey());<a name="line.716"></a>
-<span class="sourceLineNo">717</span>            if (p.startsWith(key)) {<a 
name="line.717"></a>
-<span class="sourceLineNo">718</span>               String remainder = 
(p.equals(key) ? "" : p.substring(key.length()));<a name="line.718"></a>
-<span class="sourceLineNo">719</span>               if (remainder.isEmpty() || 
remainder.startsWith("/")) {<a name="line.719"></a>
-<span class="sourceLineNo">720</span>                  String p2 = 
RestUtils.trimSlashes(e.getValue()) + remainder;<a name="line.720"></a>
-<span class="sourceLineNo">721</span>                  InputStream is = 
getResource(p2, null);<a name="line.721"></a>
-<span class="sourceLineNo">722</span>                  if (is != null) {<a 
name="line.722"></a>
-<span class="sourceLineNo">723</span>                     try {<a 
name="line.723"></a>
-<span class="sourceLineNo">724</span>                        int i = 
p2.lastIndexOf('/');<a name="line.724"></a>
-<span class="sourceLineNo">725</span>                        String name = (i 
== -1 ? p2 : p2.substring(i+1));<a name="line.725"></a>
-<span class="sourceLineNo">726</span>                        String mediaType 
= mimetypesFileTypeMap.getContentType(name);<a name="line.726"></a>
-<span class="sourceLineNo">727</span>                        ObjectMap headers 
= new ObjectMap().append("Cache-Control", "max-age=86400, public");<a 
name="line.727"></a>
-<span class="sourceLineNo">728</span>                        
staticFilesCache.put(pathInfo, new 
StreamResource(MediaType.forString(mediaType), headers, is));<a 
name="line.728"></a>
-<span class="sourceLineNo">729</span>                        return 
staticFilesCache.get(pathInfo);<a name="line.729"></a>
-<span class="sourceLineNo">730</span>                     } finally {<a 
name="line.730"></a>
-<span class="sourceLineNo">731</span>                        is.close();<a 
name="line.731"></a>
-<span class="sourceLineNo">732</span>                     }<a 
name="line.732"></a>
-<span class="sourceLineNo">733</span>                  }<a name="line.733"></a>
-<span class="sourceLineNo">734</span>               }<a name="line.734"></a>
-<span class="sourceLineNo">735</span>            }<a name="line.735"></a>
-<span class="sourceLineNo">736</span>         }<a name="line.736"></a>
-<span class="sourceLineNo">737</span>      }<a name="line.737"></a>
-<span class="sourceLineNo">738</span>      return 
staticFilesCache.get(pathInfo);<a name="line.738"></a>
-<span class="sourceLineNo">739</span>   }<a name="line.739"></a>
-<span class="sourceLineNo">740</span><a name="line.740"></a>
-<span class="sourceLineNo">741</span>   /**<a name="line.741"></a>
-<span class="sourceLineNo">742</span>    * Same as {@link 
Class#getResourceAsStream(String)} except if it doesn't find the resource<a 
name="line.742"></a>
-<span class="sourceLineNo">743</span>    *    on this class, searches up the 
parent hierarchy chain.<a name="line.743"></a>
-<span class="sourceLineNo">744</span>    * &lt;p&gt;<a name="line.744"></a>
-<span class="sourceLineNo">745</span>    * If the resource cannot be found in 
the classpath, then an attempt is made to look in the<a name="line.745"></a>
-<span class="sourceLineNo">746</span>    *    JVM working directory.<a 
name="line.746"></a>
-<span class="sourceLineNo">747</span>    * &lt;p&gt;<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    * If the 
&lt;code&gt;locale&lt;/code&gt; is specified, then we look for resources whose 
name matches that locale.<a name="line.748"></a>
-<span class="sourceLineNo">749</span>    * For example, if looking for the 
resource &lt;js&gt;"MyResource.txt"&lt;/js&gt; for the Japanese locale, we 
will<a name="line.749"></a>
-<span class="sourceLineNo">750</span>    *    look for files in the following 
order:<a name="line.750"></a>
-<span class="sourceLineNo">751</span>    * &lt;ol&gt;<a name="line.751"></a>
-<span class="sourceLineNo">752</span>    *    
&lt;li&gt;&lt;js&gt;"MyResource_ja_JP.txt"&lt;/js&gt;<a name="line.752"></a>
-<span class="sourceLineNo">753</span>    *    
&lt;li&gt;&lt;js&gt;"MyResource_ja.txt"&lt;/js&gt;<a name="line.753"></a>
-<span class="sourceLineNo">754</span>    *    
&lt;li&gt;&lt;js&gt;"MyResource.txt"&lt;/js&gt;<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    * &lt;/ol&gt;<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    *<a name="line.756"></a>
-<span class="sourceLineNo">757</span>    * @param name The resource name.<a 
name="line.757"></a>
-<span class="sourceLineNo">758</span>    * @param locale Optional locale.<a 
name="line.758"></a>
-<span class="sourceLineNo">759</span>    * @return An input stream of the 
resource, or &lt;jk&gt;null&lt;/jk&gt; if the resource could not be found.<a 
name="line.759"></a>
-<span class="sourceLineNo">760</span>    * @throws IOException<a 
name="line.760"></a>
-<span class="sourceLineNo">761</span>    */<a name="line.761"></a>
-<span class="sourceLineNo">762</span>   protected InputStream 
getResource(String name, Locale locale) throws IOException {<a 
name="line.762"></a>
-<span class="sourceLineNo">763</span>      String n = (locale == null || 
locale.toString().isEmpty() ? name : name + '|' + locale);<a 
name="line.763"></a>
-<span class="sourceLineNo">764</span>      if (! 
resourceStreams.containsKey(n)) {<a name="line.764"></a>
-<span class="sourceLineNo">765</span>         InputStream is = 
ReflectionUtils.getLocalizedResource(resource.getClass(), name, locale);<a 
name="line.765"></a>
-<span class="sourceLineNo">766</span>         if (is == null &amp;&amp; 
name.indexOf("..") == -1) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span>            for (String n2 : 
FileUtils.getCandidateFileNames(name, locale)) {<a name="line.767"></a>
-<span class="sourceLineNo">768</span>               File f = new File(n2);<a 
name="line.768"></a>
-<span class="sourceLineNo">769</span>               if (f.exists() &amp;&amp; 
f.canRead()) {<a name="line.769"></a>
-<span class="sourceLineNo">770</span>                  is = new 
FileInputStream(f);<a name="line.770"></a>
-<span class="sourceLineNo">771</span>                  break;<a 
name="line.771"></a>
-<span class="sourceLineNo">772</span>               }<a name="line.772"></a>
-<span class="sourceLineNo">773</span>            }<a name="line.773"></a>
-<span class="sourceLineNo">774</span>         }<a name="line.774"></a>
-<span class="sourceLineNo">775</span>         if (is != null) {<a 
name="line.775"></a>
-<span class="sourceLineNo">776</span>            try {<a name="line.776"></a>
-<span class="sourceLineNo">777</span>               resourceStreams.put(n, 
ByteArrayCache.DEFAULT.cache(is));<a name="line.777"></a>
-<span class="sourceLineNo">778</span>            } finally {<a 
name="line.778"></a>
-<span class="sourceLineNo">779</span>               is.close();<a 
name="line.779"></a>
-<span class="sourceLineNo">780</span>            }<a name="line.780"></a>
-<span class="sourceLineNo">781</span>         }<a name="line.781"></a>
-<span class="sourceLineNo">782</span>      }<a name="line.782"></a>
-<span class="sourceLineNo">783</span>      byte[] b = 
resourceStreams.get(n);<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      return b == null ? null : new 
ByteArrayInputStream(b);<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   }<a name="line.785"></a>
-<span class="sourceLineNo">786</span><a name="line.786"></a>
-<span class="sourceLineNo">787</span>   /**<a name="line.787"></a>
-<span class="sourceLineNo">788</span>    * Reads the input stream from {@link 
#getResource(String, Locale)} into a String.<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    *<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    * @param name The resource name.<a 
name="line.790"></a>
-<span class="sourceLineNo">791</span>    * @param locale Optional locale.<a 
name="line.791"></a>
-<span class="sourceLineNo">792</span>    * @return The contents of the stream 
as a string, or &lt;jk&gt;null&lt;/jk&gt; if the resource could not be found.<a 
name="line.792"></a>
-<span class="sourceLineNo">793</span>    * @throws IOException If resource 
could not be found.<a name="line.793"></a>
-<span class="sourceLineNo">794</span>    */<a name="line.794"></a>
-<span class="sourceLineNo">795</span>   public String 
getResourceAsString(String name, Locale locale) throws IOException {<a 
name="line.795"></a>
-<span class="sourceLineNo">796</span>      String n = (locale == null || 
locale.toString().isEmpty() ? name : name + '|' + locale);<a 
name="line.796"></a>
-<span class="sourceLineNo">797</span>      if (! 
resourceStrings.containsKey(n)) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span>         String s = 
IOUtils.read(getResource(name, locale));<a name="line.798"></a>
-<span class="sourceLineNo">799</span>         if (s == null)<a 
name="line.799"></a>
-<span class="sourceLineNo">800</span>            throw new 
IOException("Resource '"+name+"' not found.");<a name="line.800"></a>
-<span class="sourceLineNo">801</span>         resourceStrings.put(n, s);<a 
name="line.801"></a>
-<span class="sourceLineNo">802</span>      }<a name="line.802"></a>
-<span class="sourceLineNo">803</span>      return resourceStrings.get(n);<a 
name="line.803"></a>
-<span class="sourceLineNo">804</span>   }<a name="line.804"></a>
-<span class="sourceLineNo">805</span><a name="line.805"></a>
-<span class="sourceLineNo">806</span>   /**<a name="line.806"></a>
-<span class="sourceLineNo">807</span>    * Reads the input stream from {@link 
#getResource(String, Locale)} and parses it into a POJO<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    *    using the parser matched by the 
specified media type.<a name="line.808"></a>
-<span class="sourceLineNo">809</span>    * &lt;p&gt;<

<TRUNCATED>

Reply via email to