diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml index 8bfab0ac..4b4b906c 100644 --- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/pom.xml @@ -28,7 +28,7 @@ com.sourcesense.alfresco maven-alfresco-archetypes - 1.9.2-SNAPSHOT + 3.9.0-SNAPSHOT ../pom.xml diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml index 0c18f61b..8be10e91 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/pom.xml @@ -22,7 +22,7 @@ com.sourcesense.alfresco maven-alfresco-archetypes - 1.9.2-SNAPSHOT + 3.9.0-SNAPSHOT ../pom.xml diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml index 5a0c4ddf..5e2dc324 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/changes/changes.xml @@ -4,6 +4,14 @@ Gabriele Columbro + + + Removed support for H2 since alfresco does not work with it (even in PGSQL compatibility mode) + + + Tested against 4.0.b Community + + Added -Prun profile to encapsulate jetty embedded running capabilities diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index f3dd84f8..83330b58 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -6,6 +6,12 @@ **/*.java + + jetty + + *.xml + + src/main/webapp diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml index 6d4d80fc..7149eb42 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/jetty/jetty-env.xml @@ -7,8 +7,8 @@ class="org.mortbay.jetty.plus.naming.Resource"> jdbc/dataSource - - jdbc:h2:${alfresco.data.location}/h2_data/${alfresco.db.name} + + ${alfresco.db.url} ${alfresco.db.username} ${alfresco.db.password} diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml index cd7eef1c..c5b181ec 100644 --- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml @@ -15,6 +15,17 @@ --> + 4.0.0 ${groupId} ${artifactId} @@ -23,75 +34,59 @@ war Alfresco extension - - + - - local - alfresco - - ./alf_data_jetty - alf_jetty - alfresco - alfresco - 3.4.a - - org.alfresco.filesys.repo.desk - - - - - - - ${project.description} - ${project.organization.url} - ${project.groupId} - ${project.artifactId} - ${project.version} - ${svn.tags.url} - ${site.url} - + + 4.0.b + community + + local + + alfresco + + + + + ./alf_data_jetty + alf_jetty + jdbc:mysql://localhost:3306/${alfresco.db.name} + org.gjt.mm.mysql.Driver + com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource + alfresco + alfresco + + + + org.alfresco.filesys.repo.desk + + + + ${project.description} + ${project.organization.url} + ${project.groupId} + ${project.artifactId} + ${project.version} + ${svn.tags.url} + ${site.url} + + + - + org.alfresco alfresco ${alfresco.version} war - community + ${alfresco.edition} @@ -195,12 +205,7 @@ - ${webapp.name} - + src/main/properties/${env} @@ -433,7 +437,6 @@ local - 3.4.a + 4.0.b + community info 8081 + development @@ -37,7 +47,7 @@ share war ${alfresco.version} - community + ${alfresco.edition} +
+ + + + + + + + + + + + + + true + + + + + + true + + 400 + 600 + text/html,text/xhtml + custom + + plugins: "fullscreen,paste", + file_browser_callback : + 'shareFileBrowser', + paste_create_paragraphs : false, + paste_create_linebreaks : false, + paste_use_dialog : true, + paste_auto_cleanup_on_paste : true, + paste_convert_middot_lists : false, + paste_unindented_list_class : "unindentedList", + paste_convert_headers_to_strong : true, + theme_advanced_buttons1: + "bold,italic,separator,formatselect,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,image,separator,undo,redo,separator,cut,copy,paste,pastetext,pasteword,image,help,code,fullscreen", + theme_advanced_buttons2: "", + theme_advanced_buttons3: "", + theme_advanced_resizing: true + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + true + + + + + + true + + 400 + 600 + text/html,text/xhtml + custom + + plugins: "fullscreen,paste", + file_browser_callback : + 'shareFileBrowser', + paste_create_paragraphs : false, + paste_create_linebreaks : false, + paste_use_dialog : true, + paste_auto_cleanup_on_paste : true, + paste_convert_middot_lists : false, + paste_unindented_list_class : "unindentedList", + paste_convert_headers_to_strong : true, + theme_advanced_buttons1: + "bold,italic,separator,formatselect,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,image,separator,undo,redo,separator,cut,copy,paste,pastetext,pasteword,image,help,code,fullscreen", + theme_advanced_buttons2: "", + theme_advanced_buttons3: "", + theme_advanced_resizing: true + + + + +
+ + + + + +
+ + + + + + + + + + + + + + true + + + + + + true + + 400 + 600 + text/html,text/xhtml + custom + + plugins: "fullscreen,paste", + file_browser_callback : + 'shareFileBrowser', + paste_create_paragraphs : false, + paste_create_linebreaks : false, + paste_use_dialog : true, + paste_auto_cleanup_on_paste : true, + paste_convert_middot_lists : false, + paste_unindented_list_class : "unindentedList", + paste_convert_headers_to_strong : true, + theme_advanced_buttons1: + "bold,italic,separator,formatselect,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,image,separator,undo,redo,separator,cut,copy,paste,pastetext,pasteword,image,help,code,fullscreen", + theme_advanced_buttons2: "", + theme_advanced_buttons3: "", + theme_advanced_resizing: true + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + true + + + + + + true + + 400 + 600 + text/html,text/xhtml + custom + + plugins: "fullscreen,paste", + file_browser_callback : + 'shareFileBrowser', + paste_create_paragraphs : false, + paste_create_linebreaks : false, + paste_use_dialog : true, + paste_auto_cleanup_on_paste : true, + paste_convert_middot_lists : false, + paste_unindented_list_class : "unindentedList", + paste_convert_headers_to_strong : true, + theme_advanced_buttons1: + "bold,italic,separator,formatselect,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,bullist,numlist,separator,link,unlink,separator,image,separator,undo,redo,separator,cut,copy,paste,pastetext,pasteword,image,help,code,fullscreen", + theme_advanced_buttons2: "", + theme_advanced_buttons3: "", + theme_advanced_resizing: true + + + + +
+ + + + \ No newline at end of file diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-set-dublincore.ftl.sample b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-set-dublincore.ftl.sample deleted file mode 100644 index 5c4bcc1f..00000000 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-set-dublincore.ftl.sample +++ /dev/null @@ -1,47 +0,0 @@ -<#if form.fields["prop_cm_publisher"]??> - <#if form.mode == "view"> - <@formLib.renderField field=form.fields["prop_cm_publisher"] /> - <@formLib.renderField field=form.fields["prop_cm_contributor"] /> - <@formLib.renderField field=form.fields["prop_cm_type"] /> - <@formLib.renderField field=form.fields["prop_cm_identifier"] /> - <@formLib.renderField field=form.fields["prop_cm_dcsource"] /> - <@formLib.renderField field=form.fields["prop_cm_coverage"] /> - <@formLib.renderField field=form.fields["prop_cm_rights"] /> - <@formLib.renderField field=form.fields["prop_cm_subject"] /> - <#else> -
-
- <@formLib.renderField field=form.fields["prop_cm_publisher"] /> -
-
- <@formLib.renderField field=form.fields["prop_cm_contributor"] /> -
-
-
-
- <@formLib.renderField field=form.fields["prop_cm_type"] /> -
-
- <@formLib.renderField field=form.fields["prop_cm_identifier"] /> -
-
-
-
- <@formLib.renderField field=form.fields["prop_cm_dcsource"] /> -
-
- <@formLib.renderField field=form.fields["prop_cm_coverage"] /> -
-
-
-
- <@formLib.renderField field=form.fields["prop_cm_rights"] /> -
-
- <@formLib.renderField field=form.fields["prop_cm_subject"] /> -
-
- -
- - diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml deleted file mode 100644 index a5960c6e..00000000 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - classpath:alfresco/web-extension/application.properties - - - - - - - - - - - - - - \ No newline at end of file diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample new file mode 100644 index 00000000..ae5828fc --- /dev/null +++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/share-config-custom.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/share-config-custom.xml index a13ca4a5..0633447b 100644 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/share-config-custom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/share-config-custom.xml @@ -1,83 +1,331 @@ + + + + ${share.server.scheme} + ${share.server.name} + ${share.server.port} + + - - - - ${share.server.scheme} - ${share.server.name} - ${share.server.port} - - + + + + + false + + + false + + + + + + + + + + ${surf.development.mode} + + + + + + + + + + + + + + + + false + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/alfresco + + + + + false + + + + application/msword + application/vnd.ms-excel + application/vnd.ms-powerpoint + + + + + + + true + + - + + + + - - - - alfresco-noauth - Alfresco - unauthenticated access - Access to Alfresco Repository WebScripts that do not require authentication - alfresco - - ${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/${alfresco.webapp.name}/s - - none - + + - - alfresco - Alfresco - user access - Access to Alfresco Repository WebScripts that require user authentication - alfresco - - ${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/${alfresco.webapp.name}/s - - user - - - + + + + + + + + + + + location.path.documents + + slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&max={maximumFolderCountSite} + + + - - - - - + + + alfresco://company/home - alfrescoCookie Alfresco Connector - Connects to an Alfresco instance using cookie-based - authentication - org.alfresco.connector.AlfrescoConnector + + + false + + + 500 + + + + + + + + + secret + + ALFRESCO.ORG + + HTTP/repository.server.com@ALFRESCO.ORG + + ShareHTTP + + - alfresco Alfresco - user access - Access to Alfresco Repository WebScripts that require - user authentication - alfrescoCookie - http://localhost/alfresco/wcs - user true - - --> + + + + + + alfresco-noauth + Alfresco - unauthenticated access + Access to Alfresco Repository WebScripts that do not require authentication + alfresco + ${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/alfresco/s + none + + + alfresco + Alfresco - user access + Access to Alfresco Repository WebScripts that require user authentication + alfresco + ${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/alfresco/s + user + + + alfresco-feed + Alfresco Feed + Alfresco Feed - supports basic HTTP authentication via the EndPointProxyServlet + http + ${alfresco.server.scheme}://${alfresco.server.name}:${alfresco.server.port}/alfresco/s + true + user + + + + + + + \ No newline at end of file diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/ttl-forms-32-share.zip.sample b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/ttl-forms-32-share.zip.sample deleted file mode 100644 index 8edc544c..00000000 Binary files a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/ttl-forms-32-share.zip.sample and /dev/null differ diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/ttl-forms-32.amp.sample b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/ttl-forms-32.amp.sample deleted file mode 100644 index 3c4be81b..00000000 Binary files a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/ttl-forms-32.amp.sample and /dev/null differ diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/web-framework-config-custom.xml.sample b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/web-framework-config-custom.xml.sample deleted file mode 100644 index 803ec558..00000000 --- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/src/main/resources/alfresco/web-extension/web-framework-config-custom.xml.sample +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml b/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml index d6fae32f..98875f85 100644 --- a/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml +++ b/maven-alfresco-archetypes/maven-alfresco-share-module-archetype/pom.xml @@ -4,13 +4,12 @@ 4.0.0 org.alfresco.maven maven-alfresco-share-module-archetype - 1.0.0-SNAPSHOT maven-archetype Maven Archetype to build Alfresco Share JAR modules (dashlets,pages,etc.) com.sourcesense.alfresco maven-alfresco-archetypes - 1.9.2-SNAPSHOT + 3.9.0-SNAPSHOT ../pom.xml diff --git a/maven-alfresco-archetypes/pom.xml b/maven-alfresco-archetypes/pom.xml index d8112ded..e123bd51 100644 --- a/maven-alfresco-archetypes/pom.xml +++ b/maven-alfresco-archetypes/pom.xml @@ -3,7 +3,6 @@ com.sourcesense.alfresco maven-alfresco-archetypes pom - 1.9.2-SNAPSHOT Maven Alfresco Archetypes base project This project is meant to gather all commons configurations and settings between the two maven-alfresco-*-archetypes, i.e. maven-alfresco-extension-archetype and maven-alfresco-amp-archetype @@ -11,7 +10,7 @@ org.alfresco maven-alfresco-lifecycle - 1.1.1-SNAPSHOT + 3.9.0-SNAPSHOT ../pom.xml diff --git a/pom.xml b/pom.xml index 84985b80..d3a734af 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.alfresco maven-alfresco-lifecycle pom - 1.1.1-SNAPSHOT + 3.9.0-SNAPSHOT Maven Alfresco Lifecycle support base project http://maven.alfresco.com/nexus/content/repositories/alfresco-docs/maven-alfresco-lifecycle