From 60193a702937e74add2b0966643652e6a0c539f6 Mon Sep 17 00:00:00 2001 From: Martin Bergljung Date: Thu, 2 Apr 2015 16:10:53 +0100 Subject: [PATCH] DEVPLAT-13,14,31-37 --- .../alfresco-allinone-archetype/pom.xml | 1 + .../META-INF/maven/archetype-metadata.xml | 24 - .../resources/archetype-resources/pom.xml | 102 +- .../archetype-resources/repo-amp/pom.xml | 51 +- .../archetype-resources/repo-amp/run.sh | 9 - .../__artifactId__/alfresco-global.properties | 5 + .../context/bootstrap-context.xml | 24 + .../__artifactId__/model/content-model.xml | 27 + .../__artifactId__/model/workflow-model.xml | 26 + .../module/__artifactId__/module-context.xml | 18 +- .../repo-amp/tomcat/context.xml | 25 - .../archetype-resources/runner/pom.xml | 1 + .../runner/tomcat/context-repo.xml | 34 +- .../runner/tomcat/context-share.xml | 32 +- .../archetype-resources/share-amp/pom.xml | 11 +- .../archetype-resources/share-amp/run.sh | 9 - .../alfresco/messages/custom.properties | 9 + .../site-data/extensions/example-widgets.xml | 0 .../example/pages/simple-page.get.desc.xml | 0 .../example/pages/simple-page.get.html.ftl | 0 .../com/example/pages/simple-page.get.js | 0 ...m-slingshot-application-context.xml.sample | 29 + .../site-data/extensions/README.md | 4 + .../site-webscripts/org/alfresco/README.md | 4 + .../META-INF/share-config-custom.xml.sample | 428 +--- .../web-extension/share-config-custom.xml | 75 - .../src/test/resources/log4j.properties | 266 --- .../share-amp/tomcat/context.xml | 25 - .../archetype-resources/share/pom.xml | 2 + .../properties/local/application.properties | 8 - ...m-slingshot-application-context.xml.sample | 15 +- .../share-config-custom.xml.sample | 189 +- .../share/src/main/resources/log4j.properties | 221 +- .../web-extension/share-config-custom.xml | 35 +- .../share/src/test/resources/log4j.properties | 52 + .../resources/archetype-resources/pom.xml | 83 +- .../__artifactId__/alfresco-global.properties | 5 + .../context/bootstrap-context.xml | 24 + .../__artifactId__/model/content-model.xml | 27 + .../__artifactId__/model/workflow-model.xml | 26 + .../module/__artifactId__/module-context.xml | 17 +- .../local/alfresco-global.properties | 51 +- .../disable-webscript-caching-context.xml | 14 +- .../archetype-resources/tomcat/context.xml | 33 +- archetypes/share-amp-archetype/pom.xml | 98 +- .../resources/archetype-resources/pom.xml | 82 +- .../alfresco/messages/custom.properties | 9 + .../site-data/extensions/example-widgets.xml | 0 .../example/pages/simple-page.get.desc.xml | 0 .../example/pages/simple-page.get.html.ftl | 0 .../com/example/pages/simple-page.get.js | 0 ...m-slingshot-application-context.xml.sample | 30 + .../site-data/extensions/README.md | 4 + .../site-webscripts/org/alfresco/README.md | 4 + .../META-INF/share-config-custom.xml.sample | 431 +--- .../web-extension/share-config-custom.xml | 22 +- .../src/test/resources/log4j.properties | 228 +- .../archetype-resources/tomcat/context.xml | 16 +- modules/alfresco-rad/pom.xml | 2 +- pom.xml | 2 +- poms/alfresco-sdk-parent/pom.xml | 1936 +++++++++-------- 61 files changed, 1990 insertions(+), 2915 deletions(-) delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/{web-extension => }/site-data/extensions/example-widgets.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/{web-extension => }/site-webscripts/com/example/pages/simple-page.get.desc.xml (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/{web-extension => }/site-webscripts/com/example/pages/simple-page.get.html.ftl (100%) rename archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/{web-extension => }/site-webscripts/com/example/pages/simple-page.get.js (100%) create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml delete mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties create mode 100644 archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties create mode 100644 archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties create mode 100644 archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml create mode 100644 archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml create mode 100644 archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml create mode 100644 archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties rename archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/{web-extension => }/site-data/extensions/example-widgets.xml (100%) rename archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/{web-extension => }/site-webscripts/com/example/pages/simple-page.get.desc.xml (100%) rename archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/{web-extension => }/site-webscripts/com/example/pages/simple-page.get.html.ftl (100%) rename archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/{web-extension => }/site-webscripts/com/example/pages/simple-page.get.js (100%) create mode 100644 archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample create mode 100644 archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md create mode 100644 archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml index 689ac617..3e700598 100644 --- a/archetypes/alfresco-allinone-archetype/pom.xml +++ b/archetypes/alfresco-allinone-archetype/pom.xml @@ -38,6 +38,7 @@ false + maven-resources-plugin diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index 8f00d4d7..48bd1196 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -52,12 +52,6 @@ **/*.properties - - tomcat - - ** - - @@ -87,18 +81,6 @@ ** - - src/test/properties - - **/*.properties - - - - tomcat - - ** - - @@ -124,12 +106,6 @@ - - src/main/properties - - **/*.properties - - src/main/resources diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml index 33287af3..186cddbc 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,60 +1,86 @@ - + 4.0.0 ${groupId} ${artifactId} ${version} Alfresco Repository and Share Quickstart with database and an embedded runner. - This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr, AMPs) in one project - pom + This All-in-One project allows to manage all the components involved in Alfresco development (Repo, + Share, Solr4, AMPs) in one project + + pom org.alfresco.maven alfresco-sdk-parent @@alfresco.sdk.parent.version@@ - + - - - - + + + + WARN - - alf_data_dev + local - - - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - + + + + + + ${alfresco.groupId} + alfresco-platform-distribution + ${alfresco.version} + pom + import + + + - + + net.alchim31.maven + yuicompressor-maven-plugin + 1.5.1 + + + alfresco/**/*.* + **/*-min.js + **/*.css + + + + + + compress-js + + compress + + + + + + + + @@ -67,15 +93,15 @@ false - + rm - + 2.3.a.1 ${project.build.directory}/rm-amps ${project.build.directory}/${project.build.finalName}.war org.alfresco:${alfresco.rm.artifactId}:${alfresco.rm.version}:amp - + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml index 1c78f06f..7d67d6e8 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/pom.xml @@ -13,26 +13,38 @@ - - alfresco + - + ${alfresco.groupId} alfresco-repository - + - + + + + enterprise + + + ${alfresco.groupId} + alfresco-enterprise-repository + ${alfresco.version} + provided + + + + + rm @@ -45,23 +57,12 @@ - - - enterprise - - - ${alfresco.groupId} - alfresco-enterprise-repository - ${alfresco.version} - jar - provided - - - + + run - true + true diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh deleted file mode 100644 index fc86774c..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Downloads the spring-loaded lib if not existing and runs the repository AMP -springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar - -if [ ! -f $springloadedfile ]; then -mvn validate -Psetup -fi - -MAVEN_OPTS="-javaagent:$springloadedfile -noverify -Xms256m -Xmx2G -XX:PermSize=300m" mvn integration-test -Prun \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties new file mode 100644 index 00000000..390d68a0 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties @@ -0,0 +1,5 @@ +## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module. +## Define default values for all properties here. +## System Administrators can override these values in environment specific configurations in +## alfresco/tomcat/shared/classes/alfresco-global.properties. +## \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml new file mode 100644 index 00000000..e5421cc0 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + alfresco/module/${project.artifactId}/model/content-model.xml + alfresco/module/${project.artifactId}/model/workflow-model.xml + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml new file mode 100644 index 00000000..91f54ae6 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml @@ -0,0 +1,27 @@ + + + + + Document Model for Repo Extension X + My Name + 1.0 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml new file mode 100644 index 00000000..580e3f20 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml @@ -0,0 +1,26 @@ + + + + Workflow Model for Repo Extension X + My Name + 1.0 + + + + + + + + + + + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml index 2111526d..bc5b538f 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml @@ -15,11 +15,13 @@ See the License for the specific language governing permissions and limitations under the License. ---> - - - - - - - +--> + + + + + + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml deleted file mode 100644 index 68747908..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo-amp/tomcat/context.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml index 6b689205..7b17ad14 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml @@ -113,6 +113,7 @@ + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml index 94d11adb..95b83dd4 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml @@ -1,14 +1,28 @@ - - - - + + + + + + + + - - - + searchVirtualFirst="true" + virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;${project.parent.basedir}/repo-amp/target/test-classes;${project.parent.basedir}/repo-amp/target/repo-amp/config" /> + + + - + + \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml index 2db50103..65d1c488 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml @@ -1,13 +1,25 @@ - - - - + + + + + + - - + searchVirtualFirst="true" + virtualClasspath="${project.parent.basedir}/share-amp/target/classes;${project.parent.basedir}/share-amp/target/test-classes;${project.parent.basedir}/share-amp/target/share-amp/config" /> + + - - \ No newline at end of file + + + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml index 3edf8628..6b793919 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 ${artifactId} Alfresco Share AMP Module @@ -33,7 +33,6 @@ WARN - @@ -47,10 +46,10 @@ - org.springframework.extensions.surf - spring-surf-api - provided - + org.springframework.extensions.surf + spring-surf-api + provided + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh deleted file mode 100644 index ab528413..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# Downloads the spring-loaded lib if not existing and runs the share AMP -springloadedfile=~/.m2/repository/org/springframework/springloaded/${springloaded.version}/springloaded-${springloaded.version}.jar - -if [ ! -f $springloadedfile ]; then -mvn validate -Psetup -fi - -MAVEN_OPTS="-javaagent:$springloadedfile -noverify" mvn integration-test -Pamp-to-war \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties new file mode 100644 index 00000000..602ae4ed --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/messages/custom.properties @@ -0,0 +1,9 @@ +# This file should contain messages and labels specific to this share extension +# Put here things like: +# Content Model Aspect and Type Labels +# Form field labels +# Doc lib Action labels and messages +# Doc Lib Action Forms labels +# + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js similarity index 100% rename from archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js rename to archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample new file mode 100644 index 00000000..86d652b9 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample @@ -0,0 +1,29 @@ + + + + + + + + + + alfresco.messages.custom + + + + + \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md new file mode 100644 index 00000000..c6018967 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md @@ -0,0 +1,4 @@ +## If you are overriding existing pages/components put these extension modules here. +## If you are defining new extensions add them under resources/alfresco/site-data. +## + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md new file mode 100644 index 00000000..a6b158d2 --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md @@ -0,0 +1,4 @@ +## If you are overriding out-of-the-box Alfresco web scripts put these files here. +## If you are defining new web scripts add them under resources/alfresco/site-webscripts. +## + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample index 7a292745..80ab7590 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/main/resources/META-INF/share-config-custom.xml.sample @@ -1,422 +1,14 @@ + - - - - - false - - false - - - - - - - - - - production - - - - - manual - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - 1000 - - - 7000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://localhost:8080/alfresco - - - - - false - - - - application/msword - application/vnd.ms-excel - application/vnd.ms-powerpoint - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - location.path.documents - - slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&max={maximumFolderCountSite} - - - - - - - - alfresco://company/home - - - - false - - - 500 - - - - true - - - - - - - - secret - - ALFRESCO.ORG - - HTTP/repository.server.com@ALFRESCO.ORG - - ShareHTTP - - - - - - - - - - alfresco-noauth - Alfresco - unauthenticated access - Access to Alfresco Repository WebScripts that do not require authentication - alfresco - http://localhost:8080/alfresco/s - none - - - - alfresco - Alfresco - user access - Access to Alfresco Repository WebScripts that require user authentication - alfresco - http://localhost:8080/alfresco/s - user - - - - alfresco-feed - Alfresco Feed - Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet - http - http://localhost:8080/alfresco/s - true - user - - - - activiti-admin - Activiti Admin UI - user access - Access to Activiti Admin UI, that requires user authentication - activiti-admin-connector - http://localhost:8080/alfresco/activiti-admin - user - - - - - - - \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml deleted file mode 100644 index 3b5c18af..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/alfresco/web-extension/share-config-custom.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - development - - true - - - - - - - - - true - - false - - - - - - - - - - - - - alfresco-noauth - Alfresco - unauthenticated access - Access to Alfresco Repository WebScripts that do not require authentication - alfresco - ${alfresco.repo.url}/s - none - - - - alfresco - Alfresco - user access - Access to Alfresco Repository WebScripts that require user authentication - alfresco - ${alfresco.repo.url}/s - user - - - - alfresco-feed - Alfresco Feed - Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet - http - ${alfresco.repo.url}/s - true - user - - - - activiti-admin - Activiti Admin UI - user access - Access to Activiti Admin UI, that requires user authentication - activiti-admin-connector - ${alfresco.repo.url}/activiti-admin - user - - - - - diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties deleted file mode 100644 index bf4a4721..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/src/test/resources/log4j.properties +++ /dev/null @@ -1,266 +0,0 @@ -# This is a full override of Alfresco 4.2.b log4j.properties -# This file overwrites the alfresco.war log4j.properties - -# Set root logger level to error -log4j.rootLogger=${app.log.root.level}, 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=${app.log.dir}alfresco.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{ABSOLUTE} %-5p [%c] %m%n - -###### Hibernate specific appender definition ####### -#log4j.appender.file=org.apache.log4j.FileAppender -#log4j.appender.file.File=hibernate.log -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -###### Log level overrides ####### - -# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit) -# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime -# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via -# Log4j addLoggerMBean as long as the logger exists and has been loaded. - -# Hibernate -log4j.logger.org.hibernate=error -log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal -log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal -log4j.logger.org.hibernate.type=warn -log4j.logger.org.hibernate.cfg.SettingsFactory=warn - -# 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 - -# Axis/WSS4J -log4j.logger.org.apache.axis=info -log4j.logger.org.apache.ws=info - -# CXF -log4j.logger.org.apache.cxf=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 - -# OpenOfficeConnection -log4j.logger.net.sf.jooreports.openoffice.connection=fatal - -# log prepared statement cache activity ### -log4j.logger.org.hibernate.ps.PreparedStatementCache=info - -# Alfresco -log4j.logger.org.alfresco=error -log4j.logger.org.alfresco.repo.admin=info -log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn -log4j.logger.org.alfresco.repo.model.filefolder=warn -log4j.logger.org.alfresco.repo.tenant=info -log4j.logger.org.alfresco.repo.avm=info -log4j.logger.org.alfresco.config=warn -log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn -log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn -log4j.logger.org.alfresco.repo.management.subsystems=warn -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn -log4j.logger.org.alfresco.repo.security.sync=info -log4j.logger.org.alfresco.repo.security.person=info - -log4j.logger.org.alfresco.sample=info -log4j.logger.org.alfresco.web=info -#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug -#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug -#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug -#log4j.logger.org.alfresco.web.bean.clipboard=debug -log4j.logger.org.alfresco.repo.webservice=info -log4j.logger.org.alfresco.service.descriptor.DescriptorService=info -#log4j.logger.org.alfresco.web.page=debug - -log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error -#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info - -log4j.logger.org.alfresco.web.ui.common.Utils=error -#log4j.logger.org.alfresco.web.ui.common.Utils=info - -log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info -log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info - -# Specific patches -log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info -log4j.logger.org.alfresco.repo.version.VersionMigrator=info -log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info - -log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info -log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info -log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info -log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn -log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn -log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info -log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info -log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info -log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn -log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn -log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn -log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn -log4j.logger.org.alfresco.util.AbstractTriggerBean=warn -log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info -log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn - -#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug - -log4j.logger.org.alfresco.repo.workflow=info - -# CIFS server debugging -log4j.logger.org.alfresco.smb.protocol=error -#log4j.logger.org.alfresco.smb.protocol.auth=debug -#log4j.logger.org.alfresco.acegi=debug - -# FTP server debugging -log4j.logger.org.alfresco.ftp.protocol=error -#log4j.logger.org.alfresco.ftp.server=debug - -# WebDAV debugging -#log4j.logger.org.alfresco.webdav.protocol=debug -log4j.logger.org.alfresco.webdav.protocol=error - -# NTLM servlet filters -#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug - -# Kerberos servlet filters -#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug - -# File servers -log4j.logger.org.alfresco.fileserver=warn - -# Repo filesystem debug logging -#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug - -# AVM filesystem debug logging -#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug - -# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated -log4j.logger.org.alfresco.repo.node.integrity=ERROR - -# Indexer debugging -log4j.logger.org.alfresco.repo.search.Indexer=error -#log4j.logger.org.alfresco.repo.search.Indexer=debug - -log4j.logger.org.alfresco.repo.search.impl.lucene.index=error -log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn -#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG - -# Audit debugging -# log4j.logger.org.alfresco.repo.audit=DEBUG -# log4j.logger.org.alfresco.repo.audit.model=DEBUG - -# Forms debugging -# log4j.logger.org.alfresco.web.forms=debug -# log4j.logger.org.chiba.xml.xforms=debug -log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error -log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error - -# Property sheet and modelling debugging -# change to error to hide the warnings about missing properties and associations -log4j.logger.alfresco.missingProperties=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn -#log4j.logger.org.alfresco.web.ui.repo.component.property=debug - -# Dictionary/Model debugging -log4j.logger.org.alfresco.repo.dictionary=warn -log4j.logger.org.alfresco.repo.dictionary.types.period=warn - -# Virtualization Server Registry -log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error - -# Spring context runtime property setter -log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info - -# Debugging options for clustering -log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error -log4j.logger.org.alfresco.repo.content.replication=error - -#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug - -# Activity service -log4j.logger.org.alfresco.repo.activities=warn - -# User usage tracking -log4j.logger.org.alfresco.repo.usage=info - -# Sharepoint -log4j.logger.org.alfresco.module.vti=info - -# Forms Engine -log4j.logger.org.alfresco.repo.forms=info -log4j.logger.org.alfresco.web.config.forms=info -log4j.logger.org.alfresco.web.scripts.forms=info - -# CMIS -log4j.logger.org.alfresco.opencmis=error -log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error -log4j.logger.org.alfresco.cmis=error -log4j.logger.org.alfresco.cmis.dictionary=warn -log4j.logger.org.apache.chemistry.opencmis=info - -# IMAP -log4j.logger.org.alfresco.repo.imap=info - -# JBPM -# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler -log4j.logger.org.jbpm.graph.def.GraphElement=fatal - -#log4j.logger.org.alfresco.repo.googledocs=debug - -###### Scripting ####### - -# Web Framework -log4j.logger.org.springframework.extensions.webscripts=info -log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn -log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off - -# Repository -log4j.logger.org.alfresco.repo.web.scripts=warn -log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info -log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off -log4j.logger.org.alfresco.repo.jscript=error -log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn -log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info - -log4j.logger.org.alfresco.repo.avm.actions=info - -# 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= - -# Metadata extraction -log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn - -# Reduces PDFont error level due to ALF-7105 -log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal - -# no index support -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal -log4j.logger.org.alfresco.demoamp.test=DEBUG \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml deleted file mode 100644 index 68747908..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/tomcat/context.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml index fe03221d..f27a7fc2 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml @@ -28,6 +28,7 @@ amp + @@ -61,6 +62,7 @@ + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties deleted file mode 100644 index 7eace432..00000000 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/properties/local/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -# SHARE client environment dependent properties (local build) -share.server.scheme=http -share.server.name=localhost -share.server.port=${jetty.port} -alfresco.server.scheme=http -alfresco.server.name=localhost -alfresco.server.port=${jetty.port} -alfresco.webapp.name=alfresco \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample index 323b4dcb..f7325bfe 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample @@ -1,12 +1,18 @@ + - + http://www.hazelcast.com/schema/spring + http://www.hazelcast.com/schema/spring/hazelcast-spring-2.4.xsd"> diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample index a6c906ad..6281cfcd 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample @@ -1,4 +1,11 @@ - + @@ -37,6 +44,62 @@ + + + + + + + + + + + + + + - -1 + 1000 + + + 7000 @@ -117,6 +187,10 @@ + + + + - application/msword - application/vnd.ms-excel + application/vnd.openxmlformats-officedocument.wordprocessingml.document + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet application/vnd.ms-powerpoint @@ -209,14 +283,19 @@ This is a relatively expensive operation, so should be set to "false" for Repositories with broad folder structures. --> false - + 500 + + + true - + @@ -243,11 +322,21 @@ JAAS login configuration entry name. --> ShareHTTP + + true - + + @@ -277,20 +366,21 @@ true user - + - activiti-admin - Activiti Admin UI - user access - Access to Activiti Admin UI, that requires user authentication - activiti-admin-connector - http://localhost:8080/alfresco/activiti-admin + 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 + http://localhost:8080/alfresco/api user - --> - - + + + + \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties index 12d10f02..49d83d0a 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/main/resources/log4j.properties @@ -1,5 +1,5 @@ # Set root logger level to error -log4j.rootLogger=${app.log.root.level}, Console, File +log4j.rootLogger=error, Console, File ###### Console appender definition ####### @@ -17,27 +17,7 @@ log4j.appender.File.File=${app.log.dir}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{ABSOLUTE} %-5p [%c] %m%n - -###### Hibernate specific appender definition ####### -#log4j.appender.file=org.apache.log4j.FileAppender -#log4j.appender.file.File=hibernate.log -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -###### Log level overrides ####### - -# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit) -# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime -# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via -# Log4j addLoggerMBean as long as the logger exists and has been loaded. - -# Hibernate -log4j.logger.org.hibernate=error -log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal -log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal -log4j.logger.org.hibernate.type=warn -log4j.logger.org.hibernate.cfg.SettingsFactory=warn +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n # Spring log4j.logger.org.springframework=warn @@ -45,218 +25,23 @@ log4j.logger.org.springframework=warn log4j.logger.org.springframework.remoting.support=error log4j.logger.org.springframework.util=error -# Axis/WSS4J -log4j.logger.org.apache.axis=info -log4j.logger.org.apache.ws=info - -# CXF -log4j.logger.org.apache.cxf=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 -# OpenOfficeConnection -log4j.logger.net.sf.jooreports.openoffice.connection=fatal - -# log prepared statement cache activity ### -log4j.logger.org.hibernate.ps.PreparedStatementCache=info - # Alfresco log4j.logger.org.alfresco=error -log4j.logger.org.alfresco.repo.admin=info -log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn -log4j.logger.org.alfresco.repo.model.filefolder=warn -log4j.logger.org.alfresco.repo.tenant=info -log4j.logger.org.alfresco.repo.avm=info log4j.logger.org.alfresco.config=warn log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn -log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn -log4j.logger.org.alfresco.repo.management.subsystems=warn -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn -log4j.logger.org.alfresco.repo.security.sync=info -log4j.logger.org.alfresco.repo.security.person=info - -log4j.logger.org.alfresco.sample=info log4j.logger.org.alfresco.web=info -#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug -#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug -#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug -#log4j.logger.org.alfresco.web.bean.clipboard=debug -log4j.logger.org.alfresco.repo.webservice=info -log4j.logger.org.alfresco.service.descriptor.DescriptorService=info -#log4j.logger.org.alfresco.web.page=debug - -log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error -#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info - -log4j.logger.org.alfresco.web.ui.common.Utils=error -#log4j.logger.org.alfresco.web.ui.common.Utils=info - -log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info -log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info - -# Specific patches -log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info -log4j.logger.org.alfresco.repo.version.VersionMigrator=info -log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info - -log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info -log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info -log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info -log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn -log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn -log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info -log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info -log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info -log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn -log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn -log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn -log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn -log4j.logger.org.alfresco.util.AbstractTriggerBean=warn -log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info -log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn - -#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug - -log4j.logger.org.alfresco.repo.workflow=info - -# CIFS server debugging -log4j.logger.org.alfresco.smb.protocol=error -#log4j.logger.org.alfresco.smb.protocol.auth=debug -#log4j.logger.org.alfresco.acegi=debug - -# FTP server debugging -log4j.logger.org.alfresco.ftp.protocol=error -#log4j.logger.org.alfresco.ftp.server=debug - -# WebDAV debugging -#log4j.logger.org.alfresco.webdav.protocol=debug -log4j.logger.org.alfresco.webdav.protocol=error - -# NTLM servlet filters -#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug - -# Kerberos servlet filters -#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug - -# File servers -log4j.logger.org.alfresco.fileserver=warn - -# Repo filesystem debug logging -#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug - -# AVM filesystem debug logging -#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug - -# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated -log4j.logger.org.alfresco.repo.node.integrity=ERROR - -# Indexer debugging -log4j.logger.org.alfresco.repo.search.Indexer=error -#log4j.logger.org.alfresco.repo.search.Indexer=debug - -log4j.logger.org.alfresco.repo.search.impl.lucene.index=error -log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn -#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG - -# Audit debugging -# log4j.logger.org.alfresco.repo.audit=DEBUG -# log4j.logger.org.alfresco.repo.audit.model=DEBUG - -# Forms debugging -# log4j.logger.org.alfresco.web.forms=debug -# log4j.logger.org.chiba.xml.xforms=debug -log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error -log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error - -# Property sheet and modelling debugging -# change to error to hide the warnings about missing properties and associations -log4j.logger.alfresco.missingProperties=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn -#log4j.logger.org.alfresco.web.ui.repo.component.property=debug - -# Dictionary/Model debugging -log4j.logger.org.alfresco.repo.dictionary=warn -log4j.logger.org.alfresco.repo.dictionary.types.period=warn - -# Virtualization Server Registry -log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error - -# Spring context runtime property setter -log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info - -# Debugging options for clustering -log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error -log4j.logger.org.alfresco.repo.content.replication=error - -#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug - -# Activity service -log4j.logger.org.alfresco.repo.activities=warn - -# User usage tracking -log4j.logger.org.alfresco.repo.usage=info - -# Sharepoint -log4j.logger.org.alfresco.module.vti=info - -# Forms Engine -log4j.logger.org.alfresco.repo.forms=info -log4j.logger.org.alfresco.web.config.forms=info -log4j.logger.org.alfresco.web.scripts.forms=info - -# CMIS -log4j.logger.org.alfresco.opencmis=error -log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error -log4j.logger.org.alfresco.cmis=error -log4j.logger.org.alfresco.cmis.dictionary=warn -log4j.logger.org.apache.chemistry.opencmis=info - -# IMAP -log4j.logger.org.alfresco.repo.imap=info - -# JBPM -# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler -log4j.logger.org.jbpm.graph.def.GraphElement=fatal - -#log4j.logger.org.alfresco.repo.googledocs=debug - -###### Scripting ####### # Web Framework log4j.logger.org.springframework.extensions.webscripts=info log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off -# Repository -log4j.logger.org.alfresco.repo.web.scripts=warn -log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info -log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off -log4j.logger.org.alfresco.repo.jscript=error -log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn -log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info - -log4j.logger.org.alfresco.repo.avm.actions=info - # 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= - -# Metadata extraction -log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn - -# Reduces PDFont error level due to ALF-7105 -log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal - -# no index support -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal \ No newline at end of file +log4j.logger.freemarker.runtime= \ No newline at end of file diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml index e5232404..01b78708 100644 --- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/alfresco/web-extension/share-config-custom.xml @@ -1,12 +1,21 @@ - - - - development - - - + + + + + production + + + + true + + @@ -24,12 +33,18 @@ - - + - + + diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties new file mode 100644 index 00000000..3afc32dc --- /dev/null +++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/src/test/resources/log4j.properties @@ -0,0 +1,52 @@ +# This file is copied from Alfresco Share 5.0.d +# Overrides tomcat/webapps/share/WEB-INF/classes/log4j,properties +# and sets new file location from property and log level from property. +# + +# Set root logger level to error +log4j.rootLogger=${app.log.root.level}, 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=${app.log.dir}alfresco.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=warn +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= \ No newline at end of file diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml index 9d367dd2..ecd1f9b1 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 ${groupId} ${artifactId} @@ -16,46 +16,34 @@ - + + + + - - - - WARN - alf_data_dev - - local - - - /alfresco - - - - - - + ${alfresco.groupId} alfresco-platform-distribution @@ -65,17 +53,22 @@ - + + ${alfresco.groupId} alfresco-repository + - + enterprise @@ -87,5 +80,23 @@ + + + + amp-to-war + + + org.alfresco.maven + alfresco-rad + ${maven.alfresco.version} + + + diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties new file mode 100644 index 00000000..90cda7d7 --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/alfresco-global.properties @@ -0,0 +1,5 @@ +## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module. +## Define default values for all properties here. +## System Administrators can override these values in environment specific configurations in +## alfresco/tomcat/shared/classes/alfresco-global.properties. +## \ No newline at end of file diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml new file mode 100644 index 00000000..e5421cc0 --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/context/bootstrap-context.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + alfresco/module/${project.artifactId}/model/content-model.xml + alfresco/module/${project.artifactId}/model/workflow-model.xml + + + + + + + + diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml new file mode 100644 index 00000000..91f54ae6 --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/content-model.xml @@ -0,0 +1,27 @@ + + + + + Document Model for Repo Extension X + My Name + 1.0 + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml new file mode 100644 index 00000000..580e3f20 --- /dev/null +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/model/workflow-model.xml @@ -0,0 +1,26 @@ + + + + Workflow Model for Repo Extension X + My Name + 1.0 + + + + + + + + + + + + + + + + + + diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml index 223aed4f..307dcfd1 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/module/__artifactId__/module-context.xml @@ -14,11 +14,12 @@ See the License for the specific language governing permissions and limitations under the License. ---> - - - - - - - +--> + + + + + + + + diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties index 2d7b7a11..eed88e1b 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/properties/local/alfresco-global.properties @@ -12,36 +12,48 @@ # 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. - - - # RUN TIME PROPERTIES # ------------------- -# Sample custom content and index data location -# This will create alf_data Relative to appserver run folder -# In this default file we take the property from the POM (for compatibility with local tomcat and jboss deployments) but it can also be edited here. +######################################################################################################################## +# Alfresco configuration for running locally +# +# Configuration when running Tomcat embedded from Maven. +# This will create the alf_data_dev directory relative to Tomcat run folder. +# Property values from the POM but it can also be edited here. +######################################################################################################################## + dir.root=${alfresco.data.location} -# Allowed values are: NONE, AUTO, FULL + +# Alfresco Repo Webapp (alfresco.war) context, ports etc +alfresco.context=alfresco +alfresco.host=localhost +alfresco.port=8080 +alfresco.protocol=http + +# Alfresco Share Webapp (share.war) context, ports etc +share.context=share +share.host=localhost +share.port=8080 +share.protocol=http + +# Don't try and recover any index index.recovery.mode=NONE # As we run embedded, we set Lucene # TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon -#index.subsystem.name=noindex -#index.subsystem.name=solr -#index.subsystem.name=solr4 index.subsystem.name=buildonly - -#dir.keystore=. -#keystore.password=storepassword -#metadata.password=metapassword +# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date +# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597 +# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene +wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060 +wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060 +wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060 # Fail or not when there are node integrity checker errors integrity.failOnError=true # Database connection properties -# These are also filtered from Maven at build time from POM properties. -# Alternatively you can directly define them directly here db.driver=${alfresco.db.datasource.class} db.url=${alfresco.db.url} db.username=${alfresco.db.username} @@ -51,9 +63,6 @@ db.pool.max=100 hibernate.dialect=org.hibernate.dialect.H2Dialect # File servers related properties -# For local builds we disable CIFS and FTP. Edit the following property to reenable them +# For local runs we disable CIFS and FTP cifs.enabled=false - -ftp.enabled=false -ftp.port=1121 -ftp.authenticator=alfresco +ftp.enabled=false \ No newline at end of file diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml index 8d9fb35a..07829ea1 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/extension/disable-webscript-caching-context.xml @@ -17,7 +17,17 @@ limitations under the License. --> - + javascript @@ -25,7 +35,7 @@ js - + false diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml index b7abe44b..0862d9c0 100644 --- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml +++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml @@ -1,22 +1,23 @@ - + + + + extraResourcePaths="/=${project.build.directory}/${project.build.finalName}/web" /> - - - - - - + + + + diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml index 09361354..76d73520 100644 --- a/archetypes/share-amp-archetype/pom.xml +++ b/archetypes/share-amp-archetype/pom.xml @@ -1,54 +1,58 @@ - - 4.0.0 + + 4.0.0 - org.alfresco.maven.archetype - share-amp-archetype + org.alfresco.maven.archetype + share-amp-archetype - maven-archetype - Maven Alfresco SDK - Share AMP Archetype - Share project with full support for lifecycle and rapid development of AMPs (Alfresco Module Packages) + maven-archetype + Maven Alfresco SDK - Share AMP Archetype + Share project with full support for lifecycle and rapid development of AMPs (Alfresco Module + Packages) + - - org.alfresco.maven - alfresco-sdk-aggregator - 2.0.1-SNAPSHOT - ../../pom.xml - + + org.alfresco.maven + alfresco-sdk-aggregator + 2.0.1-SNAPSHOT + ../../pom.xml + - - - - src/main/resources - - archetype-resources/pom.xml - archetype-resources/run.sh - META-INF/maven/archetype-metadata.xml - - true - - - src/main/resources - - archetype-resources/pom.xml - archetype-resources/run.sh - META-INF/maven/archetype-metadata.xml - - false - - - - - maven-resources-plugin - 2.7 - - false - - @@ - - - - - + + + + src/main/resources + + archetype-resources/pom.xml + archetype-resources/run.sh + META-INF/maven/archetype-metadata.xml + + true + + + src/main/resources + + archetype-resources/pom.xml + archetype-resources/run.sh + META-INF/maven/archetype-metadata.xml + + false + + + + + + maven-resources-plugin + 2.7 + + false + + @@ + + + + + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml index c24f8ff4..ff660e85 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 ${groupId} ${artifactId} @@ -16,30 +16,34 @@ - - ${alfresco.share.artifactId} - /share + + + + + + + + ${alfresco.share.artifactId} + 8081 http://localhost:8080/alfresco - - - - - - WARN - + @@ -68,15 +73,44 @@ classes provided - - org.springframework.extensions.surf - spring-surf-api - provided - + + org.springframework.extensions.surf + spring-surf-api + provided + + + + + + net.alchim31.maven + yuicompressor-maven-plugin + 1.5.1 + + + alfresco/**/*.* + **/*-min.js + **/*.css + + + + + + compress-js + + compress + + + + + + + - + enterprise diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties new file mode 100644 index 00000000..602ae4ed --- /dev/null +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/messages/custom.properties @@ -0,0 +1,9 @@ +# This file should contain messages and labels specific to this share extension +# Put here things like: +# Content Model Aspect and Type Labels +# Form field labels +# Doc lib Action labels and messages +# Doc Lib Action Forms labels +# + + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml similarity index 100% rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/example-widgets.xml rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-data/extensions/example-widgets.xml diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml similarity index 100% rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.desc.xml rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.desc.xml diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl similarity index 100% rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.html.ftl rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.html.ftl diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js similarity index 100% rename from archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/com/example/pages/simple-page.get.js rename to archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/site-webscripts/com/example/pages/simple-page.get.js diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample new file mode 100644 index 00000000..020aeb96 --- /dev/null +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/custom-slingshot-application-context.xml.sample @@ -0,0 +1,30 @@ + + + + + + + + + + alfresco.messages.custom + + + + + \ No newline at end of file diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md new file mode 100644 index 00000000..c6018967 --- /dev/null +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-data/extensions/README.md @@ -0,0 +1,4 @@ +## If you are overriding existing pages/components put these extension modules here. +## If you are defining new extensions add them under resources/alfresco/site-data. +## + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md new file mode 100644 index 00000000..a6b158d2 --- /dev/null +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/README.md @@ -0,0 +1,4 @@ +## If you are overriding out-of-the-box Alfresco web scripts put these files here. +## If you are defining new web scripts add them under resources/alfresco/site-webscripts. +## + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample index 3b082ec5..ac18c131 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/share-config-custom.xml.sample @@ -1,423 +1,14 @@ - + - - - - - false - - false - - - - - - - - - - production - - - - - manual - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - 1000 - - - 7000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://localhost:8080/alfresco - - - - - false - - - - application/msword - application/vnd.ms-excel - application/vnd.ms-powerpoint - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - location.path.documents - - slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&max={maximumFolderCountSite} - - - - - - - - alfresco://company/home - - - - false - - - 500 - - - - true - - - - - - - - secret - - ALFRESCO.ORG - - HTTP/repository.server.com@ALFRESCO.ORG - - ShareHTTP - - - - - - - - - - alfresco-noauth - Alfresco - unauthenticated access - Access to Alfresco Repository WebScripts that do not require authentication - alfresco - http://localhost:8080/alfresco/s - none - - - - alfresco - Alfresco - user access - Access to Alfresco Repository WebScripts that require user authentication - alfresco - http://localhost:8080/alfresco/s - user - - - - alfresco-feed - Alfresco Feed - Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet - http - http://localhost:8080/alfresco/s - true - user - - - - activiti-admin - Activiti Admin UI - user access - Access to Activiti Admin UI, that requires user authentication - activiti-admin-connector - http://localhost:8080/alfresco/activiti-admin - user - - - - - - - - + \ No newline at end of file diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml index 3b5c18af..b27972ca 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/alfresco/web-extension/share-config-custom.xml @@ -3,8 +3,16 @@ - development + + production + + true @@ -25,12 +33,18 @@ - - + - + + diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties index bf4a4721..280996b9 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/src/test/resources/log4j.properties @@ -1,5 +1,7 @@ -# This is a full override of Alfresco 4.2.b log4j.properties -# This file overwrites the alfresco.war log4j.properties +# This file is copied from Alfresco Share 5.0.d +# Overrides tomcat/webapps/share/WEB-INF/classes/log4j,properties +# and sets new file location from property and log level from property. +# # Set root logger level to error log4j.rootLogger=${app.log.root.level}, Console, File @@ -11,7 +13,7 @@ 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{ISO8601} %x %-5p [%c{3}] [%t] %m%n #log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n ###### File appender definition ####### @@ -20,27 +22,7 @@ log4j.appender.File.File=${app.log.dir}alfresco.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{ABSOLUTE} %-5p [%c] %m%n - -###### Hibernate specific appender definition ####### -#log4j.appender.file=org.apache.log4j.FileAppender -#log4j.appender.file.File=hibernate.log -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -###### Log level overrides ####### - -# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit) -# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime -# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via -# Log4j addLoggerMBean as long as the logger exists and has been loaded. - -# Hibernate -log4j.logger.org.hibernate=error -log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal -log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal -log4j.logger.org.hibernate.type=warn -log4j.logger.org.hibernate.cfg.SettingsFactory=warn +log4j.appender.File.layout.ConversionPattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n # Spring log4j.logger.org.springframework=warn @@ -48,219 +30,23 @@ log4j.logger.org.springframework=warn log4j.logger.org.springframework.remoting.support=error log4j.logger.org.springframework.util=error -# Axis/WSS4J -log4j.logger.org.apache.axis=info -log4j.logger.org.apache.ws=info - -# CXF -log4j.logger.org.apache.cxf=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 -# OpenOfficeConnection -log4j.logger.net.sf.jooreports.openoffice.connection=fatal - -# log prepared statement cache activity ### -log4j.logger.org.hibernate.ps.PreparedStatementCache=info - # Alfresco log4j.logger.org.alfresco=error -log4j.logger.org.alfresco.repo.admin=info -log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn -log4j.logger.org.alfresco.repo.model.filefolder=warn -log4j.logger.org.alfresco.repo.tenant=info -log4j.logger.org.alfresco.repo.avm=info log4j.logger.org.alfresco.config=warn log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn -log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn -log4j.logger.org.alfresco.repo.management.subsystems=warn -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn -log4j.logger.org.alfresco.repo.security.sync=info -log4j.logger.org.alfresco.repo.security.person=info - -log4j.logger.org.alfresco.sample=info log4j.logger.org.alfresco.web=info -#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug -#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug -#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug -#log4j.logger.org.alfresco.web.bean.clipboard=debug -log4j.logger.org.alfresco.repo.webservice=info -log4j.logger.org.alfresco.service.descriptor.DescriptorService=info -#log4j.logger.org.alfresco.web.page=debug - -log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error -#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info - -log4j.logger.org.alfresco.web.ui.common.Utils=error -#log4j.logger.org.alfresco.web.ui.common.Utils=info - -log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info -log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info - -# Specific patches -log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info -log4j.logger.org.alfresco.repo.version.VersionMigrator=info -log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info - -log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info -log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info -log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info -log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn -log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn -log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info -log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info -log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info -log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn -log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn -log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn -log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn -log4j.logger.org.alfresco.util.AbstractTriggerBean=warn -log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info -log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn - -#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug - -log4j.logger.org.alfresco.repo.workflow=info - -# CIFS server debugging -log4j.logger.org.alfresco.smb.protocol=error -#log4j.logger.org.alfresco.smb.protocol.auth=debug -#log4j.logger.org.alfresco.acegi=debug - -# FTP server debugging -log4j.logger.org.alfresco.ftp.protocol=error -#log4j.logger.org.alfresco.ftp.server=debug - -# WebDAV debugging -#log4j.logger.org.alfresco.webdav.protocol=debug -log4j.logger.org.alfresco.webdav.protocol=error - -# NTLM servlet filters -#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug - -# Kerberos servlet filters -#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug - -# File servers -log4j.logger.org.alfresco.fileserver=warn - -# Repo filesystem debug logging -#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug - -# AVM filesystem debug logging -#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug - -# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated -log4j.logger.org.alfresco.repo.node.integrity=ERROR - -# Indexer debugging -log4j.logger.org.alfresco.repo.search.Indexer=error -#log4j.logger.org.alfresco.repo.search.Indexer=debug - -log4j.logger.org.alfresco.repo.search.impl.lucene.index=error -log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn -#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG - -# Audit debugging -# log4j.logger.org.alfresco.repo.audit=DEBUG -# log4j.logger.org.alfresco.repo.audit.model=DEBUG - -# Forms debugging -# log4j.logger.org.alfresco.web.forms=debug -# log4j.logger.org.chiba.xml.xforms=debug -log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error -log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error - -# Property sheet and modelling debugging -# change to error to hide the warnings about missing properties and associations -log4j.logger.alfresco.missingProperties=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn -#log4j.logger.org.alfresco.web.ui.repo.component.property=debug - -# Dictionary/Model debugging -log4j.logger.org.alfresco.repo.dictionary=warn -log4j.logger.org.alfresco.repo.dictionary.types.period=warn - -# Virtualization Server Registry -log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error - -# Spring context runtime property setter -log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info - -# Debugging options for clustering -log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error -log4j.logger.org.alfresco.repo.content.replication=error - -#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug - -# Activity service -log4j.logger.org.alfresco.repo.activities=warn - -# User usage tracking -log4j.logger.org.alfresco.repo.usage=info - -# Sharepoint -log4j.logger.org.alfresco.module.vti=info - -# Forms Engine -log4j.logger.org.alfresco.repo.forms=info -log4j.logger.org.alfresco.web.config.forms=info -log4j.logger.org.alfresco.web.scripts.forms=info - -# CMIS -log4j.logger.org.alfresco.opencmis=error -log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error -log4j.logger.org.alfresco.cmis=error -log4j.logger.org.alfresco.cmis.dictionary=warn -log4j.logger.org.apache.chemistry.opencmis=info - -# IMAP -log4j.logger.org.alfresco.repo.imap=info - -# JBPM -# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler -log4j.logger.org.jbpm.graph.def.GraphElement=fatal - -#log4j.logger.org.alfresco.repo.googledocs=debug - -###### Scripting ####### # Web Framework log4j.logger.org.springframework.extensions.webscripts=info log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off -# Repository -log4j.logger.org.alfresco.repo.web.scripts=warn -log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info -log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off -log4j.logger.org.alfresco.repo.jscript=error -log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn -log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info - -log4j.logger.org.alfresco.repo.avm.actions=info - # 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= - -# Metadata extraction -log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn - -# Reduces PDFont error level due to ALF-7105 -log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal - -# no index support -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal -log4j.logger.org.alfresco.demoamp.test=DEBUG \ No newline at end of file +log4j.logger.freemarker.runtime= \ No newline at end of file diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml index 5920f8e3..a5347d33 100644 --- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml +++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/tomcat/context.xml @@ -1,6 +1,7 @@ - - + + @@ -9,16 +10,7 @@ - - - + diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml index 9e672af8..f4dc8f17 100644 --- a/modules/alfresco-rad/pom.xml +++ b/modules/alfresco-rad/pom.xml @@ -91,7 +91,7 @@ alfresco/ibatis/org.hibernate.dialect.H2Dialect - - - org.alfresco.maven - alfresco-sdk-aggregator + + + org.alfresco.maven + alfresco-sdk-aggregator + 2.0.1-SNAPSHOT + ../../pom.xml + + + 2.0.1-SNAPSHOT - ../../pom.xml - - - - 2.0.1-SNAPSHOT - - + org.alfresco + ${alfresco.community.default.version} + alfresco + share + + + /alfresco + /share + + + alf_data_dev + + + alf_dev + alfresco + alfresco + AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0 + + jdbc:h2:./${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params} + org.h2.jdbcx.JdbcDataSource + + + src/main/amp + ../${project.build.finalName} + + + + + + ${project.build.directory}/${project.build.finalName}-war + + ${alfresco.repo.artifactId} + + - org.alfresco - ${alfresco.community.default.version} - - alfresco - share + local + src/main/properties/${env} + src/test/properties/${env} + ** + ** - - ${alfresco.repo.artifactId} - ${alfresco.groupId} - ${alfresco.version} - - - ${project.build.directory}/${project.build.finalName}-war + + true + -Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en - - alf_data_dev + + ${project.build.directory}/ + WARN - - alf_dev - alfresco - alfresco - + runtime + 1.5.11 - If you don't use it you will see errors such as: - "java.util.concurrent.ExecutionException: java.lang.RuntimeException: org.h2.jdbc.JdbcSQLException: - Database may be already in use: "all-in-one-test/alf_data_dev/h2_data/alf_dev.mv.db". - Possible solutions: close all other connection(s); use the server mode [90020-186]" + UTF-8 - DB_CLOSE_ON_EXIT=FALSE: Don't manually close the database when the JVM exists. + + 3.2 + 2.6.1 + 2.9 + 1.3.1 + 2.7 + 2.18 + 2.5.2 + 2.5 + 2.5 + 1.7 + 2.5.1 + 1.9.1 + 1.5.3 + 2.2 - If you don't use it you will see errors such as: - "[factory.support.DisposableBeanAdapter] [localhost-startStop-2] Invocation of destroy method - 'close' failed on bean with name 'repoSqlSessionTemplate': java.lang.UnsupportedOperationException: - Manual close is not allowed over a Spring managed SqlSession" + + ../../target/staging/poms/alfresco-sdk-parent + + 2.0.1-SNAPSHOT - The following 2 properties are needed to avoid cryptic node not found exceptions: - MVCC=FALSE: Multi-Version Concurrency Control disabled, enabling it means LOCK_MODE has no effect. - LOCK_MODE=0: Read Uncommitted, this level means that transaction isolation is disabled. - --> - AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=10000;MVCC=FALSE;LOCK_MODE=0 + + 1.4.185 + - - jdbc:h2:./${alfresco.data.location}/h2_data/${alfresco.db.name};${alfresco.db.params} - org.h2.jdbcx.JdbcDataSource - - - local - - src/main/amp - ../${project.build.finalName} - - - - - src/main/properties/${env} - src/test/properties/${env} - ** - ** - - - true - -Xms256m -Xmx1524m -XX:MaxPermSize=256m -Duser.language=en - - - ${project.build.directory}/ - WARN - - - runtime - 1.5.11 - - UTF-8 - - - 3.2 - 2.6.1 - 2.9 - 1.3.1 - 2.7 - 2.18 - 2.5.2 - 2.5 - 2.5 - 1.7 - 2.5.1 - 1.9.1 - 1.5.3 - 2.2 - - - ../../target/staging/poms/alfresco-sdk-parent - - - 2.0.1-SNAPSHOT - - - 1.4.185 - - 4.11 - 7.4.0.v20110414 - - - + Alfresco Public releases and snapshot repositories (For community version, see also 'enterprise' profile). + NOTE: This can be removed when/if Alfresco will be on Maven Central + --> - - sonatype-snapshots - Sonatype Snapshot Repo - https://oss.sonatype.org/content/repositories/snapshots/ - - false - - - true - - alfresco-public https://artifacts.alfresco.com/nexus/content/groups/public @@ -186,758 +173,925 @@ daily + + sonatype-snapshots + Sonatype Snapshot Repo + https://oss.sonatype.org/content/repositories/snapshots/ + + false + + + true + + - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - daily - - - - alfresco-plugin-public - https://artifacts.alfresco.com/nexus/content/groups/public - - - alfresco-plugin-public-snapshots - https://artifacts.alfresco.com/nexus/content/groups/public-snapshots - - true - daily - - - + + + sonatype-public + http://oss.sonatype.org/content/groups/public + + + sonatype-snapshots + https://oss.sonatype.org/content/repositories/snapshots + + true + daily + + + + alfresco-plugin-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + alfresco-plugin-public-snapshots + https://artifacts.alfresco.com/nexus/content/groups/public-snapshots + + true + daily + + + - - ${project.artifactId} - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - ${maven.alfresco.version} - true - - true - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven.resources.version} - - UTF-8 - - ftl - acp - jpg - png - gif - svg - pdf - doc - docx - xls - xlsx - ppt - pptx - bin - lic - swf - zip - msg - jar - ttf - eot - woff - woff2 - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven.war.version} - - false - - - true - - - - - + + ${project.artifactId} + + + org.alfresco.maven.plugin alfresco-maven-plugin ${maven.alfresco.version} - - - org.codehaus.plexus - plexus-archiver - 2.3 - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven.clean.version} - - - org.apache.maven.plugins - maven-dependency-plugin - ${maven.dependency.version} - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.version} - - - org.apache.maven.plugins - maven-antrun-plugin - ${maven.antrun.version} - - - com.google.code.maven-replacer-plugin - replacer - ${maven.replacer.version} - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - ${maven.tomcat.version} - - true - + true + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + 1.7 + 1.7 + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven.resources.version} + + UTF-8 + + ftl + acp + jpg + png + gif + svg + pdf + doc + docx + xls + xlsx + ppt + pptx + bin + lic + swf + zip + msg + jar + ttf + eot + woff + woff2 + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.version} + + false + + + true + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + ${maven.alfresco.version} + + + org.codehaus.plexus + plexus-archiver + 2.3 + + + + + org.apache.maven.plugins + maven-clean-plugin + ${maven.clean.version} + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.version} + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.version} + + + org.apache.maven.plugins + maven-install-plugin + ${maven.install.version} + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.version} + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven.antrun.version} + + + com.google.code.maven-replacer-plugin + replacer + ${maven.replacer.version} + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + ${maven.tomcat.version} + + true + + + + com.h2database + h2 + ${h2.version} + + + + org.codehaus.plexus + plexus-archiver + 2.3 + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + [0.0,) + + set-version + + + + + true + true + + + + + + + + + + + + + src/main/resources + ${app.filtering.enabled} + + + ${app.amp.folder} + ${app.amp.output.folder} + ${app.filtering.enabled} + + + + + src/test/resources + ${app.filtering.enabled} + + + + + + + + + + + + purge + + + + org.apache.maven.plugins + maven-clean-plugin + + + + ${project.basedir}/${alfresco.data.location} + + + ${project.basedir} + + **/*.log* + + + + + + + + + + + + enterprise + + ${alfresco.enterprise.default.version} + alfresco-enterprise + share-enterprise + + provided + + + + alfresco-private-repository + https://artifacts.alfresco.com/nexus/content/groups/private + + + + + + + clear-caches-refresh-ws + + org.codehaus.groovy.modules.http-builder + http-builder + 0.7.1 + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + generate-resources + + execute + + + + + + + + + + + + + + + + amp-to-war + + true + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + unpack-alfresco + prepare-package + + unpack + + + ${app.amp.client.war.folder} + + + ${alfresco.groupId} + ${app.amp.client.war.artifactId} + war + ${alfresco.version} + + + + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + + + amps-to-war-overlay + package + + install + + + + + + false + + + + + org.apache.tomcat.maven + tomcat7-maven-plugin + + + run-embedded + + run + + integration-test + + false + true + true + + ${project.build.directory} + + true + ${project.basedir}/tomcat/context.xml + + + + + + + + + org.alfresco.maven + alfresco-rad + ${maven.alfresco.version} + + + + + + + + + + + enable-amp + + + src/main/amp/module.properties + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + true + + + + maven-resources-plugin + + + add-module-properties-to-test-classpath + process-test-resources + + copy-resources + + + ${project.build.testOutputDirectory} + + + ${app.amp.folder} + + module.properties + + ${app.filtering.enabled} + alfresco/module/${project.artifactId} + + + + + + add-module-config-to-test-classpath + process-test-resources + + copy-resources + + + ${project.build.testOutputDirectory} + + + ${app.amp.folder}/config + + **/* + + ${app.filtering.enabled} + + + + + + + + + + + + + enable-alfresco-testing + + + src/test/java + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.surefire.version} + + ${app.testing.jvm.args} + + + + + + + junit + junit + test + + + + org.alfresco.maven + alfresco-rad + ${maven.alfresco.version} + test + + + + + + + enable-properties-filtering + + + + src/main/properties + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.buildhelper.version} + + + add-env-properties + generate-resources + + add-resource + + + + + ${app.properties.folder} + + ${app.properties.include} + + ${app.filtering.enabled} + + + + + + + + + + + enable-test-properties-filtering + + + + src/test/properties + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${maven.buildhelper.version} + + + add-env-test-properties + generate-resources + + add-test-resource + + + + + ${app.properties.test.folder} + + ${app.properties.test.include} + + ${app.filtering.enabled} + + + + + + + + + + + + + config-h2-support + + + src/test/properties/local/alfresco-global.properties + + + + com.h2database h2 ${h2.version} - - - - org.codehaus.plexus - plexus-archiver - 2.3 + test - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - [0.0,) - - set-version - - - - - true - true - - - - - - - - - + - - - src/main/resources - ${app.filtering.enabled} - - - ${app.amp.folder} - ${app.amp.output.folder} - ${app.filtering.enabled} - - - - - src/test/resources - ${app.filtering.enabled} - - - - - - - - - - enable-properties-filtering - - - - src/main/properties - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven.buildhelper.version} - - - add-env-properties - generate-resources - - add-resource - - - - - ${app.properties.folder} - - ${app.properties.include} - - ${app.filtering.enabled} - - - - - - - - - - - - - enable-test-properties-filtering - - - - src/test/properties - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${maven.buildhelper.version} - - - add-env-test-properties - generate-resources - - add-test-resource - - - - - ${app.properties.test.folder} - - ${app.properties.test.include} - - ${app.filtering.enabled} - - - - - - - - - - - - - enable-amp - - - src/main/amp/module.properties - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - true - - - - maven-resources-plugin - - - add-module-properties-to-test-classpath - process-test-resources - - copy-resources - - - ${project.build.testOutputDirectory} - - - ${app.amp.folder} - - module.properties - - ${app.filtering.enabled} - alfresco/module/${project.artifactId} - - - - - - add-module-config-to-test-classpath - process-test-resources - - copy-resources - - - ${project.build.testOutputDirectory} - - - ${app.amp.folder}/config - - **/* - - ${app.filtering.enabled} - - - - - - - - - - - - - - enable-alfresco-testing - - - src/test/java - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.version} - - ${app.testing.jvm.args} - - - - - - - junit - junit - test - - - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - test - - - - - - - jrebel - - - - org.zeroturnaround - jrebel-maven-plugin - 1.1.5 - - - generate-rebel-xml - prepare-package - - generate - - - - - war - false - - - - ${project.build.outputDirectory} - - - ${project.build.testOutputDirectory} - - - - - - - / - ${project.build.directory}/${project.build.finalName} - - - / - ${project.build.directory}/${project.build.finalName}-war - - - - - - - - - - - - amp-to-war - - true - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-alfresco - prepare-package - unpack - - ${alfresco.client.war.folder} - - - ${alfresco.client.war.groupId} - ${alfresco.client.war} - war - ${alfresco.client.war.version} - - - - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - amps-to-war-overlay - package - - install - - - - - - false - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - run-embedded - - run - - integration-test - - false - true - true - - ${project.build.directory} - - true - ${project.basedir}/tomcat/context.xml - - - - - - - + + enforce-sdk-rules + + true + + + + + org.apache.maven.plugins + maven-enforcer-plugin + ${maven.enforcer.plugin} + + + enforce-sdk-requirements + + enforce + + + + + + alfresco.version + The SDK 2.x is supported only for Alfresco 5.x Community and + Enterprise versions + + ^5\..* + - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - - - org.eclipse.jetty - jetty-server - ${maven.jetty.version} - + + + [1.7.0,) + Alfresco 5+ requires Java 7 + - - + + + 3.2.2 + + + true + + + + + + + - - - purge - - - - - org.apache.maven.plugins - maven-clean-plugin - - - - ${project.basedir}/${alfresco.data.location} - - - ${project.basedir}/solr_home - - - ${project.basedir} - - **/*.log - - - - - - - - - - - enforce-sdk-rules - - true - - - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin} - - - enforce-sdk-requirements - - enforce - - - - - - alfresco.version - The SDK 2.x is supported only for Alfresco 5.x Community and Enterprise versions - ^5\..* - - - - [1.7.0,) - Alfresco 5+ requires Java 7 - - - 3.2.2 - - - true - - - - - - - - - - setup - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - get-spring-loaded - validate - get - - org.springframework:springloaded:${springloaded.version} - - - - - - - - - - - enterprise - - ${alfresco.enterprise.default.version} - alfresco-enterprise - share-enterprise - - provided - - - - alfresco-private-repository - https://artifacts.alfresco.com/nexus/content/groups/private - - - - - - atv - - false - ${project.build.directory}/${project.build.finalName}-src - - - - - maven-resources-plugin - - - isolate-project-src - generate-resources - - copy-resources - - - ${maven.alfresco.validation.sourceLocation} + + + + + + + setup + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + get-spring-loaded + validate + + get + + + org.springframework:springloaded:${springloaded.version} + + + + + + + + + + + + + + + atv + + false + ${project.build.directory}/${project.build.finalName}-src + + + + + + maven-resources-plugin + + + isolate-project-src + generate-resources + + copy-resources + + + ${maven.alfresco.validation.sourceLocation} + + + ${project.basedir} + + target + + ${app.filtering.enabled} + + + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + + + run-atv + verify + + validate + + + + + + de.herschke + neo4j-maven-plugin + 2.0.2-20140827 + + + start-neo4j-server + post-integration-test + + start-server + + + + stop-neo4j-server + verify + + stop-server + + + + + 7474 + + + + + + + + + + + + + jrebel + + + + org.zeroturnaround + jrebel-maven-plugin + 1.1.5 + + + generate-rebel-xml + prepare-package + + generate + + + + + war + false + - ${project.basedir} - - target - - ${app.filtering.enabled} + ${project.build.outputDirectory} + + + ${project.build.testOutputDirectory} - - - - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - run-atv - verify - - validate - - - - - - de.herschke - neo4j-maven-plugin - 2.0.2-20140827 - - - start-neo4j-server - post-integration-test - - start-server - - - - stop-neo4j-server - verify - - stop-server - - - - - 7474 - - - - - - - - config-h2-support - - - src/test/properties/local/alfresco-global.properties - - - - - - com.h2database - h2 - ${h2.version} - test - - - - + + + + + / + ${project.build.directory}/${project.build.finalName} + + + / + ${project.build.directory}/${project.build.finalName}-war + + + + + + + + + + +