incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r765224 - in /incubator/sling/trunk: ./ launchpad/test-services/ launchpad/test-services/src/ launchpad/test-services/src/main/ launchpad/test-services/src/main/java/ launchpad/test-services/src/main/java/org/ launchpad/test-services/src/ma...
Date Wed, 15 Apr 2009 15:00:13 GMT
Author: bdelacretaz
Date: Wed Apr 15 15:00:12 2009
New Revision: 765224

URL: http://svn.apache.org/viewvc?rev=765224&view=rev
Log:
SLING-923 - Servlet resolution examples and integration tests, work in progress

Added:
    incubator/sling/trunk/launchpad/test-services/   (with props)
    incubator/sling/trunk/launchpad/test-services/pom.xml   (with props)
    incubator/sling/trunk/launchpad/test-services/src/
    incubator/sling/trunk/launchpad/test-services/src/main/
    incubator/sling/trunk/launchpad/test-services/src/main/java/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
  (with props)
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
  (with props)
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
  (with props)
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
  (with props)
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
  (with props)
    incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java
  (with props)
Modified:
    incubator/sling/trunk/launchpad/testing/pom.xml
    incubator/sling/trunk/pom.xml

Propchange: incubator/sling/trunk/launchpad/test-services/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 15 15:00:12 2009
@@ -0,0 +1,16 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+cachedir
+

Added: incubator/sling/trunk/launchpad/test-services/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/pom.xml?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/pom.xml (added)
+++ incubator/sling/trunk/launchpad/test-services/pom.xml Wed Apr 15 15:00:12 2009
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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>5-incubator-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.apache.sling.launchpad.test-services</artifactId>
+    <packaging>bundle</packaging>
+    <version>2.0.3-incubator-SNAPSHOT</version>
+
+    <name>Apache Sling Launchpad Testing Services</name>
+    <description>
+        Sling services used by the Launchpad Testing integration tests
+    </description>
+
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/test-services</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/launchpad/test-services</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services</url>
+    </scm>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Private-Package>
+                            org.apache.sling.launchpad.testservices.*
+                        </Private-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.api</artifactId>
+            <version>2.0.3-incubator-SNAPSHOT</version>
+        </dependency>
+        <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.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: incubator/sling/trunk/launchpad/test-services/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
(added)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
Wed Apr 15 15:00:12 2009
@@ -0,0 +1,39 @@
+package org.apache.sling.launchpad.testservices.servlets;
+
+/*
+ * 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.
+ */
+
+/** Example/test Sling Servlet registered with two extensions
+ * 
+ * @scr.component immediate="true" metatype="no"
+ * @scr.service interface="javax.servlet.Servlet"
+ * 
+ * @scr.property name="service.description" value="Default Query Servlet"
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * 
+ * Register this servlet for the default resource type and two selectors:
+ * @scr.property name="sling.servlet.resourceTypes"
+ *               value="sling/servlet/default"
+ *               
+ * @scr.property name="sling.servlet.extensions"
+ *               values.1 = "TEST_EXT_1"
+ *               values.2 = "TEST_EXT_2" 
+ */
+
+@SuppressWarnings("serial")
+public class ExtensionServlet extends TestServlet {  
+}
\ No newline at end of file

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
(added)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
Wed Apr 15 15:00:12 2009
@@ -0,0 +1,39 @@
+package org.apache.sling.launchpad.testservices.servlets;
+
+/*
+ * 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.
+ */
+
+/** Example/test Sling Servlet using a prefix to demonstrate how
+ *  PrefixServletZero overrides PrefixServletMinusOne
+ * 
+ * @scr.component immediate="true" metatype="no"
+ * @scr.service interface="javax.servlet.Servlet"
+ * 
+ * @scr.property name="service.description" value="Default Query Servlet"
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * 
+ * @scr.property name="sling.servlet.prefix"
+ *               value="-1"
+ * @scr.property name="sling.servlet.resourceTypes"
+ *               value="sling/servlet/default"
+ * @scr.property name="sling.servlet.extensions"
+ *               value="TEST_EXT_3"
+ */
+
+@SuppressWarnings("serial")
+public class PrefixServletMinusOne extends TestServlet {  
+}
\ No newline at end of file

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
(added)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
Wed Apr 15 15:00:12 2009
@@ -0,0 +1,39 @@
+package org.apache.sling.launchpad.testservices.servlets;
+
+/*
+ * 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.
+ */
+
+/** Example/test Sling Servlet using a prefix to demonstrate how
+ *  PrefixServletZero overrides PrefixServletMinusOne
+ * 
+ * @scr.component immediate="true" metatype="no"
+ * @scr.service interface="javax.servlet.Servlet"
+ * 
+ * @scr.property name="service.description" value="Default Query Servlet"
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * 
+ * @scr.property name="sling.servlet.prefix"
+ *               value="0"
+ * @scr.property name="sling.servlet.resourceTypes"
+ *               value="sling/servlet/default"
+ * @scr.property name="sling.servlet.extensions"
+ *               value="TEST_EXT_3"
+ */
+
+@SuppressWarnings("serial")
+public class PrefixServletZero extends TestServlet {  
+}
\ No newline at end of file

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
(added)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
Wed Apr 15 15:00:12 2009
@@ -0,0 +1,51 @@
+package org.apache.sling.launchpad.testservices.servlets;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+
+/*
+ * 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.
+ */
+
+/** Example/test Sling Servlet registered for the PUT method
+ *  on a specific resource type
+ * 
+ * @scr.component immediate="true" metatype="no"
+ * @scr.service interface="javax.servlet.Servlet"
+ * 
+ * @scr.property name="service.description" value="Default Query Servlet"
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * 
+ * @scr.property name="sling.servlet.resourceTypes"
+ *               value="TEST_HeadMethodServlet"
+ *               
+ * @scr.property name="sling.servlet.methods"
+ *               value = "PUT"
+*/
+
+@SuppressWarnings("serial")
+public class PutMethodServlet extends TestServlet {
+
+  @Override
+  protected void doPut(SlingHttpServletRequest request, SlingHttpServletResponse response)

+  throws ServletException, IOException {
+    dumpRequestAsProperties(request, response);
+  }
+}
\ No newline at end of file

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
(added)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
Wed Apr 15 15:00:12 2009
@@ -0,0 +1,42 @@
+package org.apache.sling.launchpad.testservices.servlets;
+
+/*
+ * 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.
+ */
+
+/** Example/test Sling Servlet registered with two selectors
+ * 
+ * @scr.component immediate="true" metatype="no"
+ * @scr.service interface="javax.servlet.Servlet"
+ * 
+ * @scr.property name="service.description" value="Default Query Servlet"
+ * @scr.property name="service.vendor" value="The Apache Software Foundation"
+ * 
+ * Register this servlet for the default resource type and two selectors:
+ * @scr.property name="sling.servlet.resourceTypes"
+ *               value="sling/servlet/default"
+ *               
+ * @scr.property name="sling.servlet.selectors"
+ *               values.1 = "TEST_SEL_1"
+ *               values.2 = "TEST_SEL_2"
+ *                
+ * @scr.property name="sling.servlet.extensions"
+ *               value = "txt"
+*/
+
+@SuppressWarnings("serial")
+public class SelectorServlet extends TestServlet {  
+}
\ No newline at end of file

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Added: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java?rev=765224&view=auto
==============================================================================
--- incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java
(added)
+++ incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java
Wed Apr 15 15:00:12 2009
@@ -0,0 +1,60 @@
+/*
+ * 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.
+ */
+package org.apache.sling.launchpad.testservices.servlets;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.Properties;
+
+import javax.servlet.ServletException;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+
+/** Base class for test servlets - GET displays easy to parse information 
+ *  about the servlet and resource
+ */
+@SuppressWarnings("serial")
+class TestServlet extends SlingAllMethodsServlet {
+
+  @Override
+  protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response)

+  throws ServletException, IOException {
+    dumpRequestAsProperties(request, response);
+  }
+  
+  protected void dumpRequestAsProperties(SlingHttpServletRequest request, SlingHttpServletResponse
response) throws IOException {
+    final Properties props = new Properties();
+    response.setContentType("text/plain");
+    props.put("servlet.class.name", getClass().getName());
+    
+    final Resource r = request.getResource();
+    props.put("sling.resource.path", r == null ? "" : r.getPath());
+    props.put("sling.resource.type", r == null ? "" : r.getResourceType());
+    props.put("http.request.method", request.getMethod());
+    
+    setCustomProperties(props);
+    props.store(response.getOutputStream(), "Data created by " + getClass().getName() + "
at " + new Date());
+    response.getOutputStream().flush();
+  }
+  
+  /** Hook for additional custom properties */
+  void setCustomProperties(Properties props) {
+  }
+}

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/TestServlet.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Modified: incubator/sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/testing/pom.xml?rev=765224&r1=765223&r2=765224&view=diff
==============================================================================
--- incubator/sling/trunk/launchpad/testing/pom.xml (original)
+++ incubator/sling/trunk/launchpad/testing/pom.xml Wed Apr 15 15:00:12 2009
@@ -207,7 +207,7 @@
 
                     <execution>
                         <!-- 
-                        	Copy bundles that must be initially installed to
+                        	Copy additional bundles that must be initially installed to
                             WEB-INF/resources/bundles/N where N = desired
                             start level 
                         -->
@@ -221,7 +221,7 @@
                             </outputDirectory>
                             <excludeTransitive>true</excludeTransitive>
                             <includeArtifactIds>
-                                org.apache.sling.scripting.python
+                                org.apache.sling.launchpad.test-services
                             </includeArtifactIds>
                             <includeScope>
                                 provided
@@ -501,6 +501,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.launchpad.test-services</artifactId>
+            <version>2.0.3-incubator-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <version>1.5.2</version>

Modified: incubator/sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=765224&r1=765223&r2=765224&view=diff
==============================================================================
--- incubator/sling/trunk/pom.xml (original)
+++ incubator/sling/trunk/pom.xml Wed Apr 15 15:00:12 2009
@@ -153,6 +153,7 @@
             </activation>
             <modules>
                 <module>launchpad/testing</module>
+                <module>launchpad/test-services</module>
             </modules>
         </profile>
       <!-- Profile for including samples -->



Mime
View raw message