Skip to content

Commit

Permalink
Merged HEAD-BUG-FIX (5.1/Cloud) to trunk (5.1/Cloud)
Browse files Browse the repository at this point in the history 
   104620: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      104163: RA-237: fix SSL alfresco community (alfresco.war) to include share services amp.


git-svn-id: https://svn.alfresco.com/repos/alfresco-open-mirror/web-apps/Share/trunk@104683 7033f55c-6c29-4ad8-afba-765cb616e738
  • Loading branch information
adavis committed May 20, 2015
1 parent 62f4b1e commit 3e3fcec
Showing 1 changed file with 52 additions and 31 deletions.
83 changes: 52 additions & 31 deletions alfresco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<goal>war</goal>
</goals>
<configuration>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
<classifier>nossl</classifier>
</configuration>
</execution>
Expand All @@ -69,42 +68,13 @@
<goals>
<goal>war</goal>
</goals>
<phase>package</phase>
<configuration>
<webappDirectory>${project.build.directory}/alfresco-ssl</webappDirectory>
<webappDirectory>${project.build.directory}/${project.build.finalName}-ssl</webappDirectory>
</configuration>
</execution>
</executions>
</plugin>

<!-- NonSSL war: Replaces web.xml where applicable, commenting out the security-constraints -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<execution>
<id>disable-securecomms</id>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</file>
<replacements>
<replacement>
<token><![CDATA[<!-- Toggle securecomms placeholder start -->]]></token>
<value><![CDATA[<!-- ]]></value>
</replacement>
<replacement>
<token><![CDATA[<!-- Toggle securecomms placeholder end -->]]></token>
<value><![CDATA[--> ]]></value>
</replacement>
</replacements>
</configuration>
</plugin>

<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
Expand Down Expand Up @@ -151,6 +121,57 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-webapp-for-ssl</id>
<goals>
<goal>copy-resources</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<outputDirectory>${project.build.directory}/${project.build.finalName}-ssl</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/${project.build.finalName}</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>

<!-- NonSSL war: Replaces web.xml where applicable, commenting out the security-constraints -->
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<execution>
<id>disable-securecomms</id>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<file>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</file>
<replacements>
<replacement>
<token><![CDATA[<!-- Toggle securecomms placeholder start -->]]></token>
<value><![CDATA[<!-- ]]></value>
</replacement>
<replacement>
<token><![CDATA[<!-- Toggle securecomms placeholder end -->]]></token>
<value><![CDATA[--> ]]></value>
</replacement>
</replacements>
</configuration>
</plugin>

<!--
Configure the Tomcat plugin. Keeping the configuration separate from the 'run' profile,
allows explicit running of tomcat, e.g: mvn tomcat7:run-war-only
Expand Down

0 comments on commit 3e3fcec

Please sign in to comment.