From 35e91e0464b03bdb2d1cd9180de0965b5039c332 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 10:43:40 -0700 Subject: [PATCH 01/50] 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..3f467c8fb --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +li.strolch.module +================= + +Module build to quickly build all li.strolch projects From f5431e0f0e2458bf4b6edd01556acbf2e9ac43b0 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 19:55:25 +0200 Subject: [PATCH 02/50] Initial Commit --- pom.xml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..db323f598 --- /dev/null +++ b/pom.xml @@ -0,0 +1,26 @@ + + 4.0.0 + + + li.strolch + li.strolch.parent + 0.1.0-SNAPSHOT + ../li.strolch.parent + + + li.strolch.module + pom + Module build for li.strolch projects + Module build to quickly build all li.strolch projects + + + ../li.strolch.parent + ../li.strolch.model + ../li.strolch.persistence.api + ../li.strolch.persistence.impl + ../li.strolch.runtime + ../li.strolch.service.api + ../li.strolch.service.impl + + \ No newline at end of file From d26a3690426fa00cfbb21873487ec093a4174170 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 19:56:47 +0200 Subject: [PATCH 03/50] Added ignores of eclipse files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 2f7896d1d..81a688aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ target/ +.settings +.project From a5ad111236c4732e9c0f1829b293ed3d54fd5809 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 20:00:48 +0200 Subject: [PATCH 04/50] Initial Commit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db323f598..7f9b04250 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ ../li.strolch.parent ../li.strolch.model ../li.strolch.persistence.api - ../li.strolch.persistence.impl + ../li.strolch.persistence.xml ../li.strolch.runtime ../li.strolch.service.api ../li.strolch.service.impl From 364d8dc0137d49f9b18d598f7d3335dfb0e741bd Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 23 Oct 2013 20:10:36 +0200 Subject: [PATCH 05/50] [Project] added module li.strolch.service --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f9b04250..d94ea8ea6 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,6 @@ ../li.strolch.persistence.api ../li.strolch.persistence.xml ../li.strolch.runtime - ../li.strolch.service.api - ../li.strolch.service.impl + ../li.strolch.service \ No newline at end of file From 1c8a15390f5cbe631891cb9f16df0089bf3ec17f Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 24 Oct 2013 21:56:56 +0200 Subject: [PATCH 06/50] [New] added new module li.strolch.testbase --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d94ea8ea6..6894859db 100644 --- a/pom.xml +++ b/pom.xml @@ -17,9 +17,10 @@ ../li.strolch.parent ../li.strolch.model + ../li.strolch.testbase ../li.strolch.persistence.api ../li.strolch.persistence.xml ../li.strolch.runtime ../li.strolch.service - \ No newline at end of file + From f0cbb735b2f12d88f058641357abb78ced5fa853 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 26 Oct 2013 17:06:27 +0200 Subject: [PATCH 07/50] [Project] Refactoring projecto to be called .dev --- .gitignore | 8 ++++++++ bootstrap.sh | 40 ++++++++++++++++++++++++++++++++++++++++ pom.xml | 22 +++++++++++----------- update.sh | 18 ++++++++++++++++++ 4 files changed, 77 insertions(+), 11 deletions(-) create mode 100755 bootstrap.sh create mode 100755 update.sh diff --git a/.gitignore b/.gitignore index 81a688aa5..9ee913148 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,11 @@ target/ .settings .project +li.strolch.model +li.strolch.module +li.strolch.testbase +li.strolch.runtime +li.strolch.service +li.strolch.bom +li.strolch.persistence.api +li.strolch.persistence.xml diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 000000000..ac0775924 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,40 @@ +#!/bin/bash +####################################################################### +## +## Bootstrap developing of strolch projects by cloning all the +## projects. +## +####################################################################### + +echo "Cloning all strolch projects..." +if ! git clone git@github.com:eitch/li.strolch.model.git ; then + exit 1 +fi +echo +if ! git clone git@github.com:eitch/li.strolch.testbase.git ; then + exit 1 +fi +echo +if ! git clone git@github.com:eitch/li.strolch.runtime.git ; then + exit 1 +fi +echo +if ! git clone git@github.com:eitch/li.strolch.service.git ; then + exit 1 +fi +echo +if ! git clone git@github.com:eitch/li.strolch.bom.git ; then + exit 1 +fi +echo +if ! git clone git@github.com:eitch/li.strolch.persistence.api.git ; then + exit 1 +fi +echo +if ! git clone git@github.com:eitch/li.strolch.persistence.xml.git ; then + exit 1 +fi +echo + +echo "Done." +exit 0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6894859db..150d0b82f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,21 +6,21 @@ li.strolch li.strolch.parent 0.1.0-SNAPSHOT - ../li.strolch.parent + li.strolch.parent - li.strolch.module + li.strolch.dev pom - Module build for li.strolch projects - Module build to quickly build all li.strolch projects + Dev module build for li.strolch projects + Project used to develop strolch modules. Contains scripts for bootstrapping development, etc. - ../li.strolch.parent - ../li.strolch.model - ../li.strolch.testbase - ../li.strolch.persistence.api - ../li.strolch.persistence.xml - ../li.strolch.runtime - ../li.strolch.service + li.strolch.parent + li.strolch.model + li.strolch.testbase + li.strolch.persistence.api + li.strolch.persistence.xml + li.strolch.runtime + li.strolch.service diff --git a/update.sh b/update.sh new file mode 100755 index 000000000..3980555b6 --- /dev/null +++ b/update.sh @@ -0,0 +1,18 @@ +#!/bin/bash +####################################################################### +## +## Bootstrap developing of strolch projects by cloning all the +## projects. +## +####################################################################### + +echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. +echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. +echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. +echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. +echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. +echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. +echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. + +echo "Done." +exit 0 \ No newline at end of file From 1bf99a0d624ed22e069a1941cba0f5cb6c9843a2 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 27 Oct 2013 03:46:16 +0100 Subject: [PATCH 08/50] [New] Initial commit of bootstrap scripts --- bootstrap.sh | 86 +++++++++++++++++++++++++++++++++++++++------------- pom.xml | 3 +- update.sh | 3 +- 3 files changed, 69 insertions(+), 23 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index ac0775924..b5db304c4 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -7,34 +7,78 @@ ####################################################################### echo "Cloning all strolch projects..." -if ! git clone git@github.com:eitch/li.strolch.model.git ; then - exit 1 + +if [ -d li.strolch.parent ] ; then + echo "Project li.strolch.parent already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.parent.git ; then + exit 1 + fi + echo fi -echo -if ! git clone git@github.com:eitch/li.strolch.testbase.git ; then - exit 1 + +if [ -d li.strolch.bom ] ; then + echo "Project li.strolch.bom already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.bom.git ; then + exit 1 + fi + echo fi -echo -if ! git clone git@github.com:eitch/li.strolch.runtime.git ; then - exit 1 + +if [ -d li.strolch.model ] ; then + echo "Project li.strolch.model already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.model.git ; then + exit 1 + fi + echo fi -echo -if ! git clone git@github.com:eitch/li.strolch.service.git ; then - exit 1 + +if [ -d li.strolch.testbase ] ; then + echo "Project li.strolch.testbase already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.testbase.git ; then + exit 1 + fi + echo fi -echo -if ! git clone git@github.com:eitch/li.strolch.bom.git ; then - exit 1 + +if [ -d li.strolch.runtime ] ; then + echo "Project li.strolch.runtime already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.runtime.git ; then + exit 1 + fi + echo fi -echo -if ! git clone git@github.com:eitch/li.strolch.persistence.api.git ; then - exit 1 + +if [ -d li.strolch.service ] ; then + echo "Project li.strolch.service already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.service.git ; then + exit 1 + fi + echo fi -echo -if ! git clone git@github.com:eitch/li.strolch.persistence.xml.git ; then - exit 1 + +if [ -d li.strolch.persistence.api ] ; then + echo "Project li.strolch.persistence.api already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.persistence.api.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.persistence.xml ] ; then + echo "Project li.strolch.persistence.xml already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.persistence.xml.git ; then + exit 1 + fi + echo fi -echo echo "Done." exit 0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 150d0b82f..a5a80531d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ li.strolch li.strolch.parent 0.1.0-SNAPSHOT - li.strolch.parent + li.strolch.parent/pom.xml li.strolch.dev @@ -16,6 +16,7 @@ li.strolch.parent + li.strolch.bom li.strolch.model li.strolch.testbase li.strolch.persistence.api diff --git a/update.sh b/update.sh index 3980555b6..1739d5ce6 100755 --- a/update.sh +++ b/update.sh @@ -6,11 +6,12 @@ ## ####################################################################### +echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. +echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. -echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. From f3a912069f7fcc16027e887b8f746c79105312df Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 27 Oct 2013 03:49:34 +0100 Subject: [PATCH 09/50] [New] added push script --- .gitignore | 1 + push.sh | 19 +++++++++++++++++++ update.sh | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 push.sh diff --git a/.gitignore b/.gitignore index 9ee913148..8f28c44ef 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ li.strolch.service li.strolch.bom li.strolch.persistence.api li.strolch.persistence.xml +li.strolch.parent diff --git a/push.sh b/push.sh new file mode 100755 index 000000000..30b39c1b9 --- /dev/null +++ b/push.sh @@ -0,0 +1,19 @@ +#!/bin/bash +####################################################################### +## +## Distribute all projects by pushing to upstream +## +####################################################################### + +echo "Updating li.strolch.dev..." ; git push +echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. +echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. +echo "Updating li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. +echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. +echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. +echo "Updating li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. +echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. +echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. + +echo "Done." +exit 0 \ No newline at end of file diff --git a/update.sh b/update.sh index 1739d5ce6..ea436f477 100755 --- a/update.sh +++ b/update.sh @@ -1,11 +1,11 @@ #!/bin/bash ####################################################################### ## -## Bootstrap developing of strolch projects by cloning all the -## projects. +## Update all projects by pulling from upstream ## ####################################################################### +echo "Updating li.strolch.dev..." ; git pull echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. From 7c598a552fecb90b156f1ecaecfbba0eb897e5d2 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 27 Oct 2013 03:51:16 +0100 Subject: [PATCH 10/50] [Minor] cleanup --- push.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/push.sh b/push.sh index 30b39c1b9..eade6ecc8 100755 --- a/push.sh +++ b/push.sh @@ -5,15 +5,15 @@ ## ####################################################################### -echo "Updating li.strolch.dev..." ; git push -echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. -echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. -echo "Updating li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. -echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. -echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. -echo "Updating li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. -echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. -echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. +echo "Pushing li.strolch.dev..." ; git push +echo "Pushing li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. +echo "Pushing li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. +echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. +echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. +echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. +echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. +echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. +echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. echo "Done." exit 0 \ No newline at end of file From ac9cba1f08f42798eb04f47de690c5750e488be2 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 27 Oct 2013 03:58:29 +0100 Subject: [PATCH 11/50] [New] added a bootstrap_https.sh for https cloning on CI --- bootstrap_https.sh | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100755 bootstrap_https.sh diff --git a/bootstrap_https.sh b/bootstrap_https.sh new file mode 100755 index 000000000..207b90218 --- /dev/null +++ b/bootstrap_https.sh @@ -0,0 +1,84 @@ +#!/bin/bash +####################################################################### +## +## Bootstrap developing of strolch projects by cloning all the +## projects. +## +####################################################################### + +echo "Cloning all strolch projects..." + +if [ -d li.strolch.parent ] ; then + echo "Project li.strolch.parent already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.parent.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.bom ] ; then + echo "Project li.strolch.bom already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.bom.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.model ] ; then + echo "Project li.strolch.model already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.model.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.testbase ] ; then + echo "Project li.strolch.testbase already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.testbase.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.runtime ] ; then + echo "Project li.strolch.runtime already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.runtime.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.service ] ; then + echo "Project li.strolch.service already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.service.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.persistence.api ] ; then + echo "Project li.strolch.persistence.api already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.persistence.api.git ; then + exit 1 + fi + echo +fi + +if [ -d li.strolch.persistence.xml ] ; then + echo "Project li.strolch.persistence.xml already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.persistence.xml.git ; then + exit 1 + fi + echo +fi + +echo "Done." +exit 0 \ No newline at end of file From 7a8e9a5e14e183a84f61954f25b0b84d5d6a819f Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 27 Oct 2013 22:23:38 +0100 Subject: [PATCH 12/50] [Minor] code formatting --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index a5a80531d..cbb7567f2 100644 --- a/pom.xml +++ b/pom.xml @@ -15,13 +15,13 @@ Project used to develop strolch modules. Contains scripts for bootstrapping development, etc. - li.strolch.parent - li.strolch.bom - li.strolch.model - li.strolch.testbase - li.strolch.persistence.api - li.strolch.persistence.xml - li.strolch.runtime - li.strolch.service - + li.strolch.parent + li.strolch.bom + li.strolch.model + li.strolch.testbase + li.strolch.persistence.api + li.strolch.persistence.xml + li.strolch.runtime + li.strolch.service + From 93154566d64fe5f2d706aa343cbee171a2dad97e Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 27 Oct 2013 23:11:34 +0100 Subject: [PATCH 13/50] [Minor] README cleanup --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3f467c8fb..46ee95bda 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -li.strolch.module +li.strolch.dev ================= -Module build to quickly build all li.strolch projects +Dev module build for li.strolch projects From 528f97947299411a7bc5003495243a9e08680421 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 28 Oct 2013 18:58:05 +0100 Subject: [PATCH 14/50] [Project] modules may not be in a subfolder... --- bootstrap.sh | 32 ++++++++++++++++---------------- bootstrap_https.sh | 32 ++++++++++++++++---------------- pom.xml | 18 +++++++++--------- push.sh | 18 +++++++++--------- update.sh | 18 +++++++++--------- 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index b5db304c4..ed7e266fb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -8,73 +8,73 @@ echo "Cloning all strolch projects..." -if [ -d li.strolch.parent ] ; then +if [ -d ../li.strolch.parent ] ; then echo "Project li.strolch.parent already cloned." else - if ! git clone git@github.com:eitch/li.strolch.parent.git ; then + if ! git clone git@github.com:eitch/li.strolch.parent.git ../li.strolch.parent ;then exit 1 fi echo fi -if [ -d li.strolch.bom ] ; then +if [ -d ../li.strolch.bom ] ; then echo "Project li.strolch.bom already cloned." else - if ! git clone git@github.com:eitch/li.strolch.bom.git ; then + if ! git clone git@github.com:eitch/li.strolch.bom.git ../li.strolch.bom ;then exit 1 fi echo fi -if [ -d li.strolch.model ] ; then +if [ -d ../li.strolch.model ] ; then echo "Project li.strolch.model already cloned." else - if ! git clone git@github.com:eitch/li.strolch.model.git ; then + if ! git clone git@github.com:eitch/li.strolch.model.git ../li.strolch.model ;then exit 1 fi echo fi -if [ -d li.strolch.testbase ] ; then +if [ -d ../li.strolch.testbase ] ; then echo "Project li.strolch.testbase already cloned." else - if ! git clone git@github.com:eitch/li.strolch.testbase.git ; then + if ! git clone git@github.com:eitch/li.strolch.testbase.git ../li.strolch.testbase ;then exit 1 fi echo fi -if [ -d li.strolch.runtime ] ; then +if [ -d ../li.strolch.runtime ] ; then echo "Project li.strolch.runtime already cloned." else - if ! git clone git@github.com:eitch/li.strolch.runtime.git ; then + if ! git clone git@github.com:eitch/li.strolch.runtime.git ../li.strolch.runtime ;then exit 1 fi echo fi -if [ -d li.strolch.service ] ; then +if [ -d ../li.strolch.service ] ; then echo "Project li.strolch.service already cloned." else - if ! git clone git@github.com:eitch/li.strolch.service.git ; then + if ! git clone git@github.com:eitch/li.strolch.service.git ../li.strolch.service ;then exit 1 fi echo fi -if [ -d li.strolch.persistence.api ] ; then +if [ -d ../li.strolch.persistence.api ] ; then echo "Project li.strolch.persistence.api already cloned." else - if ! git clone git@github.com:eitch/li.strolch.persistence.api.git ; then + if ! git clone git@github.com:eitch/li.strolch.persistence.api.git ../li.strolch.persistence.api ;then exit 1 fi echo fi -if [ -d li.strolch.persistence.xml ] ; then +if [ -d ../li.strolch.persistence.xml ] ; then echo "Project li.strolch.persistence.xml already cloned." else - if ! git clone git@github.com:eitch/li.strolch.persistence.xml.git ; then + if ! git clone git@github.com:eitch/li.strolch.persistence.xml.git ../li.strolch.persistence.xml ;then exit 1 fi echo diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 207b90218..fb5fd6c28 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -8,73 +8,73 @@ echo "Cloning all strolch projects..." -if [ -d li.strolch.parent ] ; then +if [ -d ../li.strolch.parent ] ; then echo "Project li.strolch.parent already cloned." else - if ! git clone https://github.com/eitch/li.strolch.parent.git ; then + if ! git clone https://github.com/eitch/li.strolch.parent.git ../li.strolch.parent ;then exit 1 fi echo fi -if [ -d li.strolch.bom ] ; then +if [ -d ../li.strolch.bom ] ; then echo "Project li.strolch.bom already cloned." else - if ! git clone https://github.com/eitch/li.strolch.bom.git ; then + if ! git clone https://github.com/eitch/li.strolch.bom.git ../li.strolch.bom ;then exit 1 fi echo fi -if [ -d li.strolch.model ] ; then +if [ -d ../li.strolch.model ] ; then echo "Project li.strolch.model already cloned." else - if ! git clone https://github.com/eitch/li.strolch.model.git ; then + if ! git clone https://github.com/eitch/li.strolch.model.git ../li.strolch.model ;then exit 1 fi echo fi -if [ -d li.strolch.testbase ] ; then +if [ -d ../li.strolch.testbase ] ; then echo "Project li.strolch.testbase already cloned." else - if ! git clone https://github.com/eitch/li.strolch.testbase.git ; then + if ! git clone https://github.com/eitch/li.strolch.testbase.git ../li.strolch.testbase ;then exit 1 fi echo fi -if [ -d li.strolch.runtime ] ; then +if [ -d ../li.strolch.runtime ] ; then echo "Project li.strolch.runtime already cloned." else - if ! git clone https://github.com/eitch/li.strolch.runtime.git ; then + if ! git clone https://github.com/eitch/li.strolch.runtime.git ../li.strolch.runtime ;then exit 1 fi echo fi -if [ -d li.strolch.service ] ; then +if [ -d ../li.strolch.service ] ; then echo "Project li.strolch.service already cloned." else - if ! git clone https://github.com/eitch/li.strolch.service.git ; then + if ! git clone https://github.com/eitch/li.strolch.service.git ../li.strolch.service ;then exit 1 fi echo fi -if [ -d li.strolch.persistence.api ] ; then +if [ -d ../li.strolch.persistence.api ] ; then echo "Project li.strolch.persistence.api already cloned." else - if ! git clone https://github.com/eitch/li.strolch.persistence.api.git ; then + if ! git clone https://github.com/eitch/li.strolch.persistence.api.git ../li.strolch.persistence.api ;then exit 1 fi echo fi -if [ -d li.strolch.persistence.xml ] ; then +if [ -d ../li.strolch.persistence.xml ] ; then echo "Project li.strolch.persistence.xml already cloned." else - if ! git clone https://github.com/eitch/li.strolch.persistence.xml.git ; then + if ! git clone https://github.com/eitch/li.strolch.persistence.xml.git ../li.strolch.persistence.xml ;then exit 1 fi echo diff --git a/pom.xml b/pom.xml index cbb7567f2..389490131 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ li.strolch li.strolch.parent 0.1.0-SNAPSHOT - li.strolch.parent/pom.xml + ../li.strolch.parent/pom.xml li.strolch.dev @@ -15,13 +15,13 @@ Project used to develop strolch modules. Contains scripts for bootstrapping development, etc. - li.strolch.parent - li.strolch.bom - li.strolch.model - li.strolch.testbase - li.strolch.persistence.api - li.strolch.persistence.xml - li.strolch.runtime - li.strolch.service + ../li.strolch.parent + ../li.strolch.bom + ../li.strolch.model + ../li.strolch.testbase + ../li.strolch.persistence.api + ../li.strolch.persistence.xml + ../li.strolch.runtime + ../li.strolch.service diff --git a/push.sh b/push.sh index eade6ecc8..4e1ce4e89 100755 --- a/push.sh +++ b/push.sh @@ -5,15 +5,15 @@ ## ####################################################################### -echo "Pushing li.strolch.dev..." ; git push -echo "Pushing li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. -echo "Pushing li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. -echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. -echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. -echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. -echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. -echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. -echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. +echo "Pushing li.strolch.dev..." ; git push ; cd .. ; echo +echo "Pushing li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. ; echo +echo "Pushing li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. ; echo +echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. ; echo +echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. ; echo +echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. ; echo +echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo +echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. ; echo +echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo echo "Done." exit 0 \ No newline at end of file diff --git a/update.sh b/update.sh index ea436f477..2a1437fbc 100755 --- a/update.sh +++ b/update.sh @@ -5,15 +5,15 @@ ## ####################################################################### -echo "Updating li.strolch.dev..." ; git pull -echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. -echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. -echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. -echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. -echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. -echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. -echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. -echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. +echo "Updating li.strolch.dev..." ; git pull ; cd .. ; echo +echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. ; echo +echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. ; echo +echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. ; echo +echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. ; echo +echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. ; echo +echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo +echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. ; echo +echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo echo "Done." exit 0 \ No newline at end of file From 4947d256b3d7bb4d428ca63a7b48b5b366f9b837 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 28 Oct 2013 22:02:04 +0100 Subject: [PATCH 15/50] [New] added tutorialapp --- bootstrap.sh | 9 +++++++++ bootstrap_https.sh | 9 +++++++++ pom.xml | 1 + push.sh | 1 + update.sh | 1 + 5 files changed, 21 insertions(+) diff --git a/bootstrap.sh b/bootstrap.sh index ed7e266fb..e8e1a8143 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -80,5 +80,14 @@ else echo fi +if [ -d ../li.strolch.tutorialapp ] ; then + echo "Project li.strolch.tutorialapp already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.tutorialapp.git ../li.strolch.tutorialapp ;then + exit 1 + fi + echo +fi + echo "Done." exit 0 \ No newline at end of file diff --git a/bootstrap_https.sh b/bootstrap_https.sh index fb5fd6c28..91754a25e 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -80,5 +80,14 @@ else echo fi +if [ -d ../li.strolch.tutorialapp ] ; then + echo "Project li.strolch.tutorialapp already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.tutorialapp.git ../li.strolch.tutorialapp.xml ;then + exit 1 + fi + echo +fi + echo "Done." exit 0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 389490131..91c8f88ba 100644 --- a/pom.xml +++ b/pom.xml @@ -23,5 +23,6 @@ ../li.strolch.persistence.xml ../li.strolch.runtime ../li.strolch.service + ../li.strolch.tutorialapp diff --git a/push.sh b/push.sh index 4e1ce4e89..a007db766 100755 --- a/push.sh +++ b/push.sh @@ -14,6 +14,7 @@ echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo +echo "Pushing li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git push ; cd .. ; echo echo "Done." exit 0 \ No newline at end of file diff --git a/update.sh b/update.sh index 2a1437fbc..30e7787d4 100755 --- a/update.sh +++ b/update.sh @@ -14,6 +14,7 @@ echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo +echo "Updating li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git pull ; cd .. ; echo echo "Done." exit 0 \ No newline at end of file From d79532c2015f3abfa14bc9462d34a9bd7552d184 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 14 Nov 2013 21:42:48 +0100 Subject: [PATCH 16/50] [New] Added new script to list git status of each project --- status.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 status.sh diff --git a/status.sh b/status.sh new file mode 100755 index 000000000..72231d37d --- /dev/null +++ b/status.sh @@ -0,0 +1,20 @@ +#!/bin/bash +####################################################################### +## +## Show status of all projects +## +####################################################################### + +echo "Showing status of li.strolch.dev..." ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.parent..." ; cd li.strolch.parent ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.bom..." ; cd li.strolch.bom ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.model..." ; cd li.strolch.model ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.testbase..." ; cd li.strolch.testbase ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.runtime..." ; cd li.strolch.runtime ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo + +echo "Done." +exit 0 From f1f6719caf035fc24a4bb1e193c2eb5cf648e4e9 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 16 Nov 2013 01:52:03 +0100 Subject: [PATCH 17/50] [New] added script to log commits ahead of origin --- aheadStatus.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 aheadStatus.sh diff --git a/aheadStatus.sh b/aheadStatus.sh new file mode 100755 index 000000000..9e24780db --- /dev/null +++ b/aheadStatus.sh @@ -0,0 +1,30 @@ +#!/bin/bash +####################################################################### +## +## Shows how far ahead each project is against origin +## +####################################################################### + +function logAheadCount() { + aheadCount="$(git rev-list origin..master --count)" + if [ "${aheadCount}" -ne 0 ] ; then + project="${PWD}" + project="${project##*/}" + echo "${project} is ahead of origin by ${aheadCount} commits" + fi +} + +echo "Checking how far ahead each project is against origin..." +cd .. +cd "li.strolch.parent" ; logAheadCount ; cd .. +cd "li.strolch.bom" ; logAheadCount ; cd .. +cd "li.strolch.model" ; logAheadCount ; cd .. +cd "li.strolch.testbase" ; logAheadCount ; cd .. +cd "li.strolch.runtime" ; logAheadCount ; cd .. +cd "li.strolch.service" ; logAheadCount ; cd .. +cd "li.strolch.persistence.api" ; logAheadCount ; cd .. +cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. +cd "li.strolch.tutorialapp" ; logAheadCount ; cd .. + +echo "Done." +exit 0 \ No newline at end of file From 4a828731d87b5061acd32bff4bafb21ad1e6067d Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 16 Nov 2013 01:52:42 +0100 Subject: [PATCH 18/50] [New] added script to log commits ahead of origin --- aheadStatus.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/aheadStatus.sh b/aheadStatus.sh index 9e24780db..2ad119019 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -16,6 +16,7 @@ function logAheadCount() { echo "Checking how far ahead each project is against origin..." cd .. +cd "li.strolch.dev" ; logAheadCount ; cd .. cd "li.strolch.parent" ; logAheadCount ; cd .. cd "li.strolch.bom" ; logAheadCount ; cd .. cd "li.strolch.model" ; logAheadCount ; cd .. From 43307a5bc721aa41dcd1395b99ba24e7c4610054 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 15 Dec 2013 13:09:53 +0100 Subject: [PATCH 19/50] [Project] Changed all licence references to Apache License 2.0 --- LICENSE | 309 +++++++++++++++++++++++++++++--------------------------- pom.xml | 20 ++-- 2 files changed, 170 insertions(+), 159 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 91c8f88ba..ed38d0656 100644 --- a/pom.xml +++ b/pom.xml @@ -15,14 +15,14 @@ Project used to develop strolch modules. Contains scripts for bootstrapping development, etc. - ../li.strolch.parent - ../li.strolch.bom - ../li.strolch.model - ../li.strolch.testbase - ../li.strolch.persistence.api - ../li.strolch.persistence.xml - ../li.strolch.runtime - ../li.strolch.service - ../li.strolch.tutorialapp - + ../li.strolch.parent + ../li.strolch.bom + ../li.strolch.model + ../li.strolch.testbase + ../li.strolch.persistence.api + ../li.strolch.persistence.xml + ../li.strolch.runtime + ../li.strolch.service + ../li.strolch.tutorialapp + From eb382bd8543a8ebd1dc677fdee95c789dbe89e81 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 18 Dec 2013 17:45:13 +0100 Subject: [PATCH 20/50] [New] added new project li.strolch.persistence.postgres --- aheadStatus.sh | 1 + bootstrap.sh | 9 +++++++++ bootstrap_https.sh | 9 +++++++++ pom.xml | 1 + push.sh | 1 + status.sh | 1 + update.sh | 1 + 7 files changed, 23 insertions(+) diff --git a/aheadStatus.sh b/aheadStatus.sh index 2ad119019..b87f61592 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -25,6 +25,7 @@ cd "li.strolch.runtime" ; logAheadCount ; cd .. cd "li.strolch.service" ; logAheadCount ; cd .. cd "li.strolch.persistence.api" ; logAheadCount ; cd .. cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. +cd "li.strolch.persistence.postgresql" ; logAheadCount ; cd .. cd "li.strolch.tutorialapp" ; logAheadCount ; cd .. echo "Done." diff --git a/bootstrap.sh b/bootstrap.sh index e8e1a8143..c612674fb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -80,6 +80,15 @@ else echo fi +if [ -d ../li.strolch.persistence.postgresql ] ; then + echo "Project li.strolch.persistence.postgresql already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.persistence.postgresql.git ../li.strolch.persistence.postgresql ;then + exit 1 + fi + echo +fi + if [ -d ../li.strolch.tutorialapp ] ; then echo "Project li.strolch.tutorialapp already cloned." else diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 91754a25e..26db9eaa4 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -80,6 +80,15 @@ else echo fi +if [ -d ../li.strolch.persistence.postgresql ] ; then + echo "Project li.strolch.persistence.postgresql already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.persistence.postgresql.git ../li.strolch.persistence.postgresql ;then + exit 1 + fi + echo +fi + if [ -d ../li.strolch.tutorialapp ] ; then echo "Project li.strolch.tutorialapp already cloned." else diff --git a/pom.xml b/pom.xml index ed38d0656..95747193a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ ../li.strolch.testbase ../li.strolch.persistence.api ../li.strolch.persistence.xml + ../li.strolch.persistence.postgresql ../li.strolch.runtime ../li.strolch.service ../li.strolch.tutorialapp diff --git a/push.sh b/push.sh index a007db766..5d3840385 100755 --- a/push.sh +++ b/push.sh @@ -14,6 +14,7 @@ echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo +echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo echo "Pushing li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git push ; cd .. ; echo echo "Done." diff --git a/status.sh b/status.sh index 72231d37d..d7595b448 100755 --- a/status.sh +++ b/status.sh @@ -14,6 +14,7 @@ echo "Showing status of li.strolch.runtime..." ; cd li.strolch.runtime ; git sta echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo echo "Done." diff --git a/update.sh b/update.sh index 30e7787d4..138c1323f 100755 --- a/update.sh +++ b/update.sh @@ -14,6 +14,7 @@ echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo +echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo echo "Updating li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git pull ; cd .. ; echo echo "Done." From 27c8eb32b4cd24586e08f635c3272ebf842c2aca Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 24 Dec 2013 02:43:32 +0100 Subject: [PATCH 21/50] [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 95747193a..42c1b9d8b 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ li.strolch.dev pom - Dev module build for li.strolch projects + li.strolch.dev Project used to develop strolch modules. Contains scripts for bootstrapping development, etc. From 5dd0ea8b071eef0b64b3732d9c86f9018914b8b4 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 24 Dec 2013 16:56:02 +0100 Subject: [PATCH 22/50] [New] added tutorialwebapp --- aheadStatus.sh | 1 + bootstrap.sh | 9 +++++++++ bootstrap_https.sh | 11 ++++++++++- pom.xml | 1 + push.sh | 1 + status.sh | 1 + update.sh | 1 + 7 files changed, 24 insertions(+), 1 deletion(-) diff --git a/aheadStatus.sh b/aheadStatus.sh index b87f61592..619dcc3b7 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -27,6 +27,7 @@ cd "li.strolch.persistence.api" ; logAheadCount ; cd .. cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. cd "li.strolch.persistence.postgresql" ; logAheadCount ; cd .. cd "li.strolch.tutorialapp" ; logAheadCount ; cd .. +cd "li.strolch.tutorialwebapp" ; logAheadCount ; cd .. echo "Done." exit 0 \ No newline at end of file diff --git a/bootstrap.sh b/bootstrap.sh index c612674fb..2cef3c6da 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -98,5 +98,14 @@ else echo fi +if [ -d ../li.strolch.tutorialwebapp ] ; then + echo "Project li.strolch.tutorialwebapp already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.tutorialwebapp.git ../li.strolch.tutorialwebapp ;then + exit 1 + fi + echo +fi + echo "Done." exit 0 \ No newline at end of file diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 26db9eaa4..c2472fab5 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -92,7 +92,16 @@ fi if [ -d ../li.strolch.tutorialapp ] ; then echo "Project li.strolch.tutorialapp already cloned." else - if ! git clone https://github.com/eitch/li.strolch.tutorialapp.git ../li.strolch.tutorialapp.xml ;then + if ! git clone https://github.com/eitch/li.strolch.tutorialapp.git ../li.strolch.tutorialapp ;then + exit 1 + fi + echo +fi + +if [ -d ../li.strolch.tutorialwebapp ] ; then + echo "Project li.strolch.tutorialwebapp already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.tutorialwebapp.git ../li.strolch.tutorialwebapp ;then exit 1 fi echo diff --git a/pom.xml b/pom.xml index 42c1b9d8b..244287217 100644 --- a/pom.xml +++ b/pom.xml @@ -25,5 +25,6 @@ ../li.strolch.runtime ../li.strolch.service ../li.strolch.tutorialapp + ../li.strolch.tutorialwebapp diff --git a/push.sh b/push.sh index 5d3840385..42e158dc8 100755 --- a/push.sh +++ b/push.sh @@ -16,6 +16,7 @@ echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; g echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo echo "Pushing li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git push ; cd .. ; echo +echo "Pushing li.strolch.tutorialwebapp..." ; cd li.strolch.tutorialwebapp ; git push ; cd .. ; echo echo "Done." exit 0 \ No newline at end of file diff --git a/status.sh b/status.sh index d7595b448..7bae5a821 100755 --- a/status.sh +++ b/status.sh @@ -16,6 +16,7 @@ echo "Showing status of li.strolch.persistence.api..." ; cd li.strolch.persisten echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.tutorialwebapp..." ; cd li.strolch.tutoriwebalapp ; git status -s ; cd .. ; echo echo "Done." exit 0 diff --git a/update.sh b/update.sh index 138c1323f..2190c89e2 100755 --- a/update.sh +++ b/update.sh @@ -16,6 +16,7 @@ echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo echo "Updating li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git pull ; cd .. ; echo +echo "Updating li.strolch.tutorialwebapp..." ; cd li.strolch.tutorialwebapp ; git pull ; cd .. ; echo echo "Done." exit 0 \ No newline at end of file From 71001def25850bacb75b9e91117fd66c4b17a661 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 10 Jan 2014 16:50:01 +0100 Subject: [PATCH 23/50] [Major] removed project li.strolch.persistence.api Moved all classes to li.strolch.runtime --- aheadStatus.sh | 1 - bootstrap.sh | 9 --------- bootstrap_https.sh | 9 --------- pom.xml | 1 - push.sh | 1 - status.sh | 1 - update.sh | 1 - 7 files changed, 23 deletions(-) diff --git a/aheadStatus.sh b/aheadStatus.sh index 619dcc3b7..03bba4a77 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -23,7 +23,6 @@ cd "li.strolch.model" ; logAheadCount ; cd .. cd "li.strolch.testbase" ; logAheadCount ; cd .. cd "li.strolch.runtime" ; logAheadCount ; cd .. cd "li.strolch.service" ; logAheadCount ; cd .. -cd "li.strolch.persistence.api" ; logAheadCount ; cd .. cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. cd "li.strolch.persistence.postgresql" ; logAheadCount ; cd .. cd "li.strolch.tutorialapp" ; logAheadCount ; cd .. diff --git a/bootstrap.sh b/bootstrap.sh index 2cef3c6da..5264f9497 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -62,15 +62,6 @@ else echo fi -if [ -d ../li.strolch.persistence.api ] ; then - echo "Project li.strolch.persistence.api already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.persistence.api.git ../li.strolch.persistence.api ;then - exit 1 - fi - echo -fi - if [ -d ../li.strolch.persistence.xml ] ; then echo "Project li.strolch.persistence.xml already cloned." else diff --git a/bootstrap_https.sh b/bootstrap_https.sh index c2472fab5..85a85e1c3 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -62,15 +62,6 @@ else echo fi -if [ -d ../li.strolch.persistence.api ] ; then - echo "Project li.strolch.persistence.api already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.persistence.api.git ../li.strolch.persistence.api ;then - exit 1 - fi - echo -fi - if [ -d ../li.strolch.persistence.xml ] ; then echo "Project li.strolch.persistence.xml already cloned." else diff --git a/pom.xml b/pom.xml index 244287217..f65742334 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ ../li.strolch.bom ../li.strolch.model ../li.strolch.testbase - ../li.strolch.persistence.api ../li.strolch.persistence.xml ../li.strolch.persistence.postgresql ../li.strolch.runtime diff --git a/push.sh b/push.sh index 42e158dc8..7979fe0ed 100755 --- a/push.sh +++ b/push.sh @@ -12,7 +12,6 @@ echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. ; ec echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. ; echo echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. ; echo echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo -echo "Pushing li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo echo "Pushing li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git push ; cd .. ; echo diff --git a/status.sh b/status.sh index 7bae5a821..1a9b139c7 100755 --- a/status.sh +++ b/status.sh @@ -12,7 +12,6 @@ echo "Showing status of li.strolch.model..." ; cd li.strolch.model ; git status echo "Showing status of li.strolch.testbase..." ; cd li.strolch.testbase ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.runtime..." ; cd li.strolch.runtime ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo diff --git a/update.sh b/update.sh index 2190c89e2..8efc9abcc 100755 --- a/update.sh +++ b/update.sh @@ -12,7 +12,6 @@ echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. ; e echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. ; echo echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. ; echo echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo -echo "Updating li.strolch.persistence.api..." ; cd li.strolch.persistence.api ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo echo "Updating li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git pull ; cd .. ; echo From 66c9a33efb85a5093064c5658805dd707fde590d Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 10 Jan 2014 16:52:54 +0100 Subject: [PATCH 24/50] [Minor] renamed update.sh to pull.sh This better denotes what the script does --- update.sh => pull.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename update.sh => pull.sh (100%) diff --git a/update.sh b/pull.sh similarity index 100% rename from update.sh rename to pull.sh From ff43aef8d785b9015bc38022cb7796b7c25a96d2 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 10 Jan 2014 17:16:44 +0100 Subject: [PATCH 25/50] [Major] renamed project li.strolch.runtime to li.strolch.agent --- aheadStatus.sh | 2 +- bootstrap.sh | 6 +++--- bootstrap_https.sh | 6 +++--- pom.xml | 2 +- pull.sh | 2 +- push.sh | 2 +- status.sh | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/aheadStatus.sh b/aheadStatus.sh index 03bba4a77..a4b1a4913 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -21,7 +21,7 @@ cd "li.strolch.parent" ; logAheadCount ; cd .. cd "li.strolch.bom" ; logAheadCount ; cd .. cd "li.strolch.model" ; logAheadCount ; cd .. cd "li.strolch.testbase" ; logAheadCount ; cd .. -cd "li.strolch.runtime" ; logAheadCount ; cd .. +cd "li.strolch.agent" ; logAheadCount ; cd .. cd "li.strolch.service" ; logAheadCount ; cd .. cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. cd "li.strolch.persistence.postgresql" ; logAheadCount ; cd .. diff --git a/bootstrap.sh b/bootstrap.sh index 5264f9497..fc10fedfa 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -44,10 +44,10 @@ else echo fi -if [ -d ../li.strolch.runtime ] ; then - echo "Project li.strolch.runtime already cloned." +if [ -d ../li.strolch.agent ] ; then + echo "Project li.strolch.agent already cloned." else - if ! git clone git@github.com:eitch/li.strolch.runtime.git ../li.strolch.runtime ;then + if ! git clone git@github.com:eitch/li.strolch.agent.git ../li.strolch.agent ;then exit 1 fi echo diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 85a85e1c3..ae77845fa 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -44,10 +44,10 @@ else echo fi -if [ -d ../li.strolch.runtime ] ; then - echo "Project li.strolch.runtime already cloned." +if [ -d ../li.strolch.agent ] ; then + echo "Project li.strolch.agent already cloned." else - if ! git clone https://github.com/eitch/li.strolch.runtime.git ../li.strolch.runtime ;then + if ! git clone https://github.com/eitch/li.strolch.agent.git ../li.strolch.agent ;then exit 1 fi echo diff --git a/pom.xml b/pom.xml index f65742334..88c373951 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ ../li.strolch.testbase ../li.strolch.persistence.xml ../li.strolch.persistence.postgresql - ../li.strolch.runtime + ../li.strolch.agent ../li.strolch.service ../li.strolch.tutorialapp ../li.strolch.tutorialwebapp diff --git a/pull.sh b/pull.sh index 8efc9abcc..3da7e3560 100755 --- a/pull.sh +++ b/pull.sh @@ -10,7 +10,7 @@ echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. ; echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. ; echo echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. ; echo echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. ; echo -echo "Updating li.strolch.runtime..." ; cd li.strolch.runtime ; git pull ; cd .. ; echo +echo "Updating li.strolch.agent..." ; cd li.strolch.runtime ; git pull ; cd .. ; echo echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo diff --git a/push.sh b/push.sh index 7979fe0ed..e3f339e4c 100755 --- a/push.sh +++ b/push.sh @@ -10,7 +10,7 @@ echo "Pushing li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. ; echo "Pushing li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. ; echo echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. ; echo echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. ; echo -echo "Pushing li.strolch.runtime..." ; cd li.strolch.runtime ; git push ; cd .. ; echo +echo "Pushing li.strolch.agent..." ; cd li.strolch.runtime ; git push ; cd .. ; echo echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo diff --git a/status.sh b/status.sh index 1a9b139c7..5cfc8dec4 100755 --- a/status.sh +++ b/status.sh @@ -10,7 +10,7 @@ echo "Showing status of li.strolch.parent..." ; cd li.strolch.parent ; git statu echo "Showing status of li.strolch.bom..." ; cd li.strolch.bom ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.model..." ; cd li.strolch.model ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.testbase..." ; cd li.strolch.testbase ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.runtime..." ; cd li.strolch.runtime ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.agent..." ; cd li.strolch.runtime ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo From c04091ab5df0c4132ebc479ae680e25da9ece158 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 10 Jan 2014 17:24:49 +0100 Subject: [PATCH 26/50] [Major] renamed project li.strolch.runtime to li.strolch.agent --- pull.sh | 2 +- push.sh | 2 +- status.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pull.sh b/pull.sh index 3da7e3560..6fddb28b9 100755 --- a/pull.sh +++ b/pull.sh @@ -10,7 +10,7 @@ echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. ; echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. ; echo echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. ; echo echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. ; echo -echo "Updating li.strolch.agent..." ; cd li.strolch.runtime ; git pull ; cd .. ; echo +echo "Updating li.strolch.agent..." ; cd li.strolch.agent ; git pull ; cd .. ; echo echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo diff --git a/push.sh b/push.sh index e3f339e4c..3877cd524 100755 --- a/push.sh +++ b/push.sh @@ -10,7 +10,7 @@ echo "Pushing li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. ; echo "Pushing li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. ; echo echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. ; echo echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. ; echo -echo "Pushing li.strolch.agent..." ; cd li.strolch.runtime ; git push ; cd .. ; echo +echo "Pushing li.strolch.agent..." ; cd li.strolch.agent ; git push ; cd .. ; echo echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo diff --git a/status.sh b/status.sh index 5cfc8dec4..7d9742983 100755 --- a/status.sh +++ b/status.sh @@ -10,7 +10,7 @@ echo "Showing status of li.strolch.parent..." ; cd li.strolch.parent ; git statu echo "Showing status of li.strolch.bom..." ; cd li.strolch.bom ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.model..." ; cd li.strolch.model ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.testbase..." ; cd li.strolch.testbase ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.agent..." ; cd li.strolch.runtime ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.agent..." ; cd li.strolch.agent ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo From 241d266af24a1ea6d0df394e50a042ade13a0596 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 15 Jan 2014 22:11:40 +0100 Subject: [PATCH 27/50] [New] Added new project li.strolch.rest --- aheadStatus.sh | 1 + bootstrap.sh | 9 +++++++++ bootstrap_https.sh | 9 +++++++++ pom.xml | 1 + pull.sh | 1 + push.sh | 1 + status.sh | 1 + 7 files changed, 23 insertions(+) diff --git a/aheadStatus.sh b/aheadStatus.sh index a4b1a4913..1f8d8f251 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -23,6 +23,7 @@ cd "li.strolch.model" ; logAheadCount ; cd .. cd "li.strolch.testbase" ; logAheadCount ; cd .. cd "li.strolch.agent" ; logAheadCount ; cd .. cd "li.strolch.service" ; logAheadCount ; cd .. +cd "li.strolch.rest" ; logAheadCount ; cd .. cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. cd "li.strolch.persistence.postgresql" ; logAheadCount ; cd .. cd "li.strolch.tutorialapp" ; logAheadCount ; cd .. diff --git a/bootstrap.sh b/bootstrap.sh index fc10fedfa..127f6ee05 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -62,6 +62,15 @@ else echo fi +if [ -d ../li.strolch.rest ] ; then + echo "Project li.strolch.rest already cloned." +else + if ! git clone git@github.com:eitch/li.strolch.rest.git ../li.strolch.rest ;then + exit 1 + fi + echo +fi + if [ -d ../li.strolch.persistence.xml ] ; then echo "Project li.strolch.persistence.xml already cloned." else diff --git a/bootstrap_https.sh b/bootstrap_https.sh index ae77845fa..9e1be82fc 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -62,6 +62,15 @@ else echo fi +if [ -d ../li.strolch.rest ] ; then + echo "Project li.strolch.rest already cloned." +else + if ! git clone https://github.com/eitch/li.strolch.rest.git ../li.strolch.rest ;then + exit 1 + fi + echo +fi + if [ -d ../li.strolch.persistence.xml ] ; then echo "Project li.strolch.persistence.xml already cloned." else diff --git a/pom.xml b/pom.xml index 88c373951..02c1fe3be 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ ../li.strolch.persistence.postgresql ../li.strolch.agent ../li.strolch.service + ../li.strolch.rest ../li.strolch.tutorialapp ../li.strolch.tutorialwebapp diff --git a/pull.sh b/pull.sh index 6fddb28b9..98001b5c2 100755 --- a/pull.sh +++ b/pull.sh @@ -12,6 +12,7 @@ echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. ; e echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. ; echo echo "Updating li.strolch.agent..." ; cd li.strolch.agent ; git pull ; cd .. ; echo echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo +echo "Updating li.strolch.rest..." ; cd li.strolch.rest ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo echo "Updating li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git pull ; cd .. ; echo diff --git a/push.sh b/push.sh index 3877cd524..01d91413c 100755 --- a/push.sh +++ b/push.sh @@ -12,6 +12,7 @@ echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. ; ec echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. ; echo echo "Pushing li.strolch.agent..." ; cd li.strolch.agent ; git push ; cd .. ; echo echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo +echo "Pushing li.strolch.rest..." ; cd li.strolch.rest ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo echo "Pushing li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git push ; cd .. ; echo diff --git a/status.sh b/status.sh index 7d9742983..74b4905b1 100755 --- a/status.sh +++ b/status.sh @@ -12,6 +12,7 @@ echo "Showing status of li.strolch.model..." ; cd li.strolch.model ; git status echo "Showing status of li.strolch.testbase..." ; cd li.strolch.testbase ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.agent..." ; cd li.strolch.agent ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.rest..." ; cd li.strolch.rest ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo From c39a5e8cc6145404866ee904317447872e186416 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 20 Jan 2014 14:29:45 +0100 Subject: [PATCH 28/50] [New] Added windows batch file scripts --- aheadStatus.cmd | 48 +++++++++++++++++++++++++++++++++++++++++++++ bootstrap.cmd | 35 +++++++++++++++++++++++++++++++++ bootstrap_https.cmd | 35 +++++++++++++++++++++++++++++++++ projects.lst | 12 ++++++++++++ pull.cmd | 36 ++++++++++++++++++++++++++++++++++ push.cmd | 36 ++++++++++++++++++++++++++++++++++ status.cmd | 36 ++++++++++++++++++++++++++++++++++ 7 files changed, 238 insertions(+) create mode 100644 aheadStatus.cmd create mode 100644 bootstrap.cmd create mode 100644 bootstrap_https.cmd create mode 100644 projects.lst create mode 100644 pull.cmd create mode 100644 push.cmd create mode 100644 status.cmd diff --git a/aheadStatus.cmd b/aheadStatus.cmd new file mode 100644 index 000000000..2fa36fbfc --- /dev/null +++ b/aheadStatus.cmd @@ -0,0 +1,48 @@ +@echo off +REM ####################################################################### +REM ## +REM ## Shows how far ahead each project is against origin +REM ## +REM ####################################################################### + +setlocal +setlocal ENABLEDELAYEDEXPANSION + +echo. +echo INFO: Showing ahead status of all projects... +echo. +for /F %%i in ('type projects.lst') do ( + set project=%%i + + if not exist "..\!project!" ( + echo INFO: Project !project! does not exist. Maybe you need to bootstrap? + ) else ( + cd ..\!project! + set tmpFile=%RANDOM%%RANDOM%.tmp + git rev-list origin..master --count > !tmpFile! + if !ERRORLEVEL! NEQ 0 ( + del !tmpFile! + goto :FAIL + ) + for /F %%i in ('type !tmpFile!') do ( + set aheadCount=%%i + if !aheadCount! NEQ 0 ( + echo INFO: !aheadCount! commits not pushed for project !project! + ) else ( + echo INFO: Project !project! is clean. + ) + ) + del !tmpFile! + if !ERRORLEVEL! NEQ 0 goto :FAIL + ) +) + +echo. +echo INFO: Done. +echo. +endlocal +exit /b 0 + +:FAIL +echo INFO: Failed to show ahead status a project. +exit /b !ERRORLEVEL! \ No newline at end of file diff --git a/bootstrap.cmd b/bootstrap.cmd new file mode 100644 index 000000000..1592facfe --- /dev/null +++ b/bootstrap.cmd @@ -0,0 +1,35 @@ +@echo off +REM ####################################################################### +REM ## +REM ## Bootstrap developing of projects by cloning all the projects. +REM ## +REM ####################################################################### + +setlocal +setlocal ENABLEDELAYEDEXPANSION + +echo. +echo INFO: Cloning all projects... +echo. +for /F %%i in ('type projects.lst') do ( + set project=%%i + + if exist "..\!project!" ( + echo INFO: Project !project! already exists. Not cloning + ) else ( + echo INFO: Cloning project !project! ... + git clone git@github.com:eitch/!project!.git ..\!project! + if !ERRORLEVEL! NEQ 0 goto :FAIL + echo. + ) +) + +echo. +echo INFO: Done. +echo. +endlocal +exit /b 0 + +:FAIL +echo INFO: Failed to clone a project. +exit /b !ERRORLEVEL! \ No newline at end of file diff --git a/bootstrap_https.cmd b/bootstrap_https.cmd new file mode 100644 index 000000000..58062b794 --- /dev/null +++ b/bootstrap_https.cmd @@ -0,0 +1,35 @@ +@echo off +REM ####################################################################### +REM ## +REM ## Bootstrap developing of projects by cloning all the projects. +REM ## +REM ####################################################################### + +setlocal +setlocal ENABLEDELAYEDEXPANSION + +echo. +echo INFO: Cloning all projects... +echo. +for /F %%i in ('type projects.lst') do ( + set project=%%i + + if exist "..\!project!" ( + echo INFO: Project !project! already exists. Not cloning + ) else ( + echo INFO: Cloning project !project! ... + git git clone https://github.com/eitch/!project!.git ..\!project! + if !ERRORLEVEL! NEQ 0 goto :FAIL + echo. + ) +) + +echo. +echo INFO: Done. +echo. +endlocal +exit /b 0 + +:FAIL +echo INFO: Failed to clone a project. +exit /b !ERRORLEVEL! \ No newline at end of file diff --git a/projects.lst b/projects.lst new file mode 100644 index 000000000..56bc9371c --- /dev/null +++ b/projects.lst @@ -0,0 +1,12 @@ +li.strolch.dev +li.strolch.parent +li.strolch.bom +li.strolch.model +li.strolch.testbase +li.strolch.agent +li.strolch.service +li.strolch.rest +li.strolch.persistence.xml +li.strolch.persistence.postgresql +li.strolch.tutorialapp +li.strolch.tutorialwebapp \ No newline at end of file diff --git a/pull.cmd b/pull.cmd new file mode 100644 index 000000000..802a99458 --- /dev/null +++ b/pull.cmd @@ -0,0 +1,36 @@ +@echo off +REM ####################################################################### +REM ## +REM ## Script to pull all projects from upstream +REM ## +REM ####################################################################### + +setlocal +setlocal ENABLEDELAYEDEXPANSION + +echo. +echo INFO: Pulling all projects... +echo. +for /F %%i in ('type projects.lst') do ( + set project=%%i + + if exist "..\!project!" ( + echo INFO: Pullin project !project! ... + cd ..\!project! + git status pull + if !ERRORLEVEL! NEQ 0 goto :FAIL + echo. + ) else ( + echo INFO: Project !project! does not exist. Maybe you need to bootstrap? + ) +) + +echo. +echo INFO: Done. +echo. +endlocal +exit /b 0 + +:FAIL +echo INFO: Failed to pull a project. +exit /b !ERRORLEVEL! diff --git a/push.cmd b/push.cmd new file mode 100644 index 000000000..188a91dca --- /dev/null +++ b/push.cmd @@ -0,0 +1,36 @@ +@echo off +REM ####################################################################### +REM ## +REM ## Distribute all projects by pushing to upstream +REM ## +REM ####################################################################### + +setlocal +setlocal ENABLEDELAYEDEXPANSION + +echo. +echo INFO: Pushing all projects... +echo. +for /F %%i in ('type projects.lst') do ( + set project=%%i + + if exist "..\!project!" ( + echo INFO: Pushing project !project! ... + cd ..\!project! + git push + if !ERRORLEVEL! NEQ 0 goto :FAIL + echo. + ) else ( + echo INFO: Project !project! does not exist. Maybe you need to bootstrap? + ) +) + +echo. +echo INFO: Done. +echo. +endlocal +exit /b 0 + +:FAIL +echo INFO: Failed to push a project. +exit /b !ERRORLEVEL! diff --git a/status.cmd b/status.cmd new file mode 100644 index 000000000..c5c17d022 --- /dev/null +++ b/status.cmd @@ -0,0 +1,36 @@ +@echo off +REM ####################################################################### +REM ## +REM ## Show status of all projects +REM ## +REM ####################################################################### + +setlocal +setlocal ENABLEDELAYEDEXPANSION + +echo. +echo INFO: Showing status of all projects... +echo. +for /F %%i in ('type projects.lst') do ( + set project=%%i + + if exist "..\!project!" ( + echo INFO: Status of project !project!: + cd ..\!project! + git status -s + if !ERRORLEVEL! NEQ 0 goto :FAIL + echo. + ) else ( + echo INFO: Project !project! does not exist. Maybe you need to bootstrap? + ) +) + +echo. +echo INFO: Done. +echo. +endlocal +exit /b 0 + +:FAIL +echo INFO: Failed to show status a project. +exit /b !ERRORLEVEL! From cf979a3e2828ec29690469d785a0b98c5f1bad89 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Wed, 22 Jan 2014 20:27:09 +0100 Subject: [PATCH 29/50] Fixed typo --- status.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/status.sh b/status.sh index 74b4905b1..f0f741304 100755 --- a/status.sh +++ b/status.sh @@ -16,7 +16,7 @@ echo "Showing status of li.strolch.rest..." ; cd li.strolch.rest ; git status -s echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.tutorialwebapp..." ; cd li.strolch.tutoriwebalapp ; git status -s ; cd .. ; echo +echo "Showing status of li.strolch.tutorialwebapp..." ; cd li.strolch.tutorialwebapp ; git status -s ; cd .. ; echo echo "Done." exit 0 From 13a158c8680c69dcd76cb2ba622ac1e7ab8f43df Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 8 Mar 2014 17:22:35 +0100 Subject: [PATCH 30/50] [Project] modifies scripts to use project.lst for iteration and added relevant ch.eitchnet.* projects to list --- aheadStatus.sh | 31 ++++-------- bootstrap.sh | 117 +++++---------------------------------------- bootstrap_https.sh | 117 +++++---------------------------------------- projects.lst | 4 ++ pull.sh | 27 ++++------- push.sh | 27 ++++------- status.sh | 27 ++++------- 7 files changed, 70 insertions(+), 280 deletions(-) diff --git a/aheadStatus.sh b/aheadStatus.sh index 1f8d8f251..85b5f0151 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -1,33 +1,22 @@ #!/bin/bash -####################################################################### -## -## Shows how far ahead each project is against origin -## -####################################################################### + +projectsFile="${PWD}/projects.lst" function logAheadCount() { aheadCount="$(git rev-list origin..master --count)" - if [ "${aheadCount}" -ne 0 ] ; then +# if [ "${aheadCount}" -ne 0 ] ; then project="${PWD}" project="${project##*/}" - echo "${project} is ahead of origin by ${aheadCount} commits" - fi + echo "${aheadCount} commits need pushing for ${project}" +# fi } -echo "Checking how far ahead each project is against origin..." cd .. -cd "li.strolch.dev" ; logAheadCount ; cd .. -cd "li.strolch.parent" ; logAheadCount ; cd .. -cd "li.strolch.bom" ; logAheadCount ; cd .. -cd "li.strolch.model" ; logAheadCount ; cd .. -cd "li.strolch.testbase" ; logAheadCount ; cd .. -cd "li.strolch.agent" ; logAheadCount ; cd .. -cd "li.strolch.service" ; logAheadCount ; cd .. -cd "li.strolch.rest" ; logAheadCount ; cd .. -cd "li.strolch.persistence.xml" ; logAheadCount ; cd .. -cd "li.strolch.persistence.postgresql" ; logAheadCount ; cd .. -cd "li.strolch.tutorialapp" ; logAheadCount ; cd .. -cd "li.strolch.tutorialwebapp" ; logAheadCount ; cd .. +while read project; do + cd "${project}" + logAheadCount + cd .. +done < ${projectsFile} echo "Done." exit 0 \ No newline at end of file diff --git a/bootstrap.sh b/bootstrap.sh index 127f6ee05..394726b38 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,111 +1,20 @@ #!/bin/bash -####################################################################### -## -## Bootstrap developing of strolch projects by cloning all the -## projects. -## -####################################################################### -echo "Cloning all strolch projects..." +projectsFile="${PWD}/projects.lst" -if [ -d ../li.strolch.parent ] ; then - echo "Project li.strolch.parent already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.parent.git ../li.strolch.parent ;then - exit 1 +echo "Cloning projects using SSH..." + +cd .. +while read project; do + if [ -d "${project}" ] ; then + echo "Project ${project} already cloned." + else + if ! git clone "git@github.com:eitch/${project}.git" "${project}" ;then + exit 1 + fi + echo fi - echo -fi - -if [ -d ../li.strolch.bom ] ; then - echo "Project li.strolch.bom already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.bom.git ../li.strolch.bom ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.model ] ; then - echo "Project li.strolch.model already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.model.git ../li.strolch.model ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.testbase ] ; then - echo "Project li.strolch.testbase already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.testbase.git ../li.strolch.testbase ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.agent ] ; then - echo "Project li.strolch.agent already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.agent.git ../li.strolch.agent ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.service ] ; then - echo "Project li.strolch.service already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.service.git ../li.strolch.service ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.rest ] ; then - echo "Project li.strolch.rest already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.rest.git ../li.strolch.rest ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.persistence.xml ] ; then - echo "Project li.strolch.persistence.xml already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.persistence.xml.git ../li.strolch.persistence.xml ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.persistence.postgresql ] ; then - echo "Project li.strolch.persistence.postgresql already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.persistence.postgresql.git ../li.strolch.persistence.postgresql ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.tutorialapp ] ; then - echo "Project li.strolch.tutorialapp already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.tutorialapp.git ../li.strolch.tutorialapp ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.tutorialwebapp ] ; then - echo "Project li.strolch.tutorialwebapp already cloned." -else - if ! git clone git@github.com:eitch/li.strolch.tutorialwebapp.git ../li.strolch.tutorialwebapp ;then - exit 1 - fi - echo -fi +done < ${projectsFile} echo "Done." exit 0 \ No newline at end of file diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 9e1be82fc..4e02fa773 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -1,111 +1,20 @@ #!/bin/bash -####################################################################### -## -## Bootstrap developing of strolch projects by cloning all the -## projects. -## -####################################################################### -echo "Cloning all strolch projects..." +projectsFile="${PWD}/projects.lst" -if [ -d ../li.strolch.parent ] ; then - echo "Project li.strolch.parent already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.parent.git ../li.strolch.parent ;then - exit 1 +echo "Cloning projects using HTTPS..." + +cd .. +while read project; do + if [ -d "${project}" ] ; then + echo "Project ${project} already cloned." + else + if ! git clone "https://github.com/eitch/${project}.git" "${project}" ;then + exit 1 + fi + echo fi - echo -fi - -if [ -d ../li.strolch.bom ] ; then - echo "Project li.strolch.bom already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.bom.git ../li.strolch.bom ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.model ] ; then - echo "Project li.strolch.model already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.model.git ../li.strolch.model ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.testbase ] ; then - echo "Project li.strolch.testbase already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.testbase.git ../li.strolch.testbase ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.agent ] ; then - echo "Project li.strolch.agent already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.agent.git ../li.strolch.agent ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.service ] ; then - echo "Project li.strolch.service already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.service.git ../li.strolch.service ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.rest ] ; then - echo "Project li.strolch.rest already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.rest.git ../li.strolch.rest ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.persistence.xml ] ; then - echo "Project li.strolch.persistence.xml already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.persistence.xml.git ../li.strolch.persistence.xml ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.persistence.postgresql ] ; then - echo "Project li.strolch.persistence.postgresql already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.persistence.postgresql.git ../li.strolch.persistence.postgresql ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.tutorialapp ] ; then - echo "Project li.strolch.tutorialapp already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.tutorialapp.git ../li.strolch.tutorialapp ;then - exit 1 - fi - echo -fi - -if [ -d ../li.strolch.tutorialwebapp ] ; then - echo "Project li.strolch.tutorialwebapp already cloned." -else - if ! git clone https://github.com/eitch/li.strolch.tutorialwebapp.git ../li.strolch.tutorialwebapp ;then - exit 1 - fi - echo -fi +done < ${projectsFile} echo "Done." exit 0 \ No newline at end of file diff --git a/projects.lst b/projects.lst index 56bc9371c..9c54685ad 100644 --- a/projects.lst +++ b/projects.lst @@ -1,3 +1,7 @@ +ch.eitchnet.parent +ch.eitchnet.privilege +ch.eitchnet.utils +ch.eitchnet.xmlpers li.strolch.dev li.strolch.parent li.strolch.bom diff --git a/pull.sh b/pull.sh index 98001b5c2..9d87de0ad 100755 --- a/pull.sh +++ b/pull.sh @@ -1,22 +1,15 @@ #!/bin/bash -####################################################################### -## -## Update all projects by pulling from upstream -## -####################################################################### -echo "Updating li.strolch.dev..." ; git pull ; cd .. ; echo -echo "Updating li.strolch.parent..." ; cd li.strolch.parent ; git pull ; cd .. ; echo -echo "Updating li.strolch.bom..." ; cd li.strolch.bom ; git pull ; cd .. ; echo -echo "Updating li.strolch.model..." ; cd li.strolch.model ; git pull ; cd .. ; echo -echo "Updating li.strolch.testbase..." ; cd li.strolch.testbase ; git pull ; cd .. ; echo -echo "Updating li.strolch.agent..." ; cd li.strolch.agent ; git pull ; cd .. ; echo -echo "Updating li.strolch.service..." ; cd li.strolch.service ; git pull ; cd .. ; echo -echo "Updating li.strolch.rest..." ; cd li.strolch.rest ; git pull ; cd .. ; echo -echo "Updating li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git pull ; cd .. ; echo -echo "Updating li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git pull ; cd .. ; echo -echo "Updating li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git pull ; cd .. ; echo -echo "Updating li.strolch.tutorialwebapp..." ; cd li.strolch.tutorialwebapp ; git pull ; cd .. ; echo +projectsFile="${PWD}/projects.lst" + +cd .. +while read project; do + echo "Pulling ${project}..." + cd ${project} + git pull + cd .. + echo +done < ${projectsFile} echo "Done." exit 0 \ No newline at end of file diff --git a/push.sh b/push.sh index 01d91413c..6d2517ab5 100755 --- a/push.sh +++ b/push.sh @@ -1,22 +1,15 @@ #!/bin/bash -####################################################################### -## -## Distribute all projects by pushing to upstream -## -####################################################################### -echo "Pushing li.strolch.dev..." ; git push ; cd .. ; echo -echo "Pushing li.strolch.parent..." ; cd li.strolch.parent ; git push ; cd .. ; echo -echo "Pushing li.strolch.bom..." ; cd li.strolch.bom ; git push ; cd .. ; echo -echo "Pushing li.strolch.model..." ; cd li.strolch.model ; git push ; cd .. ; echo -echo "Pushing li.strolch.testbase..." ; cd li.strolch.testbase ; git push ; cd .. ; echo -echo "Pushing li.strolch.agent..." ; cd li.strolch.agent ; git push ; cd .. ; echo -echo "Pushing li.strolch.service..." ; cd li.strolch.service ; git push ; cd .. ; echo -echo "Pushing li.strolch.rest..." ; cd li.strolch.rest ; git push ; cd .. ; echo -echo "Pushing li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git push ; cd .. ; echo -echo "Pushing li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git push ; cd .. ; echo -echo "Pushing li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git push ; cd .. ; echo -echo "Pushing li.strolch.tutorialwebapp..." ; cd li.strolch.tutorialwebapp ; git push ; cd .. ; echo +projectsFile="${PWD}/projects.lst" + +cd .. +while read project; do + echo "Pushing ${project}..." + cd ${project} + git push + cd .. + echo +done < ${projectsFile} echo "Done." exit 0 \ No newline at end of file diff --git a/status.sh b/status.sh index f0f741304..1320dd854 100755 --- a/status.sh +++ b/status.sh @@ -1,22 +1,15 @@ #!/bin/bash -####################################################################### -## -## Show status of all projects -## -####################################################################### -echo "Showing status of li.strolch.dev..." ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.parent..." ; cd li.strolch.parent ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.bom..." ; cd li.strolch.bom ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.model..." ; cd li.strolch.model ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.testbase..." ; cd li.strolch.testbase ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.agent..." ; cd li.strolch.agent ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.service..." ; cd li.strolch.service ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.rest..." ; cd li.strolch.rest ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.persistence.xml..." ; cd li.strolch.persistence.xml ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.persistence.postgresql..." ; cd li.strolch.persistence.postgresql ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.tutorialapp..." ; cd li.strolch.tutorialapp ; git status -s ; cd .. ; echo -echo "Showing status of li.strolch.tutorialwebapp..." ; cd li.strolch.tutorialwebapp ; git status -s ; cd .. ; echo +projectsFile="${PWD}/projects.lst" + +cd .. +while read project; do + echo "Status of ${project}..." + cd ${project} + git status -s + cd .. + echo +done < ${projectsFile} echo "Done." exit 0 From d93b25751eb1451ed8105ced8e752bbad5941efe Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 8 Mar 2014 17:30:21 +0100 Subject: [PATCH 31/50] [Project] modifies scripts to use project.lst for iteration and added relevant ch.eitchnet.* projects to list --- projects.lst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects.lst b/projects.lst index 9c54685ad..2f24e900f 100644 --- a/projects.lst +++ b/projects.lst @@ -13,4 +13,5 @@ li.strolch.rest li.strolch.persistence.xml li.strolch.persistence.postgresql li.strolch.tutorialapp -li.strolch.tutorialwebapp \ No newline at end of file +li.strolch.tutorialwebapp + From fcfdbbd9f77af7b10cae708960ea65922d46bc4d Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 8 Mar 2014 17:36:33 +0100 Subject: [PATCH 32/50] [Project] fixed empty problem when iterating projects list --- aheadStatus.sh | 3 +++ bootstrap.sh | 3 +++ bootstrap_https.sh | 3 +++ pull.sh | 3 +++ push.sh | 3 +++ status.sh | 3 +++ 6 files changed, 18 insertions(+) diff --git a/aheadStatus.sh b/aheadStatus.sh index 85b5f0151..d52fcda15 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -13,6 +13,9 @@ function logAheadCount() { cd .. while read project; do + if [ "${project}" == "" ] ; then + continue; + fi cd "${project}" logAheadCount cd .. diff --git a/bootstrap.sh b/bootstrap.sh index 394726b38..f35f0693b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -6,6 +6,9 @@ echo "Cloning projects using SSH..." cd .. while read project; do + if [ "${project}" == "" ] ; then + continue; + fi if [ -d "${project}" ] ; then echo "Project ${project} already cloned." else diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 4e02fa773..458f2a498 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -6,6 +6,9 @@ echo "Cloning projects using HTTPS..." cd .. while read project; do + if [ "${project}" == "" ] ; then + continue; + fi if [ -d "${project}" ] ; then echo "Project ${project} already cloned." else diff --git a/pull.sh b/pull.sh index 9d87de0ad..51d8f1269 100755 --- a/pull.sh +++ b/pull.sh @@ -4,6 +4,9 @@ projectsFile="${PWD}/projects.lst" cd .. while read project; do + if [ "${project}" == "" ] ; then + continue; + fi echo "Pulling ${project}..." cd ${project} git pull diff --git a/push.sh b/push.sh index 6d2517ab5..25d0fa18c 100755 --- a/push.sh +++ b/push.sh @@ -4,6 +4,9 @@ projectsFile="${PWD}/projects.lst" cd .. while read project; do + if [ "${project}" == "" ] ; then + continue; + fi echo "Pushing ${project}..." cd ${project} git push diff --git a/status.sh b/status.sh index 1320dd854..5d1e08496 100755 --- a/status.sh +++ b/status.sh @@ -4,6 +4,9 @@ projectsFile="${PWD}/projects.lst" cd .. while read project; do + if [ "${project}" == "" ] ; then + continue; + fi echo "Status of ${project}..." cd ${project} git status -s From d88bb9d074893fac28ffe2c4fdf3bb11831d954e Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 8 Mar 2014 18:32:05 +0100 Subject: [PATCH 33/50] [Project] added eitchnet dependencies to module build --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 02c1fe3be..f10f21621 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,9 @@ Project used to develop strolch modules. Contains scripts for bootstrapping development, etc. + ../ch.eitchnet.privilege + ../ch.eitchnet.utils + ../ch.eitchnet.xmlpers ../li.strolch.parent ../li.strolch.bom ../li.strolch.model From d7d12251623cef68b796db370d5fe1435584d233 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 9 Mar 2014 11:55:31 +0100 Subject: [PATCH 34/50] [New] added new li.strolch.website project to projects.lst --- projects.lst | 1 + 1 file changed, 1 insertion(+) diff --git a/projects.lst b/projects.lst index 2f24e900f..9755d082f 100644 --- a/projects.lst +++ b/projects.lst @@ -14,4 +14,5 @@ li.strolch.persistence.xml li.strolch.persistence.postgresql li.strolch.tutorialapp li.strolch.tutorialwebapp +li.strolch.website From 5ee34360ba67174762f7a93f3de17534e5caf867 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 14 Mar 2014 14:36:33 +0100 Subject: [PATCH 35/50] [Project] fixed urls of projects --- bootstrap.cmd | 2 +- bootstrap.sh | 2 +- bootstrap_https.cmd | 2 +- bootstrap_https.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap.cmd b/bootstrap.cmd index 1592facfe..d425af482 100644 --- a/bootstrap.cmd +++ b/bootstrap.cmd @@ -18,7 +18,7 @@ for /F %%i in ('type projects.lst') do ( echo INFO: Project !project! already exists. Not cloning ) else ( echo INFO: Cloning project !project! ... - git clone git@github.com:eitch/!project!.git ..\!project! + git clone git@github.com:eitchnet/!project!.git ..\!project! if !ERRORLEVEL! NEQ 0 goto :FAIL echo. ) diff --git a/bootstrap.sh b/bootstrap.sh index f35f0693b..feb5d81fc 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -12,7 +12,7 @@ while read project; do if [ -d "${project}" ] ; then echo "Project ${project} already cloned." else - if ! git clone "git@github.com:eitch/${project}.git" "${project}" ;then + if ! git clone "git@github.com:eitchnet/${project}.git" "${project}" ;then exit 1 fi echo diff --git a/bootstrap_https.cmd b/bootstrap_https.cmd index 58062b794..aa012b1a6 100644 --- a/bootstrap_https.cmd +++ b/bootstrap_https.cmd @@ -18,7 +18,7 @@ for /F %%i in ('type projects.lst') do ( echo INFO: Project !project! already exists. Not cloning ) else ( echo INFO: Cloning project !project! ... - git git clone https://github.com/eitch/!project!.git ..\!project! + git git clone https://github.com/eitchnet/!project!.git ..\!project! if !ERRORLEVEL! NEQ 0 goto :FAIL echo. ) diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 458f2a498..ced970948 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -12,7 +12,7 @@ while read project; do if [ -d "${project}" ] ; then echo "Project ${project} already cloned." else - if ! git clone "https://github.com/eitch/${project}.git" "${project}" ;then + if ! git clone "https://github.com/eitchnet/${project}.git" "${project}" ;then exit 1 fi echo From cdbfba9907539a0c44c73c784205b608c556a382 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 21 Mar 2014 14:01:09 +0100 Subject: [PATCH 36/50] [New] Added a new script to build MSE --- buildMSE.sh | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 buildMSE.sh diff --git a/buildMSE.sh b/buildMSE.sh new file mode 100755 index 000000000..e58446114 --- /dev/null +++ b/buildMSE.sh @@ -0,0 +1,50 @@ +VERVEINE="/data/programs/verveinej/verveinej.sh" +DIST_STROLCH_MSE="/var/www/eitch/www.strolch.li/dist/snapshot" + +## Prepare a new environment +mkdir -p target/strolch_mse +cd target/strolch_mse +if ! git clone $(cd ../.. ; pwd) ; then + echo "ERROR: Failed to clone for new environment." + exit 1 +fi +cd li.strolch.dev + +echo "INFO Bootstrapping..." +if ! ./bootstrap_https.sh ; then + echo "ERROR: Failed to boostrap!" + exit 1 +fi + +echo "INFO: Copying dependencies" +mvn -DskipTests=true clean dependency:copy-dependencies + +echo "INFO Running verveinej..." +cd .. +if ! ${VERVEINE} -- -autocp . . ; then + echo "ERROR: Failed to run verveinej!" + exit 1 +fi +mv output.mse Strolch.mse + +echo "INFO Cleaning sources..." +cd li.strolch.dev +if ! mvn clean ; then + echo "ERROR: Failed to run mvn clean!" + exit 1 +fi + +echo "INFO Packaging..." +cd ../.. +if ! tar --exclude="*/target" --exclude="*/.git*" -cvzf strolch_mse.tar.gz strolch_mse ; then + echo "ERROR: Failed to build package!" + exit 1 +fi +rm -rf strolch_mse/ + +if ! mv strolch_mse.tar.gz ${DIST_STROLCH_MSE}/strolch_mse.tar.gz ; then + echo "ERROR: Failed to publish MSE file!" + exit 1 +fi + +exit 0 \ No newline at end of file From 45bc38df7daff53714b6f39ebefd22bc33002fb6 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 21 Mar 2014 22:54:34 +0100 Subject: [PATCH 37/50] [Project] sources are now generated in package goal --- buildMSE.sh | 6 +++-- createBundle.sh | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100755 createBundle.sh diff --git a/buildMSE.sh b/buildMSE.sh index e58446114..9715b6e43 100755 --- a/buildMSE.sh +++ b/buildMSE.sh @@ -1,5 +1,7 @@ +#!/bin/bash + VERVEINE="/data/programs/verveinej/verveinej.sh" -DIST_STROLCH_MSE="/var/www/eitch/www.strolch.li/dist/snapshot" +DIST_STROLCH="/var/www/eitch/www.strolch.li/dist/snapshot" ## Prepare a new environment mkdir -p target/strolch_mse @@ -42,7 +44,7 @@ if ! tar --exclude="*/target" --exclude="*/.git*" -cvzf strolch_mse.tar.gz strol fi rm -rf strolch_mse/ -if ! mv strolch_mse.tar.gz ${DIST_STROLCH_MSE}/strolch_mse.tar.gz ; then +if ! mv strolch_mse.tar.gz ${DIST_STROLCH}/strolch_mse.tar.gz ; then echo "ERROR: Failed to publish MSE file!" exit 1 fi diff --git a/createBundle.sh b/createBundle.sh new file mode 100755 index 000000000..da311b209 --- /dev/null +++ b/createBundle.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +DIST_STROLCH="/var/www/eitch/www.strolch.li/dist/snapshot" +workDir="${PWD}/target/strolch_bundle" +projectsFile="${PWD}/projects.lst" + +DIST_STROLCH="/Users/eitch/Downloads/" + +# first we create all needed packages +if ! mvn -DskipTests clean package ; then + echo "ERROR: Failed to build packages!" + exit 1 +fi + +# Make sure the work directory exists +if ! [ -d "${workDir}" ] ; then + if ! mkdir -p "${workDir}" ; then + echo "ERROR: Failed to create work dir ${workDir}." + exit 1 + fi +fi + +echo "INFO: Bundling projects..." + +# Now copy those packages to our work dir +cd .. +while read project; do + if [ "${project}" == "" ] ; then + continue; + fi + if ! cd "${project}" ; then + echo "ERROR: Could not switch to directory ${project}" + exit 1 + fi + + echo "INFO: Copying ${project} packages..." + if ! ls target/*.jar 2>/dev/null ; then + echo "INFO: Project ${project} has no target, skipping." + cd .. + continue + fi + + if ! cp target/*.jar "${workDir}" ; then + echo "ERROR: Failed to copy package for project ${project}." + exit 1 + fi + + cd .. + +done < ${projectsFile} + +cd ${workDir}/.. +if ! tar -cvzf strolch_bundle.tar.gz strolch_bundle ; then + echo "ERROR: Failed to make bundle." + exit 1 +fi + +if ! mv strolch_bundle.tar.gz "${DIST_STROLCH}" ; then + echo "ERROR: Failed to publish bundle." + exit 1 +fi + +echo "Done." +exit 0 \ No newline at end of file From 2dcffa48dad085acc10a03cfd082048947f7519a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 21 Mar 2014 22:58:43 +0100 Subject: [PATCH 38/50] [Project] sources are now generated in package goal --- createBundle.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/createBundle.sh b/createBundle.sh index da311b209..b1e915884 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -4,8 +4,6 @@ DIST_STROLCH="/var/www/eitch/www.strolch.li/dist/snapshot" workDir="${PWD}/target/strolch_bundle" projectsFile="${PWD}/projects.lst" -DIST_STROLCH="/Users/eitch/Downloads/" - # first we create all needed packages if ! mvn -DskipTests clean package ; then echo "ERROR: Failed to build packages!" From 681d344d1c613d158f77fb5f6c9e42b1f448ab64 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 21 Mar 2014 23:57:42 +0100 Subject: [PATCH 39/50] [New] Added development and download pages --- createBundle.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/createBundle.sh b/createBundle.sh index b1e915884..e6b6a41ee 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -43,6 +43,11 @@ while read project; do exit 1 fi + if ! cp target/*.jar "${DIST_STROLCH}" ; then + echo "ERROR: Failed to publish package for project ${project}." + exit 1 + fi + cd .. done < ${projectsFile} From caf631b37fd7f99bf7d2082b23d31c776dbd5540 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 22 Mar 2014 00:04:03 +0100 Subject: [PATCH 40/50] [New] Added development and download pages --- createBundle.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/createBundle.sh b/createBundle.sh index e6b6a41ee..6d9b21026 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -1,5 +1,7 @@ #!/bin/bash +projectName=strolch_bundle +projectVersion=0.1.0-SNAPSHOT DIST_STROLCH="/var/www/eitch/www.strolch.li/dist/snapshot" workDir="${PWD}/target/strolch_bundle" projectsFile="${PWD}/projects.lst" @@ -53,12 +55,12 @@ while read project; do done < ${projectsFile} cd ${workDir}/.. -if ! tar -cvzf strolch_bundle.tar.gz strolch_bundle ; then +if ! tar -cvzf ${projectName}-${projectVersion}.tar.gz ${projectName} ; then echo "ERROR: Failed to make bundle." exit 1 fi -if ! mv strolch_bundle.tar.gz "${DIST_STROLCH}" ; then +if ! mv ${projectName}-${projectVersion}.tar.gz "${DIST_STROLCH}" ; then echo "ERROR: Failed to publish bundle." exit 1 fi From 9c1a73235fb235ab3596cd0a9fa5744db6ecb157 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 22 Mar 2014 00:15:05 +0100 Subject: [PATCH 41/50] [New] Added development and download pages --- createBundle.sh | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/createBundle.sh b/createBundle.sh index 6d9b21026..99a9c042f 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -34,20 +34,18 @@ while read project; do fi echo "INFO: Copying ${project} packages..." - if ! ls target/*.jar 2>/dev/null ; then + if ls target/*.jar 2>/dev/null ; then + if ! cp target/*.jar "${workDir}" ; then + echo "ERROR: Failed to copy package for project ${project}." + exit 1 + fi + else if ls target/*.war 2>/dev/null ; then + if ! cp target/*.war "${workDir}" ; then + echo "ERROR: Failed to copy wars for project ${project}." + exit 1 + fi + else echo "INFO: Project ${project} has no target, skipping." - cd .. - continue - fi - - if ! cp target/*.jar "${workDir}" ; then - echo "ERROR: Failed to copy package for project ${project}." - exit 1 - fi - - if ! cp target/*.jar "${DIST_STROLCH}" ; then - echo "ERROR: Failed to publish package for project ${project}." - exit 1 fi cd .. From 27b65826f98562ec800bebe56a369d06dcaf3aec Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 22 Mar 2014 00:17:38 +0100 Subject: [PATCH 42/50] [New] Added development and download pages --- createBundle.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/createBundle.sh b/createBundle.sh index 99a9c042f..80565aa28 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -39,7 +39,7 @@ while read project; do echo "ERROR: Failed to copy package for project ${project}." exit 1 fi - else if ls target/*.war 2>/dev/null ; then + elif ls target/*.war 2>/dev/null ; then if ! cp target/*.war "${workDir}" ; then echo "ERROR: Failed to copy wars for project ${project}." exit 1 From d5f1aeefcfb06f63a8bde5a4018f4e7b76fea5af Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 22 Mar 2014 00:40:55 +0100 Subject: [PATCH 43/50] [New] Added development and download pages --- createBundle.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/createBundle.sh b/createBundle.sh index 80565aa28..e10394984 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -6,6 +6,18 @@ DIST_STROLCH="/var/www/eitch/www.strolch.li/dist/snapshot" workDir="${PWD}/target/strolch_bundle" projectsFile="${PWD}/projects.lst" +echo "INFO Bootstrapping..." +if ! ./bootstrap_https.sh ; then + echo "ERROR: Failed to boostrap!" + exit 1 +fi + +echo "INFO Pulling..." +if ! ./pull.sh ; then + echo "ERROR: Failed to pull from upstream!" + exit 1 +fi + # first we create all needed packages if ! mvn -DskipTests clean package ; then echo "ERROR: Failed to build packages!" From ea72df1d66942bf33760dc919701d9c4e6083c44 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sat, 22 Mar 2014 00:44:21 +0100 Subject: [PATCH 44/50] [New] Added development and download pages --- createBundle.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/createBundle.sh b/createBundle.sh index e10394984..e77edaddf 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -51,11 +51,19 @@ while read project; do echo "ERROR: Failed to copy package for project ${project}." exit 1 fi + if ! cp target/*.jar "${DIST_STROLCH}" ; then + echo "ERROR: Failed to publish package for project ${project}." + exit 1 + fi elif ls target/*.war 2>/dev/null ; then if ! cp target/*.war "${workDir}" ; then echo "ERROR: Failed to copy wars for project ${project}." exit 1 fi + if ! cp target/*.war "${DIST_STROLCH}" ; then + echo "ERROR: Failed to publish wars for project ${project}." + exit 1 + fi else echo "INFO: Project ${project} has no target, skipping." fi From fd4f7382f566dcb8dcd98efd745ec8a48c0c134c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Thu, 27 Mar 2014 18:51:28 +0100 Subject: [PATCH 45/50] [Project] added MacOSX ignors --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8f28c44ef..c0a62e72c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ li.strolch.bom li.strolch.persistence.api li.strolch.persistence.xml li.strolch.parent +/.DS_Store From dbe9b8e61bb273b4b184567d76a2c5fa5cf5da8c Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 17:23:27 +0200 Subject: [PATCH 46/50] [Project] set version to 1.0.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f10f21621..5eaa1398b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ li.strolch li.strolch.parent - 0.1.0-SNAPSHOT + 1.0.0-SNAPSHOT ../li.strolch.parent/pom.xml From 0673036a98ff0b54d492408c543f47cfd0d06159 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 18:06:09 +0200 Subject: [PATCH 47/50] [Project] extended checking out to support tag/branch --- bootstrap.sh | 18 ++++++++++++++---- bootstrap_https.sh | 18 ++++++++++++++---- createBundle.sh | 28 +++++++++++++++++++--------- projects.lst | 35 +++++++++++++++++------------------ pull.sh | 15 +++++++++++++-- push.sh | 16 +++++++++++++--- status.sh | 14 ++++++++++++-- 7 files changed, 102 insertions(+), 42 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index feb5d81fc..448596e44 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -9,10 +9,20 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi - if [ -d "${project}" ] ; then - echo "Project ${project} already cloned." + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " + exit 1 + fi + + if [ -d "${name}" ] ; then + echo "Project ${name} already cloned." else - if ! git clone "git@github.com:eitchnet/${project}.git" "${project}" ;then + if ! git clone "git@github.com:eitchnet/${name}.git" "${name}" ;then exit 1 fi echo @@ -20,4 +30,4 @@ while read project; do done < ${projectsFile} echo "Done." -exit 0 \ No newline at end of file +exit 0 diff --git a/bootstrap_https.sh b/bootstrap_https.sh index ced970948..06e7d0c06 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -9,10 +9,20 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi - if [ -d "${project}" ] ; then - echo "Project ${project} already cloned." + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " + exit 1 + fi + + if [ -d "${name}" ] ; then + echo "Project ${name} already cloned." else - if ! git clone "https://github.com/eitchnet/${project}.git" "${project}" ;then + if ! git clone "https://github.com/eitchnet/${name}.git" "${name}" ;then exit 1 fi echo @@ -20,4 +30,4 @@ while read project; do done < ${projectsFile} echo "Done." -exit 0 \ No newline at end of file +exit 0 diff --git a/createBundle.sh b/createBundle.sh index e77edaddf..cb38165ba 100755 --- a/createBundle.sh +++ b/createBundle.sh @@ -40,32 +40,42 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi - if ! cd "${project}" ; then - echo "ERROR: Could not switch to directory ${project}" + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " exit 1 fi - echo "INFO: Copying ${project} packages..." + if ! cd "${name}" ; then + echo "ERROR: Could not switch to directory ${name}" + exit 1 + fi + + echo "INFO: Copying ${name} packages..." if ls target/*.jar 2>/dev/null ; then if ! cp target/*.jar "${workDir}" ; then - echo "ERROR: Failed to copy package for project ${project}." + echo "ERROR: Failed to copy package for project ${name}." exit 1 fi if ! cp target/*.jar "${DIST_STROLCH}" ; then - echo "ERROR: Failed to publish package for project ${project}." + echo "ERROR: Failed to publish package for project ${name}." exit 1 fi elif ls target/*.war 2>/dev/null ; then if ! cp target/*.war "${workDir}" ; then - echo "ERROR: Failed to copy wars for project ${project}." + echo "ERROR: Failed to copy wars for project ${name}." exit 1 fi if ! cp target/*.war "${DIST_STROLCH}" ; then - echo "ERROR: Failed to publish wars for project ${project}." + echo "ERROR: Failed to publish wars for project ${name}." exit 1 fi else - echo "INFO: Project ${project} has no target, skipping." + echo "INFO: Project ${name} has no target, skipping." fi cd .. @@ -84,4 +94,4 @@ if ! mv ${projectName}-${projectVersion}.tar.gz "${DIST_STROLCH}" ; then fi echo "Done." -exit 0 \ No newline at end of file +exit 0 diff --git a/projects.lst b/projects.lst index 9755d082f..a66db9e5e 100644 --- a/projects.lst +++ b/projects.lst @@ -1,18 +1,17 @@ -ch.eitchnet.parent -ch.eitchnet.privilege -ch.eitchnet.utils -ch.eitchnet.xmlpers -li.strolch.dev -li.strolch.parent -li.strolch.bom -li.strolch.model -li.strolch.testbase -li.strolch.agent -li.strolch.service -li.strolch.rest -li.strolch.persistence.xml -li.strolch.persistence.postgresql -li.strolch.tutorialapp -li.strolch.tutorialwebapp -li.strolch.website - +ch.eitchnet.parent:1.0.0 +ch.eitchnet.privilege:master +ch.eitchnet.utils:master +ch.eitchnet.xmlpers:master +li.strolch.dev:master +li.strolch.parent:master +li.strolch.bom:master +li.strolch.model:master +li.strolch.testbase:master +li.strolch.agent:master +li.strolch.service:master +li.strolch.rest:master +li.strolch.persistence.xml:master +li.strolch.persistence.postgresql:master +li.strolch.tutorialapp:master +li.strolch.tutorialwebapp:master +li.strolch.website:master diff --git a/pull.sh b/pull.sh index 51d8f1269..54c19d92e 100755 --- a/pull.sh +++ b/pull.sh @@ -7,12 +7,23 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " + exit 1 + fi + echo "Pulling ${project}..." - cd ${project} + cd ${name} git pull + git checkout ${tag} cd .. echo done < ${projectsFile} echo "Done." -exit 0 \ No newline at end of file +exit 0 diff --git a/push.sh b/push.sh index 25d0fa18c..82bc08827 100755 --- a/push.sh +++ b/push.sh @@ -7,12 +7,22 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi - echo "Pushing ${project}..." - cd ${project} + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " + exit 1 + fi + + echo "Pushing ${name}..." + cd ${name} git push cd .. echo done < ${projectsFile} echo "Done." -exit 0 \ No newline at end of file +exit 0 diff --git a/status.sh b/status.sh index 5d1e08496..7d30dd33f 100755 --- a/status.sh +++ b/status.sh @@ -7,8 +7,18 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi - echo "Status of ${project}..." - cd ${project} + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " + exit 1 + fi + + echo "Status of ${name}..." + cd ${name} git status -s cd .. echo From 25b5c509c25b5c3b344e8e5a749f40dc8c63c9a8 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 18:15:33 +0200 Subject: [PATCH 48/50] [Project] extended checking out to support tag/branch --- bootstrap.sh | 1 + bootstrap_https.sh | 1 + pull.sh | 5 +++-- push.sh | 2 +- status.sh | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 448596e44..2c9e24dc0 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -19,6 +19,7 @@ while read project; do exit 1 fi + echo "== Cloning ${project}..." if [ -d "${name}" ] ; then echo "Project ${name} already cloned." else diff --git a/bootstrap_https.sh b/bootstrap_https.sh index 06e7d0c06..4bcc711dc 100755 --- a/bootstrap_https.sh +++ b/bootstrap_https.sh @@ -19,6 +19,7 @@ while read project; do exit 1 fi + echo "== Cloning ${project}..." if [ -d "${name}" ] ; then echo "Project ${name} already cloned." else diff --git a/pull.sh b/pull.sh index 54c19d92e..97312ce60 100755 --- a/pull.sh +++ b/pull.sh @@ -17,12 +17,13 @@ while read project; do exit 1 fi - echo "Pulling ${project}..." + echo "== Pulling ${project}..." cd ${name} - git pull + git pull origin ${tag} git checkout ${tag} cd .. echo + done < ${projectsFile} echo "Done." diff --git a/push.sh b/push.sh index 82bc08827..af735bebd 100755 --- a/push.sh +++ b/push.sh @@ -17,7 +17,7 @@ while read project; do exit 1 fi - echo "Pushing ${name}..." + echo "== Pushing ${name}..." cd ${name} git push cd .. diff --git a/status.sh b/status.sh index 7d30dd33f..70982c56c 100755 --- a/status.sh +++ b/status.sh @@ -17,7 +17,7 @@ while read project; do exit 1 fi - echo "Status of ${name}..." + echo "== Status of ${name}..." cd ${name} git status -s cd .. From f3cbd5b7bb1ecab3631b02019b24800bdf146178 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Sun, 24 Aug 2014 18:26:23 +0200 Subject: [PATCH 49/50] [Project] extended checking out to support tag/branch --- aheadStatus.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/aheadStatus.sh b/aheadStatus.sh index d52fcda15..e16b79424 100755 --- a/aheadStatus.sh +++ b/aheadStatus.sh @@ -7,6 +7,7 @@ function logAheadCount() { # if [ "${aheadCount}" -ne 0 ] ; then project="${PWD}" project="${project##*/}" + echo "== Status: ${project}..." echo "${aheadCount} commits need pushing for ${project}" # fi } @@ -16,10 +17,20 @@ while read project; do if [ "${project}" == "" ] ; then continue; fi - cd "${project}" + + array=(${project//:/ }) + name="${array[0]}" + tag="${array[1]}" + + if [ "${name}" == "" ] || [ "${tag}" == "" ] ; then + echo -e "ERROR: Invalid project: ${project}! Must have form " + exit 1 + fi + + cd "${name}" logAheadCount cd .. done < ${projectsFile} echo "Done." -exit 0 \ No newline at end of file +exit 0 From 585be07091c592e23e2675c8d782f7c2c7f93068 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 16 Sep 2014 08:50:16 +0200 Subject: [PATCH 50/50] moved everything to a subdirectory for repo merge --- .gitignore => li.strolch.dev/.gitignore | 0 LICENSE => li.strolch.dev/LICENSE | 0 README.md => li.strolch.dev/README.md | 0 aheadStatus.cmd => li.strolch.dev/aheadStatus.cmd | 0 aheadStatus.sh => li.strolch.dev/aheadStatus.sh | 0 bootstrap.cmd => li.strolch.dev/bootstrap.cmd | 0 bootstrap.sh => li.strolch.dev/bootstrap.sh | 0 bootstrap_https.cmd => li.strolch.dev/bootstrap_https.cmd | 0 bootstrap_https.sh => li.strolch.dev/bootstrap_https.sh | 0 buildMSE.sh => li.strolch.dev/buildMSE.sh | 0 createBundle.sh => li.strolch.dev/createBundle.sh | 0 pom.xml => li.strolch.dev/pom.xml | 0 projects.lst => li.strolch.dev/projects.lst | 0 pull.cmd => li.strolch.dev/pull.cmd | 0 pull.sh => li.strolch.dev/pull.sh | 0 push.cmd => li.strolch.dev/push.cmd | 0 push.sh => li.strolch.dev/push.sh | 0 status.cmd => li.strolch.dev/status.cmd | 0 status.sh => li.strolch.dev/status.sh | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename .gitignore => li.strolch.dev/.gitignore (100%) rename LICENSE => li.strolch.dev/LICENSE (100%) rename README.md => li.strolch.dev/README.md (100%) rename aheadStatus.cmd => li.strolch.dev/aheadStatus.cmd (100%) rename aheadStatus.sh => li.strolch.dev/aheadStatus.sh (100%) rename bootstrap.cmd => li.strolch.dev/bootstrap.cmd (100%) rename bootstrap.sh => li.strolch.dev/bootstrap.sh (100%) rename bootstrap_https.cmd => li.strolch.dev/bootstrap_https.cmd (100%) rename bootstrap_https.sh => li.strolch.dev/bootstrap_https.sh (100%) rename buildMSE.sh => li.strolch.dev/buildMSE.sh (100%) rename createBundle.sh => li.strolch.dev/createBundle.sh (100%) rename pom.xml => li.strolch.dev/pom.xml (100%) rename projects.lst => li.strolch.dev/projects.lst (100%) rename pull.cmd => li.strolch.dev/pull.cmd (100%) rename pull.sh => li.strolch.dev/pull.sh (100%) rename push.cmd => li.strolch.dev/push.cmd (100%) rename push.sh => li.strolch.dev/push.sh (100%) rename status.cmd => li.strolch.dev/status.cmd (100%) rename status.sh => li.strolch.dev/status.sh (100%) diff --git a/.gitignore b/li.strolch.dev/.gitignore similarity index 100% rename from .gitignore rename to li.strolch.dev/.gitignore diff --git a/LICENSE b/li.strolch.dev/LICENSE similarity index 100% rename from LICENSE rename to li.strolch.dev/LICENSE diff --git a/README.md b/li.strolch.dev/README.md similarity index 100% rename from README.md rename to li.strolch.dev/README.md diff --git a/aheadStatus.cmd b/li.strolch.dev/aheadStatus.cmd similarity index 100% rename from aheadStatus.cmd rename to li.strolch.dev/aheadStatus.cmd diff --git a/aheadStatus.sh b/li.strolch.dev/aheadStatus.sh similarity index 100% rename from aheadStatus.sh rename to li.strolch.dev/aheadStatus.sh diff --git a/bootstrap.cmd b/li.strolch.dev/bootstrap.cmd similarity index 100% rename from bootstrap.cmd rename to li.strolch.dev/bootstrap.cmd diff --git a/bootstrap.sh b/li.strolch.dev/bootstrap.sh similarity index 100% rename from bootstrap.sh rename to li.strolch.dev/bootstrap.sh diff --git a/bootstrap_https.cmd b/li.strolch.dev/bootstrap_https.cmd similarity index 100% rename from bootstrap_https.cmd rename to li.strolch.dev/bootstrap_https.cmd diff --git a/bootstrap_https.sh b/li.strolch.dev/bootstrap_https.sh similarity index 100% rename from bootstrap_https.sh rename to li.strolch.dev/bootstrap_https.sh diff --git a/buildMSE.sh b/li.strolch.dev/buildMSE.sh similarity index 100% rename from buildMSE.sh rename to li.strolch.dev/buildMSE.sh diff --git a/createBundle.sh b/li.strolch.dev/createBundle.sh similarity index 100% rename from createBundle.sh rename to li.strolch.dev/createBundle.sh diff --git a/pom.xml b/li.strolch.dev/pom.xml similarity index 100% rename from pom.xml rename to li.strolch.dev/pom.xml diff --git a/projects.lst b/li.strolch.dev/projects.lst similarity index 100% rename from projects.lst rename to li.strolch.dev/projects.lst diff --git a/pull.cmd b/li.strolch.dev/pull.cmd similarity index 100% rename from pull.cmd rename to li.strolch.dev/pull.cmd diff --git a/pull.sh b/li.strolch.dev/pull.sh similarity index 100% rename from pull.sh rename to li.strolch.dev/pull.sh diff --git a/push.cmd b/li.strolch.dev/push.cmd similarity index 100% rename from push.cmd rename to li.strolch.dev/push.cmd diff --git a/push.sh b/li.strolch.dev/push.sh similarity index 100% rename from push.sh rename to li.strolch.dev/push.sh diff --git a/status.cmd b/li.strolch.dev/status.cmd similarity index 100% rename from status.cmd rename to li.strolch.dev/status.cmd diff --git a/status.sh b/li.strolch.dev/status.sh similarity index 100% rename from status.sh rename to li.strolch.dev/status.sh