You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2018/02/03 22:45:40 UTC
[sling-whiteboard] branch master updated (2aec688 -> c68b74a)
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git.
from 2aec688 Adding an i18n concept
add 429f87d Added the Sling Project Archetype to the Whiteboard
new 94fe05c Merge branch 'feature/sling-7276'
new c68b74a Adjusted the Readme and added IntelliJ ignores
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 2 +
project-archetype/README.md | 84 +++++
project-archetype/build.run.and.deploy.test.sh | 58 +++
project-archetype/pom.xml | 77 ++++
.../META-INF/archetype-post-generate.groovy | 140 +++++++
.../META-INF/maven/archetype-metadata.xml | 167 +++++++++
.../.archetype-config/archetype.properties | 34 ++
.../resources/archetype-resources/README.All.md | 130 +++++++
.../resources/archetype-resources/README.NotAll.md | 90 +++++
.../main/resources/archetype-resources/all/pom.xml | 108 ++++++
.../archetype-resources/core.example/pom.xml | 177 +++++++++
.../SampleRequestModel.java | 56 +++
.../src/main/java/servlet/ByPathServlet.java | 74 ++++
.../main/java/servlet/ByResourceTypeServlet.java | 80 ++++
.../servlet/ByPathServletTest.java | 28 +-
.../resources/archetype-resources/core/pom.xml | 171 +++++++++
.../src/main/resources/archetype-resources/pom.xml | 416 +++++++++++++++++++++
.../archetype-resources/ui.apps.example/README.md | 24 +-
.../archetype-resources/ui.apps.example/pom.xml | 120 ++++++
.../src/main/content/META-INF/vault/filter.xml | 43 +++
.../src/main/content/META-INF/vault/settings.xml | 20 +
.../jcr_root/apps/__appsFolderName__/.content.xml | 15 +-
.../apps/__appsFolderName__/home/.content.xml | 23 ++
.../apps/__appsFolderName__/home/body.html | 19 +-
.../apps/__appsFolderName__/home/head.html | 18 +-
.../apps/__appsFolderName__/install/.content.xml | 14 +-
.../apps/__appsFolderName__/page/.content.xml | 22 ++
.../apps/__appsFolderName__/page/body.html | 16 +-
.../apps/__appsFolderName__/page/footer.html | 14 +-
.../apps/__appsFolderName__/page/head.html | 18 +-
.../apps/__appsFolderName__/page/page.html | 30 +-
.../content/__contentFolderName__/.content.xml | 21 ++
.../__contentFolderName__/home/.content.xml | 23 ++
.../home/welcome/.content.xml | 15 +-
.../resources/archetype-resources/ui.apps/pom.xml | 120 ++++++
.../src/main/content/META-INF/vault/filter.xml | 42 +++
.../src/main/content/META-INF/vault/settings.xml | 20 +
.../jcr_root/apps/__appsFolderName__/.content.xml | 15 +-
.../apps/__appsFolderName__/install/.content.xml | 14 +-
.../content/__contentFolderName__/.content.xml | 15 +-
.../resources/projects/all/archetype.properties | 35 ++
.../src/test/resources/projects/all/goal.txt | 0
.../projects/allDeleted/archetype.properties | 35 ++
.../test/resources/projects/allDeleted/goal.txt | 0
.../projects/allMerged/archetype.properties | 35 ++
.../src/test/resources/projects/allMerged/goal.txt | 0
.../resources/projects/notAll/archetype.properties | 35 ++
.../src/test/resources/projects/notAll/goal.txt | 0
.../projects/notAllDeleted/archetype.properties | 35 ++
.../test/resources/projects/notAllDeleted/goal.txt | 0
.../projects/notAllMerged/archetype.properties | 35 ++
.../test/resources/projects/notAllMerged/goal.txt | 0
52 files changed, 2678 insertions(+), 105 deletions(-)
create mode 100644 project-archetype/README.md
create mode 100755 project-archetype/build.run.and.deploy.test.sh
create mode 100644 project-archetype/pom.xml
create mode 100644 project-archetype/src/main/resources/META-INF/archetype-post-generate.groovy
create mode 100644 project-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/.archetype-config/archetype.properties
create mode 100644 project-archetype/src/main/resources/archetype-resources/README.All.md
create mode 100644 project-archetype/src/main/resources/archetype-resources/README.NotAll.md
create mode 100644 project-archetype/src/main/resources/archetype-resources/all/pom.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/core.example/pom.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/core.example/src/main/java/__slingModelSubPackage__/SampleRequestModel.java
create mode 100644 project-archetype/src/main/resources/archetype-resources/core.example/src/main/java/servlet/ByPathServlet.java
create mode 100644 project-archetype/src/main/resources/archetype-resources/core.example/src/main/java/servlet/ByResourceTypeServlet.java
copy featuremodel/feature-launcher/src/main/java/org/apache/sling/feature/launcher/spi/LauncherPrepareContext.java => project-archetype/src/main/resources/archetype-resources/core.example/src/test/java/__packageInPathFormat__/servlet/ByPathServletTest.java (69%)
create mode 100644 project-archetype/src/main/resources/archetype-resources/core/pom.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/pom.xml
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/README.md (64%)
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/pom.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/META-INF/vault/filter.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/META-INF/vault/settings.xml
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/.content.xml (68%)
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/home/.content.xml
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/home/body.html (64%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/home/head.html (70%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml (72%)
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/page/.content.xml
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/page/body.html (74%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/page/footer.html (84%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/page/head.html (70%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/apps/__appsFolderName__/page/page.html (56%)
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/content/__contentFolderName__/.content.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/content/__contentFolderName__/home/.content.xml
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps.example/src/main/content/jcr_root/content/__contentFolderName__/home/welcome/.content.xml (69%)
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps/pom.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps/src/main/content/META-INF/vault/filter.xml
create mode 100644 project-archetype/src/main/resources/archetype-resources/ui.apps/src/main/content/META-INF/vault/settings.xml
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps/src/main/content/jcr_root/apps/__appsFolderName__/.content.xml (69%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps/src/main/content/jcr_root/apps/__appsFolderName__/install/.content.xml (72%)
copy .sling-module.xml => project-archetype/src/main/resources/archetype-resources/ui.apps/src/main/content/jcr_root/content/__contentFolderName__/.content.xml (69%)
create mode 100644 project-archetype/src/test/resources/projects/all/archetype.properties
create mode 100644 project-archetype/src/test/resources/projects/all/goal.txt
create mode 100644 project-archetype/src/test/resources/projects/allDeleted/archetype.properties
create mode 100644 project-archetype/src/test/resources/projects/allDeleted/goal.txt
create mode 100644 project-archetype/src/test/resources/projects/allMerged/archetype.properties
create mode 100644 project-archetype/src/test/resources/projects/allMerged/goal.txt
create mode 100644 project-archetype/src/test/resources/projects/notAll/archetype.properties
create mode 100644 project-archetype/src/test/resources/projects/notAll/goal.txt
create mode 100644 project-archetype/src/test/resources/projects/notAllDeleted/archetype.properties
create mode 100644 project-archetype/src/test/resources/projects/notAllDeleted/goal.txt
create mode 100644 project-archetype/src/test/resources/projects/notAllMerged/archetype.properties
create mode 100644 project-archetype/src/test/resources/projects/notAllMerged/goal.txt
--
To stop receiving notification emails like this one, please contact
andysch@apache.org.
[sling-whiteboard] 02/02: Adjusted the Readme and added IntelliJ
ignores
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit c68b74aabe2f9bf42b7ff71261b5b1444f5686a9
Author: Andreas Schaefer <as...@headwire.com>
AuthorDate: Sat Feb 3 14:45:27 2018 -0800
Adjusted the Readme and added IntelliJ ignores
---
.gitignore | 2 ++
project-archetype/README.md | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
index c1ba99a..db3cdc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
.settings
target
bin
+*.iml
+.idea
diff --git a/project-archetype/README.md b/project-archetype/README.md
index 3e1f1ea..e17377f 100644
--- a/project-archetype/README.md
+++ b/project-archetype/README.md
@@ -47,8 +47,8 @@ how to build and deploy the entire project in one step.
|slingModelSubPackage |Sub Package where Sling Models should be place in with no trailing dots|
|slingHostName |Host Name or IP Address of the server where Sling is hosted|
|slingPort |Port to which your Sling instance is bound to|
-|optionAll |Determines if the project is created with an **all** package as single deployed unit (y/n)|
-|optionExample |Determines if the examples are kept separate (s), merged into the regular modules (m) or deleted (d)|
+|optionAll |Determines if the project is created with an **all** package or packaged inside the ui.apps mdoule (y/n)|
+|optionExample |Determines if the example code is kept in separate modules (s), merged together into single modules (m) or example code is deleted (d)|
#### Usage
@@ -69,6 +69,12 @@ Until this project is fully released in the public Maven Repo this is how to use
#### Build and Install Integration Test
There is a simple integration test setup with this archetype.
+This script will build both the Merged All and UI (ui.apps packaging) and install them on the
+local Sling instance. The resulting pages (from the example code) can be viewed here:
+
+* [All Home](http://localhost:8080/content/testContentAll/home.html)
+* [UI Home](http://localhost:8080/content/testContentUI/home.html)
+
You can run this one using the attached Unix shell script:
sh build.run.and.deploy.test.sh
--
To stop receiving notification emails like this one, please contact
andysch@apache.org.
[sling-whiteboard] 01/02: Merge branch 'feature/sling-7276'
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
andysch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 94fe05cac4d24fe5d7e0e0c055b36ea3079584f7
Merge: 2aec688 429f87d
Author: Andreas Schaefer <as...@headwire.com>
AuthorDate: Sat Feb 3 14:31:06 2018 -0800
Merge branch 'feature/sling-7276'
project-archetype/README.md | 78 ++++
project-archetype/build.run.and.deploy.test.sh | 58 +++
project-archetype/pom.xml | 77 ++++
.../META-INF/archetype-post-generate.groovy | 140 +++++++
.../META-INF/maven/archetype-metadata.xml | 167 +++++++++
.../.archetype-config/archetype.properties | 34 ++
.../resources/archetype-resources/README.All.md | 130 +++++++
.../resources/archetype-resources/README.NotAll.md | 90 +++++
.../main/resources/archetype-resources/all/pom.xml | 108 ++++++
.../archetype-resources/core.example/pom.xml | 177 +++++++++
.../SampleRequestModel.java | 56 +++
.../src/main/java/servlet/ByPathServlet.java | 74 ++++
.../main/java/servlet/ByResourceTypeServlet.java | 80 ++++
.../servlet/ByPathServletTest.java | 36 ++
.../resources/archetype-resources/core/pom.xml | 171 +++++++++
.../src/main/resources/archetype-resources/pom.xml | 416 +++++++++++++++++++++
.../archetype-resources/ui.apps.example/README.md | 32 ++
.../archetype-resources/ui.apps.example/pom.xml | 120 ++++++
.../src/main/content/META-INF/vault/filter.xml | 43 +++
.../src/main/content/META-INF/vault/settings.xml | 20 +
.../jcr_root/apps/__appsFolderName__/.content.xml | 27 ++
.../apps/__appsFolderName__/home/.content.xml | 23 ++
.../apps/__appsFolderName__/home/body.html | 27 ++
.../apps/__appsFolderName__/home/head.html | 26 ++
.../apps/__appsFolderName__/install/.content.xml | 26 ++
.../apps/__appsFolderName__/page/.content.xml | 22 ++
.../apps/__appsFolderName__/page/body.html | 24 ++
.../apps/__appsFolderName__/page/footer.html | 22 ++
.../apps/__appsFolderName__/page/head.html | 26 ++
.../apps/__appsFolderName__/page/page.html | 38 ++
.../content/__contentFolderName__/.content.xml | 21 ++
.../__contentFolderName__/home/.content.xml | 23 ++
.../home/welcome/.content.xml | 25 ++
.../resources/archetype-resources/ui.apps/pom.xml | 120 ++++++
.../src/main/content/META-INF/vault/filter.xml | 42 +++
.../src/main/content/META-INF/vault/settings.xml | 20 +
.../jcr_root/apps/__appsFolderName__/.content.xml | 27 ++
.../apps/__appsFolderName__/install/.content.xml | 26 ++
.../content/__contentFolderName__/.content.xml | 27 ++
.../resources/projects/all/archetype.properties | 35 ++
.../src/test/resources/projects/all/goal.txt | 0
.../projects/allDeleted/archetype.properties | 35 ++
.../test/resources/projects/allDeleted/goal.txt | 0
.../projects/allMerged/archetype.properties | 35 ++
.../src/test/resources/projects/allMerged/goal.txt | 0
.../resources/projects/notAll/archetype.properties | 35 ++
.../src/test/resources/projects/notAll/goal.txt | 0
.../projects/notAllDeleted/archetype.properties | 35 ++
.../test/resources/projects/notAllDeleted/goal.txt | 0
.../projects/notAllMerged/archetype.properties | 35 ++
.../test/resources/projects/notAllMerged/goal.txt | 0
51 files changed, 2909 insertions(+)
--
To stop receiving notification emails like this one, please contact
andysch@apache.org.