Merged WOLF-6 (WOLF.0.0) to 5.1.1 (5.1.1)

122643 mrogers: UTF-371 - Add AOS to the update package.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/services/full-installer/branches/5.1.1@123988 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

enterprise-update/assemblies/updateTool.xml

@@ -77,11 +77,22 @@
             <lineEnding>keep</lineEnding>
         </fileSet>
 		
+		<!-- AOS VTI.WAR -->
 		<fileSet>
-            <directory>${unpacked.alfresco.enterprise.distribution}/web-server/webapps</directory>
+            <directory>${unpacked.org.alfresco.aos.distribution}</directory>
             <outputDirectory>resources/war</outputDirectory>
             <includes>
-                <include>_vti_bin.war</include>
+                <include>*.war</include>
+            </includes>
+            <lineEnding>keep</lineEnding>
+        </fileSet>
+		
+		<!-- AOS AMP -->
+		<fileSet>
+            <directory>${unpacked.org.alfresco.aos.distribution}</directory>
+            <outputDirectory>resources/amp/platform</outputDirectory>
+            <includes>
+                <include>*.amp</include>
             </includes>
             <lineEnding>keep</lineEnding>
         </fileSet>

enterprise-update/pom.xml

@@ -16,7 +16,8 @@
 		<unpacked.alfresco.platform.distribution>${project.build.directory}/dependency/alfresco-platform-enterprise-distributionzip-${alfresco.platform.version}</unpacked.alfresco.platform.distribution>
 		<unpacked.alfresco.share.distribution>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</unpacked.alfresco.share.distribution>
 		<unpacked.alfresco.wcmqs.distribution>${project.build.directory}/dependency/wcmqs-${project.version}</unpacked.alfresco.wcmqs.distribution>
-		
+		<unpacked.org.alfresco.aos.distribution>${project.build.directory}/dependency/aos-${alfresco.aos-module.version}</unpacked.org.alfresco.aos.distribution>
+
 		<!-- e.g. pull the update scripts from src/main/resources/script/5.0 -->
 		<unpacked.update.script>${project.build.directory}/classes/script/${version.major}.${version.minor}</unpacked.update.script>
     </properties>
@@ -206,6 +207,26 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+					
+					<execution>
+                        <id>unpack-aos-distribution</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+								  <groupId>org.alfresco.aos-module</groupId>
+									<artifactId>alfresco-aos-module-distributionzip</artifactId>
+									<version>${alfresco.aos-module.version}</version>
+                                    <overWrite>true</overWrite>
+                                    <type>zip</type>
+									<outputDirectory>${unpacked.org.alfresco.aos.distribution}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>					
                 </executions>
             </plugin>
             

pom.xml

@@ -23,8 +23,8 @@
 
         <!-- Alfresco Update Tool version bundled in the update installer -->
         <alfresco.updatetool.version>1.0-SNAPSHOT</alfresco.updatetool.version>
-        
-        <!-- Alfresco Office Services Module -->
+		
+		<!-- Alfresco Office Services Module -->
         <alfresco.aos-module.version>1.1</alfresco.aos-module.version>
 
         <!-- Versions of binaries packaged in the installer -->