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

121560 mrogers: Merged 5.0.N (5.0.4) to WOLF-6 (WOLF.0.0)
      121460 mrogers: UTF-375 - added awe.war and also simplified update build to use the wqs distribution package


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

enterprise-update/assemblies/updateTool.xml

@@ -113,8 +113,32 @@
             </includes>
             <lineEnding>keep</lineEnding>
         </fileSet>
-        
-        
+		
+		<!-- WQS Assets -->
+		<fileSet>
+            <directory>${unpacked.alfresco.wcmqs.distribution}</directory>
+            <outputDirectory>resources/amp/platform</outputDirectory>
+            <includes>
+                <include>alfresco-wcmqs.amp</include>
+            </includes>
+        </fileSet>
+		
+		<fileSet>
+            <directory>${unpacked.alfresco.wcmqs.distribution}</directory>
+            <outputDirectory>resources/amp/share</outputDirectory>
+            <includes>
+                <include>alfresco-wcmqs-share.amp</include>
+            </includes>
+        </fileSet>
+		
+		<fileSet>
+            <directory>${unpacked.alfresco.wcmqs.distribution}</directory>
+            <outputDirectory>resources/war</outputDirectory>
+            <includes>
+                <include>*.war</include>
+            </includes>
+        </fileSet>
+		
     </fileSets>
     
 
@@ -179,28 +203,7 @@
             <includes>
                 <include>org.alfresco.integrations:alfresco-googledocs-share:amp:enterprise:*</include>
             </includes>
-        </dependencySet>
-        
-        <!-- WQS Platform AMP-->
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <useStrictFiltering>true</useStrictFiltering>
-            <outputDirectory>resources/amp/platform</outputDirectory>
-            <includes>
-                <include>org.alfresco:alfresco-wcmqs:amp:*</include>
-            </includes>   
-        </dependencySet>
-       
-        <!-- WQS Share AMP-->
-        <dependencySet>
-            <useProjectArtifact>false</useProjectArtifact>
-            <useStrictFiltering>true</useStrictFiltering>
-            <outputDirectory>resources/amp/share</outputDirectory>
-            <includes>
-                <include>org.alfresco:alfresco-wcmqs-share:amp:*</include>
-            </includes>
-        </dependencySet>
-        
+        </dependencySet>       
         
     </dependencySets>
     

enterprise-update/pom.xml

@@ -15,6 +15,7 @@
         <unpacked.update.tool>${project.build.directory}/dependency/alfresco-update-tool-distribution-${alfresco.updatetool.version}</unpacked.update.tool>
 		<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>
 		
 		<!-- 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>
@@ -69,20 +70,11 @@
             <type>amp</type>
         </dependency>
         
-        <!--  wcmqs platform amp -->
         <dependency>
             <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-wcmqs</artifactId>
+            <artifactId>alfresco-wcmqs-distribution</artifactId>
             <version>${alfresco.share.version}</version>
-            <type>amp</type>
-        </dependency>
-        
-        <!-- wcmqs share amp -->
-        <dependency>
-            <groupId>org.alfresco</groupId>
-            <artifactId>alfresco-wcmqs-share</artifactId>
-            <version>${alfresco.share.version}</version>
-            <type>amp</type>
+            <type>zip</type>
         </dependency>
 		
 		<!-- Update Tool distribution package -->
@@ -142,6 +134,24 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
+				    <execution>
+                        <id>unpack-wcmqs-distribution</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.alfresco</groupId>
+                                    <artifactId>alfresco-wcmqs-distribution</artifactId>
+                                    <version>${alfresco.share.version}</version>
+                                    <type>zip</type>
+                                    <outputDirectory>${unpacked.alfresco.wcmqs.distribution}</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>unpack-update-tool-distribution</id>
                         <phase>generate-resources</phase>