[sling-org-apache-sling-app-cms] 05/09: Fixed SLING-8956 - Fixing token replacement issues

[dk...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git

commit 5d4d462f430200782f861241beffcd6626320ae3
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jan 2 17:31:08 2020 -0500

    Fixed SLING-8956 - Fixing token replacement issues
---
 archetype/src/main/resources/archetype-resources/README.md              | 2 +-
 .../java/{__package__ => __packageInPathFormat__}/HelloWorldModel.java  | 0
 .../src/main/resources/jcr_root/apps/__appName__/components/page.json   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/archetype/src/main/resources/archetype-resources/README.md b/archetype/src/main/resources/archetype-resources/README.md
index fbe66ce..7626d1b 100644
--- a/archetype/src/main/resources/archetype-resources/README.md
+++ b/archetype/src/main/resources/archetype-resources/README.md
@@ -8,7 +8,7 @@
 	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. -->
-# ${appname} Sling CMS Project
+# ${appName} Apache Sling CMS Project
 
 An OSGi Bundle project created for the Apache Sling CMS. This project includes a
  simple client library using Bootstrap, a site configuration, a simple app with
diff --git a/archetype/src/main/resources/archetype-resources/src/main/java/__package__/HelloWorldModel.java b/archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/HelloWorldModel.java
similarity index 100%
rename from archetype/src/main/resources/archetype-resources/src/main/java/__package__/HelloWorldModel.java
rename to archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/HelloWorldModel.java
diff --git a/archetype/src/main/resources/archetype-resources/src/main/resources/jcr_root/apps/__appName__/components/page.json b/archetype/src/main/resources/archetype-resources/src/main/resources/jcr_root/apps/__appName__/components/page.json
index 91db14b..81b0ec0 100644
--- a/archetype/src/main/resources/archetype-resources/src/main/resources/jcr_root/apps/__appName__/components/page.json
+++ b/archetype/src/main/resources/archetype-resources/src/main/resources/jcr_root/apps/__appName__/components/page.json
@@ -1,6 +1,6 @@
 {
     "jcr:primaryType" : "sling:Component",
-    "jcr:title": "${sample} - Page",
+    "jcr:title": "${appName} - Page",
     "sling:resourceSuperType": "reference/components/pages/base",
     "componentType": "Page"
 }