BDE-400: Updated naming convention after feedback from Richard.

- Fixed alfresco-share-services.amp distribution
- Added new string for install dir (For some reason it doesn’t work on windows yet)


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

distribution/src/assembly/full-distribution.xml

@@ -40,16 +40,10 @@
             <outputDirectory/>
             <includes>
                 <include>web-server/**</include>
-                <include>modules/**</include>
+		<include>modules/**</include>
+		<include>amps/**</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}</directory>
-            <includes>
-                <include>*.amp</include>
-            </includes>
-            <outputDirectory>amps</outputDirectory>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/dependency/alfresco-share-distribution-${alfresco.share.version}/web-extension-samples</directory>
             <outputDirectory>web-server/shared/classes/alfresco/web-extension</outputDirectory>

enterprise-installer/pom.xml

@@ -23,6 +23,7 @@
            project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 
            project.windowsSigningPkcs12Password=${p12Password} 
            alfresco_edition=enterprise 
+           alfresco_package='${alfresco.package.name}' 
            alfrescogoogledocs_component_enabled=1 
            alfrescosharepoint_component_enabled=0 
            alfrescosolr_component_enabled=1 

installer/pom.xml

@@ -23,6 +23,7 @@
            project.windowsSigningPkcs12File=${signing.key.location}/Alfresco-Software-Ltd.p12 
            project.windowsSigningPkcs12Password=${p12Password} 
            alfresco_edition=community 
+           alfresco_package='${alfresco.package.name}' 
            project.outputDirectory=${project.build.directory} 
         </bitrock.arguments>
     </properties>

pom.xml

@@ -42,9 +42,9 @@
 
         <!-- 
             Build number (Default value is used unless overridden by command line)
-            Default value: SNAPSHOT
+            Default value: SNAPSHOT-0
         -->
-        <installer.build.number>SNAPSHOT</installer.build.number>
+        <installer.build.number>SNAPSHOT-0</installer.build.number>
 
         <!-- 
             Installer version that will be used in the final name.