PROTON-1385: remove redundant and offset 'java' dirs from examples area
diff --git a/examples/engine/java/drain b/examples/engine/drain
similarity index 100%
rename from examples/engine/java/drain
rename to examples/engine/drain
diff --git a/examples/engine/java/LICENSE b/examples/engine/java/LICENSE
deleted file mode 100644
index ad410e1..0000000
--- a/examples/engine/java/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-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.
\ No newline at end of file
diff --git a/examples/engine/java/pom.xml b/examples/engine/pom.xml
similarity index 96%
rename from examples/engine/java/pom.xml
rename to examples/engine/pom.xml
index bf334b0..75fe422 100644
--- a/examples/engine/java/pom.xml
+++ b/examples/engine/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>proton-project</artifactId>
<version>0.17.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/engine/java/server b/examples/engine/server
similarity index 100%
rename from examples/engine/java/server
rename to examples/engine/server
diff --git a/examples/engine/java/spout b/examples/engine/spout
similarity index 100%
rename from examples/engine/java/spout
rename to examples/engine/spout
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Drain.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Drain.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Drain.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Drain.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Driver.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Driver.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Driver.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Driver.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/FlowController.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/FlowController.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/FlowController.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/FlowController.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Handshaker.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Handshaker.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Handshaker.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Handshaker.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Message.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Message.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Message.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Message.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Pool.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Pool.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Pool.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Pool.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Router.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Router.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Router.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Router.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Server.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Server.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Server.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Server.java
diff --git a/examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Spout.java b/examples/engine/src/main/java/org/apache/qpid/proton/examples/Spout.java
similarity index 100%
rename from examples/engine/java/src/main/java/org/apache/qpid/proton/examples/Spout.java
rename to examples/engine/src/main/java/org/apache/qpid/proton/examples/Spout.java
diff --git a/examples/java/reactor/.gitignore b/examples/java/reactor/.gitignore
deleted file mode 100644
index 5e56e04..0000000
--- a/examples/java/reactor/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/bin
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/README.md b/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/README.md
deleted file mode 100644
index 73fbb87..0000000
--- a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-The examples in this directory provide a basic introduction to the
-proton reactor API and are best viewed in the order presented below.
-
-The examples contain comments that explain things in a tutorial-style
-manner. At some point soon this content will be pulled out into a
-proper tutorial that references the relevant code snippets from these
-examples. Until then please bear with this clumsy style of
-presentation.
-
-This API is present in Java and Python as well. Most of these examples will
-transliterate into C in a fairly straightforward way.
-
- - HelloWorld.java
- - GoodbyeWorld.java
-
- - Scheduling.java
- - Counter.java
- - CountRandomly.java
-
- - Unhandled.java
- - ReactorLogger.java
- - GlobalLogger.java
- - Delegates.java
-
- - Handlers.java
-
- - Echo.java
- - Cat.java
-
- - Send.java
- - Recv.java
diff --git a/examples/java/reactor/README.md b/examples/reactor/README.md
similarity index 100%
rename from examples/java/reactor/README.md
rename to examples/reactor/README.md
diff --git a/examples/java/reactor/pom.xml b/examples/reactor/pom.xml
similarity index 96%
rename from examples/java/reactor/pom.xml
rename to examples/reactor/pom.xml
index 3ca3ec3..32e995e 100644
--- a/examples/java/reactor/pom.xml
+++ b/examples/reactor/pom.xml
@@ -20,7 +20,7 @@
<groupId>org.apache.qpid</groupId>
<artifactId>proton-project</artifactId>
<version>0.17.0-SNAPSHOT</version>
- <relativePath>../../..</relativePath>
+ <relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/examples/java/reactor/run b/examples/reactor/run
similarity index 100%
rename from examples/java/reactor/run
rename to examples/reactor/run
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Cat.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Cat.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Cat.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Cat.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/CountRandomly.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/CountRandomly.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/CountRandomly.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/CountRandomly.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Counter.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Counter.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Counter.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Counter.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Delegates.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Delegates.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Delegates.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Delegates.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Echo.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Echo.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Echo.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Echo.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/EchoInputStreamWrapper.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/EchoInputStreamWrapper.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/EchoInputStreamWrapper.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/EchoInputStreamWrapper.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GlobalLogger.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GlobalLogger.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GlobalLogger.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GlobalLogger.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/GoodbyeWorld.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/HelloWorld.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/HelloWorld.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/HelloWorld.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/HelloWorld.java
diff --git a/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/README.md b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/README.md
new file mode 100644
index 0000000..261c917
--- /dev/null
+++ b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/README.md
@@ -0,0 +1,24 @@
+The examples in this directory provide a basic introduction to the
+proton reactor API and are best viewed in the order presented below.
+The examples contain comments that explain things in a tutorial-style
+manner.
+
+ - HelloWorld.java
+ - GoodbyeWorld.java
+
+ - Scheduling.java
+ - Counter.java
+ - CountRandomly.java
+
+ - Unhandled.java
+ - ReactorLogger.java
+ - GlobalLogger.java
+ - Delegates.java
+
+ - Handlers.java
+
+ - Echo.java
+ - Cat.java
+
+ - Send.java
+ - Recv.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/ReactorLogger.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/ReactorLogger.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/ReactorLogger.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/ReactorLogger.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Recv.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Recv.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Recv.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Recv.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Scheduling.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Scheduling.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Scheduling.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Scheduling.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Send.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Send.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Send.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Send.java
diff --git a/examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Unhandled.java b/examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Unhandled.java
similarity index 100%
rename from examples/java/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Unhandled.java
rename to examples/reactor/src/main/java/org/apache/qpid/proton/example/reactor/Unhandled.java
diff --git a/pom.xml b/pom.xml
index 7f2b443..1ea5a3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,8 +136,8 @@
<modules>
<module>proton-j</module>
<module>tests</module>
- <module>examples/engine/java</module>
- <module>examples/java/reactor</module>
+ <module>examples/engine</module>
+ <module>examples/reactor</module>
</modules>
<url>http://qpid.apache.org/proton</url>
