Author: cziegeler
Date: Mon Jun 16 02:09:19 2008
New Revision: 668084
URL: http://svn.apache.org/viewvc?rev=668084&view=rev
Log:
Define all versions in the parent pom, update jcrapp notice and readme and fix
svn reverence in app, webapp.
Added:
incubator/sling/trunk/launchpad/jcrapp/README.txt (with props)
Removed:
incubator/sling/trunk/launchpad/jcrapp/DISCLAIMER
Modified:
incubator/sling/trunk/launchpad/app/README.txt
incubator/sling/trunk/launchpad/app/pom.xml
incubator/sling/trunk/launchpad/jcrapp/NOTICE
incubator/sling/trunk/launchpad/jcrapp/pom.xml
incubator/sling/trunk/launchpad/webapp/README.txt
incubator/sling/trunk/parent/pom.xml
Modified: incubator/sling/trunk/launchpad/app/README.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/README.txt?rev=668084&r1=668083&r2=668084&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/README.txt (original)
+++ incubator/sling/trunk/launchpad/app/README.txt Mon Jun 16 02:09:19 2008
@@ -32,7 +32,7 @@
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/base
+ svn checkout
http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/app
See the Subversion documentation for other source control features.
Modified: incubator/sling/trunk/launchpad/app/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/app/pom.xml?rev=668084&r1=668083&r2=668084&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/app/pom.xml (original)
+++ incubator/sling/trunk/launchpad/app/pom.xml Mon Jun 16 02:09:19 2008
@@ -257,7 +257,6 @@
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-service</artifactId>
- <version>0.2.3</version>
<optional>true</optional>
</dependency>
Modified: incubator/sling/trunk/launchpad/jcrapp/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/jcrapp/NOTICE?rev=668084&r1=668083&r2=668084&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/NOTICE (original)
+++ incubator/sling/trunk/launchpad/jcrapp/NOTICE Mon Jun 16 02:09:19 2008
@@ -6,43 +6,4 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-==============================================================
- Jetty Web Container
- Copyright 1995-2006 Mort Bay Consulting Pty Ltd
-==============================================================
-
-The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd
-unless otherwise noted. It is licensed under the apache 2.0
-license.
-
-The javax.servlet package used by Jetty is copyright
-Sun Microsystems, Inc and Apache Software Foundation. It is
-distributed under the Common Development and Distribution License.
-You can obtain a copy of the license at
-https://glassfish.dev.java.net/public/CDDLv1.0.html.
-
-The UnixCrypt.java code ~Implements the one way cryptography used by
-Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
-modified April 2001 by Iris Van den Broeke, Daniel Deville.
-Permission to use, copy, modify and distribute UnixCrypt
-for non-commercial or commercial purposes and without fee is
-granted provided that the copyright notice appears in all copies.
-
-The default JSP implementation is provided by the Glassfish JSP engine
-from project Glassfish http://glassfish.dev.java.net. Copyright 2005
-Sun Microsystems, Inc. and portions Copyright Apache Software Foundation.
-
-Some portions of the code are Copyright:
- 2006 Tim Vernum
- 1999 Jason Gilbert.
-
-The jboss integration module contains some LGPL code.
-
-
-
-TODO TODO TODO TODO
- Check all dependencies
-TODO TODO TODO TODO
\ No newline at end of file
Added: incubator/sling/trunk/launchpad/jcrapp/README.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/jcrapp/README.txt?rev=668084&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/README.txt (added)
+++ incubator/sling/trunk/launchpad/jcrapp/README.txt Mon Jun 16 02:09:19 2008
@@ -0,0 +1,104 @@
+Apache Sling Launchpad JCR App
+
+Standalone Sling JCR Server launching the embedded Jackrabbit Repository.
+Note, that this is not the full Sling Application but just the bundles
+needed to start the Jackrabbit Repository. For the full Sling
+Application look at the Launchpad Application or Launpad Web
+Application.
+
+
+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/jcrapp
+
+See the Subversion documentation for other source control features.
+
+
+
+How to run this
+---------------
+
+1) Build all Sling bundles
+
+ cd <top of the Sling source code tree>
+ mvn clean install
+
+2) Build the launchpad servlets
+
+ cd launchpad/launchpad-servlets
+ mvn clean install
+ cd -
+
+3) Build and run this
+
+ cd launchpad/launchpad-webapp
+ mvn clean package jetty:run
+
+Once the webapp starts, http://localhost:8888/sling should display the Sling
+web console.
+
+4) Test node creation and display
+To create a node with curl:
+
+ curl -D - -Ftitle=something http://admin:[EMAIL
PROTECTED]:8888/testing/this
+
+Then, http://admin:[EMAIL PROTECTED]: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.
+
+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.
Propchange: incubator/sling/trunk/launchpad/jcrapp/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/sling/trunk/launchpad/jcrapp/README.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/sling/trunk/launchpad/jcrapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/jcrapp/pom.xml?rev=668084&r1=668083&r2=668084&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/jcrapp/pom.xml (original)
+++ incubator/sling/trunk/launchpad/jcrapp/pom.xml Mon Jun 16 02:09:19 2008
@@ -144,7 +144,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>1.0.0</version>
<optional>true</optional>
</dependency>
@@ -169,7 +168,6 @@
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-service</artifactId>
- <version>0.2.3</version>
<optional>true</optional>
</dependency>
Modified: incubator/sling/trunk/launchpad/webapp/README.txt
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/README.txt?rev=668084&r1=668083&r2=668084&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/webapp/README.txt (original)
+++ incubator/sling/trunk/launchpad/webapp/README.txt Mon Jun 16 02:09:19 2008
@@ -35,7 +35,7 @@
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/base
+ svn checkout
http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/webapp
See the Subversion documentation for other source control features.
Modified: incubator/sling/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/parent/pom.xml?rev=668084&r1=668083&r2=668084&view=diff
==============================================================================
--- incubator/sling/trunk/parent/pom.xml (original)
+++ incubator/sling/trunk/parent/pom.xml Mon Jun 16 02:09:19 2008
@@ -685,6 +685,13 @@
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
+
+ <!-- HttpService implementation: embedded Jetty -->
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-service</artifactId>
+ <version>0.2.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>
