Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 68782 invoked from network); 2 Dec 2008 14:20:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Dec 2008 14:20:45 -0000 Received: (qmail 88370 invoked by uid 500); 2 Dec 2008 14:20:57 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 88337 invoked by uid 500); 2 Dec 2008 14:20:57 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 88328 invoked by uid 99); 2 Dec 2008 14:20:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 06:20:57 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Dec 2008 14:19:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E99782388892; Tue, 2 Dec 2008 06:19:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r722464 [1/2] - in /incubator/sling/trunk: ./ extensions/jcrinstall/ extensions/jcrinstall/service/ extensions/jcrinstall/service/src/ extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ extensions/jcrinsta... Date: Tue, 02 Dec 2008 14:19:44 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081202141944.E99782388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Tue Dec 2 06:19:42 2008 New Revision: 722464 URL: http://svn.apache.org/viewvc?rev=722464&view=rev Log: SLING-734 - jcrinstall integration tests, main module moved to 'service' and 'testing' module created Added: incubator/sling/trunk/extensions/jcrinstall/service/ (with props) incubator/sling/trunk/extensions/jcrinstall/service/pom.xml (props changed) - copied unchanged from r722400, incubator/sling/trunk/extensions/jcrinstall/pom.xml incubator/sling/trunk/extensions/jcrinstall/service/src/ (props changed) - copied from r722400, incubator/sling/trunk/extensions/jcrinstall/src/ incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigInstallableData.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ConfigInstallableData.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileInstallableData.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileNodeConverter.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/RepositoryObserver.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/InstallableData.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/InstallableData.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiController.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiResourceProcessor.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/OsgiResourceProcessor.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessor.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/java/org/apache/sling/jcr/jcrinstall/osgi/impl/OsgiControllerImpl.java incubator/sling/trunk/extensions/jcrinstall/service/src/main/resources/OSGI-INF/ - copied from r722457, incubator/sling/trunk/extensions/jcrinstall/src/main/resources/OSGI-INF/ incubator/sling/trunk/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FindWatchedFoldersTest.java incubator/sling/trunk/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockRepositoryObserver.java incubator/sling/trunk/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockStartLevel.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/MockStartLevel.java incubator/sling/trunk/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/jcr/impl/ResourceDetectionTest.java incubator/sling/trunk/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessorTest.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/osgi/impl/BundleResourceProcessorTest.java incubator/sling/trunk/extensions/jcrinstall/service/src/test/java/org/apache/sling/jcr/jcrinstall/osgi/impl/MockInstallableData.java - copied unchanged from r722457, incubator/sling/trunk/extensions/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/osgi/impl/MockInstallableData.java incubator/sling/trunk/extensions/jcrinstall/testing/ (with props) incubator/sling/trunk/extensions/jcrinstall/testing/README.txt (with props) incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml (with props) incubator/sling/trunk/extensions/jcrinstall/testing/src/ incubator/sling/trunk/extensions/jcrinstall/testing/src/main/ incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/ incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/ incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/DISCLAIMER incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/LICENSE incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/NOTICE incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/web.xml (with props) incubator/sling/trunk/extensions/jcrinstall/testing/src/test/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/ incubator/sling/trunk/extensions/jcrinstall/testing/src/test/java/org/apache/sling/jcr/jcrinstall/integrationtest/HttpPingTest.java (with props) Removed: incubator/sling/trunk/extensions/jcrinstall/pom.xml incubator/sling/trunk/extensions/jcrinstall/service/src/main/java/org/apache/sling/jcr/jcrinstall/jcr/impl/FileDataProvider.java incubator/sling/trunk/extensions/jcrinstall/src/ Modified: incubator/sling/trunk/pom.xml Propchange: incubator/sling/trunk/extensions/jcrinstall/service/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Dec 2 06:19:42 2008 @@ -0,0 +1,12 @@ +target +bin +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml + Propchange: incubator/sling/trunk/extensions/jcrinstall/service/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/sling/trunk/extensions/jcrinstall/service/pom.xml ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: incubator/sling/trunk/extensions/jcrinstall/service/src/ ------------------------------------------------------------------------------ svn:mergeinfo = Propchange: incubator/sling/trunk/extensions/jcrinstall/testing/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Tue Dec 2 06:19:42 2008 @@ -0,0 +1,12 @@ +target +bin +derby.log +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml + Added: incubator/sling/trunk/extensions/jcrinstall/testing/README.txt URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/testing/README.txt?rev=722464&view=auto ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/testing/README.txt (added) +++ incubator/sling/trunk/extensions/jcrinstall/testing/README.txt Tue Dec 2 06:19:42 2008 @@ -0,0 +1,69 @@ +Apache Sling Jcrinstall Testing module + +This module builds a Sling webapp using bundles from the trunk, and +runs integration tests for the jcrinstall module. + +The web container setup and pom.xml are very similar to the +launchpad/testing setup. + +Disclaimer +========== +Apache Sling is an effort undergoing incubation at The Apache Software Foundation (ASF), +sponsored by the Apache Jackrabbit PMC. Incubation is required of all newly accepted +projects until a further review indicates that the infrastructure, communications, +and decision making process have stabilized in a manner consistent with other +successful ASF projects. While incubation status is not necessarily a reflection of +the completeness or stability of the code, it does indicate that the project has yet +to be fully endorsed by the ASF. + +Getting Started +=============== + +This component uses a Maven 2 (http://maven.apache.org/) build +environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/) +2.0.7 or later. We recommend to use the latest Maven version. + +If you have Maven 2 installed, you can compile and +package the jar using the following command: + + mvn package + +See the Maven 2 documentation for other build features. + +The latest source code for this component is available in the +Subversion (http://subversion.tigris.org/) source repository of +the Apache Software Foundation. If you have Subversion installed, +you can checkout the latest source using the following command: + + svn checkout http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/webapp + +See the Subversion documentation for other source control features. + +Integration tests +----------------- +This module provides a number of integration tests, that run automatically when +doing a full build, and test Sling via its client HTTP interfaces. + +These tests can also be run against another instance of Sling, for example to +test it in another web container than the embedded Jetty that is used during the +Maven build. + +See pom.xml for the parameters that control these integration tests. Here's an +example of running them against a Sling instance running on host xyzzy, port 1234, +with the Sling webapp mounted under /foo: + + mvn -o -s /dev/null test \ + -Dhttp.port=1234 \ + -Dtest.host=xyzzy \ + -Dhttp.base.path=foo \ + -Dwebdav.workspace.path=foo/dav/default \ + -Dtest=**/integrationtest/**/*Test.java + +The -s /dev/null parameter disables all your local Maven settings, to make sure +they don't interfere. Feel free to remove that if you know what you're doing. + +To run a single test, other values can be used for the "-Dtest" parameter. + +This is very useful during development: you can leave a Sling webapp instance +running, update bundles in it using the mvn autoInstallBundle profile, and run +specific integration tests quickly from another terminal. \ No newline at end of file Propchange: incubator/sling/trunk/extensions/jcrinstall/testing/README.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml?rev=722464&view=auto ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml (added) +++ incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml Tue Dec 2 06:19:42 2008 @@ -0,0 +1,664 @@ + + + + + 4.0.0 + + org.apache.sling + sling + 4-incubator-SNAPSHOT + ../../parent/pom.xml + + + org.apache.sling.jcr.jcrinstall.testing + war + 4-incubator-SNAPSHOT + + Sling - JCR OSGi Installer Integration Testing + + Integration tests for the jcrinstall module. + + + + scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/jcrinstall/testing + scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/jcrinstall/testing + http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/testing + + + + + 8888 + + + + + + + + + localhost + + + 0 + + + target/sling + + + + **/jcr/jcrinstall/integrationtest + + + + false + + + + + + + org.mortbay.jetty + maven-jetty-plugin + 6.1.5 + + / + + ${jetty.scan.interval.seconds} + + + + + sling.home + ${jetty.sling.home} + + + + + + ${http.port} + 60000 + + + + + + target/${artifactId}-${pom.version} + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + + unpack-dependencies + + unpack-dependencies + + + + org.apache.sling.launchpad.app,servlet + + true + + ${project.build.directory}/launchpad-app + + false + + true + + + + + + copy-bundles-dependencies + + copy-dependencies + + + + ${project.build.directory}/${project.build.finalName}/WEB-INF/resources/bundles + + true + + org.apache.felix,org.apache.sling,org.apache.jackrabbit + + + + org.apache.sling.launchpad.app,org.apache.sling.launchpad.base + + + provided + + + + + + + + + org.apache.maven.plugins + maven-war-plugin + + + + + + ${basedir}/target/launchpad-app + + WEB-INF/classes + + + org/apache/sling/launcher/app/main/** + + + resources/bundles/org.apache.sling** + + + resources/bundles/org.apache.felix.http.jetty*.jar + + + resources/bundles/pax-web-service*.jar + + + resources/bundles/org.apache.felix.commons.servlet-api*.jar + + + + org/** + resources/bundles/org.apache.felix** + + + + + + ${basedir}/target/launchpad-app + + WEB-INF + + resources/** + sling.properties + sling_install.properties + jre-*.properties + + + + resources/bundles/org.apache.sling** + + + resources/corebundles/org.apache.sling** + + + resources/bundles/org.apache.felix.http.jetty*.jar + + + resources/bundles/pax-web-service*.jar + + + resources/bundles/org.apache.felix.commons.servlet-api*.jar + + + + + + + ${basedir}/target/launchpad-app + + / + + WEB-INF/jcr-client.properties + + + + + ${basedir} + META-INF + + LICENSE* + NOTICE* + DISCLAIMER + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + launchpad.http.server.url + + http://${test.host}:${http.port}/${http.base.path} + + + + launchpad.webdav.server.url + + http://${test.host}:${http.port}/${webdav.workspace.path} + + + + + + + + maven-assembly-plugin + + + src/main/assembly/bin.xml + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + org.apache.sling + + + + + + + + + + cargoIntegrationTesting + + + !maven.test.skip + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + surefire-integration-test + integration-test + + test + + + + none + + + + ${integration.test.code.path}/**/*Test.java + + + + + + + launchpad.http.server.url + + + http://${test.host}:${http.port}/${project.build.finalName} + + + + + launchpad.webdav.server.url + + + http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path} + + + + + + + + + org.codehaus.cargo + cargo-maven2-plugin + 0.3.1 + + + start-container + pre-integration-test + + start + + + + stop-container + post-integration-test + + stop + + + + + ${integration.test.wait} + + jetty6x + embedded + + + ${basedir}/target/it/sling + + + + + + + ${http.port} + + + + + + + + + + + + disableIntegrationTestsInTestPhase + + + !maven.test.skip + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + ${integration.test.code.path}/**/*.java + + + + + + + + + + + + org.apache.sling + org.apache.sling.launchpad.base + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.commons.log + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.commons.json + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.api + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.engine + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.httpauth + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.adapter + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.servlets.resolver + 2.0.5-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.servlets.get + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.servlets.post + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.commons.osgi + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.commons.mime + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.api + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.base + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.resource + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.jackrabbit.api + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.jackrabbit.server + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.jackrabbit + jackrabbit-jcr-commons + provided + + + org.apache.sling + org.apache.sling.jcr.webdav + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.classloader + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.bundleresource.impl + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.commons.json + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.commons.testing + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.servlets.post + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.jcr.jcrinstall + 2.0.3-incubator-SNAPSHOT + provided + + + org.apache.sling + org.apache.sling.runmode + 2.0.3-incubator-SNAPSHOT + provided + + + + commons-io + commons-io + provided + + + commons-collections + commons-collections + provided + + + + org.apache.sling + org.apache.sling.launchpad.app + 4-incubator-SNAPSHOT + provided + + + + org.eclipse.equinox.http + servlet + provided + + + + junit + junit + test + + + commons-httpclient + commons-httpclient + test + + + org.slf4j + slf4j-log4j12 + test + + + org.slf4j + jcl-over-slf4j + test + + + + + javax.servlet + servlet-api + + + Propchange: incubator/sling/trunk/extensions/jcrinstall/testing/pom.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/DISCLAIMER URL: http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/DISCLAIMER?rev=722464&view=auto ============================================================================== --- incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/DISCLAIMER (added) +++ incubator/sling/trunk/extensions/jcrinstall/testing/src/main/webapp/WEB-INF/DISCLAIMER Tue Dec 2 06:19:42 2008 @@ -0,0 +1,7 @@ +Apache Sling is an effort undergoing incubation at The Apache Software Foundation (ASF), +sponsored by the Apache Jackrabbit PMC. Incubation is required of all newly accepted +projects until a further review indicates that the infrastructure, communications, +and decision making process have stabilized in a manner consistent with other +successful ASF projects. While incubation status is not necessarily a reflection of +the completeness or stability of the code, it does indicate that the project has yet +to be fully endorsed by the ASF. \ No newline at end of file