diff --git a/.gitignore b/.gitignore
index 5cd20fa5aa..9346843361 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,34 @@
-*.class
-
-# Eclipse
-.classpath
-.settings
-.project
-
-# Intellij
-.idea/
-*.iml
-*.iws
-
-# Mac
-.DS_Store
-
-# Maven
-target
-*.log
-*.log.*
-
-# Mobile Tools for Java (J2ME)
-
-.mtj
-.tmp/
-
-# Package Files #
-
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-
-hs_err_pid*
+*.class
+
+# Eclipse
+.classpath
+.settings
+.project
+
+# Intellij
+.idea/
+*.iml
+*.iws
+
+# Mac
+.DS_Store
+
+# Maven
+target
+*.log
+*.log.*
+
+# Mobile Tools for Java (J2ME)
+
+.mtj
+.tmp/
+
+# Package Files #
+
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+hs_err_pid*
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f2f2c95a68..c625f4d723 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -1,118 +1,118 @@
-
- 4.0.0
-
- org.alfresco
- full-community-packaging
- 6.0.0-SNAPSHOT
- ../pom.xml
-
- alfresco-content-services-community-full-distribution
- pom
- Alfresco Content Services Community Full Distribution
-
-
-
- 8080
-
-
-
-
- org.alfresco
- alfresco-content-services-community-distribution
- zip
-
-
- *
- *
-
-
-
-
- org.alfresco
- alfresco-solr4-distribution
- zip
-
-
- *
- *
-
-
-
-
- org.alfresco
- alfresco-content-services-share-distribution
- zip
-
-
- *
- *
-
-
-
-
-
-
- ${project.artifactId}-${installer.version.name}
-
-
- src/main/resources
- true
-
-
-
-
- maven-dependency-plugin
-
-
- extract-keystore
- generate-resources
-
- unpack
-
-
-
-
- org.alfresco
- alfresco-content-services-community-distribution
- zip
-
-
- org.alfresco
- alfresco-solr4-distribution
- zip
- ${project.build.directory}/dependency/solr4
-
-
- org.alfresco
- alfresco-content-services-share-distribution
- zip
-
-
-
-
-
-
-
-
- maven-assembly-plugin
-
-
- make-assembly
- package
-
- single
-
-
- false
-
- src/assembly/full-distribution.xml
-
-
-
-
-
-
-
-
-
+
+ 4.0.0
+
+ org.alfresco
+ full-community-packaging
+ 6.0.0-SNAPSHOT
+ ../pom.xml
+
+ alfresco-content-services-community-full-distribution
+ pom
+ Alfresco Content Services Community Full Distribution
+
+
+
+ 8080
+
+
+
+
+ org.alfresco
+ alfresco-content-services-community-distribution
+ zip
+
+
+ *
+ *
+
+
+
+
+ org.alfresco
+ alfresco-solr4-distribution
+ zip
+
+
+ *
+ *
+
+
+
+
+ org.alfresco
+ alfresco-content-services-share-distribution
+ zip
+
+
+ *
+ *
+
+
+
+
+
+
+ ${project.artifactId}-${installer.version.name}
+
+
+ src/main/resources
+ true
+
+
+
+
+ maven-dependency-plugin
+
+
+ extract-keystore
+ generate-resources
+
+ unpack
+
+
+
+
+ org.alfresco
+ alfresco-content-services-community-distribution
+ zip
+
+
+ org.alfresco
+ alfresco-solr4-distribution
+ zip
+ ${project.build.directory}/dependency/solr4
+
+
+ org.alfresco
+ alfresco-content-services-share-distribution
+ zip
+
+
+
+
+
+
+
+
+ maven-assembly-plugin
+
+
+ make-assembly
+ package
+
+ single
+
+
+ false
+
+ src/assembly/full-distribution.xml
+
+
+
+
+
+
+
+
+
diff --git a/distribution/src/assembly/full-distribution.xml b/distribution/src/assembly/full-distribution.xml
index e7c2220e27..9f607449c5 100644
--- a/distribution/src/assembly/full-distribution.xml
+++ b/distribution/src/assembly/full-distribution.xml
@@ -1,62 +1,62 @@
-
- distribution
-
- false
-
-
- zip
-
-
-
-
-
- target/classes
-
-
-
-
-
- ${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}
-
-
-
-
-
- ${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}
-
-
-
-
-
- ${project.build.directory}/dependency/solr4
- solr4
-
- solr4.war
-
-
-
- ${project.build.directory}/dependency/solr4
- web-server/webapps
-
- solr4.war
-
-
-
-
-
- ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}
-
-
- web-server/**
- modules/**
- amps/**
-
-
-
- ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples
- web-server/shared/classes/alfresco/web-extension
-
-
-
-
+
+ distribution
+
+ false
+
+
+ zip
+
+
+
+
+
+ target/classes
+
+
+
+
+
+ ${project.build.directory}/dependency/alfresco-content-services-community-distribution-${dependency.acs-community-packaging.version}
+
+
+
+
+
+ ${project.build.directory}/dependency/alfresco-content-services-distribution-${dependency.acs-packaging.version}
+
+
+
+
+
+ ${project.build.directory}/dependency/solr4
+ solr4
+
+ solr4.war
+
+
+
+ ${project.build.directory}/dependency/solr4
+ web-server/webapps
+
+ solr4.war
+
+
+
+
+
+ ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}
+
+
+ web-server/**
+ modules/**
+ amps/**
+
+
+
+ ${project.build.directory}/dependency/alfresco-content-services-share-distribution-${alfresco.share.version}/web-extension-samples
+ web-server/shared/classes/alfresco/web-extension
+
+
+
+
diff --git a/distribution/src/main/resources/README.txt b/distribution/src/main/resources/README.txt
index 63104fc294..7cd221d0dd 100644
--- a/distribution/src/main/resources/README.txt
+++ b/distribution/src/main/resources/README.txt
@@ -1,8 +1,8 @@
-Alfresco Community (Build: ${installer.version.name})
-===============================
-
-Contains:
- - Alfresco Content Services Community: ${dependency.acs-community-packaging.version}
- - Alfresco Share: ${alfresco.share.version}
-
-For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm
+Alfresco Community (Build: ${installer.version.name})
+===============================
+
+Contains:
+ - Alfresco Content Services Community: ${dependency.acs-community-packaging.version}
+ - Alfresco Share: ${alfresco.share.version}
+
+For users of Alfresco Community Edition, more information on this release is available at https://community.alfresco.com/community/ecm
diff --git a/installer-resources/pom.xml b/installer-resources/pom.xml
index 18deeca383..551483055c 100644
--- a/installer-resources/pom.xml
+++ b/installer-resources/pom.xml
@@ -1,15 +1,15 @@
-
- 4.0.0
- alfresco-installer-resources
- jar
- Alfresco Content Services Installer Resources
-
-
- org.alfresco
- full-community-packaging
- 6.0.0-SNAPSHOT
- ../pom.xml
-
-
-
+
+ 4.0.0
+ alfresco-installer-resources
+ jar
+ Alfresco Content Services Installer Resources
+
+
+ org.alfresco
+ full-community-packaging
+ 6.0.0-SNAPSHOT
+ ../pom.xml
+
+
+
diff --git a/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml b/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml
index 05e5410b93..28b1e1bca4 100644
--- a/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml
+++ b/installer-resources/src/main/resources/bitrock/alfresco-aos-module.xml
@@ -1,63 +1,63 @@
-
- aosmodule
- Alfresco Office Services
- Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco Content Services installation.
- 1
- 1
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- programfiles
- Program Files
- ${alfresco_amps_directory}
- all
-
-
-
-
-
-
-
-
- vtibinwarfile
- //War Files
- ${installdiralfresco}
-
-
-
-
-
- aosmodulecustomextensions
- Program Files
- ${alfresco_shared_directory}/alfresco/extension
- all
-
-
-
-
-
-
-
-
- aosmodulelicenses
- //Alfresco Licenses
- ${alfresco_base_application_directory}/licenses
-
-
-
-
-
-
+
+ aosmodule
+ Alfresco Office Services
+ Select this module to allow applications that can talk to a SharePoint server to talk to your Alfresco Content Services installation.
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ programfiles
+ Program Files
+ ${alfresco_amps_directory}
+ all
+
+
+
+
+
+
+
+
+ vtibinwarfile
+ //War Files
+ ${installdiralfresco}
+
+
+
+
+
+ aosmodulecustomextensions
+ Program Files
+ ${alfresco_shared_directory}/alfresco/extension
+ all
+
+
+
+
+
+
+
+
+ aosmodulelicenses
+ //Alfresco Licenses
+ ${alfresco_base_application_directory}/licenses
+
+
+
+
+
+
diff --git a/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml b/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml
index 4287bcce09..7329d91857 100644
--- a/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml
+++ b/installer-resources/src/main/resources/bitrock/alfresco-googledocs.xml
@@ -1,40 +1,40 @@
-
- alfrescogoogledocs
- Google Docs Integration
- Include Google Docs Integration Features.
- 1
- 1
- 1
-
-
-
-
-
-
-
-
- Program Files
- ${alfresco_amps_directory}
- googledocs
- all
-
-
-
-
-
-
-
-
- Program Files
- ${alfresco_amps_share_directory}
- googledocsshare
- all
-
-
-
-
-
-
-
-
+
+ alfrescogoogledocs
+ Google Docs Integration
+ Include Google Docs Integration Features.
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+
+ Program Files
+ ${alfresco_amps_directory}
+ googledocs
+ all
+
+
+
+
+
+
+
+
+ Program Files
+ ${alfresco_amps_share_directory}
+ googledocsshare
+ all
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/installer-resources/src/main/resources/extract-binaries.xml b/installer-resources/src/main/resources/extract-binaries.xml
index 91467cddad..22eddb7f0c 100644
--- a/installer-resources/src/main/resources/extract-binaries.xml
+++ b/installer-resources/src/main/resources/extract-binaries.xml
@@ -1,175 +1,175 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Extracting binaries for @{targetPlatform}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Extracting Common...
-
-
-
-
-
- Extracting Tomcat...
-
-
-
-
-
-
-
- Extracting Java...
-
-
-
-
-
- Extracting Manager...
-
-
-
-
-
-
-
-
-
-
-
- Extracting binaries for @{targetPlatform}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Extracting PostgreSQL...
-
-
-
-
-
- Extracting LibreOffice...
-
-
-
-
-
- Extracting ImageMagick...
-
-
-
-
-
-
- Extracting Alfresco Pdf Renderer...
-
-
-
-
-
-
-
-
-
- Check running platform for Installbuilder...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Extracting Installbuilder...
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Extracting binaries for @{targetPlatform}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Extracting Common...
+
+
+
+
+
+ Extracting Tomcat...
+
+
+
+
+
+
+
+ Extracting Java...
+
+
+
+
+
+ Extracting Manager...
+
+
+
+
+
+
+
+
+
+
+
+ Extracting binaries for @{targetPlatform}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Extracting PostgreSQL...
+
+
+
+
+
+ Extracting LibreOffice...
+
+
+
+
+
+ Extracting ImageMagick...
+
+
+
+
+
+
+ Extracting Alfresco Pdf Renderer...
+
+
+
+
+
+
+
+
+
+ Check running platform for Installbuilder...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Extracting Installbuilder...
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index fa3a6526b5..e7fdf31786 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,315 +1,315 @@
-
- 4.0.0
-
- org.alfresco
- alfresco-super-pom
- 6
-
- full-community-packaging
- 6.0.0-SNAPSHOT
- pom
- Alfresco Content Services Community Full Packaging
-
-
- scm:git:https://git.alfresco.com/Repository/full-community-packaging.gitt
- scm:git:https://git.alfresco.com/Repository/full-community-packaging.git
- https://git.alfresco.com/Repository/full-community-packaging.git
- HEAD
-
-
-
-
- 6.0.b-SNAPSHOT
-
-
- 5.2.2-SNAPSHOT
-
-
- 3.0.4.2
-
-
- 1.1.7
-
- 6.1
- 6.5
-
-
- 5.2-20170508
- 7.0.59-alfresco-distribution
- 1.8.0_111
- 9.4.4-20151016
- 5.2.1-alfresco
- 8.64
- 7.0.5
- 1.0
- 1.0
-
-
- ${maven.build.timestamp}
- yyyyMMdd
-
-
- 15.10.1
-
-
-
- ${project.version}${alfresco.release.availability}
- alfresco-community
- ${alfresco.package.name}-distribution
-
-
-
- distribution
- public-javadoc
- installer-resources
- installer
-
-
-
-
-
-
- org.alfresco
- acs-community-packaging
- ${dependency.acs-community-packaging.version}
- pom
- import
-
-
- org.alfresco
- alfresco-content-services-community-distribution
- ${dependency.acs-community-packaging.version}
- zip
-
-
- org.alfresco.aos-module
- alfresco-aos-module
- ${alfresco.aos-module.version}
- amp
-
-
- org.alfresco.aos-module
- alfresco-aos-module-distributionzip
- ${alfresco.aos-module.version}
- zip
-
-
- org.alfresco.aos-module
- alfresco-vti-bin
- ${alfresco.aos-module.version}
- war
-
-
- org.alfresco
- alfresco-content-services-share-distribution
- ${alfresco.share.version}
- zip
-
-
- org.alfresco
- alfresco-share-services
- ${alfresco.share.version}
- amp
-
-
- org.alfresco
- share
- ${alfresco.share.version}
- war
-
-
- org.alfresco
- alfresco-solr1-distribution
- ${alfresco.solr.version}
- zip
-
-
- org.alfresco
- alfresco-solr4-distribution
- ${alfresco.solr4.version}
- zip
-
-
- org.alfresco
- alfresco-wcmqs-distribution
- ${alfresco.share.version}
- zip
-
-
- org.alfresco
- alfresco-wcmqs-web
- ${alfresco.share.version}
- classes
-
-
- org.alfresco
- alfresco-wcmqs-client-api
- ${alfresco.share.version}
-
-
- org.alfresco.integrations
- alfresco-googledocs-repo
- ${alfresco.googledocs.version}
- amp
-
-
- org.alfresco.integrations
- alfresco-googledocs-share
- ${alfresco.googledocs.version}
- amp
-
-
-
-
- org.alfresco
- installer-common
- ${installer.common.version}
- linux
- tgz
-
-
-
-
- org.apache.tomcat
- tomcat
- ${installer.tomcat.version}
- linux
- tgz
-
-
- org.apache.tomcat
- tomcat
- ${installer.tomcat.version}
- win64
- tgz
-
-
-
-
- org.postgresql
- postgresql-distribution
- ${installer.postgresql.version}
- linux
- tgz
-
-
- org.postgresql
- postgresql-distribution
- ${installer.postgresql.version}
- win64
- tgz
-
-
-
-
- com.oracle.java
- jre
- ${installer.java.version}
- linux
- tgz
-
-
- com.oracle.java
- jre
- ${installer.java.version}
- win64
- tgz
-
-
-
-
- org.libreoffice
- libreoffice-dist
- ${installer.libreoffice.version}
- linux
- tgz
-
-
- org.libreoffice
- libreoffice-dist
- ${installer.libreoffice.version}
- windows
- tgz
-
-
-
-
- org.alfresco
- alfresco-pdf-renderer
- ${installer.alfresco-pdf-renderer.version}
- linux
- tgz
-
-
- org.alfresco
- alfresco-pdf-renderer
- ${installer.alfresco-pdf-renderer.version}
- win64
- tgz
-
-
-
-
- org.imagemagick
- imagemagick-distribution
- ${installer.imagemagick.version}
- linux
- tgz
-
-
- org.imagemagick
- imagemagick-distribution
- ${installer.imagemagick.version}
- win64
- tgz
-
-
-
-
- com.bitnami
- installbuilder
- ${installer.installbuilder.version}
- linux
- tgz
-
-
- com.bitnami
- installbuilder
- ${installer.installbuilder.version}
- win
- tgz
-
-
-
-
- org.alfresco
- manager
- ${installer.manager.version}
- linux
- tgz
-
-
- org.alfresco
- manager
- ${installer.manager.version}
- win64
- tgz
-
-
-
-
-
-
- alfresco-internal
- https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases
-
-
- alfresco-internal-snapshots
- https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots
-
-
-
+
+ 4.0.0
+
+ org.alfresco
+ alfresco-super-pom
+ 6
+
+ full-community-packaging
+ 6.0.0-SNAPSHOT
+ pom
+ Alfresco Content Services Community Full Packaging
+
+
+ scm:git:https://git.alfresco.com/Repository/full-community-packaging.gitt
+ scm:git:https://git.alfresco.com/Repository/full-community-packaging.git
+ https://git.alfresco.com/Repository/full-community-packaging.git
+ HEAD
+
+
+
+
+ 6.0.b-SNAPSHOT
+
+
+ 5.2.2-SNAPSHOT
+
+
+ 3.0.4.2
+
+
+ 1.1.7
+
+ 6.1
+ 6.5
+
+
+ 5.2-20170508
+ 7.0.59-alfresco-distribution
+ 1.8.0_111
+ 9.4.4-20151016
+ 5.2.1-alfresco
+ 8.64
+ 7.0.5
+ 1.0
+ 1.0
+
+
+ ${maven.build.timestamp}
+ yyyyMMdd
+
+
+ 15.10.1
+
+
+
+ ${project.version}${alfresco.release.availability}
+ alfresco-community
+ ${alfresco.package.name}-distribution
+
+
+
+ distribution
+ public-javadoc
+ installer-resources
+ installer
+
+
+
+
+
+
+ org.alfresco
+ acs-community-packaging
+ ${dependency.acs-community-packaging.version}
+ pom
+ import
+
+
+ org.alfresco
+ alfresco-content-services-community-distribution
+ ${dependency.acs-community-packaging.version}
+ zip
+
+
+ org.alfresco.aos-module
+ alfresco-aos-module
+ ${alfresco.aos-module.version}
+ amp
+
+
+ org.alfresco.aos-module
+ alfresco-aos-module-distributionzip
+ ${alfresco.aos-module.version}
+ zip
+
+
+ org.alfresco.aos-module
+ alfresco-vti-bin
+ ${alfresco.aos-module.version}
+ war
+
+
+ org.alfresco
+ alfresco-content-services-share-distribution
+ ${alfresco.share.version}
+ zip
+
+
+ org.alfresco
+ alfresco-share-services
+ ${alfresco.share.version}
+ amp
+
+
+ org.alfresco
+ share
+ ${alfresco.share.version}
+ war
+
+
+ org.alfresco
+ alfresco-solr1-distribution
+ ${alfresco.solr.version}
+ zip
+
+
+ org.alfresco
+ alfresco-solr4-distribution
+ ${alfresco.solr4.version}
+ zip
+
+
+ org.alfresco
+ alfresco-wcmqs-distribution
+ ${alfresco.share.version}
+ zip
+
+
+ org.alfresco
+ alfresco-wcmqs-web
+ ${alfresco.share.version}
+ classes
+
+
+ org.alfresco
+ alfresco-wcmqs-client-api
+ ${alfresco.share.version}
+
+
+ org.alfresco.integrations
+ alfresco-googledocs-repo
+ ${alfresco.googledocs.version}
+ amp
+
+
+ org.alfresco.integrations
+ alfresco-googledocs-share
+ ${alfresco.googledocs.version}
+ amp
+
+
+
+
+ org.alfresco
+ installer-common
+ ${installer.common.version}
+ linux
+ tgz
+
+
+
+
+ org.apache.tomcat
+ tomcat
+ ${installer.tomcat.version}
+ linux
+ tgz
+
+
+ org.apache.tomcat
+ tomcat
+ ${installer.tomcat.version}
+ win64
+ tgz
+
+
+
+
+ org.postgresql
+ postgresql-distribution
+ ${installer.postgresql.version}
+ linux
+ tgz
+
+
+ org.postgresql
+ postgresql-distribution
+ ${installer.postgresql.version}
+ win64
+ tgz
+
+
+
+
+ com.oracle.java
+ jre
+ ${installer.java.version}
+ linux
+ tgz
+
+
+ com.oracle.java
+ jre
+ ${installer.java.version}
+ win64
+ tgz
+
+
+
+
+ org.libreoffice
+ libreoffice-dist
+ ${installer.libreoffice.version}
+ linux
+ tgz
+
+
+ org.libreoffice
+ libreoffice-dist
+ ${installer.libreoffice.version}
+ windows
+ tgz
+
+
+
+
+ org.alfresco
+ alfresco-pdf-renderer
+ ${installer.alfresco-pdf-renderer.version}
+ linux
+ tgz
+
+
+ org.alfresco
+ alfresco-pdf-renderer
+ ${installer.alfresco-pdf-renderer.version}
+ win64
+ tgz
+
+
+
+
+ org.imagemagick
+ imagemagick-distribution
+ ${installer.imagemagick.version}
+ linux
+ tgz
+
+
+ org.imagemagick
+ imagemagick-distribution
+ ${installer.imagemagick.version}
+ win64
+ tgz
+
+
+
+
+ com.bitnami
+ installbuilder
+ ${installer.installbuilder.version}
+ linux
+ tgz
+
+
+ com.bitnami
+ installbuilder
+ ${installer.installbuilder.version}
+ win
+ tgz
+
+
+
+
+ org.alfresco
+ manager
+ ${installer.manager.version}
+ linux
+ tgz
+
+
+ org.alfresco
+ manager
+ ${installer.manager.version}
+ win64
+ tgz
+
+
+
+
+
+
+ alfresco-internal
+ https://artifacts.alfresco.com/nexus/content/repositories/enterprise-releases
+
+
+ alfresco-internal-snapshots
+ https://artifacts.alfresco.com/nexus/content/repositories/internal-snapshots
+
+
+