Commit 6c3977a5 authored by mindthegab's avatar mindthegab
Browse files

fixed all-in-one run, disabled testing in amp-to-war 

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@717 04253f4f-3451-0410-a141-5562f1e59037
parent 38fd25b3

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/pom.xml

+58 −0
Original line number Diff line number Diff line
@@ -84,4 +84,62 @@ 
            </plugin>

        </plugins>

    </build>

    <profiles>

        <!-- Overrides the run profile to disable securecomms -->

        <profile>

            <id>run</id>

            <build>

                <plugins>

                    <plugin>

                        <artifactId>maven-war-plugin</artifactId>

                        <executions>

                            <execution>

                                <id>prepare-exploded-war</id>

                                <goals>

                                    <goal>exploded</goal>

                                </goals>

                                <phase>prepare-package</phase>

                            </execution>

                            <execution>

                                <id>default-war</id>

                                <configuration>

                                    <webXml>${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/web.xml</webXml>

                                </configuration>

                            </execution>

                        </executions>

                    </plugin>

                    <!-- 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>

                            <ignoreErrors>true</ignoreErrors>

                            <file>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</file>

                            <outputDir>${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/</outputDir>

                            <preserveDir>false</preserveDir>

                            <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>

                </plugins>

            </build>

        </profile>

    </profiles>

</project>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/alfresco/src/main/webapp/WEB-INF/web.xml

deleted100644 → 0
+0 −911

File deleted.

Preview size limit exceeded, changes collapsed.

poms/alfresco-sdk-parent/pom.xml

+30 −4
Original line number Diff line number Diff line
@@ -419,7 +419,8 @@ 
                <phase>process-test-resources</phase>

                <goals><goal>copy-resources</goal></goals>

                <configuration>

                  <outputDirectory>${app.amp.test.output.folder}</outputDirectory>

                  <!-- <outputDirectory>${app.amp.test.output.folder}</outputDirectory> -->

                 <outputDirectory>${project.build.testOutputDirectory}</outputDirectory>

                  <resources>

                    <resource>

                      <directory>${app.amp.folder}/config</directory>
@@ -444,13 +445,18 @@ 
                  <argLine>${app.testing.jvm.args}</argLine>

                  <additionalClasspathElements>

                      <!-- Adds the previously built ${app.amp.test.output.folder} to test classpath to enable module installation at test time -->

                      <additionalClasspathElement>${app.amp.test.output.folder}</additionalClasspathElement>

                      <!-- <additionalClasspathElement>${app.amp.test.output.folder}</additionalClasspathElement> -->

                  </additionalClasspathElements>

              </configuration>

            </plugin>

        </plugins>

      </build>

      <dependencies>

          <dependency>

              <artifactId>junit-remote</artifactId>

              <groupId>com.tradeshift</groupId>

              <version>3</version>

          </dependency>

          <!-- SDK AMP Testing Dependencies -->

          <dependency>

            <groupId>com.h2database</groupId>
@@ -468,7 +474,8 @@ 
            <groupId>org.springframework</groupId>

            <artifactId>spring-test</artifactId>

            <version>3.0.5.RELEASE</version>

            <scope>test</scope>

            <!-- To make remote testing working -->

            <!--             <scope>test</scope> -->

          </dependency>

          <!-- Requires this explicit test dependency, for a Spring 3.0.5 bug 

          |    See https://jira.springsource.org/browse/SPR-8527
@@ -499,6 +506,9 @@ 
    <!-- Enable AMP project packing on a WAR and run embedded in Tomcat -->

    <profile>

      <id>amp-to-war</id>

      <properties>

        <skipTests>true</skipTests>

      </properties>

      <build>

        <plugins>

          <!-- Fetch and unpack Alfresco Repository / Share in the target / folder -->
@@ -550,7 +560,7 @@ 
                </configuration>

              </execution>

              <execution>

                <id>copy-tomcat-context</id>

                <id>copy-tomcat-resources</id>

                <phase>prepare-package</phase>

                <goals><goal>copy-resources</goal></goals>

                <configuration>
@@ -560,12 +570,28 @@ 
                      <directory>tomcat</directory>

                      <filtering>${app.filtering.enabled}</filtering>

                      <targetPath>WEB-INF</targetPath>

                      <includes>

                        <include>context.xml</include>

                      </includes>

                    </resource>

                    <resource>

                      <directory>tomcat</directory>

                      <filtering>${app.filtering.enabled}</filtering>

                      <targetPath>WEB-INF/classes/alfresco/extension</targetPath>

                      <includes>

                        <include>rad-context.xml</include>

                      </includes>

                    </resource>

                    <resource>

                      <directory>src/test/properties/${env}</directory>

                      <filtering>${app.filtering.enabled}</filtering>

                      <targetPath>WEB-INF/classes</targetPath>

                    </resource>

                    <resource>

                      <directory>${project.build.testOutputDirectory}</directory>

                      <filtering>${app.filtering.enabled}</filtering>

                      <targetPath>WEB-INF/classes</targetPath>

                    </resource>

                  </resources>

                </configuration>

              </execution>