incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r823470 - in /sling/trunk/contrib/launchpad/testing: pom.xml src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/
Date Fri, 09 Oct 2009 09:09:13 GMT
Author: bdelacretaz
Date: Fri Oct  9 09:09:13 2009
New Revision: 823470

URL: http://svn.apache.org/viewvc?rev=823470&view=rev
Log:
SLING-1141 - remove old jcrinstall codebase

Removed:
    sling/trunk/contrib/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/jcrinstall/
Modified:
    sling/trunk/contrib/launchpad/testing/pom.xml

Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=823470&r1=823469&r2=823470&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Fri Oct  9 09:09:13 2009
@@ -88,41 +88,8 @@
         -->
         <integration.test.wait>false</integration.test.wait>
         
-        <!--
-            Defines the part of the tree, which must not be compiled in
-            normal test scenarios. The jcrinstall-tests profile will
-            compile these classes to be included in a full-test scenario. 
-        -->
-        <jcrinstall.integration.test.code.path>
-            **/jcrinstall/**
-        </jcrinstall.integration.test.code.path>
-
         <resources.bundles.path>${project.build.directory}/launchpad-bundles/resources/bundles</resources.bundles.path>
-        
-        <!--
-            Start levels - Sling stuff start level must be >= jcrinstall level,
-            and both must be < default bundles start level 
-         -->
-        <jcrinstall.start.level>15</jcrinstall.start.level>
         <sling.modules.start.level>15</sling.modules.start.level>
-        
-        <!--
-            Where to copy our test bundles
-            Used when profile jcrinstall-tests is active.
-         -->
-        <sling.testbundles.path>${resources.bundles.path}/${jcrinstall.start.level}</sling.testbundles.path>
-        
-        <!--
-            Can be used to run tests with more or less bundles
-            Used when profile jcrinstall-tests is active
-         -->
-        <sling.test.scale.factor>1</sling.test.scale.factor>
-        
-        <!--
-             How long to wait for the expected number of bundles to be active, in tests
-            Used when profile jcrinstall-tests is active
-         -->
-        <sling.test.bundles.wait.seconds>20</sling.test.bundles.wait.seconds>
     </properties>
 
     <build>
@@ -258,25 +225,6 @@
                 </executions>
             </plugin>
 
-            <!--
-                Exclude the JCRInstall test classes from default build
-                See jcrinstall-tests for the setup of compilation of these
-                classes for a full test
-            -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <sumpf>gurk</sumpf>
-                    <testExcludes>
-                        <testExclude>
-                            ${jcrinstall.integration.test.code.path}
-                        </testExclude>
-                    </testExcludes>
-                    <verbose>true</verbose>
-                </configuration>
-            </plugin>
-
             <!-- 
               Include sling-app launcher classes and resources, but no Sling 
               bundles (we want to specify our own versions) 
@@ -330,20 +278,6 @@
                                 http://${test.host}:${http.port}/${webdav.workspace.path}
                             </value>
                         </property>
-                        
-                        <!-- system properties used for profile jcrinstall-tests -->
-                        <property>
-                            <name>sling.testbundles.path</name>
-                            <value>${sling.testbundles.path}</value>
-                        </property>
-                        <property>
-                            <name>sling.test.scale.factor</name>
-                            <value>${sling.test.scale.factor}</value>
-                        </property>
-                        <property>
-                            <name>sling.test.bundles.wait.seconds</name>
-                            <value>${sling.test.bundles.wait.seconds}</value>
-                        </property>
                     </systemProperties>
                 </configuration>
             </plugin>
@@ -449,20 +383,6 @@
                                                 http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path}
                                             </value>
                                         </property>
-                                        
-                                        <!-- system properties used for profile jcrinstall-tests
-->
-                                        <property>
-                                            <name>sling.testbundles.path</name>
-                                            <value>${sling.testbundles.path}</value>
-                                        </property>
-                                        <property>
-                                            <name>sling.test.scale.factor</name>
-                                            <value>${sling.test.scale.factor}</value>
-                                        </property>
-                                        <property>
-                                            <name>sling.test.bundles.wait.seconds</name>
-                                            <value>${sling.test.bundles.wait.seconds}</value>
-                                        </property>
                                     </systemProperties>
                                 </configuration>
                             </execution>
@@ -543,102 +463,6 @@
                 </plugins>
             </build>
         </profile>
-        
-        <!--
-            The jcrinstall-tests profile includes the integration tests
-            for the JCRInstall functionality in the integration tests. By
-            default this profile is disabled.
-            For CI builds it is recommended to activate this profile, for
-            normal builds you may omit this profile 
-        -->
-        <profile>
-            <id>jcrinstall-tests</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>copy-jcrinstall-dependencies</id>
-                                <goals>
-                                    <goal>copy-dependencies</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>
-                                        ${resources.bundles.path}/${jcrinstall.start.level}
-                                    </outputDirectory>
-                                    <excludeTransitive>true</excludeTransitive>
-                                    <includeArtifactIds>
-                                        org.apache.sling.jcr.jcrinstall,org.apache.sling.jcr.jcrinstall.testbundles.observer,org.apache.sling.jcr.jcrinstall.servlet,org.apache.sling.runmode,org.apache.sling.osgi.installer
-                                    </includeArtifactIds>
-                                </configuration>
-                            </execution>
-                       </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>compile-jcrinstall-tests</id>
-                                <goals>
-                                    <goal>testCompile</goal>
-                                </goals>
-                                <configuration>
-                                    <testIncludes>
-                                        <testInclude>
-                                            ${jcrinstall.integration.test.code.path}
-                                        </testInclude>
-                                    </testIncludes>
-                                    <!-- overwrite global setting here -->
-                                    <testExcludes>
-                                        <testExclude>
-                                            dummymarker
-                                        </testExclude>
-                                    </testExcludes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.sling</groupId>
-                    <artifactId>org.apache.sling.jcr.jcrinstall</artifactId>
-                    <version>2.0.3-SNAPSHOT</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.sling</groupId>
-                    <artifactId>org.apache.sling.osgi.installer</artifactId>
-                    <version>2.0.3-SNAPSHOT</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.sling</groupId>
-                    <artifactId>org.apache.sling.jcr.jcrinstall.testbundles.observer</artifactId>
-                    <version>2.0.3-SNAPSHOT</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.sling</groupId>
-                    <artifactId>org.apache.sling.jcr.jcrinstall.servlet</artifactId>
-                    <version>2.0.3-SNAPSHOT</version>
-                    <scope>provided</scope>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.sling</groupId>
-                    <artifactId>org.apache.sling.runmode</artifactId>
-                    <version>2.0.3-SNAPSHOT</version>
-                    <scope>provided</scope>
-                </dependency>
-            </dependencies>
-        </profile>
     </profiles>
 
     <dependencies>



Mime
View raw message