Author: bdelacretaz
Date: Mon Apr 6 13:59:00 2009
New Revision: 762344
URL: http://svn.apache.org/viewvc?rev=762344&view=rev
Log:
SLING-860 - added the apt and path-based.rtp bundle dependencies, tests pass now
Modified:
incubator/sling/trunk/contrib/launchpad/testing/README.txt
incubator/sling/trunk/contrib/launchpad/testing/pom.xml
Modified: incubator/sling/trunk/contrib/launchpad/testing/README.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing/README.txt?rev=762344&r1=762343&r2=762344&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/launchpad/testing/README.txt (original)
+++ incubator/sling/trunk/contrib/launchpad/testing/README.txt Mon Apr 6
13:59:00 2009
@@ -39,10 +39,8 @@
See the Subversion documentation for other source control features.
-How to run this
----------------
- NOTE: "mvn clean" does not delete the "sling" work directory - make sure to
- delete it manually if you want to start from a clean state.
+How to run these tests
+----------------------
1) Build all Sling bundles
@@ -51,21 +49,12 @@
2) Build and run this
- cd launchpad/testing
- mvn clean package jetty:run
+ cd contrib/launchpad/testing
+ mvn clean install
-Once the webapp starts, http://localhost:8888/system/console should display
the Felix
-OSGi console.
-
-4) Test node creation and display
-To create a node with curl:
-
- curl -D - -Ftitle=something
http://admin:ad...@localhost:8888/testing/this
-
-Then, http://admin:ad...@localhost:8888/testing/this should display a default
HTML
-representation, including the value of the "title" property.
-
-Add a txt or json extension to see other output formats.
+This might required building a few other Sling bundles, from the contrib
+and samples code trees. We'll need to improve this, but right now there's no
+common pom to build all what's required for these contrib integration tests.
Integration tests
-----------------
Modified: incubator/sling/trunk/contrib/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/launchpad/testing/pom.xml?rev=762344&r1=762343&r2=762344&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/contrib/launchpad/testing/pom.xml Mon Apr 6 13:59:00
2009
@@ -235,7 +235,7 @@
</outputDirectory>
<excludeTransitive>true</excludeTransitive>
<includeArtifactIds>
-
org.apache.sling.scripting.python,org.apache.sling.scripting.xproc
+
org.apache.sling.scripting.python,org.apache.sling.scripting.xproc,org.apache.sling.extensions.apt.parser,org.apache.sling.extensions.apt.servlet,org.apache.sling.samples.path-based.rtp
</includeArtifactIds>
<includeScope>
provided
@@ -662,6 +662,24 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.extensions.apt.servlet</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.extensions.apt.parser</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling.samples</groupId>
+ <artifactId>org.apache.sling.samples.path-based.rtp</artifactId>
+ <version>2.0.3-incubator-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.servlets.post</artifactId>
<version>2.0.2-incubator</version>
<scope>test</scope>