incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r633492 - in /incubator/sling/trunk/launchpad/launchpad-webapp: pom.xml src/main/webapp/WEB-INF/jcr-client.properties
Date Tue, 04 Mar 2008 14:39:11 GMT
Author: fmeschbe
Date: Tue Mar  4 06:39:09 2008
New Revision: 633492

URL: http://svn.apache.org/viewvc?rev=633492&view=rev
Log:
SLING-189 Remove dependency on launcher/webapp and directly use launchpad/app;
clean up dependencies leaving only those required for testing.

Added:
    incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/jcr-client.properties
Modified:
    incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml

Modified: incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml?rev=633492&r1=633491&r2=633492&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/pom.xml Tue Mar  4 06:39:09 2008
@@ -1,397 +1,465 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.sling</groupId>
-    <artifactId>sling</artifactId>
-    <version>1-incubator-SNAPSHOT</version>
-    <relativePath>../../parent/pom.xml</relativePath>
-  </parent>
-
-  <artifactId>org.apache.sling.launchpad.webapp</artifactId>
-  <packaging>war</packaging>
-  <version>2.0.0-incubator-SNAPSHOT</version>
-
-  <name>Sling Launchpad Web Application</name>
-  <description>
-    The launchpad webapp packages the standard launchpad components in a Sling web application. See SLING-149.
-  </description>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/launchpad-webapp</connection>
-    <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/launchpad-webapp
-    </developerConnection>
-    <url>http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp</url>
-  </scm>
-
-  <properties>
-    <!--
-      Jetty default port (override with -D)
-    -->
-    <http.port>8888</http.port>
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
     
-    <!-- path suffix for WebDAV access to the repository -->
-    <webdav.workspace.path>dav/default</webdav.workspace.path>
+    http://www.apache.org/licenses/LICENSE-2.0
     
-    <!-- hostname for integration tests -->
-    <test.host>localhost</test.host>
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>sling</artifactId>
+        <version>1-incubator-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.apache.sling.launchpad.webapp</artifactId>
+    <packaging>war</packaging>
+    <version>2.0.0-incubator-SNAPSHOT</version>
+
+    <name>Sling Launchpad Web Application</name>
+    <description>
+        The launchpad webapp packages the standard launchpad components
+        in a Sling web application. See SLING-149.
+    </description>
+
+    <scm>
+        <connection>
+            scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/launchpad-webapp
+        </connection>
+        <developerConnection>
+            scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/launchpad-webapp
+        </developerConnection>
+        <url>
+            http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp
+        </url>
+    </scm>
+
+    <properties>
+        <!--
+            Jetty default port (override with -D)
+        -->
+        <http.port>8888</http.port>
 
-    <!--
-      Disable Jetty webapp rescan (override with -D) 
-    -->
-    <jetty.scan.interval.seconds>0</jetty.scan.interval.seconds>
-    
-    <!-- 
-      Sling home directory when starting with jetty:run
-     -->
-    <jetty.sling.home>target/sling</jetty.sling.home>
-    
-    <!-- 
-      Defines which tests are for the "integration-testing" phase
-     -->
-    <integration.test.code.path>**/launchpad/webapp/integrationtest</integration.test.code.path>
-    
-    <!-- 
-      Set this to true to stop mvn once the integration test Jetty instance is
-      started. Useful to manually test the integration testing webapp.
-     -->
-     <integration.test.wait>false</integration.test.wait>
-  </properties>
-
-  <build>
-    <plugins>
-
-      <plugin>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>maven-jetty-plugin</artifactId>
-        <version>6.1.5</version>
-        <configuration>
-          <contextPath>/</contextPath>
-          <scanIntervalSeconds>${jetty.scan.interval.seconds}</scanIntervalSeconds>
-          
-          <systemProperties>
-            <systemProperty>
-              <name>sling.home</name>
-              <value>${jetty.sling.home}</value>
-            </systemProperty>
-          </systemProperties>
-
-          <connectors>
-            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-              <port>${http.port}</port>
-              <maxIdleTime>60000</maxIdleTime>
-            </connector>
-          </connectors>
-
-          <!-- 
-            Use target/... as the webapp source, as we unpack stuff there from the
-            Sling launcher modules
-          -->
-          <webAppSourceDirectory>target/${artifactId}-${pom.version}</webAppSourceDirectory>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <!-- Unpack the sling-webapp launcher for inclusion in the web app -->
-            <id>unpack-dependencies</id>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeArtifactIds>org.apache.sling.launcher.webapp,servlet</includeArtifactIds>
-              <excludeTransitive>true</excludeTransitive>
-              <outputDirectory>${project.build.directory}/launcher-webapp</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-            </configuration>
-          </execution>
-          <execution>
-            <!-- Copy bundles that must be initially installed to WEB-INF/resources/bundles -->
-            <id>copy-dependencies</id>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                ${project.build.directory}/${project.build.finalName}/WEB-INF/resources/bundles
-              </outputDirectory>
-              <excludeTransitive>true</excludeTransitive>
-              <includeGroupIds>org.apache.felix,org.apache.sling,org.apache.jackrabbit</includeGroupIds>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Include sling-webapp launcher classes and resources -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <webResources>
-            <!-- the classes (except unneeded Main) -->
-            <resource>
-              <directory>${basedir}/target/launcher-webapp</directory>
-              <targetPath>WEB-INF/classes</targetPath>
-              <excludes>
-                <exclude>org/apache/sling/launcher/app/main/**</exclude>
-                <exclude>resources/bundles/org.apache.felix.http.jetty*.jar</exclude>
-                <exclude>resources/bundles/org.apache.felix.commons.servlet-api*.jar</exclude>
-              </excludes>
-              <includes>
-                <include>org/**</include>
-              </includes>
-            </resource>
-            <!-- the configuration resources -->
-            <resource>
-              <directory>${basedir}/target/launcher-webapp</directory>
-              <targetPath>WEB-INF</targetPath>
-              <includes>
-                <include>resources/**</include>
-                <include>sling.properties</include>
-                <include>sling_install.properties</include>
-                <include>jre-*.properties</include>
-              </includes>
-              <excludes>
-                <exclude>resources/bundles/org.apache.felix.http.jetty*.jar</exclude>
-                <exclude>resources/bundles/org.apache.felix.commons.servlet-api*.jar</exclude>
-              </excludes>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemProperties>
-            <!-- 
-              WARNING: make sure these URLs are consistent with the
-              cargo-maven2-plugin settings: AFAIK Maven does not
-              expand variables in the <value> element.
-              And WARNING: these properties are duplicated somewhere in this
-              POM with slightly different values...there must be a better way. 
-            -->
-            <property>
-              <name>launchpad.http.server.url</name>
-              <value>http://${test.host}:${http.port}</value>
-            </property>
-            <property>
-              <name>launchpad.webdav.server.url</name>
-              <value>http://${test.host}:${http.port}/${webdav.workspace.path}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-      
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <!--
-        Run the cargo-based integration tests.
-      -->
-      <id>cargoIntegrationTesting</id>
-      <activation>
-        <property>
-          <name>!maven.test.skip</name>
-        </property>
-      </activation>
-      <build>
+        <!-- path suffix for WebDAV access to the repository -->
+        <webdav.workspace.path>dav/default</webdav.workspace.path>
+
+        <!-- hostname for integration tests -->
+        <test.host>localhost</test.host>
+
+        <!--
+            Disable Jetty webapp rescan (override with -D) 
+        -->
+        <jetty.scan.interval.seconds>0</jetty.scan.interval.seconds>
+
+        <!-- 
+            Sling home directory when starting with jetty:run
+        -->
+        <jetty.sling.home>target/sling</jetty.sling.home>
+
+        <!-- 
+            Defines which tests are for the "integration-testing" phase
+        -->
+        <integration.test.code.path>
+            **/launchpad/webapp/integrationtest
+        </integration.test.code.path>
+
+        <!-- 
+            Set this to true to stop mvn once the integration test Jetty instance is
+            started. Useful to manually test the integration testing webapp.
+        -->
+        <integration.test.wait>false</integration.test.wait>
+    </properties>
+
+    <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>surefire-integration-test</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>test</goal>
-                </goals>
+
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.5</version>
                 <configuration>
-                  <excludes>
-                    <exclude>none</exclude>
-                  </excludes>
-                  <includes>
-                    <include>${integration.test.code.path}/**/*Test.java</include>
-                  </includes>
-                  <systemProperties>
+                    <contextPath>/</contextPath>
+                    <scanIntervalSeconds>
+                        ${jetty.scan.interval.seconds}
+                    </scanIntervalSeconds>
+
+                    <systemProperties>
+                        <systemProperty>
+                            <name>sling.home</name>
+                            <value>${jetty.sling.home}</value>
+                        </systemProperty>
+                    </systemProperties>
+
+                    <connectors>
+                        <connector
+                            implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                            <port>${http.port}</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+
                     <!-- 
-                      WARNING: make sure these URLs are consistent with the
-                      cargo-maven2-plugin settings: AFAIK Maven does not
-                      expand variables in the <value> element.
-                      And WARNING: these properties are duplicated somewhere in this
-                      POM with slightly different values...there must be a better way. 
+                        Use target/... as the webapp source, as we unpack stuff there from the
+                        Sling launcher modules
                     -->
-                    <property>
-                      <name>launchpad.http.server.url</name>
-                      <value>http://${test.host}:${http.port}/${project.build.finalName}</value>
-                    </property>
-                    <property>
-                      <name>launchpad.webdav.server.url</name>
-                      <value>http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path}</value>
-                    </property>
-                  </systemProperties>
+                    <webAppSourceDirectory>
+                        target/${artifactId}-${pom.version}
+                    </webAppSourceDirectory>
                 </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.cargo</groupId>
-            <artifactId>cargo-maven2-plugin</artifactId>
-            <version>0.3.1</version>
-            <executions>
-              <execution>
-                <id>start-container</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>start</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>stop-container</id>
-                <phase>post-integration-test</phase>
-                <goals>
-                  <goal>stop</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <wait>${integration.test.wait}</wait>
-              <container>
-                <containerId>jetty6x</containerId>
-                <type>embedded</type>
-                <systemProperties>
-                    <sling.home>${basedir}/target/it/sling</sling.home>
-                </systemProperties>
-              </container>
-              <configuration>
-              <properties>
-                <cargo.servlet.port>${http.port}</cargo.servlet.port>
-                <!-- 
-                <cargo.jvmargs>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y</cargo.jvmargs>
-                 -->
-              </properties>
-              </configuration>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <!--
-        By default, do not run the integration tests in the test phase, as they have
-        no Sling instance to talk to.
-        
-        To run integration tests against a running instance of Sling (useful to quickly
-        run some of them) use for example:
-        
-            mvn test -Dtest=**/integrationtest/**/*Test.java
-           
-        or
-        
-           mvn test -Dtest=IncludeTest   
-      -->
-      <id>disableIntegrationTestsInTestPhase</id>
-      <activation>
-        <property>
-          <name>!maven.test.skip</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>${integration.test.code.path}/**/*.java</exclude>
-              </excludes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+            </plugin>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <scope>compile</scope>
-    </dependency>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <!-- Unpack the sling-app launcher for inclusion in the web app -->
+                        <id>unpack-dependencies</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeArtifactIds>
+                                org.apache.sling.launchpad.app,servlet
+                            </includeArtifactIds>
+                            <excludeTransitive>true</excludeTransitive>
+                            <outputDirectory>
+                                ${project.build.directory}/launchpad-app
+                            </outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>
+                                true
+                            </overWriteSnapshots>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <!-- Copy bundles that must be initially installed to WEB-INF/resources/bundles -->
+                        <id>copy-dependencies</id>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/${project.build.finalName}/WEB-INF/resources/bundles
+                            </outputDirectory>
+                            <excludeTransitive>true</excludeTransitive>
+                            <includeGroupIds>
+                                org.apache.felix,org.apache.sling,org.apache.jackrabbit
+                            </includeGroupIds>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- Include sling-webapp launcher classes and resources -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <!-- the classes (except unneeded Main) -->
+                        <resource>
+                            <directory>
+                                ${basedir}/target/launchpad-app
+                            </directory>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <excludes>
+                                <exclude>
+                                    org/apache/sling/launcher/app/main/**
+                                </exclude>
+                                <exclude>
+                                    resources/bundles/org.apache.felix.http.jetty*.jar
+                                </exclude>
+                                <exclude>
+                                    resources/bundles/pax-web-service*.jar
+                                </exclude>
+                                <exclude>
+                                    resources/bundles/org.apache.felix.commons.servlet-api*.jar
+                                </exclude>
+                            </excludes>
+                            <includes>
+                                <include>org/**</include>
+                            </includes>
+                        </resource>
+                        <!-- the configuration resources -->
+                        <resource>
+                            <directory>
+                                ${basedir}/target/launchpad-app
+                            </directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <includes>
+                                <include>resources/**</include>
+                                <include>sling.properties</include>
+                                <include>
+                                    sling_install.properties
+                                </include>
+                                <include>jre-*.properties</include>
+                            </includes>
+                            <excludes>
+                                <exclude>
+                                    resources/bundles/org.apache.felix.http.jetty*.jar
+                                </exclude>
+                                <exclude>
+                                    resources/bundles/pax-web-service*.jar
+                                </exclude>
+                                <exclude>
+                                    resources/bundles/org.apache.felix.commons.servlet-api*.jar
+                                </exclude>
+                            </excludes>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
 
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.launcher.webapp</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.equinox.http</groupId>
-      <artifactId>servlet</artifactId>
-      <version>1.0.0-v20070606</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.3</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-      <version>3.1</version>
-      <scope>test</scope>
-      <exclusions>
-        <!-- 
-          Same problem as JCR-683: commons-httpclient depends on commons-logging. Since 
-          this webapp uses log4j (see the slf4j-log4j12 dependency below), we need to
-          override this dependency with jcl104-over-sflf4j, found below
-        -->
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>    
-    </dependency>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                        <!-- 
+                            WARNING: make sure these URLs are consistent with the
+                            cargo-maven2-plugin settings: AFAIK Maven does not
+                            expand variables in the <value> element.
+                            And WARNING: these properties are duplicated somewhere in this
+                            POM with slightly different values...there must be a better way. 
+                        -->
+                        <property>
+                            <name>launchpad.http.server.url</name>
+                            <value>
+                                http://${test.host}:${http.port}
+                            </value>
+                        </property>
+                        <property>
+                            <name>launchpad.webdav.server.url</name>
+                            <value>
+                                http://${test.host}:${http.port}/${webdav.workspace.path}
+                            </value>
+                        </property>
+                    </systemProperties>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <!--
+                Run the cargo-based integration tests.
+            -->
+            <id>cargoIntegrationTesting</id>
+            <activation>
+                <property>
+                    <name>!maven.test.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>surefire-integration-test</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>none</exclude>
+                                    </excludes>
+                                    <includes>
+                                        <include>
+                                            ${integration.test.code.path}/**/*Test.java
+                                        </include>
+                                    </includes>
+                                    <systemProperties>
+                                        <!-- 
+                                            WARNING: make sure these URLs are consistent with the
+                                            cargo-maven2-plugin settings: AFAIK Maven does not
+                                            expand variables in the <value> element.
+                                            And WARNING: these properties are duplicated somewhere in this
+                                            POM with slightly different values...there must be a better way. 
+                                        -->
+                                        <property>
+                                            <name>
+                                                launchpad.http.server.url
+                                            </name>
+                                            <value>
+                                                http://${test.host}:${http.port}/${project.build.finalName}
+                                            </value>
+                                        </property>
+                                        <property>
+                                            <name>
+                                                launchpad.webdav.server.url
+                                            </name>
+                                            <value>
+                                                http://${test.host}:${http.port}/${project.build.finalName}/${webdav.workspace.path}
+                                            </value>
+                                        </property>
+                                    </systemProperties>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.cargo</groupId>
+                        <artifactId>cargo-maven2-plugin</artifactId>
+                        <version>0.3.1</version>
+                        <executions>
+                            <execution>
+                                <id>start-container</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <execution>
+                                <id>stop-container</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <wait>${integration.test.wait}</wait>
+                            <container>
+                                <containerId>jetty6x</containerId>
+                                <type>embedded</type>
+                                <systemProperties>
+                                    <sling.home>
+                                        ${basedir}/target/it/sling
+                                    </sling.home>
+                                </systemProperties>
+                            </container>
+                            <configuration>
+                                <properties>
+                                    <cargo.servlet.port>
+                                        ${http.port}
+                                    </cargo.servlet.port>
+                                    <!-- 
+                                        <cargo.jvmargs>-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=30333,server=y,suspend=y</cargo.jvmargs>
+                                    -->
+                                </properties>
+                            </configuration>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <!--
+                By default, do not run the integration tests in the test phase, as they have
+                no Sling instance to talk to.
+                
+                To run integration tests against a running instance of Sling (useful to quickly
+                run some of them) use for example:
+                
+                mvn test -Dtest=**/integrationtest/**/*Test.java
+                
+                or
+                
+                mvn test -Dtest=IncludeTest   
+            -->
+            <id>disableIntegrationTestsInTestPhase</id>
+            <activation>
+                <property>
+                    <name>!maven.test.skip</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>
+                                    ${integration.test.code.path}/**/*.java
+                                </exclude>
+                            </excludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.app</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.eclipse.equinox.http</groupId>
+            <artifactId>servlet</artifactId>
+            <version>1.0.0-v20070606</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.3</version>
+            <scope>test</scope>
+        </dependency>
+ 
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.ujax</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>
+                org.apache.sling.scripting.javascript
+            </artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+            <scope>test</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+            <scope>test</scope>
+            <exclusions>
+                <!-- 
+                    Same problem as JCR-683: commons-httpclient depends on commons-logging. Since 
+                    this webapp uses log4j (see the slf4j-log4j12 dependency below), we need to
+                    override this dependency with jcl104-over-sflf4j, found below
+                -->
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -404,218 +472,13 @@
       <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
-    
-
-    <!-- The servlet container will have to provide these API classes -->
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.ujax</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.servlets.default</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.launchpad.content</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.api</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.core</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.adapter</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.mime</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.commons.json</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.api</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.base</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.resource</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.classloader</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.servlet.resolver</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.scripting.api</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.scripting.resolver</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.scripting.javascript</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.scripting.jsp</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.scripting.jsp.taglib</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.jackrabbit.server</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.webdav</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.jcr.ocm</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.osgi.commons</artifactId>
-      <version>2.0.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-jcr-commons</artifactId>
-      <version>1.5-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    
-    <!--
-      Commons Dependencies provided by the Apache Felix project
-    -->
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-io</artifactId>
-      <version>1.3.2-0002-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
 
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-fileupload</artifactId>
-      <version>1.1.1-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
 
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-collections</artifactId>
-      <version>3.2.0-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
+        <!-- The servlet container will have to provide these API classes -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
 
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-beanutils</artifactId>
-      <version>1.7.0-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-codec</artifactId>
-      <version>1.3.0-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.jsp-api</artifactId>
-      <version>2.0.0-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-el</artifactId>
-      <version>1.0.0-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.cglib-full</artifactId>
-      <version>2.0.2-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.felix.commons</groupId>
-      <artifactId>org.apache.felix.commons.commons-httpclient</artifactId>
-      <version>3.0.1-0001-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    
-  </dependencies>
+    </dependencies>
 </project>

Added: incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/jcr-client.properties
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/jcr-client.properties?rev=633492&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/jcr-client.properties (added)
+++ incubator/sling/trunk/launchpad/launchpad-webapp/src/main/webapp/WEB-INF/jcr-client.properties Tue Mar  4 06:39:09 2008
@@ -0,0 +1,34 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
+#
+# The JCR API packages for boot delegation
+sling.bootdelegation.class.javax.jcr.Repository = \
+ javax.jcr, \
+ javax.jcr.lock, \
+ javax.jcr.nodetype, \
+ javax.jcr.observation, \
+ javax.jcr.query, \
+ javax.jcr.util, \
+ javax.jcr.version
+ 
+#
+# The Jackrabbit API packages for boot delegation
+sling.bootdelegation.class.org.apache.jackrabbit.api.JackrabbitRepository = \
+ org.apache.jackrabbit.api



Mime
View raw message