From 3af2005dd0288224ab0cafc9689f0c4346df6366 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 10:44:50 -0700 Subject: [PATCH 01/25] Initial commit --- .gitignore | 1 + LICENSE | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 4 ++ 3 files changed, 196 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..2f7896d1d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +target/ diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..37ec93a14 --- /dev/null +++ b/LICENSE @@ -0,0 +1,191 @@ +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: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +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 +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. diff --git a/README.md b/README.md new file mode 100644 index 000000000..300f3bd44 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +li.strolch.parent +================= + +Parent for all li.strolch projects for easier project maintenance From 2961211417bf7b29a63f113b2719ebe16d141b26 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 19:56:05 +0200 Subject: [PATCH 02/25] Initial Commit --- pom.xml | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 330 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..b09d5d6c9 --- /dev/null +++ b/pom.xml @@ -0,0 +1,330 @@ + + 4.0.0 + + li.strolch + li.strolch.parent + 0.1.0-SNAPSHOT + pom + Parent for li.strolch projects + Parent for all li.strolch projects for easier project maintenance + 2013 + + + UTF-8 + + + + + + + GNU Lesser General Public License + http://www.gnu.org/licenses/lgpl.html + repo + + + Apache License 2.0 + http://www.spdx.org/licenses/Apache-2.0 + + + + + eitchnet.ch + http://blog.eitchnet.ch + + + + + eitch + Robert von Vurg + eitch@eitchnet.ch + http://blog.eitchnet.ch + eitchnet.ch + http://blog.eitchnet.ch + + architect + developer + + +1 + + http://localhost + + + + + + + + + + + + deployment + Internal Releases + http://nexus.eitchnet.ch/content/repositories/releases/ + + + deployment + Internal Releases + http://nexus.eitchnet.ch/content/repositories/snapshots/ + + + + + + + + li.strolch + li.strolch.model + ${project.version} + + + li.strolch + li.strolch.persistence.api + ${project.version} + + + li.strolch + li.strolch.persistence.impl + ${project.version} + + + li.strolch + li.strolch.runtime + ${project.version} + + + + ch.eitchnet + ch.eitchnet.utils + 0.2.0-SNAPSHOT + + + ch.eitchnet + ch.eitchnet.xmlpers + 0.3.0-SNAPSHOT + + + + org.slf4j + slf4j-api + 1.7.2 + + + + junit + junit + 4.11 + test + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.hamcrest + hamcrest-library + 1.3 + test + + + org.slf4j + slf4j-log4j12 + 1.7.2 + test + + + + + + + + ch.eitchnet + ch.eitchnet.utils + + + + org.slf4j + slf4j-api + + + + junit + junit + test + + + org.hamcrest + hamcrest-core + test + + + org.hamcrest + hamcrest-library + test + + + org.slf4j + slf4j-log4j12 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.0 + + 1.7 + 1.7 + + + + + org.apache.maven.plugins + maven-site-plugin + 2.3 + + UTF-8 + + + + org.apache.maven.plugins + maven-eclipse-plugin + 2.9 + + true + true + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + attach-sources + verify + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.4 + + + + true + true + + + + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + deploy + + jar + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.7 + + + deploy + deploy + + deploy + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/lib + false + false + true + false + + + + + + + maven-assembly-plugin + 2.4 + + + + true + + + + + jar-with-dependencies + + + + + jar-with-dependencies + package + + single + + + + + + + + + + \ No newline at end of file From 2d4675642743159c7ba9a203bba6645d2d487348 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 19:56:33 +0200 Subject: [PATCH 03/25] Added ignores of eclipse files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2f7896d1d..6efaec8b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ target/ +.project +.settings From ebc7115565a0a3c4c26929fa6823e4ca4640e464 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 20:28:52 +0200 Subject: [PATCH 04/25] [Project] added dependency management of ch.eitchnet.privilege --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index b09d5d6c9..670dfdc67 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,11 @@ ch.eitchnet.xmlpers 0.3.0-SNAPSHOT + + ch.eitchnet + ch.eitchnet.privilege + 0.2.0-SNAPSHOT + org.slf4j From 42e31731533e0cfd0b5e1d537fe4e2f93895bb41 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 24 Oct 2013 21:46:19 +0200 Subject: [PATCH 05/25] [Project] added dependency management of li.strolch.testbase --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 670dfdc67..8a0a20664 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,11 @@ li.strolch.model ${project.version} + + li.strolch + li.strolch.testbase + ${project.version} + li.strolch li.strolch.persistence.api From 1cb07f1dd3f9942f3dcba9613c689efe0470ba34 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 25 Oct 2013 07:39:12 +0200 Subject: [PATCH 06/25] [Minor] li.strolch.persistence.impl was renamed to .xml --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a0a20664..739a500ef 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ li.strolch - li.strolch.persistence.impl + li.strolch.persistence.xml ${project.version} @@ -106,6 +106,11 @@ li.strolch.runtime ${project.version} + + li.strolch + li.strolch.service + ${project.version} + ch.eitchnet From 33f2bbffa9507d007b27f29a9b4d532bbcd010dc Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 25 Nov 2013 23:24:25 +0100 Subject: [PATCH 07/25] [New] added dependency management for additional dependencies: li.strolch.bom commons-cli:commons-cli:1.2 --- pom.xml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 739a500ef..5da364270 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,12 @@ li.strolch.service ${project.version} + + li.strolch + li.strolch.bom + pom + ${project.version} + ch.eitchnet @@ -133,6 +139,11 @@ slf4j-api 1.7.2 + + commons-cli + commons-cli + 1.2 + junit @@ -323,19 +334,19 @@ - - jar-with-dependencies - + + + - - - jar-with-dependencies - package - - single - - - + + + + + + + + + From f6a6509e889bc09da5bbb380ba5b25e70eed6652 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 11 Dec 2013 23:52:46 +0100 Subject: [PATCH 08/25] [Project] nexus repository id has changed --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5da364270..411501f26 100644 --- a/pom.xml +++ b/pom.xml @@ -67,12 +67,12 @@ - deployment + nexus.eitchnet.ch Internal Releases http://nexus.eitchnet.ch/content/repositories/releases/ - deployment + nexus.eitchnet.ch Internal Releases http://nexus.eitchnet.ch/content/repositories/snapshots/ From 6e308778e4d6b522afc8ce1d99c974d11973a5c3 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 15 Dec 2013 13:10:08 +0100 Subject: [PATCH 09/25] [Project] Changed all licence references to Apache License 2.0 --- LICENSE | 309 +++++++++++++++++++++++++++++--------------------------- pom.xml | 7 +- 2 files changed, 161 insertions(+), 155 deletions(-) diff --git a/LICENSE b/LICENSE index 37ec93a14..d64569567 100644 --- a/LICENSE +++ b/LICENSE @@ -1,180 +1,191 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -1. Definitions. + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. + 1. Definitions. -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -"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. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this 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. -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. -"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. + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. -"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). + "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. -"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. + "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). -"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." + "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. -"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. + "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." -2. Grant of Copyright License. + "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. -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. + 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. + 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. -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: -4. Redistribution. + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and -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: + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -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 -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. + (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 -5. Submission of Contributions. + (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. -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. + 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. -6. Trademarks. + 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. -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. + 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. + 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. -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. -8. Limitation of Liability. + 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. -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. + END OF TERMS AND CONDITIONS -9. Accepting Warranty or Additional Liability. + APPENDIX: How to apply the Apache License to your work. -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. + 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] @@ -182,7 +193,7 @@ third-party archives. 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 + 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, diff --git a/pom.xml b/pom.xml index 411501f26..b1c91f849 100644 --- a/pom.xml +++ b/pom.xml @@ -17,14 +17,9 @@ - - GNU Lesser General Public License - http://www.gnu.org/licenses/lgpl.html - repo - Apache License 2.0 - http://www.spdx.org/licenses/Apache-2.0 + http://www.apache.org/licenses/LICENSE-2.0 From 95052e16f97c21bf7fa7cb436786da2fe0b897ff Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 24 Dec 2013 02:43:37 +0100 Subject: [PATCH 10/25] [Minor] set artifact name to artifactId for easier reading of build log --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b1c91f849..fe8927e9a 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ li.strolch.parent 0.1.0-SNAPSHOT pom - Parent for li.strolch projects + li.strolch.parent Parent for all li.strolch projects for easier project maintenance 2013 From 80504aeb194d73f2b4567df91cc66bf2f2656fea Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 24 Dec 2013 16:49:36 +0100 Subject: [PATCH 11/25] [New] added configuration for maven-war-plugin --- pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pom.xml b/pom.xml index fe8927e9a..56cac2bdd 100644 --- a/pom.xml +++ b/pom.xml @@ -266,6 +266,16 @@ + + org.apache.maven.plugins + maven-war-plugin + 2.4 + + false + ${warFinalName} + + + org.apache.maven.plugins maven-javadoc-plugin From c2c70d7a8604ac7d83ad2ab254f7909ca4103c91 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 25 Dec 2013 15:18:15 +0100 Subject: [PATCH 12/25] [New] added plugin management for tomcat7-maven-plugin --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 56cac2bdd..fa8e43377 100644 --- a/pom.xml +++ b/pom.xml @@ -275,6 +275,17 @@ ${warFinalName} + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + ${tomcat7Url} + ${tomcat7ServerId} + /${warFinalName} + + org.apache.maven.plugins From dcbae91a004b37424583861b3055072a7323c236 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 10 Jan 2014 16:50:07 +0100 Subject: [PATCH 13/25] [Major] removed project li.strolch.persistence.api Moved all classes to li.strolch.runtime --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index fa8e43377..02905e5ad 100644 --- a/pom.xml +++ b/pom.xml @@ -86,11 +86,6 @@ li.strolch.testbase ${project.version} - - li.strolch - li.strolch.persistence.api - ${project.version} - li.strolch li.strolch.persistence.xml From 291f7f352fc762820eaaea661500660ff75c6f7a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 10 Jan 2014 17:16:52 +0100 Subject: [PATCH 14/25] [Major] renamed project li.strolch.runtime to li.strolch.agent --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02905e5ad..1951c849e 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ li.strolch - li.strolch.runtime + li.strolch.agent ${project.version} From f835fad2cbdfa292f8d7d3e57561b4420cd0bce7 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 15 Jan 2014 22:10:15 +0100 Subject: [PATCH 15/25] [New] Added new project li.strolch.rest --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 1951c849e..6e2b6d5f3 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,11 @@ li.strolch.service ${project.version} + + li.strolch + li.strolch.rest + ${project.version} + li.strolch li.strolch.bom From 7132a0c77ff0e172f6481497c58e0f709d8dce8a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 23 Jan 2014 22:00:56 +0100 Subject: [PATCH 16/25] [New] added version info metadata to agent --- pom.xml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e2b6d5f3..7b05dc349 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,8 @@ UTF-8 + yyyy-MM-dd HH:mm:ss + ${maven.build.timestamp} @@ -75,7 +77,6 @@ - li.strolch li.strolch.model @@ -202,8 +203,35 @@ + + + + src/main/resources + true + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.2 + + + validate + + create + + + + + false + false + + + org.apache.maven.plugins maven-compiler-plugin From 13f0bc391d5cb1cf1e4a03fefbcaee3b04122efa Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 23 Jan 2014 22:52:40 +0100 Subject: [PATCH 17/25] [Project] added Jenkins build badge to README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 300f3bd44..f5ff4305e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ li.strolch.parent ================= +[![Build Status](http://jenkins.eitchnet.ch/buildStatus/icon?job=li.strolch.parent)](http://jenkins.eitchnet.ch/view/strolch/job/li.strolch.parent/) + Parent for all li.strolch projects for easier project maintenance From ffc8be74988ddbe33a2f00292a06b3e0667d952b Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 3 Mar 2014 23:33:21 +0100 Subject: [PATCH 18/25] [Minor] Testbase dependency management is scope test also added postgresql dependency management --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 7b05dc349..fd1e1ed97 100644 --- a/pom.xml +++ b/pom.xml @@ -86,12 +86,18 @@ li.strolch li.strolch.testbase ${project.version} + test li.strolch li.strolch.persistence.xml ${project.version} + + li.strolch + li.strolch.persistence.postgresql + ${project.version} + li.strolch li.strolch.agent From d40ea5616ba6f02920ded6f9f064834d12935752 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 14 Mar 2014 14:36:45 +0100 Subject: [PATCH 19/25] [Project] fixed urls of projects --- pom.xml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index fd1e1ed97..627756bd0 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ eitchnet.ch - http://blog.eitchnet.ch + http://www.strolch.li @@ -35,33 +35,17 @@ eitch Robert von Vurg eitch@eitchnet.ch - http://blog.eitchnet.ch + http://www.eitchnet.ch eitchnet.ch - http://blog.eitchnet.ch + http://www.eitchnet.ch architect developer +1 - - http://localhost - - - - - - nexus.eitchnet.ch From 33d5c13ebe816cc7837a16a3707b0af3b338dc0b Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 19 Mar 2014 14:19:43 +0100 Subject: [PATCH 20/25] [Project] Enabled compiler warnings for maven-compiler-plugin --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 627756bd0..65942e94a 100644 --- a/pom.xml +++ b/pom.xml @@ -229,6 +229,9 @@ 1.7 1.7 + true + true + -Xlint:all From 9997dce1e426b77397f84437c8b2e5af5f4162e3 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 21 Mar 2014 22:52:31 +0100 Subject: [PATCH 21/25] [Project] sources are now generated in package goal --- pom.xml | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index fd1e1ed97..d07692b49 100644 --- a/pom.xml +++ b/pom.xml @@ -84,9 +84,13 @@ li.strolch - li.strolch.testbase + li.strolch.agent + ${project.version} + + + li.strolch + li.strolch.service ${project.version} - test li.strolch @@ -98,21 +102,28 @@ li.strolch.persistence.postgresql ${project.version} - - li.strolch - li.strolch.agent - ${project.version} - - - li.strolch - li.strolch.service - ${project.version} - li.strolch li.strolch.rest ${project.version} + + li.strolch + li.strolch.tutorialapp + ${project.version} + + + li.strolch + li.strolch.tutorialwebapp + war + ${project.version} + + + li.strolch + li.strolch.testbase + ${project.version} + test + li.strolch li.strolch.bom @@ -273,7 +284,7 @@ attach-sources - verify + package jar-no-fork From 774d1302a5f8685965ffdaa5e0dcc52816f1fba5 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 14 Aug 2014 16:35:33 +0200 Subject: [PATCH 22/25] [Project] added plugin depedencies for version --- pom.xml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f396e9ae0..54618cac5 100644 --- a/pom.xml +++ b/pom.xml @@ -212,9 +212,22 @@ - + + + org.codehaus.mojo + versions-maven-plugin + 2.1 + + + maven-scm-plugin + 1.9.1 + + ${project.artifactId}-${project.version} + + + org.codehaus.mojo buildnumber-maven-plugin From 844b571caffc616eb6daef67c84444dec30f234a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 17:22:42 +0200 Subject: [PATCH 23/25] [Project] set version to 1.0.0-SNAPSHOT --- pom.xml | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/pom.xml b/pom.xml index 54618cac5..3cf35cd96 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ li.strolch li.strolch.parent - 0.1.0-SNAPSHOT + 1.0.0-SNAPSHOT pom li.strolch.parent Parent for all li.strolch projects for easier project maintenance @@ -91,46 +91,33 @@ li.strolch.rest ${project.version} - - li.strolch - li.strolch.tutorialapp - ${project.version} - - - li.strolch - li.strolch.tutorialwebapp - war - ${project.version} - + + li.strolch li.strolch.testbase ${project.version} test - - li.strolch - li.strolch.bom - pom - ${project.version} - + ch.eitchnet ch.eitchnet.utils - 0.2.0-SNAPSHOT + 1.0.0-SNAPSHOT ch.eitchnet ch.eitchnet.xmlpers - 0.3.0-SNAPSHOT + 1.0.0-SNAPSHOT ch.eitchnet ch.eitchnet.privilege - 0.2.0-SNAPSHOT + 1.0.0-SNAPSHOT + org.slf4j slf4j-api @@ -142,6 +129,7 @@ 1.2 + junit junit @@ -171,16 +159,17 @@ + ch.eitchnet ch.eitchnet.utils - org.slf4j slf4j-api + junit junit @@ -204,7 +193,6 @@ - src/main/resources From 45e92e4dce0b544dbcf7056114a37d1870986c4b Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 17:31:55 +0200 Subject: [PATCH 24/25] [Project] set version to 1.0.0-SNAPSHOT --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3cf35cd96..537a413aa 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ yyyy-MM-dd HH:mm:ss ${maven.build.timestamp} - + @@ -202,7 +202,6 @@ - org.codehaus.mojo versions-maven-plugin From 128fdd2f972125b792f5fd08048d8815bb8ba2dd Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 16 Sep 2014 08:51:34 +0200 Subject: [PATCH 25/25] moved everything to a subdirectory for repo merge --- .gitignore => li.strolch.parent/.gitignore | 0 LICENSE => li.strolch.parent/LICENSE | 0 README.md => li.strolch.parent/README.md | 0 pom.xml => li.strolch.parent/pom.xml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => li.strolch.parent/.gitignore (100%) rename LICENSE => li.strolch.parent/LICENSE (100%) rename README.md => li.strolch.parent/README.md (100%) rename pom.xml => li.strolch.parent/pom.xml (100%) diff --git a/.gitignore b/li.strolch.parent/.gitignore similarity index 100% rename from .gitignore rename to li.strolch.parent/.gitignore diff --git a/LICENSE b/li.strolch.parent/LICENSE similarity index 100% rename from LICENSE rename to li.strolch.parent/LICENSE diff --git a/README.md b/li.strolch.parent/README.md similarity index 100% rename from README.md rename to li.strolch.parent/README.md diff --git a/pom.xml b/li.strolch.parent/pom.xml similarity index 100% rename from pom.xml rename to li.strolch.parent/pom.xml