You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2016/10/29 20:12:25 UTC
svn commit: r1767126 - in /sling/trunk/samples/fling: ./
src/main/resources/apps/fling/i18n/ src/main/resources/apps/fling/messaging/
src/main/resources/apps/fling/messaging/form/ src/main/resources/etc/
Author: olli
Date: Sat Oct 29 20:12:25 2016
New Revision: 1767126
URL: http://svn.apache.org/viewvc?rev=1767126&view=rev
Log:
move i18n and messaging resources from /etc to /apps/fling
Added:
sling/trunk/samples/fling/src/main/resources/apps/fling/i18n/
sling/trunk/samples/fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json
sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/
sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/form/
sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/form/comment.txt
Removed:
sling/trunk/samples/fling/src/main/resources/etc/
Modified:
sling/trunk/samples/fling/pom.xml
Modified: sling/trunk/samples/fling/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/fling/pom.xml?rev=1767126&r1=1767125&r2=1767126&view=diff
==============================================================================
--- sling/trunk/samples/fling/pom.xml (original)
+++ sling/trunk/samples/fling/pom.xml Sat Oct 29 20:12:25 2016
@@ -172,8 +172,7 @@
</Sling-Bundle-Resources>
<Sling-Initial-Content>
apps/fling;path:=/apps/fling;overwrite:=true;uninstall:=true,
- content;path:=/content;overwrite:=true;uninstall:=true,
- etc;path:=/etc;overwrite:=true;uninstall:=true
+ content;path:=/content;overwrite:=true;uninstall:=true
</Sling-Initial-Content>
<Sling-Model-Packages>
org.apache.sling.samples.fling.page
@@ -193,7 +192,7 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes combine.children="append">
- <exclude>**/etc/messaging/form/comment.txt</exclude>
+ <exclude>**/apps/fling/messaging/form/comment.txt</exclude>
</excludes>
</configuration>
</plugin>
Added: sling/trunk/samples/fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json
URL: http://svn.apache.org/viewvc/sling/trunk/samples/fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json?rev=1767126&view=auto
==============================================================================
--- sling/trunk/samples/fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json (added)
+++ sling/trunk/samples/fling/src/main/resources/apps/fling/i18n/org.apache.sling.samples.fling.json Sat Oct 29 20:12:25 2016
@@ -0,0 +1,21 @@
+{
+ "en": {
+ "jcr:mixinTypes": [
+ "mix:language"
+ ],
+ "jcr:language": "en",
+ "sling:basename": "org.apache.sling.samples.fling",
+ "action.logout": {
+ "jcr:primaryType": "sling:MessageEntry",
+ "sling:message": "logout"
+ },
+ "no_auth": {
+ "jcr:primaryType": "sling:MessageEntry",
+ "sling:message": "no auth"
+ },
+ "fling.validator.comment.invalid": {
+ "jcr:primaryType": "sling:MessageEntry",
+ "sling:message": "Invalid comment, try with: {0}"
+ }
+ }
+}
Added: sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/form/comment.txt
URL: http://svn.apache.org/viewvc/sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/form/comment.txt?rev=1767126&view=auto
==============================================================================
--- sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/form/comment.txt (added)
+++ sling/trunk/samples/fling/src/main/resources/apps/fling/messaging/form/comment.txt Sat Oct 29 20:12:25 2016
@@ -0,0 +1,5 @@
+A visitor of Fling left a comment.
+
+[[${form.name}]] says:
+
+[[${form.comment}]]