You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2011/09/20 08:10:40 UTC
svn commit: r1172987 - in /sling/trunk: ./ bundles/servlets/compat/
bundles/servlets/compat/src/ bundles/servlets/compat/src/main/
bundles/servlets/compat/src/main/java/
bundles/servlets/compat/src/main/java/org/
bundles/servlets/compat/src/main/java/o...
Author: cziegeler
Date: Tue Sep 20 06:10:40 2011
New Revision: 1172987
URL: http://svn.apache.org/viewvc?rev=1172987&view=rev
Log:
SLING-2226 : Move json query servlet to a new compat bundle
Added:
sling/trunk/bundles/servlets/compat/ (with props)
sling/trunk/bundles/servlets/compat/README.txt (with props)
sling/trunk/bundles/servlets/compat/pom.xml (with props)
sling/trunk/bundles/servlets/compat/src/
sling/trunk/bundles/servlets/compat/src/main/
sling/trunk/bundles/servlets/compat/src/main/java/
sling/trunk/bundles/servlets/compat/src/main/java/org/
sling/trunk/bundles/servlets/compat/src/main/java/org/apache/
sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/
sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/
sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/
sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/
sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java (contents, props changed)
- copied, changed from r1172585, sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/JsonQueryServlet.java
Removed:
sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/JsonQueryServlet.java
Modified:
sling/trunk/bundles/servlets/get/pom.xml
sling/trunk/pom.xml
Propchange: sling/trunk/bundles/servlets/compat/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Sep 20 06:10:40 2011
@@ -0,0 +1 @@
+target
Added: sling/trunk/bundles/servlets/compat/README.txt
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/compat/README.txt?rev=1172987&view=auto
==============================================================================
--- sling/trunk/bundles/servlets/compat/README.txt (added)
+++ sling/trunk/bundles/servlets/compat/README.txt Tue Sep 20 06:10:40 2011
@@ -0,0 +1,27 @@
+Apache Sling Compat Servlets
+
+Provides functionality which has been removed from the GET servlets module.
+
+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/sling/trunk/scripting/servlets/compat
+
+See the Subversion documentation for other source control features.
+
Propchange: sling/trunk/bundles/servlets/compat/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/bundles/servlets/compat/README.txt
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/bundles/servlets/compat/README.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: sling/trunk/bundles/servlets/compat/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/compat/pom.xml?rev=1172987&view=auto
==============================================================================
--- sling/trunk/bundles/servlets/compat/pom.xml (added)
+++ sling/trunk/bundles/servlets/compat/pom.xml Tue Sep 20 06:10:40 2011
@@ -0,0 +1,108 @@
+<?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>12</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.servlets.compat</artifactId>
+ <packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
+ <name>Apache Sling Compat Servlets</name>
+ <description>
+ Provides functionality which has been removed from the GET servlets module.
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/compat</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/servlets/compat</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/compat</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.servlets.compat.*
+ </Private-Package>
+ <Embed-Dependency>
+ org.apache.sling.servlets.get;inline="org/apache/sling/servlets/get/impl/helpers/JsonResourceWriter.*"
+ </Embed-Dependency>
+ </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.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.json</artifactId>
+ <version>2.0.6</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.servlets.get</artifactId>
+ <version>2.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: sling/trunk/bundles/servlets/compat/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/bundles/servlets/compat/pom.xml
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: sling/trunk/bundles/servlets/compat/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java (from r1172585, sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/JsonQueryServlet.java)
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java?p2=sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java&p1=sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/JsonQueryServlet.java&r1=1172585&r2=1172987&rev=1172987&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/JsonQueryServlet.java (original)
+++ sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java Tue Sep 20 06:10:40 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.servlets.get.impl;
+package org.apache.sling.servlets.compat.impl;
import java.io.IOException;
import java.util.ArrayList;
Propchange: sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Propchange: sling/trunk/bundles/servlets/compat/src/main/java/org/apache/sling/servlets/compat/impl/JsonQueryServlet.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: sling/trunk/bundles/servlets/get/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/pom.xml?rev=1172987&r1=1172986&r2=1172987&view=diff
==============================================================================
--- sling/trunk/bundles/servlets/get/pom.xml (original)
+++ sling/trunk/bundles/servlets/get/pom.xml Tue Sep 20 06:10:40 2011
@@ -81,21 +81,19 @@
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.0.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.0.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.4-incubator</version>
+ <version>2.0.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
- <version>2.0.4-incubator</version>
+ <version>2.0.6</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1172987&r1=1172986&r2=1172987&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Tue Sep 20 06:10:40 2011
@@ -143,6 +143,7 @@
<module>bundles/servlets/resolver</module>
<module>bundles/servlets/get</module>
<module>bundles/servlets/post</module>
+ <module>bundles/servlets/compat</module>
<!-- Scripting Support -->
<module>bundles/scripting/api</module>