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/02 13:29:25 UTC
[2/2] incubator-juneau git commit: Latest changes from Peter for
Maven support.
Latest changes from Peter for Maven support.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/28f8b2c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/28f8b2c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/28f8b2c7
Branch: refs/heads/master
Commit: 28f8b2c70733abb9d08e4ed5d9a97990e901b1bd
Parents: 71f2919
Author: jamesbognar <ja...@gmail.com>
Authored: Tue Aug 2 09:29:21 2016 -0400
Committer: jamesbognar <ja...@gmail.com>
Committed: Tue Aug 2 09:29:21 2016 -0400
----------------------------------------------------------------------
.gitignore | 3 +
LICENSE | 201 +++++++++++++++++++
README.md | 154 ++++++++++++++
org.apache.juneau.client/.classpath | 20 +-
.../.settings/org.eclipse.core.resources.prefs | 4 +
.../.settings/org.eclipse.wst.validation.prefs | 1 +
org.apache.juneau.client/build.properties | 3 +-
org.apache.juneau.client/pom.xml | 64 +++---
org.apache.juneau.distrib/.gitignore | 1 +
org.apache.juneau.distrib/.project | 17 ++
.../.settings/org.eclipse.core.resources.prefs | 2 +
.../.settings/org.eclipse.m2e.core.prefs | 4 +
org.apache.juneau.distrib/pom.xml | 85 ++++++++
org.apache.juneau.distrib/src/assembly/all.xml | 42 ++++
org.apache.juneau.microservice.template/pom.xml | 57 +++---
org.apache.juneau.microservice/.classpath | 25 +--
.../.settings/org.eclipse.core.resources.prefs | 3 +
org.apache.juneau.microservice/pom.xml | 74 ++++---
org.apache.juneau.releng/.classpath | 21 --
org.apache.juneau.releng/.gitignore | 1 +
org.apache.juneau.releng/.project | 6 +
.../.settings/org.eclipse.core.resources.prefs | 2 +
.../.settings/org.eclipse.m2e.core.prefs | 4 +
org.apache.juneau.releng/META-INF/MANIFEST.MF | 38 +---
org.apache.juneau.releng/build.properties | 13 --
.../launches/Package Juneau.launch | 19 ++
org.apache.juneau.releng/pom.xml | 137 +++++++++++++
org.apache.juneau.samples/.classpath | 7 +-
.../.settings/org.eclipse.core.resources.prefs | 4 +
org.apache.juneau.samples/META-INF/MANIFEST.MF | 18 +-
org.apache.juneau.samples/pom.xml | 100 ++++++---
.../src/main/resources/averycutedog.jpg | Bin 0 -> 40879 bytes
.../src/main/resources/samples.cfg | 130 ++++++++++++
org.apache.juneau.server.test/.classpath | 4 +-
.../.settings/org.eclipse.core.resources.prefs | 3 +
.../juneau-server-test.launch | 34 +---
org.apache.juneau.server.test/pom.xml | 90 +++++----
org.apache.juneau.server/.classpath | 17 +-
.../.settings/org.eclipse.core.resources.prefs | 4 +
.../.settings/org.eclipse.wst.common.component | 1 -
.../.settings/org.eclipse.wst.validation.prefs | 1 +
org.apache.juneau.server/META-INF/MANIFEST.MF | 5 +-
org.apache.juneau.server/build.properties | 2 -
org.apache.juneau.server/pom.xml | 59 +++---
org.apache.juneau/.classpath | 1 -
.../.settings/org.eclipse.core.resources.prefs | 1 +
.../.settings/org.eclipse.wst.common.component | 2 -
org.apache.juneau/pom.xml | 45 +----
.../src/test/resources/log4j.properties | 2 +-
49 files changed, 1161 insertions(+), 370 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b70a062
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+
+*.class
+/.DS_Store
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..8dada3e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "{}"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright {yyyy} {name of copyright owner}
+
+ Licensed 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.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..40419cf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,154 @@
+# Juneau
+
+## Links:
+* [Home Page](https://sites.google.com/site/apachejuneau)
+
+## Contacts:
+* [James Bognar - Salesforce](mailto:james.bognar@salesforce.com)
+* [Peter Haumer - IBM](mailto:phaumer@us.ibm.com)
+
+## Quick Examples:
+
+Core library includes easy-to-use and customizable serializers and parsers. The examples here are only a small taste of what's possible.
+Extensive examples are provided in the Javadocs.
+
+Default serializers can often be used to serializers POJOs in a single line of code...
+```Java
+ // A simple POJO class
+ public class Person {
+ public String name = "John Smith";
+ public int age = 21;
+ }
+
+ // Serialize a bean to JSON, XML, or HTML
+ Person p = new Person();
+
+ // Produces:
+ // "{name:'John Smith',age:21}"
+ String json = JsonSerializer.DEFAULT.serialize(p);
+
+ // Produces:
+ // <object>
+ // <name>John Smith</name>
+ // <age>21</age>
+ // </object>
+ String xml = XmlSerializer.DEFAULT.serialize(p);
+
+ // Produces:
+ // <table>
+ // <tr><th>key</th><th>value</th></tr>
+ // <tr><td>name</td><td>John Smith</td></tr>
+ // <tr><td>age</td><td>21</td></tr>
+ // </table>
+ String html = HtmlSerializer.DEFAULT.serialize(p);
+```
+
+Parsing back into POJOs is equally simple...
+```Java
+ // Use one of the predefined parsers.
+ ReaderParser parser = JsonParser.DEFAULT;
+
+ // Parse a JSON object (creates a generic ObjectMap).
+ String json = "{name:'John Smith',age:21}";
+ Map m1 = parser.parse(json, Map.class);
+
+ // Parse a JSON string.
+ json = "'foobar'";
+ String s2 = parser.parse(json, String.class);
+
+ // Parse a JSON number as a Long or Float.
+ json = "123";
+ Long l3 = parser.parse(json, Long.class);
+ Float f3 = parser.parse(json, Float.class);
+
+ // Parse a JSON object as a bean.
+ json = "{name:'John Smith',age:21}";
+ Person p4 = parser.parse(json, Person.class);
+
+ // Parse a JSON object as a HashMap<String,Person>.
+ json = "{a:{name:'John Smith',age:21},b:{name:'Joe Smith',age:42}}";
+ Map<String,Person> m5 = parser.parseMap(json, HashMap.class, String.class, Person.class)
+
+ // Parse a JSON array of integers as a Collection of Integers or int[] array.
+ json = "[1,2,3]";
+ List<Integer> l6 = parser.parseCollection(json, LinkedList.class, Integer.class);
+ int[] i6 = parser.parse(json, int[].class);
+
+```
+
+Server component allows for annotated REST servlets that automatically support all language types...
+```Java
+ @RestResource(
+ path="/systemProperties"
+ )
+ public class SystemPropertiesService extends RestServletJenaDefault {
+
+ /** [OPTIONS /*] - Show resource options. */
+ @RestMethod(name="OPTIONS", path="/*")
+ public ResourceOptions getOptions(RestRequest req) {
+ return new ResourceOptions(this, req);
+ }
+
+ /** [GET /] - Get all system properties. */
+ @RestMethod(name="GET", path="/")
+ public TreeMap<String,String> getSystemProperties() throws Throwable {
+ return new TreeMap(System.getProperties());
+ }
+
+ /** [GET /{propertyName}] - Get system property with specified name. */
+ @RestMethod(name="GET", path="/{propertyName}")
+ public String getSystemProperty(@Attr String propertyName) throws Throwable {
+ return System.getProperty(propertyName);
+ }
+
+ /** [PUT /{propertyName}] - Set system property with specified name. */
+ @RestMethod(name="PUT", path="/{propertyName}", guards=AdminGuard.class)
+ public Redirect setSystemProperty(@Attr String propertyName, @Content String value) {
+ System.setProperty(propertyName, value);
+ return new Redirect();
+ }
+
+ /** [DELETE /{propertyName}] - Delete system property with specified name. */
+ @RestMethod(name="DELETE", path="/{propertyName}", guards=AdminGuard.class)
+ public Redirect deleteSystemProperty(@Attr String propertyName) {
+ System.clearProperty(propertyName);
+ return new Redirect();
+ }
+ }
+```
+
+Client component allows you to easily interact with REST intefaces using POJOs...
+```Java
+ // Create a reusable JSON client.
+ RestClient client = new RestClient(JsonSerializer.class, JsonParser.class);
+
+ // The address of the root resource.
+ String url = "http://localhost:9080/sample/addressBook";
+
+ // Do a REST GET against a remote REST interface and convert
+ // the response to an unstructured ObjectMap object.
+ ObjectMap m1 = client.doGet(url).getResponse(ObjectMap.class);
+
+ // Same as above, except parse the JSON as a bean.
+ AddressBook a2 = client.doGet(url).getResponse(AddressBook.class);
+
+ // Add a person to the address book.
+ // Use XML as the transport medium.
+ client = new RestClient(XmlSerializer.class, XmlParser.class);
+ Person p = new Person("Joe Smith", 21);
+ int returnCode = client.doPost(url + "/entries", p).execute();
+```
+
+A remote proxy interface API is also provided ...
+```Java
+ RestClient client = new RestClient(JsonSerializer.class, JsonParser.class)
+ .setRemoteableUriServletUrl("https://localhost:9443/jazz/remote");
+
+ // Execute a method on the server.
+ IAddressBook ab = client.getRemoteableProxy(IAddressBook.class);
+ ab.createPerson(...);
+```
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.client/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.client/.classpath b/org.apache.juneau.client/.classpath
index e4f84a9..d8744ff 100755
--- a/org.apache.juneau.client/.classpath
+++ b/org.apache.juneau.client/.classpath
@@ -1,19 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry exported="true" kind="lib" path="/org.apache.juneau.releng/lib/httpclient/httpclient-4.5.jar"/>
- <classpathentry exported="true" kind="lib" path="/org.apache.juneau.releng/lib/httpclient/httpcore-4.4.1.jar"/>
- <classpathentry exported="true" kind="lib" path="/org.apache.juneau.releng/lib/httpclient/httpmime-4.5.jar"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ <attribute name="org.eclipse.jst.component.nondependency" value=""/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau.releng"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.apache.juneau"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
+ <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.client/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.client/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.client/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f9fe345
--- /dev/null
+++ b/org.apache.juneau.client/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.client/.settings/org.eclipse.wst.validation.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.client/.settings/org.eclipse.wst.validation.prefs b/org.apache.juneau.client/.settings/org.eclipse.wst.validation.prefs
index 1d71887..c6b7b01 100755
--- a/org.apache.juneau.client/.settings/org.eclipse.wst.validation.prefs
+++ b/org.apache.juneau.client/.settings/org.eclipse.wst.validation.prefs
@@ -2,6 +2,7 @@ DELEGATES_PREFERENCE=delegateValidatorList
USER_BUILD_PREFERENCE=enabledBuildValidatorList
USER_MANUAL_PREFERENCE=enabledManualValidatorList
USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.402.v201212031633
+disabled=06target
eclipse.preferences.version=1
override=true
suspend=false
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.client/build.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.client/build.properties b/org.apache.juneau.client/build.properties
index fec46c9..0edf12d 100755
--- a/org.apache.juneau.client/build.properties
+++ b/org.apache.juneau.client/build.properties
@@ -11,7 +11,8 @@
# * specific language governing permissions and limitations under the License.
# *
# ***************************************************************************************************************************
-source.. = src/main/java/
+source.. = src/main/java/,\
+ src/test/java/
output.. = target/classes
bin.includes = META-INF/,\
.,\
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.client/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.client/pom.xml b/org.apache.juneau.client/pom.xml
index af191f3..f6195a4 100644
--- a/org.apache.juneau.client/pom.xml
+++ b/org.apache.juneau.client/pom.xml
@@ -12,32 +12,40 @@
* specific language governing permissions and limitations under the License.
***************************************************************************************************************************/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.juneau</groupId>
- <artifactId>org.apache.juneau.client</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <name>org.apache.juneau.client</name>
- <description>org.apache.juneau.client</description>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>juneau-client</artifactId>
+ <name>Apache Juneau Client</name>
+ <description>REST client API.</description>
+
+ <parent>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-all</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <relativePath>../org.apache.juneau.releng/pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-core</artifactId>
+ <version>${juneau.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.5</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.distrib/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.juneau.distrib/.gitignore b/org.apache.juneau.distrib/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/org.apache.juneau.distrib/.gitignore
@@ -0,0 +1 @@
+/target/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.distrib/.project
----------------------------------------------------------------------
diff --git a/org.apache.juneau.distrib/.project b/org.apache.juneau.distrib/.project
new file mode 100644
index 0000000..3cc163b
--- /dev/null
+++ b/org.apache.juneau.distrib/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.apache.juneau.distrib</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ </natures>
+</projectDescription>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.distrib/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.distrib/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.distrib/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.apache.juneau.distrib/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.distrib/.settings/org.eclipse.m2e.core.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.distrib/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.distrib/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.apache.juneau.distrib/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.distrib/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.distrib/pom.xml b/org.apache.juneau.distrib/pom.xml
new file mode 100644
index 0000000..7e54afa
--- /dev/null
+++ b/org.apache.juneau.distrib/pom.xml
@@ -0,0 +1,85 @@
+<!--
+/***************************************************************************************************************************
+ * 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.
+ ***************************************************************************************************************************/
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>juneau-distrib</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Juneau Distribution</name>
+ <description>Location to find fully build Juneau distributions.</description>
+
+ <parent>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-all</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-microservice</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>juneau-distro-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.1</version>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../org.apache.juneau.releng/target</directory>
+ <includes>
+ <include>
+ juneau-all-${juneau.version}-javadoc.jar
+ </include>
+ </includes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.distrib/src/assembly/all.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.distrib/src/assembly/all.xml b/org.apache.juneau.distrib/src/assembly/all.xml
new file mode 100644
index 0000000..50e23d0
--- /dev/null
+++ b/org.apache.juneau.distrib/src/assembly/all.xml
@@ -0,0 +1,42 @@
+<!--
+/***************************************************************************************************************************
+ * 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.
+ ***************************************************************************************************************************/
+ -->
+<assembly
+ xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+ <id>all</id>
+ <formats>
+ <format>dir</format>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <moduleSets>
+ <moduleSet>
+ <useAllReactorProjects>true</useAllReactorProjects>
+ <includes>
+ <include>org.apache.juneau:juneau-core</include>
+ <include>org.apache.juneau:juneau-client</include>
+ <include>org.apache.juneau:juneau-server</include>
+ <include>org.apache.juneau:juneau-microservice</include>
+ </includes>
+ <binaries>
+ <outputDirectory>/</outputDirectory>
+ <unpack>false</unpack>
+ </binaries>
+ <sources>
+ </sources>
+ </moduleSet>
+ </moduleSets>
+</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.microservice.template/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.microservice.template/pom.xml b/org.apache.juneau.microservice.template/pom.xml
index 07254a9..a90dbc2 100644
--- a/org.apache.juneau.microservice.template/pom.xml
+++ b/org.apache.juneau.microservice.template/pom.xml
@@ -12,31 +12,34 @@
* specific language governing permissions and limitations under the License.
***************************************************************************************************************************/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.juneau</groupId>
- <artifactId>org.apache.juneau.microservice.template</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <name>org.apache.juneau.microservice.template</name>
- <description>org.apache.juneau.microservice.template</description>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-microservice-template</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <name>Apache Juneau Microservice Template</name>
+ <description>A template project developers use to start with to create a microservice.</description>
+ <properties>
+ <encoding>UTF-8</encoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-microservice</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.microservice/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.microservice/.classpath b/org.apache.juneau.microservice/.classpath
index 8522470..86e6eda 100755
--- a/org.apache.juneau.microservice/.classpath
+++ b/org.apache.juneau.microservice/.classpath
@@ -1,26 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.9.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-io-1.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient-4.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpcore-4.4.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpmime-4.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jetty-all-8.1.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/javax.servlet-api-3.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/org.apache.commons.fileupload_1.3.1.jar"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.server"/>
- <classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.releng"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau.client"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/org.apache.juneau"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
+ <attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.microservice/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.microservice/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.microservice/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..e9441bb
--- /dev/null
+++ b/org.apache.juneau.microservice/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.microservice/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.microservice/pom.xml b/org.apache.juneau.microservice/pom.xml
index 7cf7e9e..c8f1b8a 100644
--- a/org.apache.juneau.microservice/pom.xml
+++ b/org.apache.juneau.microservice/pom.xml
@@ -12,32 +12,50 @@
* specific language governing permissions and limitations under the License.
***************************************************************************************************************************/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.juneau</groupId>
- <artifactId>org.apache.juneau.microservice</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <name>org.apache.juneau.microservice</name>
- <description>org.apache.juneau.microservice</description>
- <build>
- <sourceDirectory>src</sourceDirectory>
- <resources>
- <resource>
- <directory>src</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>juneau-microservice</artifactId>
+ <name>Apache Juneau Microservice</name>
+ <description>API for creating standalone executable jars that can be used to start lightweight configurable REST interfaces.</description>
+
+ <parent>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-all</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <relativePath>../org.apache.juneau.releng/pom.xml</relativePath>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-server</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-client</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.aggregate</groupId>
+ <artifactId>jetty-all-server</artifactId>
+ <version>8.1.0.v20120127</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.9</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.1</version>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/.classpath b/org.apache.juneau.releng/.classpath
index 3ea783e..7cec603 100755
--- a/org.apache.juneau.releng/.classpath
+++ b/org.apache.juneau.releng/.classpath
@@ -1,25 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/derby/derby.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxrs/jsr311-api-1.1.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/javax.servlet_2.5.0.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.9/commons-codec-1.9.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/commons-fileupload/org.apache.commons.fileupload_1.3.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient/commons-logging-1.1.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient/httpclient-4.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient/httpcomponents-client-4.5-src.zip"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient/httpcore-4.4.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/httpclient/httpmime-4.5.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxrs/wink-common-1.2.1-incubating.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jaxrs/wink-server-1.2.1-incubating.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/jena-core-2.7.1-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/jena-core-2.7.1.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/jena-iri-0.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/log4j-1.2.16.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/slf4j-api-1.6.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/slf4j-log4j12-1.6.4.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/junit/hamcrest-core-1.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/junit/junit-4.12.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/jena/xercesImpl-2.9.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/.gitignore
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/.gitignore b/org.apache.juneau.releng/.gitignore
index a42a3f9..8a71b6c 100644
--- a/org.apache.juneau.releng/.gitignore
+++ b/org.apache.juneau.releng/.gitignore
@@ -3,3 +3,4 @@ build/
old_source/
/out.html
/TESTS-TestSuites.xml
+/target/
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/.project
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/.project b/org.apache.juneau.releng/.project
index fa8e64f..aff18a4 100755
--- a/org.apache.juneau.releng/.project
+++ b/org.apache.juneau.releng/.project
@@ -20,8 +20,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.releng/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/org.apache.juneau.releng/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/.settings/org.eclipse.m2e.core.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/.settings/org.eclipse.m2e.core.prefs b/org.apache.juneau.releng/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/org.apache.juneau.releng/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/META-INF/MANIFEST.MF b/org.apache.juneau.releng/META-INF/MANIFEST.MF
index 32b19be..f22f8d2 100755
--- a/org.apache.juneau.releng/META-INF/MANIFEST.MF
+++ b/org.apache.juneau.releng/META-INF/MANIFEST.MF
@@ -5,40 +5,4 @@ Bundle-SymbolicName: org.apache.juneau.releng
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: IBM
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ClassPath:
- lib/derby/derby.jar,
- lib/jaxrs/jsr311-api-1.1.1.jar,
- lib/httpclient/httpclient-4.5.jar,
- lib/httpclient/httpmime-4.5.jar,
- lib/httpclient/httpcore-4.4.1.jar
-Export-Package:
- com.hp.hpl.jena.rdf.model,
- com.hp.hpl.jena.shared,
- org.apache.derby.jdbc,
- javax.ws.rs,
- javax.ws.rs.core,
- javax.ws.rs.ext,
- org.apache.commons.fileupload,
- org.apache.commons.fileupload.servlet,
- org.apache.http,
- org.apache.http.auth,
- org.apache.http.client,
- org.apache.http.client.config,
- org.apache.http.client.entity,
- org.apache.http.client.methods,
- org.apache.http.client.params,
- org.apache.http.client.utils,
- org.apache.http.config,
- org.apache.http.conn,
- org.apache.http.conn.scheme,
- org.apache.http.conn.ssl,
- org.apache.http.conn.socket,
- org.apache.http.entity,
- org.apache.http.entity.mime,
- org.apache.http.impl.client,
- org.apache.http.impl.conn,
- org.apache.http.impl.cookie,
- org.apache.http.message,
- org.apache.http.params,
- org.apache.http.protocol,
- org.apache.http.util
+
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/build.properties
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/build.properties b/org.apache.juneau.releng/build.properties
index 7444406..8d24d5d 100755
--- a/org.apache.juneau.releng/build.properties
+++ b/org.apache.juneau.releng/build.properties
@@ -11,17 +11,6 @@
# * specific language governing permissions and limitations under the License. *
# ***************************************************************************************************************************
-bin.includes = lib/derby/derby.jar,\
- lib/jaxrs/jsr311-api-1.1.1.jar,\
- META-INF/,\
- .
-jars.extra.classpath = lib/jaxrs/jsr311-api-1.1.1.jar,\
- lib/jena/jena-core-2.7.1-sources.jar,\
- lib/jena/jena-core-2.7.1.jar,\
- lib/jena/jena-iri-0.9.2.jar,\
- lib/jena/log4j-1.2.16.jar,\
- lib/jena/slf4j-api-1.6.4.jar,\
- lib/jena/slf4j-log4j12-1.6.4.jar
nls_exclude=**/*.html
jre.compilation.profile = JavaSE-1.6
@@ -29,5 +18,3 @@ jre.compilation.profile = JavaSE-1.6
version = 6.0.0
dir.build=build
-
-
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/launches/Package Juneau.launch
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/launches/Package Juneau.launch b/org.apache.juneau.releng/launches/Package Juneau.launch
new file mode 100644
index 0000000..35c323a
--- /dev/null
+++ b/org.apache.juneau.releng/launches/Package Juneau.launch
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.m2e.Maven2LaunchConfigurationType">
+<booleanAttribute key="M2_DEBUG_OUTPUT" value="false"/>
+<stringAttribute key="M2_GOALS" value="clean package install"/>
+<booleanAttribute key="M2_NON_RECURSIVE" value="false"/>
+<booleanAttribute key="M2_OFFLINE" value="false"/>
+<stringAttribute key="M2_PROFILES" value=""/>
+<listAttribute key="M2_PROPERTIES"/>
+<stringAttribute key="M2_RUNTIME" value="EMBEDDED"/>
+<booleanAttribute key="M2_SKIP_TESTS" value="false"/>
+<intAttribute key="M2_THREADS" value="1"/>
+<booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
+<stringAttribute key="M2_USER_SETTINGS" value=""/>
+<booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:<?xml version="1.0" encoding="UTF-8"?> <resources> <item path="/org.apache.juneau/target" type="2"/> <item path="/org.apache.juneau.client/target" type="2"/> <item path="/org.apache.juneau.distrib/target" type="2"/> <item path="/org.apache.juneau.microservice/target" type="2"/> <item path="/org.apache.juneau.releng/target" type="2"/> <item path="/org.apache.juneau.samples/target" type="2"/> <item path="/org.apache.juneau.server/target" type="2"/> <item path="/org.apache.juneau.server.test/target" type="2"/> </resources>}"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.apache.juneau.releng}"/>
+</launchConfiguration>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.releng/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.releng/pom.xml b/org.apache.juneau.releng/pom.xml
new file mode 100644
index 0000000..57c4276
--- /dev/null
+++ b/org.apache.juneau.releng/pom.xml
@@ -0,0 +1,137 @@
+<!--
+/***************************************************************************************************************************
+ * 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.
+ ***************************************************************************************************************************/
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-all</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Juneau</name>
+ <description>All the Apache Juneau content in one convenient package.</description>
+
+ <properties>
+ <juneau.version>6.0.0-SNAPSHOT</juneau.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <encoding>UTF-8</encoding>
+ </properties>
+
+ <modules>
+ <module>../org.apache.juneau</module>
+ <module>../org.apache.juneau.client</module>
+ <module>../org.apache.juneau.server</module>
+ <module>../org.apache.juneau.microservice</module>
+ <module>../org.apache.juneau.samples</module>
+ <module>../org.apache.juneau.server.test</module>
+ <module>../org.apache.juneau.distrib</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19.1</version>
+ <configuration>
+ <includes>
+ <include>**/CT_*.class</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.10.4</version>
+ <configuration>
+ <show>protected</show>
+ <windowtitle>${project.name} ${project.version}</windowtitle>
+ <author>true</author>
+ <linksource>true</linksource>
+ <source>1.6</source>
+ <bootclasspath>${sun.boot.class.path}</bootclasspath>
+ <overview>${basedir}/../org.apache.juneau/src/main/java/overview.html</overview>
+ <stylesheetfile>${basedir}/../org.apache.juneau.releng/javadoc.css</stylesheetfile>
+ <use>true</use>
+ <additionalparam>-sourcetab 3 -notimestamp -Xdoclint:none</additionalparam>
+ <verbose>false</verbose>
+ <excludePackageNames>*proto*</excludePackageNames>
+ <links>
+ <link>http://docs.oracle.com/javase/7/docs/api/</link>
+ <link>http://docs.oracle.com/javaee/5/api/</link>
+ </links>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>aggregate</id>
+ <phase>package</phase>
+ <goals>
+ <goal>aggregate-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>3.0.0</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/all.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.samples/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/.classpath b/org.apache.juneau.samples/.classpath
index 44142ee..acc10d9 100755
--- a/org.apache.juneau.samples/.classpath
+++ b/org.apache.juneau.samples/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@@ -26,5 +26,10 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.samples/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.samples/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..ba7daf0
--- /dev/null
+++ b/org.apache.juneau.samples/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.samples/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/META-INF/MANIFEST.MF b/org.apache.juneau.samples/META-INF/MANIFEST.MF
index 7368cf1..57dc385 100755
--- a/org.apache.juneau.samples/META-INF/MANIFEST.MF
+++ b/org.apache.juneau.samples/META-INF/MANIFEST.MF
@@ -2,20 +2,4 @@ Manifest-Version: 1.0
Main-Class: org.apache.juneau.microservice.RestMicroservice
Rest-Resources: org.apache.juneau.server.samples.RootResources
Main-ConfigFile: samples.cfg
-Class-Path:
- lib/commons-codec-1.9.jar
- lib/commons-io-1.2.jar
- lib/commons-logging-1.1.1.jar
- lib/httpclient-4.5.jar
- lib/httpcore-4.4.1.jar
- lib/httpmime-4.5.jar
- lib/javax.servlet-api-3.0.jar
- lib/jetty-all-8.1.0.jar
- lib/juneau-all-5.2.jar
- lib/org.apache.commons.fileupload_1.3.1.jar
- lib/derby.jar
- lib/jena-core-2.7.1.jar
- lib/jena-iri-0.9.2.jar
- lib/log4j-1.2.16.jar
- lib/slf4j-api-1.6.4.jar
- lib/slf4j-log4j12-1.6.4.jar
+
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.samples/pom.xml
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/pom.xml b/org.apache.juneau.samples/pom.xml
index b5f71c6..1a45ca9 100644
--- a/org.apache.juneau.samples/pom.xml
+++ b/org.apache.juneau.samples/pom.xml
@@ -12,31 +12,77 @@
* specific language governing permissions and limitations under the License.
***************************************************************************************************************************/
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.juneau</groupId>
- <artifactId>org.apache.juneau.samples</artifactId>
- <version>6.0.0-SNAPSHOT</version>
- <name>org.apache.juneau.samples</name>
- <description>org.apache.juneau.samples</description>
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.3</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-samples</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ <name>Apache Juneau Samples</name>
+ <description>Sample code packaged as a microservice.</description>
+ <properties>
+ <encoding>UTF-8</encoding>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.juneau</groupId>
+ <artifactId>juneau-microservice</artifactId>
+ <version>6.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-iri</artifactId>
+ <version>0.9.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.10.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.10</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.3</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <minimizeJar>false</minimizeJar>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <manifestEntries>
+ <Main-Class>org.apache.juneau.microservice.RestMicroservice</Main-Class>
+ <Rest-Resources>org.apache.juneau.server.samples.RootResources</Rest-Resources>
+ <Main-ConfigFile>samples.cfg</Main-ConfigFile>
+ </manifestEntries>
+ </transformer>
+ </transformers>
+ <finalName>${project.artifactId}-${project.version}-uber</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/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
new file mode 100755
index 0000000..335855e
Binary files /dev/null and b/org.apache.juneau.samples/src/main/resources/averycutedog.jpg differ
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.samples/src/main/resources/samples.cfg
----------------------------------------------------------------------
diff --git a/org.apache.juneau.samples/src/main/resources/samples.cfg b/org.apache.juneau.samples/src/main/resources/samples.cfg
new file mode 100755
index 0000000..cbf4f99
--- /dev/null
+++ b/org.apache.juneau.samples/src/main/resources/samples.cfg
@@ -0,0 +1,130 @@
+#================================================================================
+# Basic configuration file for SaaS microservices
+# Subprojects can use this as a starting point.
+#================================================================================
+
+#================================================================================
+# REST settings
+#================================================================================
+[REST]
+
+port = 10000
+
+# Authentication: NONE, BASIC.
+authType = NONE
+
+# The BASIC auth username, password, and realm
+loginUser =
+loginPassword =
+authRealm =
+
+# Stylesheet to use for HTML views.
+# The default options are:
+# - styles/juneau.css
+# - styles/devops.css
+# Other stylesheets can be referenced relative to the servlet package or working
+# directory.
+stylesheet = styles/devops.css
+
+# What to do when the config file is saved.
+# Possible values:
+# NOTHING - Don't do anything.
+# RESTART_SERVER - Restart the Jetty server.
+# RESTART_SERVICE - Shutdown and exit with code '3'.
+saveConfigAction = RESTART_SERVER
+
+# Enable SSL support.
+useSsl = false
+
+#================================================================================
+# Bean properties on the org.eclipse.jetty.util.ssl.SslSocketFactory class
+#--------------------------------------------------------------------------------
+# Ignored if REST/useSsl is false.
+# Specify any of the following fields:
+# allowRenegotiate (boolean)
+# certAlias (String)
+# crlPath (String)
+# enableCRLDP (boolean)
+# enableOCSP (boolean)
+# excludeCipherSuites (String[])
+# excludeProtocols (String[])
+# includeCipherSuites (String[])
+# includeProtocols (String...)
+# keyManagerPassword (String)
+# keyStore (String)
+# keyStorePassword (String)
+# keyStorePath (String)
+# keyStoreProvider (String)
+# keyStoreType (String)
+# maxCertPathLength (int)
+# needClientAuth (boolean)
+# ocspResponderURL (String)
+# protocol (String)
+# provider (String)
+# secureRandomAlgorithm (String)
+# sessionCachingEnabled (boolean)
+# sslKeyManagerFactoryAlgorithm (String)
+# sslSessionCacheSize (int)
+# sslSessionTimeout (int)
+# trustAll (boolean)
+# trustManagerFactoryAlgorithm (String)
+# trustStore (String)
+# trustStorePassword (String)
+# trustStoreProvider (String)
+# trustStoreType (String)
+# validateCerts (boolean)
+# validatePeerCerts (boolean)
+# wantClientAuth (boolean)
+#================================================================================
+[REST-SslContextFactory]
+keyStorePath = client_keystore.jks
+keyStorePassword* = {HRAaRQoT}
+excludeCipherSuites = TLS_DHE.*, TLS_EDH.*
+excludeProtocols = SSLv3
+allowRenegotiate = false
+
+#================================================================================
+# Logger settings
+# See FileHandler Java class for details.
+#================================================================================
+[Logging]
+logDir = logs
+logFile = sample.%g.log
+dateFormat = yyyy.MM.dd hh:mm:ss
+format = [{date} {level}] {msg}%n
+append = false
+limit = 10M
+count = 5
+levels = { org.apache.juneau:'INFO' }
+useStackTraceHashes = true
+consoleLevel = WARNING
+
+#================================================================================
+# System properties
+#--------------------------------------------------------------------------------
+# These are arbitrary system properties that can be set during startup.
+#================================================================================
+[SystemProperties]
+
+# Configure Jetty for StdErrLog Logging
+org.eclipse.jetty.util.log.class = org.eclipse.jetty.util.log.StrErrLog
+
+# Jetty logging level
+org.eclipse.jetty.LEVEL = WARN
+
+#================================================================================
+# DockerRegistryResource properties
+#================================================================================
+[DockerRegistry]
+url = http://clmdocker02.ratl.swg.usma.ibm.com:5000/v1
+
+#================================================================================
+# SqlQueryResource properties
+#================================================================================
+[SqlQueryResource]
+driver = org.apache.derby.jdbc.EmbeddedDriver
+connectionUrl = jdbc:derby:C:/testDB;create=true
+allowTempUpdates = true
+includeRowNums = true
+
+
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server.test/.classpath
----------------------------------------------------------------------
diff --git a/org.apache.juneau.server.test/.classpath b/org.apache.juneau.server.test/.classpath
index 538e633..276460c 100755
--- a/org.apache.juneau.server.test/.classpath
+++ b/org.apache.juneau.server.test/.classpath
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java">
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server.test/.settings/org.eclipse.core.resources.prefs
----------------------------------------------------------------------
diff --git a/org.apache.juneau.server.test/.settings/org.eclipse.core.resources.prefs b/org.apache.juneau.server.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..5b781ec
--- /dev/null
+++ b/org.apache.juneau.server.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/28f8b2c7/org.apache.juneau.server.test/juneau-server-test.launch
----------------------------------------------------------------------
diff --git a/org.apache.juneau.server.test/juneau-server-test.launch b/org.apache.juneau.server.test/juneau-server-test.launch
index 0d9fb35..fdf1280 100755
--- a/org.apache.juneau.server.test/juneau-server-test.launch
+++ b/org.apache.juneau.server.test/juneau-server-test.launch
@@ -10,46 +10,16 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" javaProject="org.apache.juneau.server" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.server.test" type="1"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.samples" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.microservice" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/commons-codec-1.9.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/commons-io-1.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/commons-logging-1.1.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/httpclient-4.5.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/httpcore-4.4.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/httpmime-4.5.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/jetty-all-8.1.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/javax.servlet-api-3.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.microservice/lib/org.apache.commons.fileupload_1.3.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.server" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.releng" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.client" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau" type="1"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/derby/derby.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jaxrs/jsr311-api-1.1.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/javax.servlet_2.5.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/commons-codec-1.9/commons-codec-1.9.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/commons-fileupload/org.apache.commons.fileupload_1.3.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/httpclient/commons-logging-1.1.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/httpclient/httpclient-4.5.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/httpclient/httpcomponents-client-4.5-src.zip" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/httpclient/httpcore-4.4.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/httpclient/httpmime-4.5.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jaxrs/wink-common-1.2.1-incubating.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jaxrs/wink-server-1.2.1-incubating.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/jena-core-2.7.1-sources.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/jena-core-2.7.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/jena-iri-0.9.2.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/log4j-1.2.16.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/slf4j-api-1.6.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/slf4j-log4j12-1.6.4.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/junit/hamcrest-core-1.3.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/junit/junit-4.12.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/org.apache.juneau.releng/lib/jena/xercesImpl-2.9.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="org.apache.juneau.samples" type="1"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="org.apache.juneau.server"/> </runtimeClasspathEntry> "/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.RestMicroservice"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.juneau.server.test"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>