Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

99607: Merged DEV to HEAD-BUG-FIX (5.1) - separating Share from Repo
      98570: RA-11: remove slingshot project, fix up poms.
        Temporary fix included: removed antrun execution of fetch-slingshot-messages in projects/web-client/pom.xml - this allows a full build in the main code base, with e.g. mvn clean install -Penterprise,solr-http
      98616: RA-11: Removed share-po from main code-base.
      98747: RA-8 Remove Share Enterprise - moved into its own space


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100473 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-03-27 22:42:19 +00:00
parent 37501be12a
commit eb647cb49e

23
pom.xml
View File

@@ -245,27 +245,8 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>fetch-slingshot-messages</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<copy todir="${project.build.outputDirectory}/alfresco/messages" overwrite="true">
<!-- for activity messages based on activity type -->
<fileset dir="${basedir}/../slingshot/config/alfresco/site-webscripts/org/alfresco/components/dashlets" includes="activity-list.get*.properties" />
<!-- note: remove ".get" since it seems to confuse java.util.ResourceBundle.getBundle -->
<mapper type="regexp" from="^(activity-list).get(.*\.properties)$$" to="\1\2" />
</copy>
<copy todir="${project.build.outputDirectory}/alfresco/messages" overwrite="true">
<!-- for role.* messages -->
<fileset dir="${basedir}/../slingshot/config/alfresco/messages" includes="slingshot*.properties" />
</copy>
</target>
</configuration>
</execution>
<!-- TODO: Airwolf temp... removing fetch-slingshot-messages. Does this move to the cloud build? -->
<!-- ACE-2318 Bring alfresco-jmxrmi.* from repository -->
<execution>
<id>fetch-jmxrmi-properties</id>