Skip to content

Commit

Permalink
ACE-777 Stop providing non-SSL versions of alfresco war files: it is …
Browse files Browse the repository at this point in the history 
…now useless

git-svn-id: https://svn.alfresco.com/repos/alfresco-open-mirror/web-apps/Share/trunk@109026 7033f55c-6c29-4ad8-afba-765cb616e738
  • Loading branch information
slanglois committed Jul 27, 2015
1 parent 017d2aa commit 63f34e7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 148 deletions.
76 changes: 0 additions & 76 deletions alfresco-enterprise/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,6 @@
<!-- Must be done before the replacer filter-copies web.xml into place -->
<phase>prepare-package</phase>
</execution>
<!-- Additional execution to generate a non-ssl war -->
<execution>
<id>nossl-war</id>
<goals>
<goal>war</goal>
</goals>
<configuration>
<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
<classifier>nossl</classifier>
</configuration>
</execution>
<execution>
<id>default-war</id>
<goals>
<goal>war</goal>
</goals>
<phase>package</phase>
<configuration>
<webappDirectory>${project.build.directory}/alfresco-ssl</webappDirectory>
</configuration>
</execution>
</executions>
</plugin>

Expand All @@ -139,61 +118,6 @@
</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>

<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<executions>
<!-- NonSSL war: Replaces web.xml where applicable, commenting out the security-constraints -->
<execution>
<id>disable-securecomms</id>
<phase>prepare-package</phase>
<goals>
<goal>replace</goal>
</goals>
<configuration>
<!--
After other replacements common to both SSL and non-SSL web.xml have taken
place, perform replacements specific to non-SSL version.
-->
<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>
</execution>
</executions>
</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
72 changes: 0 additions & 72 deletions alfresco/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-platform</artifactId>
<version>${alfresco.platform.version}</version>
<!-- <classifier>nossl</classifier> -->
<type>war</type>
<scope>runtime</scope>
</dependency>
Expand All @@ -47,7 +46,6 @@
<overlay>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-platform</artifactId>
<!-- <classifier>nossl</classifier> -->
<excludes/>
</overlay>
<overlay>
Expand All @@ -66,77 +64,7 @@
</goals>
<phase>generate-resources</phase>
</execution>
<!-- Additional execution to generate a non-ssl war -->
<execution>
<id>nossl-war</id>
<goals>
<goal>war</goal>
</goals>
<configuration>
<classifier>nossl</classifier>
</configuration>
</execution>
<execution>
<id>default-war</id>
<goals>
<goal>war</goal>
</goals>
<configuration>
<webappDirectory>${project.build.directory}/${project.build.finalName}-ssl</webappDirectory>
</configuration>
</execution>
</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>

<!--
Expand Down

0 comments on commit 63f34e7

Please sign in to comment.