From 9c4adc5dd62722ce6984173f45854a7c7170ccf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Lo=CC=88fgren?= <peter@loftux.se>
Date: Mon, 20 Oct 2014 15:29:40 +0200
Subject: [PATCH 1/2] Adding non filtered files -jar  to allow jar files to be
 added in src/main/amp/lib -font files if used in custom themes

---
 poms/alfresco-sdk-parent/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 9ed22c56..af7129e4 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -201,6 +201,7 @@
               <nonFilteredFileExtension>jpg</nonFilteredFileExtension>
               <nonFilteredFileExtension>png</nonFilteredFileExtension>
               <nonFilteredFileExtension>gif</nonFilteredFileExtension>
+              <nonFilteredFileExtension>svg</nonFilteredFileExtension>
               <nonFilteredFileExtension>pdf</nonFilteredFileExtension>
               <nonFilteredFileExtension>doc</nonFilteredFileExtension>
               <nonFilteredFileExtension>docx</nonFilteredFileExtension>
@@ -213,6 +214,11 @@
               <nonFilteredFileExtension>swf</nonFilteredFileExtension>
               <nonFilteredFileExtension>zip</nonFilteredFileExtension>
               <nonFilteredFileExtension>msg</nonFilteredFileExtension>
+              <nonFilteredFileExtension>jar</nonFilteredFileExtension>
+              <nonFilteredFileExtension>ttf</nonFilteredFileExtension>
+              <nonFilteredFileExtension>eot</nonFilteredFileExtension>
+              <nonFilteredFileExtension>woff</nonFilteredFileExtension>
+              <nonFilteredFileExtension>woff2</nonFilteredFileExtension>
             </nonFilteredFileExtensions>
           </configuration>
         </plugin>

From 154da687950282b33731c82588cfb080f545c6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Lo=CC=88fgren?= <peter@loftux.se>
Date: Mon, 27 Oct 2014 16:59:51 +0100
Subject: [PATCH 2/2] Add support for upgrade scripts for H2 Upgrades may or
 may not work (determined by my own experience). The failure seen was due to
 an activiti patch in 5.0.b, this patch is changes so if using later version
 of Alfresco the upgrades work. There is however no guarantee that it will
 work in the future, but I think it is worth to have support, because if it
 works, you avoid having to recreate test data when upgrading alfresco
 version.

Since I couldn't find a good way to use wildcard copy for the upgrade scripts copying, it does have the version numbers included in path. So whenever Alfresco determines that it is time for a new folder for later version, this has to be added.
---
 poms/alfresco-sdk-parent/pom.xml | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index af7129e4..3673db2e 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -887,7 +887,7 @@
                                         <groupId>${alfresco.groupId}</groupId>
                                         <artifactId>alfresco-repository</artifactId>
                                         <version>${alfresco.version}</version>
-                                        <includes>alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/*</includes>
+                                        <includes>alfresco/dbscripts/create/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/dbscripts/upgrade/*/org.hibernate.dialect.PostgreSQLDialect/*,alfresco/ibatis/org.hibernate.dialect.PostgreSQLDialect/*</includes>
                                         <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
                                     </artifactItem>
                                 </artifactItems>
@@ -921,6 +921,28 @@
                                         </includes>
                                         <targetPath>alfresco/ibatis//org.hibernate.dialect.H2Dialect</targetPath>
                                     </resource>
+                                    <!-- Upgrade scripts -->
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/upgrade/4.1/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/upgrade/4.2/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
+                                    <resource>
+                                        <directory>${project.build.testOutputDirectory}/alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.PostgreSQLDialect</directory>
+                                        <includes>
+                                            <include>*</include>
+                                        </includes>
+                                        <targetPath>alfresco/dbscripts/upgrade/5.0/org.hibernate.dialect.H2Dialect</targetPath>
+                                    </resource>
                                 </resources>
                             </configuration>
                         </execution>