You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2016/08/03 19:05:19 UTC

[3/3] incubator-juneau git commit: Move resources into resources folders.

Move resources into resources folders.

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

Branch: refs/heads/master
Commit: 70164913529ebb855400b7da2c442b9175058907
Parents: c652fc5
Author: jamesbognar <ja...@gmail.com>
Authored: Wed Aug 3 15:05:14 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Wed Aug 3 15:05:14 2016 -0400

----------------------------------------------------------------------
 .../nls/AddressBookResource.properties          |  74 --
 .../server/samples/htdocs/code-highlighting.css | 124 ---
 .../samples/nls/AtomFeedResource.properties     |  21 -
 .../nls/CodeFormatterResource.properties        |  18 -
 .../samples/nls/HelloWorldResource.properties   |  19 -
 .../samples/nls/JsonSchemaResource.properties   |  20 -
 .../nls/MethodExampleResource.properties        |  37 -
 .../samples/nls/PhotosResource.properties       |  24 -
 .../samples/nls/RequestEchoResource.properties  |  19 -
 .../server/samples/nls/RootResources.properties |  18 -
 .../nls/SampleRemoteableServlet.properties      |  17 -
 .../samples/nls/SourceResource.properties       |  19 -
 .../samples/nls/SqlQueryResource.properties     |  19 -
 .../samples/nls/TempDirResource.properties      |  18 -
 .../samples/nls/TumblrParserResource.properties |  19 -
 .../nls/UrlEncodedFormResource.properties       |  22 -
 .../src/main/resources/averycutedog.jpg         | Bin 40879 -> 0 bytes
 .../nls/AddressBookResource.properties          |  74 ++
 .../juneau/server/samples/averycutedog.jpg      | Bin 0 -> 40879 bytes
 .../server/samples/htdocs/code-highlighting.css | 124 +++
 .../samples/nls/AtomFeedResource.properties     |  21 +
 .../nls/CodeFormatterResource.properties        |  18 +
 .../samples/nls/HelloWorldResource.properties   |  19 +
 .../samples/nls/JsonSchemaResource.properties   |  20 +
 .../nls/MethodExampleResource.properties        |  37 +
 .../samples/nls/PhotosResource.properties       |  24 +
 .../samples/nls/RequestEchoResource.properties  |  19 +
 .../server/samples/nls/RootResources.properties |  18 +
 .../nls/SampleRemoteableServlet.properties      |  17 +
 .../samples/nls/SourceResource.properties       |  19 +
 .../samples/nls/SqlQueryResource.properties     |  19 +
 .../samples/nls/TempDirResource.properties      |  18 +
 .../samples/nls/TumblrParserResource.properties |  19 +
 .../nls/UrlEncodedFormResource.properties       |  22 +
 org.apache.juneau.server/.classpath             |   1 +
 .../.settings/org.eclipse.wst.common.component  |   1 +
 .../server/htdocs/MethodExampleResource1.png    | Bin 12276 -> 0 bytes
 .../org/apache/juneau/server/htdocs/javadoc.css | 782 -------------------
 .../server/labels/nls/DefaultLabels.properties  |  41 -
 .../org/apache/juneau/server/styles/devops.css  | 203 -----
 .../org/apache/juneau/server/styles/juneau.css  | 142 ----
 .../server/htdocs/MethodExampleResource1.png    | Bin 0 -> 12276 bytes
 .../org/apache/juneau/server/htdocs/javadoc.css | 782 +++++++++++++++++++
 .../server/labels/nls/DefaultLabels.properties  |  41 +
 .../org/apache/juneau/server/styles/devops.css  | 203 +++++
 .../org/apache/juneau/server/styles/juneau.css  | 142 ++++
 46 files changed, 1658 insertions(+), 1656 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties
deleted file mode 100755
index b3230b0..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties
+++ /dev/null
@@ -1,74 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-label = AddressBook sample resource
-description = Proof-of-concept resource that shows off the capabilities of working with POJO resources
-
-getRoot = Get root page
-
-getAllPeople = Get all people in the address book
-getAllPeople.res.200.content = List<Person>
-
-getPerson = Get a single person by ID
-getPerson.req.attr.id = Person UUID
-getPerson.res.200.content = Person bean
-getPerson.res.404 = Person ID not found
-
-getAllAddresses = Get all addresses in the address book
-getAllAddresses.res.200.content = List<Address>
-
-getAddress = Get a single address by ID
-getAddress.req.attr.id = Address UUID
-getAddress.res.200.content = Address bean
-getAddress.res.404 = Address ID not found
-
-createPerson = Create a new Person bean 
-createPerson.res.307.header.Location = URL of new person
-
-createAddress = Create a new Address bean
-createAddress.req.attr.id = Person UUID
-createAddress.res.307.header.Location = URL of new address
-
-deletePerson = Delete a Person bean
-deletePerson.req.attr.id = Person UUID
-deletePerson.res.200.content = "DELETE successful"
-deletePerson.res.404 = Person ID not found
-
-deleteAddress = Delete an Address bean
-deleteAddress.req.attr.id = Address UUID
-deleteAddress.res.200.content = "DELETE successful"
-deleteAddress.res.404 = Address ID not found
-
-updatePerson = Change property on Person bean
-updatePerson.req.attr.id = Person UUID
-updatePerson.req.content = Anything
-updatePerson.res.200.content = "PUT successful"
-updatePerson.res.400 = Invalid object type used
-updatePerson.res.404 = Person ID not found
-
-updateAddress = Change property on Address bean
-updateAddress.req.attr.id = Address UUID
-updateAddress.req.content = Anything
-updateAddress.res.200.content = "PUT successful"
-updateAddress.res.400 = Invalid object type used
-updateAddress.res.404 = Address ID not found
-
-doInit = Reinitialize this resource
-doInit.res.200.content = "OK"
-
-getOptions = View resource options
-
-getCognosData = Get data in Cognos/XML format
-getCognosData.res.200.content = DataSet
-
-otherNotes = GZip support enabled.  Public methods can be invoked by using the &Method URL parameter.  'text/cognos+xml' support available under root resource only
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/htdocs/code-highlighting.css
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/htdocs/code-highlighting.css b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/htdocs/code-highlighting.css
deleted file mode 100755
index 1475500..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/htdocs/code-highlighting.css
+++ /dev/null
@@ -1,124 +0,0 @@
-code, 
-tt, 
-pre,
-dt code {
-	font-size: 9pt;
-}
-
-/*--- Bordered code ---*/
-p.bcode {
-	font-size: 9pt;
-	white-space: pre;
-	border: 1px solid black;
-	margin: 10px 20px;
-	padding: 10px;
-	border-radius: 10px;
-	overflow: hidden;
-	font-family: monospace;
-	background-color: #f8f8f8;
-	border-color: #cccccc;
-	-moz-tab-size: 3;
-	tab-size: 3;
-	-o-tab-size: 3;
-}
-
-.fixedWidth {
-	max-width: 800px;
-}
-
-/* Override padding bottom in javadoc comments. */
-.blockList p.bcode {
-	padding-bottom: 0px !important;
-}
-
-/*--- Unbordered code ---*/
-p.code {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-	padding-bottom: 15px;
-	margin: -15px;
-}
-
-td.code {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-}
-
-table.code {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-}
-
-/*--- Java code effects ---*/
-jc,jd,jt,jk,js,jf,jsf,jsm,ja {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-}
-/* Comment */
-jc {
-	color: green;
-}
-/* Javadoc comment */
-jd {
-	color: #3f5fbf;
-}
-/* Javadoc tag */
-jt {
-	color: #7f9fbf;
-	font-weight: bold;
-}
-/* Primitive */
-jk {
-	color: #7f0055;
-	font-weight: bold;
-}
-/* String */
-js {
-	color: blue;
-}
-/* Field */
-jf {
-	color: blue;
-}
-/* Static field */
-jsf {
-	color: blue;
-	font-style: italic;
-}
-/* Static method */
-jsm {
-	font-style: italic;
-}
-/* Annotation */
-ja {
-	color: grey;
-}
-
-/*--- XML code effects ---*/
-xt,xa,xc,xs {
-	font-size: 9pt;
-	white-space: pre;
-	font-family: monospace;
-}
-
-xt {
-	color: DarkCyan;
-}
-
-xa {
-	color: purple;
-}
-
-xc {
-	color: mediumblue;
-}
-
-xs {
-	color: blue;
-	font-style: italic;
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/AtomFeedResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/AtomFeedResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/AtomFeedResource.properties
deleted file mode 100755
index 1fadf05..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/AtomFeedResource.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# AtomFeedResource labels
-#--------------------------------------------------------------------------------
-label = Sample ATOM feed resource
-description = Sample resource that shows how to render ATOM feeds
-getFeed = Get the sample ATOM feed
-setFeed = Overwrite the sample ATOM feed
-doOptions = Show resource options

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties
deleted file mode 100755
index f3f1d08..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# CodeFormatterResource labels
-#--------------------------------------------------------------------------------
-label = Code Formatter
-description = Utility for generating HTML code-formatted source code

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/HelloWorldResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/HelloWorldResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/HelloWorldResource.properties
deleted file mode 100755
index 8414e9a..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/HelloWorldResource.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# HelloWorldResource labels
-#--------------------------------------------------------------------------------
-label = Hello World sample resource
-description = Simplest possible resource
-sayHello = Responds with "Hello world!" 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties
deleted file mode 100755
index 45664dd..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# JsonSchemaResource labels
-#--------------------------------------------------------------------------------
-label = Sample resource that shows how to generate JSON-Schema documents
-getSchema = Get the JSON-Schema document
-setSchema = Overwrite the JSON-Schema document
-doOptions = Show resource options

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/MethodExampleResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/MethodExampleResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/MethodExampleResource.properties
deleted file mode 100755
index 6921941..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/MethodExampleResource.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# MethodExampleResource labels
-#--------------------------------------------------------------------------------
-label = A simple REST method example resource
-doGetExample = Sample GET method
-doGetExample1 = Sample GET using annotations
-doGetExample1.req.attr.a1 = Sample variable
-doGetExample1.req.attr.a2 = Sample variable
-doGetExample1.req.attr.a3 = Sample variable
-doGetExample1.req.param.p1 = Sample parameter
-doGetExample1.req.param.p2 = Sample parameter
-doGetExample1.req.param.p3 = Sample parameter
-doGetExample1.req.header.Accept-Language = Sample header
-doGetExample1.req.header.DNT = Sample header
-doGetExample2 = Sample GET using Java APIs
-doGetExample2.req.attr.a1 = Sample variable
-doGetExample2.req.attr.a2 = Sample variable
-doGetExample2.req.attr.a3 = Sample variable
-doGetExample2.req.param.p1 = Sample parameter
-doGetExample2.req.param.p2 = Sample parameter
-doGetExample2.req.param.p3 = Sample parameter
-doGetExample2.req.header.Accept-Language = Sample header
-doGetExample2.req.header.DNT = Sample header
-getOptions = Get these options

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/PhotosResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/PhotosResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/PhotosResource.properties
deleted file mode 100755
index fdcd5f2..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/PhotosResource.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# PhotosResource labels
-#--------------------------------------------------------------------------------
-label = Sample resource that allows images to be uploaded and retrieved.
-getAllPhotos = Show the list of all currently loaded photos
-getPhoto = Get a photo by ID
-addPhoto = Add a photo
-setPhoto = Overwrite a photo by ID
-deletePhoto = Delete a photo by ID
-doOptions = Show resource options
-

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RequestEchoResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RequestEchoResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RequestEchoResource.properties
deleted file mode 100755
index 40ec24f..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RequestEchoResource.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# RequestEchoResource labels
-#--------------------------------------------------------------------------------
-label = Echos the current HttpServletRequest object back to the browser.
-doGet = Serializes the incoming HttpServletRequest object.
-

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RootResources.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RootResources.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RootResources.properties
deleted file mode 100755
index d187d6f..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/RootResources.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# RootResources labels
-#--------------------------------------------------------------------------------
-label = Root resources
-description = This is an example of a router resource that is used to access other resources.

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties
deleted file mode 100755
index 087c24c..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# SampleRemoteableServlet labels
-#--------------------------------------------------------------------------------
-label = Sample resource that demonstrates the remotable API

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SourceResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SourceResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SourceResource.properties
deleted file mode 100755
index 1bb3e9f..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SourceResource.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# SourceResource labels
-#--------------------------------------------------------------------------------
-label = Servlet for viewing source code on classes whose Java files are present on the classpath.
-getSource = View source on the specified classes.
-

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SqlQueryResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SqlQueryResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SqlQueryResource.properties
deleted file mode 100755
index 3bde956..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/SqlQueryResource.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# SqlQueryResource labels
-#--------------------------------------------------------------------------------
-label = Sample resource that shows how to serialize SQL ResultSets 
-doGet = Display the query entry page
-doPost = Execute one or more queries

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TempDirResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TempDirResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TempDirResource.properties
deleted file mode 100755
index 1586ab6..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TempDirResource.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# TempDirResource labels
-#--------------------------------------------------------------------------------
-label = Temp Directory View Service
-description = View and download files in the '$S{java.io.tmpdir}' directory.

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TumblrParserResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TumblrParserResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TumblrParserResource.properties
deleted file mode 100755
index a900159..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/TumblrParserResource.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# SqlQueryResource labels
-#--------------------------------------------------------------------------------
-label = Tumblr blog parser service
-getInstructions = Get the instructions page
-parseBlog = Parse the specified blog

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/UrlEncodedFormResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/UrlEncodedFormResource.properties b/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/UrlEncodedFormResource.properties
deleted file mode 100755
index 385508d..0000000
--- a/org.apache.juneau.samples/src/main/java/org/apache/juneau/server/samples/nls/UrlEncodedFormResource.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# ***************************************************************************************************************************
-# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
-# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
-# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
-# * with the License.  You may obtain a copy of the License at                                                              *
-# *                                                                                                                         *
-# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
-# *                                                                                                                         *
-# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
-# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
-# * specific language governing permissions and limitations under the License.                                              *
-# ***************************************************************************************************************************
-
-#--------------------------------------------------------------------------------
-# UrlEncodedFormResource labels
-#--------------------------------------------------------------------------------
-label = URL-Encoded Form Post Example
-description = Shows how URL-Encoded form input can be loaded into POJOs.  POJO is simply echoed back.
-aString = A String:
-aNumber = A Number:
-aDate = A Date:
-submit = submit
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/averycutedog.jpg
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/averycutedog.jpg b/org.apache.juneau.samples/src/main/resources/averycutedog.jpg
deleted file mode 100755
index 335855e..0000000
Binary files a/org.apache.juneau.samples/src/main/resources/averycutedog.jpg and /dev/null differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties
new file mode 100755
index 0000000..b3230b0
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/addressbook/nls/AddressBookResource.properties
@@ -0,0 +1,74 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+label = AddressBook sample resource
+description = Proof-of-concept resource that shows off the capabilities of working with POJO resources
+
+getRoot = Get root page
+
+getAllPeople = Get all people in the address book
+getAllPeople.res.200.content = List<Person>
+
+getPerson = Get a single person by ID
+getPerson.req.attr.id = Person UUID
+getPerson.res.200.content = Person bean
+getPerson.res.404 = Person ID not found
+
+getAllAddresses = Get all addresses in the address book
+getAllAddresses.res.200.content = List<Address>
+
+getAddress = Get a single address by ID
+getAddress.req.attr.id = Address UUID
+getAddress.res.200.content = Address bean
+getAddress.res.404 = Address ID not found
+
+createPerson = Create a new Person bean 
+createPerson.res.307.header.Location = URL of new person
+
+createAddress = Create a new Address bean
+createAddress.req.attr.id = Person UUID
+createAddress.res.307.header.Location = URL of new address
+
+deletePerson = Delete a Person bean
+deletePerson.req.attr.id = Person UUID
+deletePerson.res.200.content = "DELETE successful"
+deletePerson.res.404 = Person ID not found
+
+deleteAddress = Delete an Address bean
+deleteAddress.req.attr.id = Address UUID
+deleteAddress.res.200.content = "DELETE successful"
+deleteAddress.res.404 = Address ID not found
+
+updatePerson = Change property on Person bean
+updatePerson.req.attr.id = Person UUID
+updatePerson.req.content = Anything
+updatePerson.res.200.content = "PUT successful"
+updatePerson.res.400 = Invalid object type used
+updatePerson.res.404 = Person ID not found
+
+updateAddress = Change property on Address bean
+updateAddress.req.attr.id = Address UUID
+updateAddress.req.content = Anything
+updateAddress.res.200.content = "PUT successful"
+updateAddress.res.400 = Invalid object type used
+updateAddress.res.404 = Address ID not found
+
+doInit = Reinitialize this resource
+doInit.res.200.content = "OK"
+
+getOptions = View resource options
+
+getCognosData = Get data in Cognos/XML format
+getCognosData.res.200.content = DataSet
+
+otherNotes = GZip support enabled.  Public methods can be invoked by using the &Method URL parameter.  'text/cognos+xml' support available under root resource only
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg
new file mode 100755
index 0000000..335855e
Binary files /dev/null and b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/averycutedog.jpg differ

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/htdocs/code-highlighting.css
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/htdocs/code-highlighting.css b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/htdocs/code-highlighting.css
new file mode 100755
index 0000000..1475500
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/htdocs/code-highlighting.css
@@ -0,0 +1,124 @@
+code, 
+tt, 
+pre,
+dt code {
+	font-size: 9pt;
+}
+
+/*--- Bordered code ---*/
+p.bcode {
+	font-size: 9pt;
+	white-space: pre;
+	border: 1px solid black;
+	margin: 10px 20px;
+	padding: 10px;
+	border-radius: 10px;
+	overflow: hidden;
+	font-family: monospace;
+	background-color: #f8f8f8;
+	border-color: #cccccc;
+	-moz-tab-size: 3;
+	tab-size: 3;
+	-o-tab-size: 3;
+}
+
+.fixedWidth {
+	max-width: 800px;
+}
+
+/* Override padding bottom in javadoc comments. */
+.blockList p.bcode {
+	padding-bottom: 0px !important;
+}
+
+/*--- Unbordered code ---*/
+p.code {
+	font-size: 9pt;
+	white-space: pre;
+	font-family: monospace;
+	padding-bottom: 15px;
+	margin: -15px;
+}
+
+td.code {
+	font-size: 9pt;
+	white-space: pre;
+	font-family: monospace;
+}
+
+table.code {
+	font-size: 9pt;
+	white-space: pre;
+	font-family: monospace;
+}
+
+/*--- Java code effects ---*/
+jc,jd,jt,jk,js,jf,jsf,jsm,ja {
+	font-size: 9pt;
+	white-space: pre;
+	font-family: monospace;
+}
+/* Comment */
+jc {
+	color: green;
+}
+/* Javadoc comment */
+jd {
+	color: #3f5fbf;
+}
+/* Javadoc tag */
+jt {
+	color: #7f9fbf;
+	font-weight: bold;
+}
+/* Primitive */
+jk {
+	color: #7f0055;
+	font-weight: bold;
+}
+/* String */
+js {
+	color: blue;
+}
+/* Field */
+jf {
+	color: blue;
+}
+/* Static field */
+jsf {
+	color: blue;
+	font-style: italic;
+}
+/* Static method */
+jsm {
+	font-style: italic;
+}
+/* Annotation */
+ja {
+	color: grey;
+}
+
+/*--- XML code effects ---*/
+xt,xa,xc,xs {
+	font-size: 9pt;
+	white-space: pre;
+	font-family: monospace;
+}
+
+xt {
+	color: DarkCyan;
+}
+
+xa {
+	color: purple;
+}
+
+xc {
+	color: mediumblue;
+}
+
+xs {
+	color: blue;
+	font-style: italic;
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/AtomFeedResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/AtomFeedResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/AtomFeedResource.properties
new file mode 100755
index 0000000..1fadf05
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/AtomFeedResource.properties
@@ -0,0 +1,21 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# AtomFeedResource labels
+#--------------------------------------------------------------------------------
+label = Sample ATOM feed resource
+description = Sample resource that shows how to render ATOM feeds
+getFeed = Get the sample ATOM feed
+setFeed = Overwrite the sample ATOM feed
+doOptions = Show resource options

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties
new file mode 100755
index 0000000..f3f1d08
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/CodeFormatterResource.properties
@@ -0,0 +1,18 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# CodeFormatterResource labels
+#--------------------------------------------------------------------------------
+label = Code Formatter
+description = Utility for generating HTML code-formatted source code

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/HelloWorldResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/HelloWorldResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/HelloWorldResource.properties
new file mode 100755
index 0000000..8414e9a
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/HelloWorldResource.properties
@@ -0,0 +1,19 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# HelloWorldResource labels
+#--------------------------------------------------------------------------------
+label = Hello World sample resource
+description = Simplest possible resource
+sayHello = Responds with "Hello world!" 

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties
new file mode 100755
index 0000000..45664dd
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/JsonSchemaResource.properties
@@ -0,0 +1,20 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# JsonSchemaResource labels
+#--------------------------------------------------------------------------------
+label = Sample resource that shows how to generate JSON-Schema documents
+getSchema = Get the JSON-Schema document
+setSchema = Overwrite the JSON-Schema document
+doOptions = Show resource options

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/MethodExampleResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/MethodExampleResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/MethodExampleResource.properties
new file mode 100755
index 0000000..6921941
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/MethodExampleResource.properties
@@ -0,0 +1,37 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# MethodExampleResource labels
+#--------------------------------------------------------------------------------
+label = A simple REST method example resource
+doGetExample = Sample GET method
+doGetExample1 = Sample GET using annotations
+doGetExample1.req.attr.a1 = Sample variable
+doGetExample1.req.attr.a2 = Sample variable
+doGetExample1.req.attr.a3 = Sample variable
+doGetExample1.req.param.p1 = Sample parameter
+doGetExample1.req.param.p2 = Sample parameter
+doGetExample1.req.param.p3 = Sample parameter
+doGetExample1.req.header.Accept-Language = Sample header
+doGetExample1.req.header.DNT = Sample header
+doGetExample2 = Sample GET using Java APIs
+doGetExample2.req.attr.a1 = Sample variable
+doGetExample2.req.attr.a2 = Sample variable
+doGetExample2.req.attr.a3 = Sample variable
+doGetExample2.req.param.p1 = Sample parameter
+doGetExample2.req.param.p2 = Sample parameter
+doGetExample2.req.param.p3 = Sample parameter
+doGetExample2.req.header.Accept-Language = Sample header
+doGetExample2.req.header.DNT = Sample header
+getOptions = Get these options

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/PhotosResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/PhotosResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/PhotosResource.properties
new file mode 100755
index 0000000..fdcd5f2
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/PhotosResource.properties
@@ -0,0 +1,24 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# PhotosResource labels
+#--------------------------------------------------------------------------------
+label = Sample resource that allows images to be uploaded and retrieved.
+getAllPhotos = Show the list of all currently loaded photos
+getPhoto = Get a photo by ID
+addPhoto = Add a photo
+setPhoto = Overwrite a photo by ID
+deletePhoto = Delete a photo by ID
+doOptions = Show resource options
+

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RequestEchoResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RequestEchoResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RequestEchoResource.properties
new file mode 100755
index 0000000..40ec24f
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RequestEchoResource.properties
@@ -0,0 +1,19 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# RequestEchoResource labels
+#--------------------------------------------------------------------------------
+label = Echos the current HttpServletRequest object back to the browser.
+doGet = Serializes the incoming HttpServletRequest object.
+

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RootResources.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RootResources.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RootResources.properties
new file mode 100755
index 0000000..d187d6f
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/RootResources.properties
@@ -0,0 +1,18 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# RootResources labels
+#--------------------------------------------------------------------------------
+label = Root resources
+description = This is an example of a router resource that is used to access other resources.

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties
new file mode 100755
index 0000000..087c24c
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SampleRemoteableServlet.properties
@@ -0,0 +1,17 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# SampleRemoteableServlet labels
+#--------------------------------------------------------------------------------
+label = Sample resource that demonstrates the remotable API

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SourceResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SourceResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SourceResource.properties
new file mode 100755
index 0000000..1bb3e9f
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SourceResource.properties
@@ -0,0 +1,19 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# SourceResource labels
+#--------------------------------------------------------------------------------
+label = Servlet for viewing source code on classes whose Java files are present on the classpath.
+getSource = View source on the specified classes.
+

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SqlQueryResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SqlQueryResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SqlQueryResource.properties
new file mode 100755
index 0000000..3bde956
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/SqlQueryResource.properties
@@ -0,0 +1,19 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# SqlQueryResource labels
+#--------------------------------------------------------------------------------
+label = Sample resource that shows how to serialize SQL ResultSets 
+doGet = Display the query entry page
+doPost = Execute one or more queries

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TempDirResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TempDirResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TempDirResource.properties
new file mode 100755
index 0000000..1586ab6
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TempDirResource.properties
@@ -0,0 +1,18 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# TempDirResource labels
+#--------------------------------------------------------------------------------
+label = Temp Directory View Service
+description = View and download files in the '$S{java.io.tmpdir}' directory.

http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/70164913/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TumblrParserResource.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TumblrParserResource.properties b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TumblrParserResource.properties
new file mode 100755
index 0000000..a900159
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/org/apache/juneau/server/samples/nls/TumblrParserResource.properties
@@ -0,0 +1,19 @@
+# ***************************************************************************************************************************
+# * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file *
+# * distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file        *
+# * to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance            * 
+# * with the License.  You may obtain a copy of the License at                                                              *
+# *                                                                                                                         *
+# *  http://www.apache.org/licenses/LICENSE-2.0                                                                             *
+# *                                                                                                                         *
+# * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an  *
+# * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the        *
+# * specific language governing permissions and limitations under the License.                                              *
+# ***************************************************************************************************************************
+
+#--------------------------------------------------------------------------------
+# SqlQueryResource labels
+#--------------------------------------------------------------------------------
+label = Tumblr blog parser service
+getInstructions = Get the instructions page
+parseBlog = Parse the specified blog