diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1 b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1 index e4e3b6e..61bcb2f 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1 +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.ps1 @@ -13,6 +13,11 @@ function start_ { mvn -Drad process-classes } +function start_log { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad "-Ddocker.showLogs" process-classes +} + function stop_ { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -41,6 +46,9 @@ switch ($args[0]) { "start" { start_ } + "start_log" { + start_log + } "stop" { stop_ } @@ -58,7 +66,7 @@ switch ($args[0]) { list } default { - echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" } } diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh index 1b37cf5..7cb0a80 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/rad.sh @@ -1,7 +1,7 @@ #!/bin/sh discoverArtifactId() { - ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null` + ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate` } rebuild() { @@ -14,6 +14,11 @@ start() { mvn -Drad process-classes } +start_log() { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad -Ddocker.showLogs process-classes +} + stop() { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -38,6 +43,9 @@ case "$1" in start) start ;; + start_log) + start_log + ;; stop) stop ;; @@ -55,7 +63,7 @@ case "$1" in list ;; *) - echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" exit 1 esac diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleEarlyComponent.java b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleEarlyComponent.java similarity index 89% rename from beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleEarlyComponent.java rename to beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleEarlyComponent.java index f51310b..81d197c 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleEarlyComponent.java +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleEarlyComponent.java @@ -1,4 +1,4 @@ -package ${package}.annotation; +package ${package}.spring; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleLateComponent.java b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleLateComponent.java similarity index 89% rename from beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleLateComponent.java rename to beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleLateComponent.java index b343108..18a32cc 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/annotation/ModuleLateComponent.java +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/java/spring/ModuleLateComponent.java @@ -1,4 +1,4 @@ -package ${package}.annotation; +package ${package}.spring; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml index 6875ab6..dd06a10 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml @@ -1,9 +1,9 @@ - Example Webscript - Example Java-backed webscript description - /exampleJava?paramName={paramValue} - user - - ${shortname} + Example Webscript + Example Java-backed webscript description + /exampleJava?paramName={paramValue} + user + + ${shortname} diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml index e2a99ba..ad5d68a 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml @@ -1,9 +1,9 @@ - Example Webscript - Example JS-backed webscript description - /exampleJs?paramName={paramValue} - guest - - ${shortname} + Example Webscript + Example JS-backed webscript description + /exampleJs?paramName={paramValue} + guest + + ${shortname} diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml new file mode 100644 index 0000000..17dbf49 --- /dev/null +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml @@ -0,0 +1,8 @@ + + + + Example Folder + + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/messages/example-model.en_US.properties b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/messages/example-model.en_US.properties new file mode 100644 index 0000000..e69de29 diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml index 788cbc2..2a0eece 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml @@ -1,24 +1,24 @@ - - - - Example Data Model - Order of the Bee - 1.0 - - - - - - - - - - - - - - - \ No newline at end of file + + + + Example Data Model + Order of the Bee + 1.0 + + + + + + + + + + + + + + + diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-boostrap-context.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-bootstrap-context.xml similarity index 97% rename from beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-boostrap-context.xml rename to beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-bootstrap-context.xml index 391039b..06c174f 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-boostrap-context.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-bootstrap-context.xml @@ -9,7 +9,7 @@ - + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml index bacb856..05e10a5 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml @@ -9,8 +9,8 @@ - - + + @@ -19,4 +19,25 @@ + + + + + + + + + + + + + /${spaces.company_home.childname} + alfresco/module/${project.groupId}.${project.artifactId}/dataset/example_v1.xml + + + + + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml index 5f87726..2e12cbb 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml @@ -10,7 +10,7 @@ - + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties index e64eae5..37d3a5c 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties @@ -1,5 +1,5 @@ -module.id=${project.artifactId} -#module.aliases=myModule-123, my-module -module.title=${project.name} -module.description=${project.description} -module.version=${project.version} +module.id=${project.artifactId} +#module.aliases=myModule-123, my-module +module.title=${project.name} +module.description=${project.description} +module.version=${project.version} diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml index 07829ea..4734b72 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml @@ -1,63 +1,63 @@ - - - - - - - - javascript - - - js - - - - false - - - - - true - - - - - - - - - - ${spaces.store} - - - ${spaces.company_home.childname} - - - - - + + + + + + + + javascript + + + js + + + + false + + + + + true + + + + + + + + + + ${spaces.store} + + + ${spaces.company_home.childname} + + + + + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml index ca3c4f3..62fb813 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,52 +1,52 @@ - - - - 4.0.0 - ${groupId} - ${artifactId}-parent - ${version} - pom - - ${shortname} ACS All-in-one Parent Project - - - 4.2.0 - community - 6.2.0-ga - 6.2.2.2 - - UTF-8 - 8 - 8 - - - - tengine-A - - platform-module-A - platform-webapp - - share-module-A - share-webapp - - - - - inteligr8-releases - http://repos.inteligr8.com/nexus/repository/inteligr8-public - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - - - - inteligr8-releases - http://repos.inteligr8.com/nexus/repository/inteligr8-private - - - + + + + 4.0.0 + ${groupId} + ${artifactId}-parent + ${version} + pom + + ${shortname} ACS All-in-one Parent Project + + + 4.2.0 + community + 6.2.0-ga + 6.2.2.2 + + UTF-8 + 8 + 8 + + + + tengine-A + + platform-module-A + platform-webapp + + share-module-A + share-webapp + + + + + inteligr8-releases + http://repos.inteligr8.com/nexus/repository/inteligr8-public + + + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + + + + inteligr8-releases + http://repos.inteligr8.com/nexus/repository/inteligr8-private + + + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1 b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1 index e4e3b6e..61bcb2f 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1 +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.ps1 @@ -13,6 +13,11 @@ function start_ { mvn -Drad process-classes } +function start_log { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad "-Ddocker.showLogs" process-classes +} + function stop_ { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -41,6 +46,9 @@ switch ($args[0]) { "start" { start_ } + "start_log" { + start_log + } "stop" { stop_ } @@ -58,7 +66,7 @@ switch ($args[0]) { list } default { - echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" } } diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh index 1b37cf5..7cb0a80 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/rad.sh @@ -1,7 +1,7 @@ #!/bin/sh discoverArtifactId() { - ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null` + ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate` } rebuild() { @@ -14,6 +14,11 @@ start() { mvn -Drad process-classes } +start_log() { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad -Ddocker.showLogs process-classes +} + stop() { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -38,6 +43,9 @@ case "$1" in start) start ;; + start_log) + start_log + ;; stop) stop ;; @@ -55,7 +63,7 @@ case "$1" in list ;; *) - echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" exit 1 esac diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/META-INF/share-config-custom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/META-INF/share-config-custom.xml index 3bbc9ee..3c7d9e8 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/META-INF/share-config-custom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/META-INF/share-config-custom.xml @@ -1,334 +1,334 @@ - - - - - - - - - - - - - - - - - - - - - - - -
cm:content
-
cm:folder
- - -
example:document
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 255 - - - - - - - - true - - - - - - - - - - - - - - - - - - - - true - aspect=cm:taggable - /api/tag/workspace/SpacesStore - tag - - - - - true - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - 255 - - - - - - - - true - - - - - true - aspect=cm:taggable - /api/tag/workspace/SpacesStore - tag - - - - - true - - - - - - - - - -
- - - - - - - - - - 255 - - - - - - - - explorer - true - - - - - - -
-
- - - - - -
- - - - - - - - - - - - 255 - - - - - - - - explorer - - - - - mimeType - - - - - editInline - - - - - - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
cm:content
+
cm:folder
+ + +
example:document
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 255 + + + + + + + + true + + + + + + + + + + + + + + + + + + + + true + aspect=cm:taggable + /api/tag/workspace/SpacesStore + tag + + + + + true + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + 255 + + + + + + + + true + + + + + true + aspect=cm:taggable + /api/tag/workspace/SpacesStore + tag + + + + + true + + + + + + + + + +
+ + + + + + + + + + 255 + + + + + + + + explorer + true + + + + + + +
+
+ + + + + +
+ + + + + + + + + + + + 255 + + + + + + + + explorer + + + + + mimeType + + + + + editInline + + + + + + +
+ + + + + + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties index e64eae5..37d3a5c 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties @@ -1,5 +1,5 @@ -module.id=${project.artifactId} -#module.aliases=myModule-123, my-module -module.title=${project.name} -module.description=${project.description} -module.version=${project.version} +module.id=${project.artifactId} +#module.aliases=myModule-123, my-module +module.title=${project.name} +module.description=${project.description} +module.version=${project.version} diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/META-INF/share-config-custom.xml b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/META-INF/share-config-custom.xml index a7b8f4f..fd66501 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/META-INF/share-config-custom.xml +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/META-INF/share-config-custom.xml @@ -1,95 +1,95 @@ - - - - - - - production - - - - true - - - - - - - - - true - - false - - - - - - - - - - - - - - alfresco-noauth - Alfresco - unauthenticated access - Access to Alfresco Repository WebScripts that do not require authentication - alfresco - ${acs-platform.url}/alfresco/s - none - - - - alfresco - Alfresco - user access - Access to Alfresco Repository WebScripts that require user authentication - alfresco - ${acs-platform.url}/alfresco/s - user - - - - alfresco-feed - Alfresco Feed - Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet - http - ${acs-platform.url}/alfresco/s - true - user - - - - alfresco-api - alfresco - Alfresco Public API - user access - Access to Alfresco Repository Public API that require user authentication. - This makes use of the authentication that is provided by parent 'alfresco' endpoint. - alfresco - ${acs-platform.url}/alfresco/api - user - - - - + + + + + + + production + + + + true + + + + + + + + + true + + false + + + + + + + + + + + + + + alfresco-noauth + Alfresco - unauthenticated access + Access to Alfresco Repository WebScripts that do not require authentication + alfresco + ${acs-platform.url}/alfresco/s + none + + + + alfresco + Alfresco - user access + Access to Alfresco Repository WebScripts that require user authentication + alfresco + ${acs-platform.url}/alfresco/s + user + + + + alfresco-feed + Alfresco Feed + Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet + http + ${acs-platform.url}/alfresco/s + true + user + + + + alfresco-api + alfresco + Alfresco Public API - user access + Access to Alfresco Repository Public API that require user authentication. + This makes use of the authentication that is provided by parent 'alfresco' endpoint. + alfresco + ${acs-platform.url}/alfresco/api + user + + + + diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j.properties b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j.properties index 97ba7dd..fd80c0c 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j.properties +++ b/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/share-module-A/src/test/resources/log4j.properties @@ -1,56 +1,56 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -# Set root logger level to error -log4j.rootLogger=error, Console, File - -# Console appender definition # - -# All outputs currently set to be a ConsoleAppender. -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout - -# use log4j NDC to replace %x with tenant domain / username -log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n -#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n - -# File appender definition # -log4j.appender.File=org.apache.log4j.DailyRollingFileAppender -log4j.appender.File.File=share.log -log4j.appender.File.Append=true -log4j.appender.File.DatePattern='.'yyyy-MM-dd -log4j.appender.File.layout=org.apache.log4j.PatternLayout -log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n - -# Spring -log4j.logger.org.springframework=warn -# Turn off Spring remoting warnings that should really be info or debug. -log4j.logger.org.springframework.remoting.support=error -log4j.logger.org.springframework.util=error - -# MyFaces -log4j.logger.org.apache.myfaces.util.DebugUtils=info -log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error -log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error -log4j.logger.org.apache.myfaces.taglib=error - -# Alfresco -log4j.logger.org.alfresco=error -log4j.logger.org.alfresco.config=warn -log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn -log4j.logger.org.alfresco.web=info - -# Web Framework -log4j.logger.org.springframework.extensions.webscripts=info -log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info -log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off - -# Freemarker -# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler -log4j.logger.freemarker.runtime= - -#----------------------------------------------------------------------- -# Custom Share module logging goes here... -#----------------------------------------------------------------------- - -log4j.logger.${package}=debug +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +# Set root logger level to error +log4j.rootLogger=error, Console, File + +# Console appender definition # + +# All outputs currently set to be a ConsoleAppender. +log4j.appender.Console=org.apache.log4j.ConsoleAppender +log4j.appender.Console.layout=org.apache.log4j.PatternLayout + +# use log4j NDC to replace %x with tenant domain / username +log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n +#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n + +# File appender definition # +log4j.appender.File=org.apache.log4j.DailyRollingFileAppender +log4j.appender.File.File=share.log +log4j.appender.File.Append=true +log4j.appender.File.DatePattern='.'yyyy-MM-dd +log4j.appender.File.layout=org.apache.log4j.PatternLayout +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n + +# Spring +log4j.logger.org.springframework=warn +# Turn off Spring remoting warnings that should really be info or debug. +log4j.logger.org.springframework.remoting.support=error +log4j.logger.org.springframework.util=error + +# MyFaces +log4j.logger.org.apache.myfaces.util.DebugUtils=info +log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error +log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error +log4j.logger.org.apache.myfaces.taglib=error + +# Alfresco +log4j.logger.org.alfresco=error +log4j.logger.org.alfresco.config=warn +log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn +log4j.logger.org.alfresco.web=info + +# Web Framework +log4j.logger.org.springframework.extensions.webscripts=info +log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info +log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off + +# Freemarker +# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler +log4j.logger.freemarker.runtime= + +#----------------------------------------------------------------------- +# Custom Share module logging goes here... +#----------------------------------------------------------------------- + +log4j.logger.${package}=debug diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml index d36d5cf..ba59b16 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,47 +1,47 @@ - 4.0.0 - - ${groupId} - ${artifactId} - ${version} - jar - - ${shortname} ACS Platform Module + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + jar + + ${shortname} ACS Platform Module - - UTF-8 - 8 - 8 + + UTF-8 + 8 + 8 4.2.0 - 6.2.0-ga - + 6.2.0-ga + - - - - org.alfresco - acs-community-packaging - ${alfresco.platform.version} - pom - import - - - + + + + org.alfresco + acs-community-packaging + ${alfresco.platform.version} + pom + import + + + - - - - - org.alfresco - alfresco-repository - provided - - + + + + + org.alfresco + alfresco-repository + provided + + - + io.repaint.maven @@ -50,33 +50,33 @@ true - + com.inteligr8.ootbee:beedk-acs-platform-self-rad-tile:${beedkVersion} - + com.inteligr8.ootbee:beedk-acs-platform-module-tile:${beedkVersion} - - - - - - inteligr8-releases - http://repos.inteligr8.com/nexus/repository/inteligr8-public - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - + + + + + inteligr8-releases + http://repos.inteligr8.com/nexus/repository/inteligr8-public + + + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public + + - - - inteligr8-releases - http://repos.inteligr8.com/nexus/repository/inteligr8-public - - + + + inteligr8-releases + http://repos.inteligr8.com/nexus/repository/inteligr8-public + + \ No newline at end of file diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1 b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1 index e4e3b6e..61bcb2f 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1 +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.ps1 @@ -13,6 +13,11 @@ function start_ { mvn -Drad process-classes } +function start_log { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad "-Ddocker.showLogs" process-classes +} + function stop_ { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -41,6 +46,9 @@ switch ($args[0]) { "start" { start_ } + "start_log" { + start_log + } "stop" { stop_ } @@ -58,7 +66,7 @@ switch ($args[0]) { list } default { - echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" } } diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh index 1b37cf5..7cb0a80 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/rad.sh @@ -1,7 +1,7 @@ #!/bin/sh discoverArtifactId() { - ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null` + ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate` } rebuild() { @@ -14,6 +14,11 @@ start() { mvn -Drad process-classes } +start_log() { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad -Ddocker.showLogs process-classes +} + stop() { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -38,6 +43,9 @@ case "$1" in start) start ;; + start_log) + start_log + ;; stop) stop ;; @@ -55,7 +63,7 @@ case "$1" in list ;; *) - echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" exit 1 esac diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleEarlyComponent.java b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/spring/ModuleEarlyComponent.java similarity index 89% rename from beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleEarlyComponent.java rename to beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/spring/ModuleEarlyComponent.java index f51310b..81d197c 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleEarlyComponent.java +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/spring/ModuleEarlyComponent.java @@ -1,4 +1,4 @@ -package ${package}.annotation; +package ${package}.spring; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleLateComponent.java b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/spring/ModuleLateComponent.java similarity index 89% rename from beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleLateComponent.java rename to beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/spring/ModuleLateComponent.java index b343108..18a32cc 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/annotation/ModuleLateComponent.java +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/java/spring/ModuleLateComponent.java @@ -1,4 +1,4 @@ -package ${package}.annotation; +package ${package}.spring; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml index 6875ab6..dd06a10 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJava.get.desc.xml @@ -1,9 +1,9 @@ - Example Webscript - Example Java-backed webscript description - /exampleJava?paramName={paramValue} - user - - ${shortname} + Example Webscript + Example Java-backed webscript description + /exampleJava?paramName={paramValue} + user + + ${shortname} diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml index e2a99ba..ad5d68a 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/extension/templates/webscripts/exampleJavaScript.get.desc.xml @@ -1,9 +1,9 @@ - Example Webscript - Example JS-backed webscript description - /exampleJs?paramName={paramValue} - guest - - ${shortname} + Example Webscript + Example JS-backed webscript description + /exampleJs?paramName={paramValue} + guest + + ${shortname} diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml new file mode 100644 index 0000000..17dbf49 --- /dev/null +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/dataset/example_v1.xml @@ -0,0 +1,8 @@ + + + + Example Folder + + diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/messages/example-model.en_US.properties b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/messages/example-model.en_US.properties new file mode 100644 index 0000000..e69de29 diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml index 788cbc2..a774c59 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/model/example-model.xml @@ -1,24 +1,24 @@ - - - - Example Data Model - Order of the Bee - 1.0 - - - - - - - - - - - - - - + + + + Example Data Model + Order of the Bee + 1.0 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-boostrap-context.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-bootstrap-context.xml similarity index 97% rename from beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-boostrap-context.xml rename to beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-bootstrap-context.xml index 391039b..06c174f 100644 --- a/beedk-acs-allinone-archetype/src/main/resources/archetype-resources/platform-module-A/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-boostrap-context.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-bootstrap-context.xml @@ -9,7 +9,7 @@ - + diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml index bacb856..05e10a5 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-context.xml @@ -9,8 +9,8 @@ - - + + @@ -19,4 +19,25 @@ + + + + + + + + + + + + + /${spaces.company_home.childname} + alfresco/module/${project.groupId}.${project.artifactId}/dataset/example_v1.xml + + + + + diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml index 5f87726..2e12cbb 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module-uninstall-context.xml @@ -10,7 +10,7 @@ - + diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties index e64eae5..37d3a5c 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties @@ -1,5 +1,5 @@ -module.id=${project.artifactId} -#module.aliases=myModule-123, my-module -module.title=${project.name} -module.description=${project.description} -module.version=${project.version} +module.id=${project.artifactId} +#module.aliases=myModule-123, my-module +module.title=${project.name} +module.description=${project.description} +module.version=${project.version} diff --git a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml index 07829ea..4734b72 100644 --- a/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml +++ b/beedk-acs-platform-module-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml @@ -1,63 +1,63 @@ - - - - - - - - javascript - - - js - - - - false - - - - - true - - - - - - - - - - ${spaces.store} - - - ${spaces.company_home.childname} - - - - - + + + + + + + + javascript + + + js + + + + false + + + + + true + + + + + + + + + + ${spaces.store} + + + ${spaces.company_home.childname} + + + + + diff --git a/beedk-acs-platform-rad-tile/tile.xml b/beedk-acs-platform-rad-tile/tile.xml index ad3c041..d73f1da 100644 --- a/beedk-acs-platform-rad-tile/tile.xml +++ b/beedk-acs-platform-rad-tile/tile.xml @@ -108,7 +108,7 @@ -Dtransform.service.enabled=${beedk.rad.ats.enabled} -Dtransform.service.url=http://${project.artifactId}-ats-atr:8095 -Dsfs.url=http://${project.artifactId}-ats-sfs:8099 \ -Dlocal.transform.service.enabled=${beedk.rad.alts.enabled} \ -DlocalTransform.core-aio.url=http://${project.artifactId}-ate-aio:8090 -DlocalTransform.ate.url=http://${project.artifactId}-ate:8090 \ - -Djodconverter.enabled=false \ + -Djodconverter.enabled=false -Dsystem.workflow.engine.activiti.enabled=true \ -Dalfresco-pdf-renderer.url=http://${project.artifactId}-ate-aio:8090 -Djodconverter.url=http://${project.artifactId}-ate-aio:8090 -Dimg.url=http://${project.artifactId}-ate-aio:8090 -Dtika.url=http://${project.artifactId}-ate-aio:8090 -Dtransform.misc.url=http://${project.artifactId}-ate-aio:8090 \ -Dindex.subsystem.name=${beedk.rad.platform.index} -Dsolr.host=${project.artifactId}-acs-search -Dsolr.secureComms=none \ ${acs-platform.tomcat.opts} diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml index 3d05602..0ed34a3 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,50 +1,50 @@ - 4.0.0 - - ${groupId} - ${artifactId} - ${version} - jar - - ${shortname} ACS Share Module + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + ${groupId} + ${artifactId} + ${version} + jar + + ${shortname} ACS Share Module - - UTF-8 - 8 - 8 + + UTF-8 + 8 + 8 4.2.0 - 6.2.0-ga - 6.2.2 - + 6.2.0-ga + 6.2.2 + - - - - org.alfresco - acs-community-packaging - ${alfresco.platform.version} - pom - import - - - + + + + org.alfresco + acs-community-packaging + ${alfresco.platform.version} + pom + import + + + - - - - - org.alfresco - share - ${alfresco.share.version} - classes - provided - - + + + + + org.alfresco + share + ${alfresco.share.version} + classes + provided + + - + io.repaint.maven @@ -53,35 +53,35 @@ true - + com.inteligr8.ootbee:beedk-acs-share-self-rad-tile:${beedkVersion} com.inteligr8.ootbee:beedk-acs-platform-artifact-rad-tile:${beedkVersion} - + com.inteligr8.ootbee:beedk-acs-share-module-tile:${beedkVersion} - - - - - - inteligr8-releases - http://repos.inteligr8.com/nexus/repository/inteligr8-public - - - alfresco-public - https://artifacts.alfresco.com/nexus/content/groups/public - - + + + + + inteligr8-releases + http://repos.inteligr8.com/nexus/repository/inteligr8-public + + + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public + + - - - inteligr8-releases - http://repos.inteligr8.com/nexus/repository/inteligr8-public - - + + + inteligr8-releases + http://repos.inteligr8.com/nexus/repository/inteligr8-public + + \ No newline at end of file diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1 b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1 index e4e3b6e..61bcb2f 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1 +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.ps1 @@ -13,6 +13,11 @@ function start_ { mvn -Drad process-classes } +function start_log { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad "-Ddocker.showLogs" process-classes +} + function stop_ { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -41,6 +46,9 @@ switch ($args[0]) { "start" { start_ } + "start_log" { + start_log + } "stop" { stop_ } @@ -58,7 +66,7 @@ switch ($args[0]) { list } default { - echo "Usage: .\rad.ps1 [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: .\rad.ps1 [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" } } diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh index 1b37cf5..7cb0a80 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/rad.sh @@ -1,7 +1,7 @@ #!/bin/sh discoverArtifactId() { - ARTIFACT_ID=`mvn -q -Dexec.executable=echo -Dexec.args='${project.artifactId}' --non-recursive exec:exec 2>/dev/null` + ARTIFACT_ID=`mvn -q -Dexpression=project.artifactId -DforceStdout help:evaluate` } rebuild() { @@ -14,6 +14,11 @@ start() { mvn -Drad process-classes } +start_log() { + echo "Rebuilding project and starting Docker containers to support rapid application development ..." + mvn -Drad -Ddocker.showLogs process-classes +} + stop() { discoverArtifactId echo "Stopping Docker containers that supported rapid application development ..." @@ -38,6 +43,9 @@ case "$1" in start) start ;; + start_log) + start_log + ;; stop) stop ;; @@ -55,7 +63,7 @@ case "$1" in list ;; *) - echo "Usage: ./rad.sh [ start | stop | restart | rebuild | tail {container} | containers ]" + echo "Usage: ./rad.sh [ start | start_log | stop | restart | rebuild | tail {container} | containers ]" exit 1 esac diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml index 3bbc9ee..3c7d9e8 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml @@ -1,334 +1,334 @@ - - - - - - - - - - - - - - - - - - - - - - - -
cm:content
-
cm:folder
- - -
example:document
- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 255 - - - - - - - - true - - - - - - - - - - - - - - - - - - - - true - aspect=cm:taggable - /api/tag/workspace/SpacesStore - tag - - - - - true - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - 255 - - - - - - - - true - - - - - true - aspect=cm:taggable - /api/tag/workspace/SpacesStore - tag - - - - - true - - - - - - - - - -
- - - - - - - - - - 255 - - - - - - - - explorer - true - - - - - - -
-
- - - - - -
- - - - - - - - - - - - 255 - - - - - - - - explorer - - - - - mimeType - - - - - editInline - - - - - - -
- - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
cm:content
+
cm:folder
+ + +
example:document
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 255 + + + + + + + + true + + + + + + + + + + + + + + + + + + + + true + aspect=cm:taggable + /api/tag/workspace/SpacesStore + tag + + + + + true + + + + + + + + + + + +
+ + +
+ + + + + + + + + + + + + 255 + + + + + + + + true + + + + + true + aspect=cm:taggable + /api/tag/workspace/SpacesStore + tag + + + + + true + + + + + + + + + +
+ + + + + + + + + + 255 + + + + + + + + explorer + true + + + + + + +
+
+ + + + + +
+ + + + + + + + + + + + 255 + + + + + + + + explorer + + + + + mimeType + + + + + editInline + + + + + + +
+ + + + + + diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties index e64eae5..37d3a5c 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/module/__groupId__.__artifactId__/module.properties @@ -1,5 +1,5 @@ -module.id=${project.artifactId} -#module.aliases=myModule-123, my-module -module.title=${project.name} -module.description=${project.description} -module.version=${project.version} +module.id=${project.artifactId} +#module.aliases=myModule-123, my-module +module.title=${project.name} +module.description=${project.description} +module.version=${project.version} diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__groupId__.__artifactId__-context.xml b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__groupId__.__artifactId__-context.xml index 5bdc358..0449596 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__groupId__.__artifactId__-context.xml +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/__groupId__.__artifactId__-context.xml @@ -10,30 +10,30 @@ - - - - ${alfresco.ext.package}.messages.example - - - + + + + ${alfresco.ext.package}.messages.example + + + - - - - text/x-markdown - - - + + + + text/x-markdown + + + - - - - text/x-markdown - - - - + + + + text/x-markdown + + + + diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/META-INF/share-config-custom.xml b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/META-INF/share-config-custom.xml index a7b8f4f..fd66501 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/META-INF/share-config-custom.xml +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/META-INF/share-config-custom.xml @@ -1,95 +1,95 @@ - - - - - - - production - - - - true - - - - - - - - - true - - false - - - - - - - - - - - - - - alfresco-noauth - Alfresco - unauthenticated access - Access to Alfresco Repository WebScripts that do not require authentication - alfresco - ${acs-platform.url}/alfresco/s - none - - - - alfresco - Alfresco - user access - Access to Alfresco Repository WebScripts that require user authentication - alfresco - ${acs-platform.url}/alfresco/s - user - - - - alfresco-feed - Alfresco Feed - Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet - http - ${acs-platform.url}/alfresco/s - true - user - - - - alfresco-api - alfresco - Alfresco Public API - user access - Access to Alfresco Repository Public API that require user authentication. - This makes use of the authentication that is provided by parent 'alfresco' endpoint. - alfresco - ${acs-platform.url}/alfresco/api - user - - - - + + + + + + + production + + + + true + + + + + + + + + true + + false + + + + + + + + + + + + + + alfresco-noauth + Alfresco - unauthenticated access + Access to Alfresco Repository WebScripts that do not require authentication + alfresco + ${acs-platform.url}/alfresco/s + none + + + + alfresco + Alfresco - user access + Access to Alfresco Repository WebScripts that require user authentication + alfresco + ${acs-platform.url}/alfresco/s + user + + + + alfresco-feed + Alfresco Feed + Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet + http + ${acs-platform.url}/alfresco/s + true + user + + + + alfresco-api + alfresco + Alfresco Public API - user access + Access to Alfresco Repository Public API that require user authentication. + This makes use of the authentication that is provided by parent 'alfresco' endpoint. + alfresco + ${acs-platform.url}/alfresco/api + user + + + + diff --git a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties index 97ba7dd..fd80c0c 100644 --- a/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties +++ b/beedk-acs-share-module-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties @@ -1,56 +1,56 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -# Set root logger level to error -log4j.rootLogger=error, Console, File - -# Console appender definition # - -# All outputs currently set to be a ConsoleAppender. -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout - -# use log4j NDC to replace %x with tenant domain / username -log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n -#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n - -# File appender definition # -log4j.appender.File=org.apache.log4j.DailyRollingFileAppender -log4j.appender.File.File=share.log -log4j.appender.File.Append=true -log4j.appender.File.DatePattern='.'yyyy-MM-dd -log4j.appender.File.layout=org.apache.log4j.PatternLayout -log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n - -# Spring -log4j.logger.org.springframework=warn -# Turn off Spring remoting warnings that should really be info or debug. -log4j.logger.org.springframework.remoting.support=error -log4j.logger.org.springframework.util=error - -# MyFaces -log4j.logger.org.apache.myfaces.util.DebugUtils=info -log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error -log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error -log4j.logger.org.apache.myfaces.taglib=error - -# Alfresco -log4j.logger.org.alfresco=error -log4j.logger.org.alfresco.config=warn -log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn -log4j.logger.org.alfresco.web=info - -# Web Framework -log4j.logger.org.springframework.extensions.webscripts=info -log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info -log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off - -# Freemarker -# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler -log4j.logger.freemarker.runtime= - -#----------------------------------------------------------------------- -# Custom Share module logging goes here... -#----------------------------------------------------------------------- - -log4j.logger.${package}=debug +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +# Set root logger level to error +log4j.rootLogger=error, Console, File + +# Console appender definition # + +# All outputs currently set to be a ConsoleAppender. +log4j.appender.Console=org.apache.log4j.ConsoleAppender +log4j.appender.Console.layout=org.apache.log4j.PatternLayout + +# use log4j NDC to replace %x with tenant domain / username +log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n +#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n + +# File appender definition # +log4j.appender.File=org.apache.log4j.DailyRollingFileAppender +log4j.appender.File.File=share.log +log4j.appender.File.Append=true +log4j.appender.File.DatePattern='.'yyyy-MM-dd +log4j.appender.File.layout=org.apache.log4j.PatternLayout +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n + +# Spring +log4j.logger.org.springframework=warn +# Turn off Spring remoting warnings that should really be info or debug. +log4j.logger.org.springframework.remoting.support=error +log4j.logger.org.springframework.util=error + +# MyFaces +log4j.logger.org.apache.myfaces.util.DebugUtils=info +log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error +log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error +log4j.logger.org.apache.myfaces.taglib=error + +# Alfresco +log4j.logger.org.alfresco=error +log4j.logger.org.alfresco.config=warn +log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn +log4j.logger.org.alfresco.web=info + +# Web Framework +log4j.logger.org.springframework.extensions.webscripts=info +log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=info +log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off + +# Freemarker +# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler +log4j.logger.freemarker.runtime= + +#----------------------------------------------------------------------- +# Custom Share module logging goes here... +#----------------------------------------------------------------------- + +log4j.logger.${package}=debug