From commitsjoseph67@example.org Wed Sep 01 08:38:14 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 3063 invoked from network); 1 Sep 2010 08:38:14 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:38:14 -0000 Received: (qmail 46146 invoked by uid 500); 1 Sep 2010 08:38:14 -0000 Delivered-To: joseph67@example.org Received: (qmail 46086 invoked by uid 500); 1 Sep 2010 08:38:12 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 46078 invoked by uid 99); 1 Sep 2010 08:38:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:38:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:38:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9114B23889D7; Wed, 1 Sep 2010 08:36:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991466 - in /sling/trunk/bundles/commons/threads: NOTICE src/main/resources/META-INF/NOTICE Date: Wed, 01 Sep 2010 08:36:52 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: cziegeler Date: Wed Sep 1 08:36:52 2010 New Revision: 991466 URL: http://svn.apache.org/viewvc?rev=991466&view=rev Log: Update notice files Modified: sling/trunk/bundles/commons/threads/NOTICE sling/trunk/bundles/commons/threads/src/main/resources/META-INF/NOTICE Modified: sling/trunk/bundles/commons/threads/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/NOTICE?rev=991466&r1=991465&r2=991466&view=diff ============================================================================== --- sling/trunk/bundles/commons/threads/NOTICE (original) +++ sling/trunk/bundles/commons/threads/NOTICE Wed Sep 1 08:36:52 2010 @@ -1,5 +1,5 @@ Apache Sling Threads -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). Modified: sling/trunk/bundles/commons/threads/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/src/main/resources/META-INF/NOTICE?rev=991466&r1=991465&r2=991466&view=diff ============================================================================== --- sling/trunk/bundles/commons/threads/src/main/resources/META-INF/NOTICE (original) +++ sling/trunk/bundles/commons/threads/src/main/resources/META-INF/NOTICE Wed Sep 1 08:36:52 2010 @@ -1,5 +1,5 @@ Apache Sling Threads -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). From commitsjoseph67@example.org Wed Sep 01 08:39:26 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 3189 invoked from network); 1 Sep 2010 08:39:25 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:39:25 -0000 Received: (qmail 46317 invoked by uid 500); 1 Sep 2010 08:39:25 -0000 Delivered-To: joseph67@example.org Received: (qmail 46281 invoked by uid 500); 1 Sep 2010 08:39:24 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 46274 invoked by uid 99); 1 Sep 2010 08:39:24 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:39:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:39:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A9D8923889E2; Wed, 1 Sep 2010 08:37:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991467 - /sling/trunk/bundles/commons/threads/pom.xml Date: Wed, 01 Sep 2010 08:37:47 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Sep 1 08:37:47 2010 New Revision: 991467 URL: http://svn.apache.org/viewvc?rev=991467&view=rev Log: [maven-release-plugin] prepare release org.apache.sling.commons.threads-3.0.2 Modified: sling/trunk/bundles/commons/threads/pom.xml Modified: sling/trunk/bundles/commons/threads/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/pom.xml?rev=991467&r1=991466&r2=991467&view=diff ============================================================================== --- sling/trunk/bundles/commons/threads/pom.xml (original) +++ sling/trunk/bundles/commons/threads/pom.xml Wed Sep 1 08:37:47 2010 @@ -29,7 +29,7 @@ <artifactId>org.apache.sling.commons.threads</artifactId> <packaging>bundle</packaging> - <version>3.0.1-SNAPSHOT</version> + <version>3.0.2</version> <name>Apache Sling Thread Support</name> <description> @@ -37,9 +37,9 @@ </description> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</developerConnection> - <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2</developerConnection> + <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.threads-3.0.2</url> </scm> <build> From commitsjoseph67@example.org Wed Sep 01 08:39:58 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 3330 invoked from network); 1 Sep 2010 08:39:58 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:39:58 -0000 Received: (qmail 46525 invoked by uid 500); 1 Sep 2010 08:39:57 -0000 Delivered-To: joseph67@example.org Received: (qmail 46464 invoked by uid 500); 1 Sep 2010 08:39:56 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 46449 invoked by uid 99); 1 Sep 2010 08:39:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:39:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:39:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6500B23889E2; Wed, 1 Sep 2010 08:38:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991469 - /sling/trunk/bundles/commons/threads/pom.xml Date: Wed, 01 Sep 2010 08:38:38 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: cziegeler Date: Wed Sep 1 08:38:38 2010 New Revision: 991469 URL: http://svn.apache.org/viewvc?rev=991469&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/commons/threads/pom.xml Modified: sling/trunk/bundles/commons/threads/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads/pom.xml?rev=991469&r1=991468&r2=991469&view=diff ============================================================================== --- sling/trunk/bundles/commons/threads/pom.xml (original) +++ sling/trunk/bundles/commons/threads/pom.xml Wed Sep 1 08:38:38 2010 @@ -29,7 +29,7 @@ <artifactId>org.apache.sling.commons.threads</artifactId> <packaging>bundle</packaging> - <version>3.0.2</version> + <version>3.0.3-SNAPSHOT</version> <name>Apache Sling Thread Support</name> <description> @@ -37,9 +37,9 @@ </description> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.threads-3.0.2</developerConnection> - <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.threads-3.0.2</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/threads</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/commons/threads</url> </scm> <build> From commitsjoseph67@example.org Wed Sep 01 08:39:59 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 3372 invoked from network); 1 Sep 2010 08:39:59 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:39:59 -0000 Received: (qmail 46597 invoked by uid 500); 1 Sep 2010 08:39:58 -0000 Delivered-To: joseph67@example.org Received: (qmail 46528 invoked by uid 500); 1 Sep 2010 08:39:57 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 46450 invoked by uid 99); 1 Sep 2010 08:39:56 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:39:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:39:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E66FB23889EA; Wed, 1 Sep 2010 08:38:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991468 - /sling/tags/org.apache.sling.commons.threads-3.0.2/ Date: Wed, 01 Sep 2010 08:38:20 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Sep 1 08:38:20 2010 New Revision: 991468 URL: http://svn.apache.org/viewvc?rev=991468&view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.threads-3.0.2 Added: sling/tags/org.apache.sling.commons.threads-3.0.2/ - copied from r991467, sling/trunk/bundles/commons/threads/ From commitsjoseph67@example.org Wed Sep 01 08:44:50 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 4375 invoked from network); 1 Sep 2010 08:44:50 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:44:50 -0000 Received: (qmail 50987 invoked by uid 500); 1 Sep 2010 08:44:49 -0000 Delivered-To: joseph67@example.org Received: (qmail 50921 invoked by uid 500); 1 Sep 2010 08:44:48 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 50914 invoked by uid 99); 1 Sep 2010 08:44:47 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:44:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:44:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C782123889EA; Wed, 1 Sep 2010 08:43:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991472 - /sling/trunk/bundles/extensions/event/pom.xml Date: Wed, 01 Sep 2010 08:43:10 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Sep 1 08:43:10 2010 New Revision: 991472 URL: http://svn.apache.org/viewvc?rev=991472&view=rev Log: [maven-release-plugin] prepare release org.apache.sling.event-2.4.0 Modified: sling/trunk/bundles/extensions/event/pom.xml Modified: sling/trunk/bundles/extensions/event/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=991472&r1=991471&r2=991472&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Wed Sep 1 08:43:10 2010 @@ -29,7 +29,7 @@ <artifactId>org.apache.sling.event</artifactId> <packaging>bundle</packaging> - <version>2.4.0-SNAPSHOT</version> + <version>2.4.0</version> <name>Apache Sling Event Support</name> <description> @@ -37,9 +37,9 @@ </description> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event</developerConnection> - <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.4.0</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.4.0</developerConnection> + <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-2.4.0</url> </scm> <build> From commitsjoseph67@example.org Wed Sep 01 08:45:38 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 4548 invoked from network); 1 Sep 2010 08:45:38 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:45:38 -0000 Received: (qmail 51331 invoked by uid 500); 1 Sep 2010 08:45:37 -0000 Delivered-To: joseph67@example.org Received: (qmail 51269 invoked by uid 500); 1 Sep 2010 08:45:37 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 51262 invoked by uid 99); 1 Sep 2010 08:45:36 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:45:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:45:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2C54D23889E2; Wed, 1 Sep 2010 08:44:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991473 - /sling/tags/org.apache.sling.event-2.4.0/ Date: Wed, 01 Sep 2010 08:44:01 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Wed Sep 1 08:44:00 2010 New Revision: 991473 URL: http://svn.apache.org/viewvc?rev=991473&view=rev Log: [maven-scm] copy for tag org.apache.sling.event-2.4.0 Added: sling/tags/org.apache.sling.event-2.4.0/ - copied from r991472, sling/trunk/bundles/extensions/event/ From commitsjoseph67@example.org Wed Sep 01 08:46:02 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 4685 invoked from network); 1 Sep 2010 08:46:02 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:46:02 -0000 Received: (qmail 52480 invoked by uid 500); 1 Sep 2010 08:46:02 -0000 Delivered-To: joseph67@example.org Received: (qmail 52415 invoked by uid 500); 1 Sep 2010 08:46:01 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 52408 invoked by uid 99); 1 Sep 2010 08:46:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:46:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:46:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5841623889E2; Wed, 1 Sep 2010 08:44:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991475 - /sling/trunk/bundles/extensions/event/pom.xml Date: Wed, 01 Sep 2010 08:44:42 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: cziegeler Date: Wed Sep 1 08:44:42 2010 New Revision: 991475 URL: http://svn.apache.org/viewvc?rev=991475&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/event/pom.xml Modified: sling/trunk/bundles/extensions/event/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=991475&r1=991474&r2=991475&view=diff ============================================================================== --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Wed Sep 1 08:44:42 2010 @@ -29,7 +29,7 @@ <artifactId>org.apache.sling.event</artifactId> <packaging>bundle</packaging> - <version>2.4.0</version> + <version>2.4.1-SNAPSHOT</version> <name>Apache Sling Event Support</name> <description> @@ -37,9 +37,9 @@ </description> <scm> - <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.4.0</connection> - <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.4.0</developerConnection> - <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-2.4.0</url> + <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event</connection> + <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event</developerConnection> + <url>http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event</url> </scm> <build> From commitsjoseph67@example.org Wed Sep 01 08:57:15 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 6216 invoked from network); 1 Sep 2010 08:57:15 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 08:57:15 -0000 Received: (qmail 59954 invoked by uid 500); 1 Sep 2010 08:57:14 -0000 Delivered-To: joseph67@example.org Received: (qmail 59816 invoked by uid 500); 1 Sep 2010 08:57:12 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 59803 invoked by uid 99); 1 Sep 2010 08:57:11 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:57:11 +0000 X-ASF-Spam-Status: No, hits=-1993.7 required=10.0 tests=ALL_TRUSTED,HTML_MESSAGE,HTML_MIME_NO_HTML_TAG,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO repository.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 08:56:53 +0000 Received: from repository (localhost [83.161.120.155]) by repository.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o818uUjW029070; Wed, 1 Sep 2010 08:56:31 GMT Date: Wed, 1 Sep 2010 08:56:30 +0000 (GMT+00:00) From: Nexus Repository Manager <joseph67@example.org> To: repo-list <joseph67@example.org>, joseph67@example.org Message-ID: <8173637.111283331390966.JavaMail.nexus@repository> Subject: Nexus: Staging Completed. MIME-Version: 1.0 Content-Type: multipart/related; boundary="----=_Part_5_32696978.1283331390964" X-EMailer-Mail-Sender: Nexus/1.7.1 (PRO-OSS; SunOS; 5.10; x86; 1.5.0_20) X-EMailer-Mail-Request-ID: NX1283331390964 X-Virus-Checked: Checked by ClamAV on apache.org ------=_Part_5_32696978.1283331390964 Content-Type: text/html;charset=UTF-8 Content-Transfer-Encoding: quoted-printable <b>Description:</b><br><br>New Releases<br><br><b>Details:</b><br><br>The f= ollowing artifacts have been staged to the <a href=3D"https://repository.ap= ache.org/content/repositories/orgapachesling-005">org.apache.sling-005 (u:c= ziegeler, a:83.161.120.155)</a> repository.<br><br><a href=3D"https://reposi= tory.apache.org/content/repositories/orgapachesling-005/org/apache/sling/or= g.apache.sling.commons.threads/3.0.2/org.apache.sling.commons.threads-3.0.2= -javadoc.jar">org.apache.sling.commons.threads-3.0.2-javadoc.jar</a><br><a = href=3D"https://repository.apache.org/content/repositories/orgapachesling-0= 05/org/apache/sling/org.apache.sling.commons.threads/3.0.2/org.apache.sling= .commons.threads-3.0.2.pom.asc">org.apache.sling.commons.threads-3.0.2.pom.= asc</a><br><a href=3D"https://repository.apache.org/content/repositories/or= gapachesling-005/org/apache/sling/org.apache.sling.commons.threads/3.0.2/or= g.apache.sling.commons.threads-3.0.2-source-release.zip.asc">org.apache.sli= ng.commons.threads-3.0.2-source-release.zip.asc</a><br><a href=3D"https://r= epository.apache.org/content/repositories/orgapachesling-005/org/apache/sli= ng/org.apache.sling.commons.threads/3.0.2/org.apache.sling.commons.threads-= 3.0.2.jar.asc">org.apache.sling.commons.threads-3.0.2.jar.asc</a><br><a hre= f=3D"https://repository.apache.org/content/repositories/orgapachesling-005/= org/apache/sling/org.apache.sling.commons.threads/3.0.2/org.apache.sling.co= mmons.threads-3.0.2-sources.jar.asc">org.apache.sling.commons.threads-3.0.2= -sources.jar.asc</a><br><a href=3D"https://repository.apache.org/content/re= positories/orgapachesling-005/org/apache/sling/org.apache.sling.commons.thr= eads/3.0.2/org.apache.sling.commons.threads-3.0.2-source-release.zip">org.a= pache.sling.commons.threads-3.0.2-source-release.zip</a><br><a href=3D"http= s://repository.apache.org/content/repositories/orgapachesling-005/org/apach= e/sling/org.apache.sling.commons.threads/3.0.2/org.apache.sling.commons.thr= eads-3.0.2.pom">org.apache.sling.commons.threads-3.0.2.pom</a><br><a href= =3D"https://repository.apache.org/content/repositories/orgapachesling-005/o= rg/apache/sling/org.apache.sling.commons.threads/3.0.2/org.apache.sling.com= mons.threads-3.0.2.jar">org.apache.sling.commons.threads-3.0.2.jar</a><br><= a href=3D"https://repository.apache.org/content/repositories/orgapachesling= -005/org/apache/sling/org.apache.sling.commons.threads/3.0.2/org.apache.sli= ng.commons.threads-3.0.2-javadoc.jar.asc">org.apache.sling.commons.threads-= 3.0.2-javadoc.jar.asc</a><br><a href=3D"https://repository.apache.org/conte= nt/repositories/orgapachesling-005/org/apache/sling/org.apache.sling.common= s.threads/3.0.2/org.apache.sling.commons.threads-3.0.2-sources.jar">org.apa= che.sling.commons.threads-3.0.2-sources.jar</a><br><a href=3D"https://repos= itory.apache.org/content/repositories/orgapachesling-005/org/apache/sling/o= rg.apache.sling.event/2.4.0/org.apache.sling.event-2.4.0-sources.jar.asc">o= rg.apache.sling.event-2.4.0-sources.jar.asc</a><br><a href=3D"https://repos= itory.apache.org/content/repositories/orgapachesling-005/org/apache/sling/o= rg.apache.sling.event/2.4.0/org.apache.sling.event-2.4.0.pom.asc">org.apach= e.sling.event-2.4.0.pom.asc</a><br><a href=3D"https://repository.apache.org= /content/repositories/orgapachesling-005/org/apache/sling/org.apache.sling.= event/2.4.0/org.apache.sling.event-2.4.0-javadoc.jar.asc">org.apache.sling.= event-2.4.0-javadoc.jar.asc</a><br><a href=3D"https://repository.apache.org= /content/repositories/orgapachesling-005/org/apache/sling/org.apache.sling.= event/2.4.0/org.apache.sling.event-2.4.0-sources.jar">org.apache.sling.even= t-2.4.0-sources.jar</a><br><a href=3D"https://repository.apache.org/content= /repositories/orgapachesling-005/org/apache/sling/org.apache.sling.event/2.= 4.0/org.apache.sling.event-2.4.0.jar.asc">org.apache.sling.event-2.4.0.jar.= asc</a><br><a href=3D"https://repository.apache.org/content/repositories/or= gapachesling-005/org/apache/sling/org.apache.sling.event/2.4.0/org.apache.s= ling.event-2.4.0-source-release.zip">org.apache.sling.event-2.4.0-source-re= lease.zip</a><br><a href=3D"https://repository.apache.org/content/repositor= ies/orgapachesling-005/org/apache/sling/org.apache.sling.event/2.4.0/org.ap= ache.sling.event-2.4.0.pom">org.apache.sling.event-2.4.0.pom</a><br><a href= =3D"https://repository.apache.org/content/repositories/orgapachesling-005/o= rg/apache/sling/org.apache.sling.event/2.4.0/org.apache.sling.event-2.4.0.j= ar">org.apache.sling.event-2.4.0.jar</a><br><a href=3D"https://repository.a= pache.org/content/repositories/orgapachesling-005/org/apache/sling/org.apac= he.sling.event/2.4.0/org.apache.sling.event-2.4.0-javadoc.jar">org.apache.s= ling.event-2.4.0-javadoc.jar</a><br><a href=3D"https://repository.apache.or= g/content/repositories/orgapachesling-005/org/apache/sling/org.apache.sling= .event/2.4.0/org.apache.sling.event-2.4.0-source-release.zip.asc">org.apach= e.sling.event-2.4.0-source-release.zip.asc</a><br> ------=_Part_5_32696978.1283331390964-- From commitsjoseph67@example.org Wed Sep 01 10:12:25 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 26572 invoked from network); 1 Sep 2010 10:12:25 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 10:12:25 -0000 Received: (qmail 7569 invoked by uid 500); 1 Sep 2010 10:12:25 -0000 Delivered-To: joseph67@example.org Received: (qmail 7504 invoked by uid 500); 1 Sep 2010 10:12:23 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 7497 invoked by uid 99); 1 Sep 2010 10:12:23 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 10:12:23 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 10:12:21 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E2792388A40; Wed, 1 Sep 2010 10:11:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991494 - in /sling/trunk: bundles/api/ bundles/api/src/main/java/org/apache/sling/api/adapter/ bundles/api/src/main/java/org/apache/sling/api/resource/ bundles/extensions/adapter/ bundles/extensions/adapter/src/main/java/org/apache/sling/a... Date: Wed, 01 Sep 2010 10:11:03 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: cziegeler Date: Wed Sep 1 10:11:02 2010 New Revision: 991494 URL: http://svn.apache.org/viewvc?rev=991494&view=rev Log: SLING-1711 : Move SlingAdaptable from adapter bundle to api Added: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java (with props) Modified: sling/trunk/bundles/api/pom.xml sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java sling/trunk/bundles/extensions/adapter/pom.xml sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/SlingAdaptable.java sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/AdapterManagerTest.java sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/bundles/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/pom.xml?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/bundles/api/pom.xml (original) +++ sling/trunk/bundles/api/pom.xml Wed Sep 1 10:11:02 2010 @@ -88,8 +88,8 @@ http://sling.apache.org/site/sling-api.html </Bundle-DocURL> <Export-Package> - org.apache.sling.api;version=2.1, <!-- 2.0.8 --> - org.apache.sling.api.adapter;version=2.1, + org.apache.sling.api;version=2.1, + org.apache.sling.api.adapter;version=2.2, org.apache.sling.api.auth;version=1.0, org.apache.sling.api.request;version=2.1, org.apache.sling.api.resource;version=2.1, Added: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java?rev=991494&view=auto ============================================================================== --- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java (added) +++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java Wed Sep 1 10:11:02 2010 @@ -0,0 +1,93 @@ +/* + * 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.api.adapter; + +import java.util.HashMap; +import java.util.Map; + +/** + * The <code>SlingAdaptable</code> class is an (abstract) default + * implementation of the <code>Adaptable</code> interface. It just uses the + * default {@link org.apache.sling.api.adapter.AdapterManager} implemented + * to adapt itself to the requested type. + * <p> + * Extensions of this class may overwrite the {@link #adaptTo(Class)} method + * using their own knowledge of adapters and may call this base class + * implementation to fall back to an extended adapters. + * + * @since 2.2 + */ +public abstract class SlingAdaptable implements Adaptable { + + /** The adapter manager used for adapting the synthetic resource. */ + private static volatile AdapterManager ADAPTER_MANAGER; + + /** + * Set the adapter manager to be used by a synthetic resource. A bundle + * implementing the adapter manager can set the manager through this method. + * The set adapter manager will be used in the {@link #adaptTo(Class)} + * method of a synthetic resource. + * + * @param adapterMgr The adapter manager. + */ + public static void setAdapterManager(final AdapterManager adapterMgr) { + ADAPTER_MANAGER = adapterMgr; + } + + /** + * Unset an adapter manager previously set with + * {@link #setAdapterManager(AdapterManager)}. If this method is called with + * an <code>AdapterManager</code> different from the currently set one it + * has no effect. + * + * @param adapterMgr The adapter manager + */ + public static void unsetAdapterManager(final AdapterManager adapterMgr) { + if (ADAPTER_MANAGER == adapterMgr) { + ADAPTER_MANAGER = null; + } + } + + /** Cache */ + private Map<Class<?>, Object> adaptersCache; + + /** + * @see org.apache.sling.api.adapter.Adaptable#adaptTo(java.lang.Class) + */ + @SuppressWarnings("unchecked") + public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) { + AdapterType result = null; + synchronized ( this ) { + if ( adaptersCache != null ) { + result = (AdapterType) adaptersCache.get(type); + } + if ( result == null ) { + final AdapterManager mgr = ADAPTER_MANAGER; + result = (mgr == null ? null : mgr.getAdapter(this, type)); + if ( result != null ) { + if ( adaptersCache == null ) { + adaptersCache = new HashMap<Class<?>, Object>(); + } + adaptersCache.put(type, result); + } + } + } + return result; + } +} Propchange: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java ------------------------------------------------------------------------------ svn:keywords = author date id revision rev url Propchange: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/adapter/SlingAdaptable.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java (original) +++ sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/AbstractResource.java Wed Sep 1 10:11:02 2010 @@ -20,7 +20,7 @@ package org.apache.sling.api.resource; import java.util.Iterator; -import org.apache.sling.api.adapter.AdapterManager; +import org.apache.sling.api.adapter.SlingAdaptable; /** * The <code>AbstractResource</code> is an abstract implementation of the @@ -34,36 +34,9 @@ import org.apache.sling.api.adapter.Adap * * @since 2.1.0 */ -public abstract class AbstractResource implements Resource { - - /** The adapter manager used for adapting the synthetic resource. */ - private static volatile AdapterManager ADAPTER_MANAGER; - - /** - * Set the adapter manager to be used by a synthetic resource. A bundle - * implementing the adapter manager can set the manager through this method. - * The set adapter manager will be used in the {@link #adaptTo(Class)} - * method of a synthetic resource. - * - * @param adapterMgr The adapter manager. - */ - public static void setAdapterManager(final AdapterManager adapterMgr) { - ADAPTER_MANAGER = adapterMgr; - } - - /** - * Unset an adapter manager previously set with - * {@link #setAdapterManager(AdapterManager)}. If this method is called with - * an <code>AdapterManager</code> different from the currently set one it - * has no effect. - * - * @param adapterMgr The adapter manager - */ - public static void unsetAdapterManager(final AdapterManager adapterMgr) { - if (ADAPTER_MANAGER == adapterMgr) { - ADAPTER_MANAGER = null; - } - } +public abstract class AbstractResource + extends SlingAdaptable + implements Resource { /** * Returns the name of this resource. @@ -85,12 +58,12 @@ public abstract class AbstractResource i */ @SuppressWarnings("deprecation") public Resource getParent() { - /* - * Implemented calling the deprecated ResourceUtil.getParent method - * (which actually has the implementation) to prevent problems if there - * are implementations of the pre-2.1.0 Resource interface in the - * framework. - */ + // + // Implemented calling the deprecated ResourceUtil.getParent method + // (which actually has the implementation) to prevent problems if there + // are implementations of the pre-2.1.0 Resource interface in the + // framework. + // return ResourceUtil.getParent(this); } @@ -134,31 +107,11 @@ public abstract class AbstractResource i * methods. */ public boolean isResourceType(String resourceType) { - /* - * Implemented calling the ResourceUtil.isA method (which actually has - * the implementation) to prevent problems if there are implementations - * of the pre-2.1.0 Resource interface in the framework. - */ + // + // Implemented calling the ResourceUtil.isA method (which actually has + // the implementation) to prevent problems if there are implementations + // of the pre-2.1.0 Resource interface in the framework. + // return ResourceUtil.isA(this, resourceType); } - - /** - * If a adapter manager has been set through - * {@link #setAdapterManager(AdapterManager)} this adapter manager is used - * to adapt the resource to the given type. Otherwise this method returns - * <code>null</code>. - * <p> - * This default base implementation is intended to be overwritten by - * extensions. Overwriting implementations are are encouraged to call this - * base class implementation if they themselves cannot adapt to the - * requested type. - */ - public <Type> Type adaptTo(Class<Type> type) { - final AdapterManager adapterMgr = ADAPTER_MANAGER; - if (adapterMgr != null) { - return adapterMgr.getAdapter(this, type); - } - return null; - } - } Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Wed Sep 1 10:11:02 2010 @@ -68,7 +68,7 @@ org.apache.sling.adapter.internal </Private-Package> <Import-Package> - org.apache.sling.api.adapter;version="[2.0,2.3)", + org.apache.sling.api.adapter;version="[2.2,2.3)", * </Import-Package> </instructions> @@ -93,7 +93,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.0.8</version> + <version>2.1.1-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> Modified: sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/SlingAdaptable.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/SlingAdaptable.java?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/SlingAdaptable.java (original) +++ sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/SlingAdaptable.java Wed Sep 1 10:11:02 2010 @@ -18,49 +18,19 @@ */ package org.apache.sling.adapter; -import java.util.HashMap; -import java.util.Map; - -import org.apache.sling.adapter.internal.AdapterManagerImpl; -import org.apache.sling.api.adapter.Adaptable; -import org.apache.sling.api.adapter.AdapterManager; /** * The <code>SlingAdaptable</code> class is an (abstract) default * implementation of the <code>Adaptable</code> interface. It just uses the - * default {@link org.apache.sling.api.adapter.AdapterManager} implemented in this bundle to adapt the itself - * to the requested type. + * default {@link org.apache.sling.api.adapter.AdapterManager} implemented + * in this bundle to adapt the itself to the requested type. * <p> * Extensions of this class may overwrite the {@link #adaptTo(Class)} method * using their own knowledge of adapters and may call this base class * implementation to fall back to an extended adapters. + * @deprecated Use the {@link org.apache.sling.api.adapter.SlingAdaptable} instead */ -public abstract class SlingAdaptable implements Adaptable { - - /** Cache */ - private Map<Class<?>, Object> adaptersCache; +@Deprecated +public abstract class SlingAdaptable extends org.apache.sling.api.adapter.SlingAdaptable { - /** - * @see org.apache.sling.api.adapter.Adaptable#adaptTo(java.lang.Class) - */ - @SuppressWarnings("unchecked") - public <AdapterType> AdapterType adaptTo(Class<AdapterType> type) { - AdapterType result = null; - synchronized ( this ) { - if ( adaptersCache != null ) { - result = (AdapterType) adaptersCache.get(type); - } - if ( result == null ) { - final AdapterManager mgr = AdapterManagerImpl.getInstance(); - result = (mgr == null ? null : mgr.getAdapter(this, type)); - if ( result != null ) { - if ( adaptersCache == null ) { - adaptersCache = new HashMap<Class<?>, Object>(); - } - adaptersCache.put(type, result); - } - } - } - return result; - } } Modified: sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java (original) +++ sling/trunk/bundles/extensions/adapter/src/main/java/org/apache/sling/adapter/internal/AdapterManagerImpl.java Wed Sep 1 10:11:02 2010 @@ -55,26 +55,6 @@ import org.osgi.service.log.LogService; */ public class AdapterManagerImpl implements AdapterManager { - /** - * The singleton instance of this manager. This field is set when the - * instance is {@link #activate(ComponentContext) activated} and cleared - * when the instance is {@link #deactivate(ComponentContext) deactivated}. - * - * This field is set to public to make it easier for testing to provide - * an own adapter manager implementation which can be used together - * with {@link org.apache.sling.adapter.SlingAdaptable}s. (see SLING-1195). - * As this class is private this field is not accessible in an OSGi environment! - */ - public static AdapterManager INSTANCE; - - /** - * Returns the instance of this class or <code>null</code> if no activate - * yet. - */ - public static AdapterManager getInstance() { - return INSTANCE; - } - /** @scr.reference cardinality="0..1" policy="dynamic" */ private LogService log; @@ -171,15 +151,6 @@ public class AdapterManagerImpl implemen } // final "enable" this manager by setting the instance - // do not overwrite the field if already set (this is unexpected - // actually) - if (AdapterManagerImpl.INSTANCE == null) { - AdapterManagerImpl.INSTANCE = this; - } else { - log(LogService.LOG_WARNING, - "Not setting Instance field: Set to another manager " - + AdapterManagerImpl.INSTANCE, null); - } SyntheticResource.setAdapterManager(this); } @@ -188,15 +159,6 @@ public class AdapterManagerImpl implemen */ protected void deactivate(ComponentContext context) { SyntheticResource.unsetAdapterManager(this); - // "disable" the manager by clearing the instance - // do not clear the field if not set to this instance - if (AdapterManagerImpl.INSTANCE == this) { - AdapterManagerImpl.INSTANCE = null; - } else { - log(LogService.LOG_WARNING, - "Not clearing instance field: Set to another manager " - + AdapterManagerImpl.INSTANCE, null); - } this.context = null; } Modified: sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/AdapterManagerTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/AdapterManagerTest.java?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/AdapterManagerTest.java (original) +++ sling/trunk/bundles/extensions/adapter/src/test/java/org/apache/sling/adapter/internal/AdapterManagerTest.java Wed Sep 1 10:11:02 2010 @@ -25,9 +25,9 @@ import static org.junit.Assert.assertTru import java.util.Map; -import org.apache.sling.adapter.SlingAdaptable; import org.apache.sling.adapter.mock.MockAdapterFactory; import org.apache.sling.api.adapter.AdapterFactory; +import org.apache.sling.api.adapter.SlingAdaptable; import org.jmock.Expectations; import org.jmock.Mockery; import org.jmock.integration.junit4.JMock; @@ -53,9 +53,7 @@ public class AdapterManagerTest { } @org.junit.After public void tearDown() { - if (AdapterManagerImpl.getInstance() == am) { - am.deactivate(null); // not correct, but argument unused - } + am.deactivate(null); // not correct, but argument unused } /** Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/bundles/list.xml?rev=991494&r1=991493&r2=991494&view=diff ============================================================================== --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Sep 1 10:11:02 2010 @@ -41,7 +41,7 @@ <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.api</artifactId> - <version>2.1.0</version> + <version>2.1.1-SNAPSHOT</version> </bundle> <bundle> <groupId>org.apache.sling</groupId> @@ -76,7 +76,7 @@ <bundle> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.adapter</artifactId> - <version>2.0.6</version> + <version>2.0.7-SNAPSHOT</version> </bundle> <bundle> <groupId>org.apache.sling</groupId> From commitsjoseph67@example.org Wed Sep 01 10:44:55 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 32158 invoked from network); 1 Sep 2010 10:44:54 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 10:44:54 -0000 Received: (qmail 40597 invoked by uid 500); 1 Sep 2010 10:44:54 -0000 Delivered-To: joseph67@example.org Received: (qmail 40533 invoked by uid 500); 1 Sep 2010 10:44:53 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 40524 invoked by uid 99); 1 Sep 2010 10:44:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 10:44:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 10:44:50 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0179923889E2; Wed, 1 Sep 2010 10:43:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991500 - in /sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl: AuthenticatorWebConsolePlugin.java SlingAuthenticator.java Date: Wed, 01 Sep 2010 10:43:31 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Wed Sep 1 10:43:31 2010 New Revision: 991500 URL: http://svn.apache.org/viewvc?rev=991500&view=rev Log: SLING-1712 use a Map<String, List<String>> to prepare the authentication handlers to present them on the Authenticator page in the Web Console Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java?rev=991500&r1=991499&r2=991500&view=diff ============================================================================== --- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java (original) +++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/AuthenticatorWebConsolePlugin.java Wed Sep 1 10:43:31 2010 @@ -81,15 +81,15 @@ public class AuthenticatorWebConsolePlug pw.println("<th class='content' colspan='2'>Handler</td>"); pw.println("</tr>"); - final Map<String, String> handlerMap = slingAuthenticator.getAuthenticationHandler(); - for (Map.Entry<String, String> handler : handlerMap.entrySet()) { - - pw.println("<tr class='content'>"); - pw.println("<td class='content'>" + handler.getKey() + "</td>"); - pw.println("<td class='content' colspan='2'>" + handler.getValue() - + "</td>"); - pw.println("</tr>"); - + final Map<String, List<String>> handlerMap = slingAuthenticator.getAuthenticationHandler(); + for (Map.Entry<String, List<String>> handler : handlerMap.entrySet()) { + final String path = handler.getKey(); + for (String name : handler.getValue()) { + pw.println("<tr class='content'>"); + pw.println("<td class='content'>" + path + "</td>"); + pw.println("<td class='content' colspan='2'>" + name + "</td>"); + pw.println("</tr>"); + } } } Modified: sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java?rev=991500&r1=991499&r2=991500&view=diff ============================================================================== --- sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java (original) +++ sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java Wed Sep 1 10:43:31 2010 @@ -543,14 +543,24 @@ public class SlingAuthenticator implemen /** * Returns the list of registered authentication handlers as a map */ - Map<String, String> getAuthenticationHandler() { + Map<String, List<String>> getAuthenticationHandler() { List<AbstractAuthenticationHandlerHolder> registeredHolders = authHandlerCache.getHolders(); - LinkedHashMap<String, String> handlerMap = new LinkedHashMap<String, String>(); + LinkedHashMap<String, List<String>> handlerMap = new LinkedHashMap<String, List<String>>(); for (AbstractAuthenticationHandlerHolder holder : registeredHolders) { - handlerMap.put(holder.fullPath, holder.getProvider()); + List<String> provider = handlerMap.get(holder.fullPath); + if (provider == null) { + provider = new ArrayList<String>(); + handlerMap.put(holder.fullPath, provider); + } + provider.add(holder.getProvider()); } if (httpBasicHandler != null) { - handlerMap.put("/", httpBasicHandler.toString()); + List<String> provider = handlerMap.get("/"); + if (provider == null) { + provider = new ArrayList<String>(); + handlerMap.put("/", provider); + } + provider.add(httpBasicHandler.toString()); } return handlerMap; } From commitsjoseph67@example.org Wed Sep 01 13:18:59 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 82788 invoked from network); 1 Sep 2010 13:18:59 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 13:18:59 -0000 Received: (qmail 15158 invoked by uid 500); 1 Sep 2010 13:18:59 -0000 Delivered-To: joseph67@example.org Received: (qmail 15081 invoked by uid 500); 1 Sep 2010 13:18:57 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 15068 invoked by uid 99); 1 Sep 2010 13:18:56 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 13:18:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 13:18:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4B78E2388A5E; Wed, 1 Sep 2010 13:17:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991526 - in /sling/trunk/bundles/auth/form: pom.xml src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Date: Wed, 01 Sep 2010 13:17:15 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fmeschbe Date: Wed Sep 1 13:17:14 2010 New Revision: 991526 URL: http://svn.apache.org/viewvc?rev=991526&view=rev Log: SLING-1714 Convert @scr JavaDoc tags to SCR annotations Modified: sling/trunk/bundles/auth/form/pom.xml sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Modified: sling/trunk/bundles/auth/form/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=991526&r1=991525&r2=991526&view=diff ============================================================================== --- sling/trunk/bundles/auth/form/pom.xml (original) +++ sling/trunk/bundles/auth/form/pom.xml Wed Sep 1 13:17:14 2010 @@ -164,5 +164,11 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.scr.annotations</artifactId> + <version>1.3.0</version> + <scope>provided</scope> + </dependency> </dependencies> </project> Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java?rev=991526&r1=991525&r2=991526&view=diff ============================================================================== --- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java (original) +++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/AuthenticationFormServlet.java Wed Sep 1 13:17:14 2010 @@ -18,37 +18,39 @@ */ package org.apache.sling.auth.form.impl; +import javax.servlet.Servlet; import javax.servlet.http.HttpServletRequest; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.Service; import org.apache.sling.auth.core.spi.AbstractAuthenticationFormServlet; import org.apache.sling.auth.form.FormReason; /** * The <code>AuthenticationFormServlet</code> provides the default login form * used for Form Based Authentication. - * - * @scr.component metatype="no" - * @scr.property name="service.vendor" value="The Apache Software Foundation" - * @scr.property name="service.description" - * value="Default Login Form for Form Based Authentication" - * @scr.service interface="javax.servlet.Servlet" */ +@Component +@Properties( { + @Property(name = "service.vendor", value = "The Apache Software Foundation"), + @Property(name = "service.description", value = "Default Login Form for Form Based Authentication") }) +@Service(value = Servlet.class) @SuppressWarnings("serial") public class AuthenticationFormServlet extends AbstractAuthenticationFormServlet { /** * The constant is used to provide the service registration path - * - * @scr.property name="sling.servlet.paths" */ + @Property(name = "sling.servlet.paths") static final String SERVLET_PATH = "/system/sling/form/login"; /** * This constant is used to provide the service registration property * indicating to pass requests to this servlet unauthenticated. - * - * @scr.property name="sling.auth.requirements" */ + @Property(name = "sling.auth.requirements") @SuppressWarnings("unused") private static final String AUTH_REQUIREMENT = "-" + SERVLET_PATH; Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java?rev=991526&r1=991525&r2=991526&view=diff ============================================================================== --- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java (original) +++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Wed Sep 1 13:17:14 2010 @@ -37,12 +37,21 @@ import javax.servlet.http.HttpSession; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang.StringUtils; +import org.apache.felix.scr.annotations.Component; +import org.apache.felix.scr.annotations.Properties; +import org.apache.felix.scr.annotations.Property; +import org.apache.felix.scr.annotations.PropertyOption; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.ReferenceCardinality; +import org.apache.felix.scr.annotations.ReferencePolicy; +import org.apache.felix.scr.annotations.Service; import org.apache.sling.api.auth.Authenticator; import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.Resource; import org.apache.sling.api.resource.ResourceResolver; import org.apache.sling.api.resource.ResourceResolverFactory; import org.apache.sling.auth.core.spi.AbstractAuthenticationHandler; +import org.apache.sling.auth.core.spi.AuthenticationHandler; import org.apache.sling.auth.core.spi.AuthenticationInfo; import org.apache.sling.auth.core.spi.DefaultAuthenticationFeedbackHandler; import org.apache.sling.auth.form.FormReason; @@ -57,38 +66,23 @@ import org.slf4j.LoggerFactory; /** * The <code>FormAuthenticationHandler</code> class implements the authorization * steps based on a cookie. - * - * @scr.component immediate="false" label="%auth.form.name" - * description="%auth.form.description" - * name="org.apache.sling.auth.form.FormAuthenticationHandler" - * @scr.property name="service.description" - * value="Apache Sling Form Based Authentication Handler" - * @scr.property name="service.vendor" value="The Apache Software Foundation" - * @scr.property nameRef= - * "org.apache.sling.auth.core.spi.AuthenticationHandler.PATH_PROPERTY" - * values.0="/" - * @scr.property nameRef= - * "org.apache.sling.auth.core.spi.AuthenticationHandler.TYPE_PROPERTY" - * valueRef="javax.servlet.http.HttpServletRequest.FORM_AUTH" - * private="true" - * @scr.service */ +@Component(label = "%auth.form.name", description = "%auth.form.description", name = "org.apache.sling.auth.form.FormAuthenticationHandler") +@Properties( { + @Property(name = Constants.SERVICE_DESCRIPTION, value = "Apache Sling Form Based Authentication Handler"), + @Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software Foundation"), + @Property(name = AuthenticationHandler.PATH_PROPERTY, value = "/", cardinality = 100), + @Property(name = AuthenticationHandler.TYPE_PROPERTY, value = HttpServletRequest.FORM_AUTH, propertyPrivate = true) }) +@Service public class FormAuthenticationHandler extends AbstractAuthenticationHandler { /** * The name of the parameter providing the login form URL. - * - * @scr.property valueRef="AuthenticationFormServlet.SERVLET_PATH" */ + @Property(value=AuthenticationFormServlet.SERVLET_PATH) private static final String PAR_LOGIN_FORM = "form.login.form"; /** - * @scr.property valueRef="DEFAULT_AUTH_STORAGE" options "cookie"="Cookie" - * "session"="Session Attribute" - */ - private static final String PAR_AUTH_STORAGE = "form.auth.storage"; - - /** * The value of the {@link #PAR_AUTH_STORAGE} parameter indicating the use * of a Cookie to store the authentication data. */ @@ -106,13 +100,10 @@ public class FormAuthenticationHandler e */ private static final String DEFAULT_AUTH_STORAGE = AUTH_STORAGE_COOKIE; - /** - * The name of the configuration parameter providing the Cookie or session - * attribute name. - * - * @scr.property valueRef="DEFAULT_AUTH_NAME" - */ - private static final String PAR_AUTH_NAME = "form.auth.name"; + @Property(value = DEFAULT_AUTH_STORAGE, options = { + @PropertyOption(name = AUTH_STORAGE_COOKIE, value = "Cookie"), + @PropertyOption(name = AUTH_STORAGE_SESSION_ATTRIBUTE, value = "Session Attribute") }) + private static final String PAR_AUTH_STORAGE = "form.auth.storage"; /** * The default Cookie or session attribute name @@ -122,12 +113,11 @@ public class FormAuthenticationHandler e private static final String DEFAULT_AUTH_NAME = "sling.formauth"; /** - * This is the name of the SimpleCredentials attribute that holds the auth - * info extracted from the cookie value. - * - * @scr.property valueRef="DEFAULT_CREDENTIALS_ATTRIBUTE_NAME" + * The name of the configuration parameter providing the Cookie or session + * attribute name. */ - private static final String PAR_CREDENTIALS_ATTRIBUTE_NAME = "form.credentials.name"; + @Property(value = DEFAULT_AUTH_NAME) + private static final String PAR_AUTH_NAME = "form.auth.name"; /** * Default value for the {@link #PAR_CREDENTIALS_ATTRIBUTE_NAME} property @@ -135,12 +125,11 @@ public class FormAuthenticationHandler e private static final String DEFAULT_CREDENTIALS_ATTRIBUTE_NAME = DEFAULT_AUTH_NAME; /** - * The number of minutes after which a login session times out. This value - * is used as the expiry time set in the authentication data. - * - * @scr.property type="Integer" valueRef="DEFAULT_AUTH_TIMEOUT" + * This is the name of the SimpleCredentials attribute that holds the auth + * info extracted from the cookie value. */ - public static final String PAR_AUTH_TIMEOUT = "form.auth.timeout"; + @Property(value = DEFAULT_CREDENTIALS_ATTRIBUTE_NAME) + private static final String PAR_CREDENTIALS_ATTRIBUTE_NAME = "form.credentials.name"; /** * The default authentication data time out value. @@ -150,20 +139,19 @@ public class FormAuthenticationHandler e private static final int DEFAULT_AUTH_TIMEOUT = 30; /** - * The name of the file used to persist the security tokens - * - * @scr.property valueRef="DEFAULT_TOKEN_FILE" + * The number of minutes after which a login session times out. This value + * is used as the expiry time set in the authentication data. */ - private static final String PAR_TOKEN_FILE = "form.token.file"; + @Property(intValue = DEFAULT_AUTH_TIMEOUT) + public static final String PAR_AUTH_TIMEOUT = "form.auth.timeout"; private static final String DEFAULT_TOKEN_FILE = "cookie-tokens.bin"; /** - * Whether to redirect to the login form or simple do an include. - * - * @scr.property type="Boolean" valueRef="DEFAULT_INCLUDE_FORM" + * The name of the file used to persist the security tokens */ - private static final String PAR_INCLUDE_FORM = "form.use.include"; + @Property(value = DEFAULT_TOKEN_FILE) + private static final String PAR_TOKEN_FILE = "form.token.file"; /** * The default include value. @@ -173,12 +161,10 @@ public class FormAuthenticationHandler e private static final boolean DEFAULT_INCLUDE_FORM = false; /** - * Whether to present a login form when a users cookie expires, the default - * is not to present the form. - * - * @scr.property type="Boolean" valueRef="DEFAULT_LOGIN_AFTER_EXPIRE" + * Whether to redirect to the login form or simple do an include. */ - private static final String PAR_LOGIN_AFTER_EXPIRE = "form.onexpire.login"; + @Property(boolValue = DEFAULT_INCLUDE_FORM) + public static final String PAR_INCLUDE_FORM = "form.use.include"; /** * The default login after expire of a cookie. @@ -188,10 +174,16 @@ public class FormAuthenticationHandler e private static final boolean DEFAULT_LOGIN_AFTER_EXPIRE = false; /** + * Whether to present a login form when a users cookie expires, the default + * is not to present the form. + */ + @Property(boolValue = DEFAULT_LOGIN_AFTER_EXPIRE) + private static final String PAR_LOGIN_AFTER_EXPIRE = "form.onexpire.login"; + + /** * The default domain on which to see the auth cookie (if cookie storage is used) - * - * @scr.property */ + @Property private static final String PAR_DEFAULT_COOKIE_DOMAIN = "form.default.cookie.domain"; /** @@ -247,9 +239,8 @@ public class FormAuthenticationHandler e /** * The service ranking property. - * - * @scr.property type="Integer" value="0" private="false" */ + @Property(intValue = 0, propertyPrivate = false) @SuppressWarnings("unused") private static final String PAR_SERVICE_RANKING = Constants.SERVICE_RANKING; @@ -304,9 +295,8 @@ public class FormAuthenticationHandler e /** * The resource resolver factory used to resolve the login form as a resource - * - * @scr.reference policy="dynamic" cardinality="0..1" */ + @Reference(policy = ReferencePolicy.DYNAMIC, cardinality = ReferenceCardinality.OPTIONAL_UNARY) private ResourceResolverFactory resourceResolverFactory; /** @@ -739,7 +729,7 @@ public class FormAuthenticationHandler e final String defaultCookieDomain = OsgiUtil.toString( properties.get(PAR_DEFAULT_COOKIE_DOMAIN), null); - + final String authStorage = OsgiUtil.toString( properties.get(PAR_AUTH_STORAGE), DEFAULT_AUTH_STORAGE); if (AUTH_STORAGE_SESSION_ATTRIBUTE.equals(authStorage)) { From commitsjoseph67@example.org Wed Sep 01 13:54:14 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 90166 invoked from network); 1 Sep 2010 13:54:13 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 13:54:13 -0000 Received: (qmail 60991 invoked by uid 500); 1 Sep 2010 13:54:13 -0000 Delivered-To: joseph67@example.org Received: (qmail 60924 invoked by uid 500); 1 Sep 2010 13:54:11 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 60914 invoked by uid 99); 1 Sep 2010 13:54:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 13:54:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 13:54:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1317C23889E9; Wed, 1 Sep 2010 13:52:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991538 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java Date: Wed, 01 Sep 2010 13:52:53 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: justin Date: Wed Sep 1 13:52:52 2010 New Revision: 991538 URL: http://svn.apache.org/viewvc?rev=991538&view=rev Log: adding integration test from SLING-1675 Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java?rev=991538&r1=991537&r2=991538&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java Wed Sep 1 13:52:52 2010 @@ -33,4 +33,10 @@ public class BundleContentTest extends H final String content = getContent(HTTP_BASE_URL + "/sling-test/sling/from-bundle.2.json", CONTENT_TYPE_JSON); assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected)); } + + public void testBundleContentParentList() throws IOException { + final String expected = "from-bundle"; + final String content = getContent(HTTP_BASE_URL + "/sling-test/sling.2.json", CONTENT_TYPE_JSON); + assertTrue("Content contains " + expected + " (" + content + ")", content.contains(expected)); + } } From commitsjoseph67@example.org Wed Sep 01 14:22:38 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 1407 invoked from network); 1 Sep 2010 14:22:38 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 14:22:38 -0000 Received: (qmail 1125 invoked by uid 500); 1 Sep 2010 14:22:38 -0000 Delivered-To: joseph67@example.org Received: (qmail 1053 invoked by uid 500); 1 Sep 2010 14:22:36 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 1046 invoked by uid 99); 1 Sep 2010 14:22:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 14:22:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 14:22:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3980923889E9; Wed, 1 Sep 2010 14:21:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991549 - /sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Date: Wed, 01 Sep 2010 14:21:16 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: fmeschbe Date: Wed Sep 1 14:21:15 2010 New Revision: 991549 URL: http://svn.apache.org/viewvc?rev=991549&view=rev Log: SLING-1714 Metatype descriptor generation is not enabled by default for annotations Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Modified: sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java?rev=991549&r1=991548&r2=991549&view=diff ============================================================================== --- sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java (original) +++ sling/trunk/bundles/auth/form/src/main/java/org/apache/sling/auth/form/impl/FormAuthenticationHandler.java Wed Sep 1 14:21:15 2010 @@ -67,7 +67,7 @@ import org.slf4j.LoggerFactory; * The <code>FormAuthenticationHandler</code> class implements the authorization * steps based on a cookie. */ -@Component(label = "%auth.form.name", description = "%auth.form.description", name = "org.apache.sling.auth.form.FormAuthenticationHandler") +@Component(label = "%auth.form.name", description = "%auth.form.description", metatype = true, name = "org.apache.sling.auth.form.FormAuthenticationHandler") @Properties( { @Property(name = Constants.SERVICE_DESCRIPTION, value = "Apache Sling Form Based Authentication Handler"), @Property(name = Constants.SERVICE_VENDOR, value = "The Apache Software Foundation"), From commitsjoseph67@example.org Wed Sep 01 15:15:22 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 18294 invoked from network); 1 Sep 2010 15:15:22 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 15:15:22 -0000 Received: (qmail 92397 invoked by uid 500); 1 Sep 2010 15:15:22 -0000 Delivered-To: joseph67@example.org Received: (qmail 92337 invoked by uid 500); 1 Sep 2010 15:15:21 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 92330 invoked by uid 99); 1 Sep 2010 15:15:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:15:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:15:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3CCD723889E9; Wed, 1 Sep 2010 15:14:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991565 - in /sling/trunk: bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/ launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ Date: Wed, 01 Sep 2010 15:14:03 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> Author: justin Date: Wed Sep 1 15:14:02 2010 New Revision: 991565 URL: http://svn.apache.org/viewvc?rev=991565&view=rev Log: SLING-1718 - adding support for multi-valued properties in html rendering Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java?rev=991565&r1=991564&r2=991565&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java (original) +++ sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/HtmlRendererServlet.java Wed Sep 1 15:14:02 2010 @@ -70,6 +70,11 @@ public class HtmlRendererServlet extends printResourceInfo(pw, r); render(pw, r, r.adaptTo(String.class)); printEpilog(pw, isIncluded); + } else if ( r.adaptTo(String[].class) != null ) { + printProlog(pw, isIncluded); + printResourceInfo(pw, r); + render(pw, r, r.adaptTo(String[].class)); + printEpilog(pw, isIncluded); } else { if ( !isIncluded ) { resp.sendError(HttpServletResponse.SC_NO_CONTENT); // NO Content @@ -127,6 +132,12 @@ public class HtmlRendererServlet extends printPropertyValue(pw, "Resource Value", value); } + private void render(PrintWriter pw, Resource r, String[] values) { + for (String value : values) { + printPropertyValue(pw, "Resource Value", value); + } + } + private void printPropertyValue(PrintWriter pw, String name, Object value) { pw.print(name + ": <b>"); Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=991565&r1=991564&r2=991565&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Wed Sep 1 15:14:02 2010 @@ -20,6 +20,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import org.apache.sling.commons.testing.integration.NameValuePairList; import org.apache.sling.servlets.post.SlingPostConstants; /** Test the rendering of JCR Properties, directly addressed by URLs. @@ -28,6 +29,9 @@ import org.apache.sling.servlets.post.Sl public class PropertyRenderingTest extends RenderingTestBase { private String slingResourceType; + + private String testMultiText1; + private String testMultiText2; @Override protected void setUp() throws Exception { @@ -35,19 +39,27 @@ public class PropertyRenderingTest exten // set test values testText = "This is a test " + System.currentTimeMillis(); + testMultiText1 = "This is a multivalued test " + System.currentTimeMillis(); + testMultiText2 = "This is another multivalued test " + System.currentTimeMillis(); + slingResourceType = getClass().getName(); // create the test node, under a path that's specific to this class to allow collisions final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX; - final Map<String,String> props = new HashMap<String,String>(); - props.put("sling:resourceType", slingResourceType); - props.put("text", testText); - displayUrl = testClient.createNode(url, props); + + NameValuePairList list = new NameValuePairList(); + list.add("sling:resourceType", slingResourceType); + list.add("text", testText); + list.add("multiText", testMultiText1); + list.add("multiText", testMultiText2); + displayUrl = testClient.createNode(url, list, null, true); } public void testNodeAccess() throws IOException { final String json = getContent(displayUrl + ".json", CONTENT_TYPE_JSON); assertJavascript(testText, json, "out.println(data.text)"); + assertJavascript(testMultiText1, json, "out.println(data.multiText[0])"); + assertJavascript(testMultiText2, json, "out.println(data.multiText[1])"); } public void testTextJson() throws IOException { @@ -70,6 +82,18 @@ public class PropertyRenderingTest exten assertEquals(testText, data); } + public void testMultiValuedTextJson() throws IOException { + final String json = getContent(displayUrl + "/multiText.json", CONTENT_TYPE_JSON); + assertEquals("{\"multiText\":[\"" + testMultiText1 + "\",\""+ testMultiText2 + "\"]}",json); + } + + public void testMultiValuedTextHtml() throws IOException { + final String data = getContent(displayUrl + "/multiText.html", CONTENT_TYPE_HTML); + System.out.println(data); + assertTrue(data.contains(testMultiText1)); + assertTrue(data.contains(testMultiText2)); + } + public void testResourceTypeNoExt() throws IOException { final String data = getContent(displayUrl + "/sling:resourceType", null); assertEquals(slingResourceType, data); From commitsjoseph67@example.org Wed Sep 01 15:15:52 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 18404 invoked from network); 1 Sep 2010 15:15:52 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 15:15:52 -0000 Received: (qmail 92883 invoked by uid 500); 1 Sep 2010 15:15:51 -0000 Delivered-To: joseph67@example.org Received: (qmail 92826 invoked by uid 500); 1 Sep 2010 15:15:51 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 92819 invoked by uid 99); 1 Sep 2010 15:15:51 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:15:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:15:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 502012388A4B; Wed, 1 Sep 2010 15:14:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991566 - in /sling/trunk: bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/ launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ Date: Wed, 01 Sep 2010 15:14:15 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Wed Sep 1 15:14:14 2010 New Revision: 991566 URL: http://svn.apache.org/viewvc?rev=991566&view=rev Log: SLING-1408 - adding support for multi-valued proeprties in text renderer Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRendererServlet.java sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Modified: sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRendererServlet.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRendererServlet.java?rev=991566&r1=991565&r2=991566&view=diff ============================================================================== --- sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRendererServlet.java (original) +++ sling/trunk/bundles/servlets/get/src/main/java/org/apache/sling/servlets/get/impl/helpers/PlainTextRendererServlet.java Wed Sep 1 15:14:14 2010 @@ -65,6 +65,8 @@ public class PlainTextRendererServlet ex dump(pw, r, map); } else if ( r.adaptTo(String.class) != null ) { printPropertyValue(pw, ResourceUtil.getName(r), r.adaptTo(String.class), false); + } else if ( r.adaptTo(String[].class) != null ) { + printPropertyValue(pw, ResourceUtil.getName(r), r.adaptTo(String[].class), false); } else { resp.sendError(HttpServletResponse.SC_NO_CONTENT); } Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=991566&r1=991565&r2=991566&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Wed Sep 1 15:14:14 2010 @@ -94,6 +94,16 @@ public class PropertyRenderingTest exten assertTrue(data.contains(testMultiText2)); } + public void testMultiValuedTextTxt() throws IOException { + final String data = getContent(displayUrl + "/multiText.txt", CONTENT_TYPE_PLAIN); + assertEquals("[" + testMultiText1 + ", " + testMultiText2 + "]", data); + } + + public void testMultiValuedTextNoExt() throws IOException { + // multi-valued properties can't be adapted to a stream, so this returns an error + assertHttpStatus(displayUrl + "/multiText", 403); + } + public void testResourceTypeNoExt() throws IOException { final String data = getContent(displayUrl + "/sling:resourceType", null); assertEquals(slingResourceType, data); From commitsjoseph67@example.org Wed Sep 01 15:25:31 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 23030 invoked from network); 1 Sep 2010 15:25:30 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 15:25:30 -0000 Received: (qmail 13388 invoked by uid 500); 1 Sep 2010 15:25:30 -0000 Delivered-To: joseph67@example.org Received: (qmail 13327 invoked by uid 500); 1 Sep 2010 15:25:30 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 13320 invoked by uid 99); 1 Sep 2010 15:25:30 -0000 Received: from Unknown (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:25:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:25:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5FDFA23889E9; Wed, 1 Sep 2010 15:23:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r991571 - in /sling/trunk/bundles: jcr/jackrabbit-accessmanager/pom.xml jcr/jackrabbit-usermanager/pom.xml scripting/jsp-taglib/pom.xml Date: Wed, 01 Sep 2010 15:23:54 -0000 To: joseph67@example.org From: joseph67@example.org X-Mailer: svnmailer-1.0.8 Message-Id: <joseph67@example.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: justin Date: Wed Sep 1 15:23:53 2010 New Revision: 991571 URL: http://svn.apache.org/viewvc?rev=991571&view=rev Log: SLING-1698 - setting explicit export version Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml sling/trunk/bundles/scripting/jsp-taglib/pom.xml Modified: sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml?rev=991571&r1=991570&r2=991571&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml (original) +++ sling/trunk/bundles/jcr/jackrabbit-accessmanager/pom.xml Wed Sep 1 15:23:53 2010 @@ -65,8 +65,8 @@ org.apache.sling.servlets.post;inline="org/apache/sling/servlets/post/impl/helper/JSONResponse*" </Embed-Dependency> <Export-Package> - org.apache.sling.jcr.jackrabbit.accessmanager;version=${project.version}, - org.apache.sling.jcr.jackrabbit.accessmanager.post;version=${project.version} + org.apache.sling.jcr.jackrabbit.accessmanager;version=2.0.6, + org.apache.sling.jcr.jackrabbit.accessmanager.post;version=2.0.6 </Export-Package> <Sling-Initial-Content /> <Sling-Nodetypes /> Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml?rev=991571&r1=991570&r2=991571&view=diff ============================================================================== --- sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml (original) +++ sling/trunk/bundles/jcr/jackrabbit-usermanager/pom.xml Wed Sep 1 15:23:53 2010 @@ -61,7 +61,7 @@ <configuration> <instructions> <Export-Package> - org.apache.sling.jackrabbit.usermanager;version=${project.version}, + org.apache.sling.jackrabbit.usermanager;version=2.0.6, </Export-Package> <Private-Package> org.apache.sling.jackrabbit.usermanager.impl.* Modified: sling/trunk/bundles/scripting/jsp-taglib/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp-taglib/pom.xml?rev=991571&r1=991570&r2=991571&view=diff ============================================================================== --- sling/trunk/bundles/scripting/jsp-taglib/pom.xml (original) +++ sling/trunk/bundles/scripting/jsp-taglib/pom.xml Wed Sep 1 15:23:53 2010 @@ -50,7 +50,7 @@ <configuration> <instructions> <Export-Package> - org.apache.sling.scripting.jsp.taglib.*;version=${project.version} + org.apache.sling.scripting.jsp.taglib.*;version=2.0.8 </Export-Package> <Import-Package> javax.jcr;resolution:=optional, From commitsjoseph67@example.org Wed Sep 01 15:30:21 2010 Return-Path: <commitsjoseph67@example.org> Delivered-To: joseph67@example.org Received: (qmail 25138 invoked from network); 1 Sep 2010 15:30:21 -0000 Received: from unknown (HELO mail.apache.org) (83.161.120.155) by 83.161.120.155 with SMTP; 1 Sep 2010 15:30:21 -0000 Received: (qmail 21448 invoked by uid 500); 1 Sep 2010 15:30:21 -0000 Delivered-To: joseph67@example.org Received: (qmail 21403 invoked by uid 500); 1 Sep 2010 15:30:20 -0000 Mailing-List: contact joseph67@example.org; run by ezmlm Precedence: bulk List-Help: <mailto:joseph67@example.org> List-Unsubscribe: <mailto:joseph67@example.org> List-Post: <mailto:joseph67@example.org> List-Id: <commits.sling.apache.org> Reply-To: joseph67@example.org Delivered-To: mailing list joseph67@example.org Received: (qmail 21396 invoked by uid 99); 1 Sep 2010 15:30:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:30:20 +0000 X-ASF-Spam-Status: No, hits=-1994.3 required=10.0 tests=ALL_TRUSTED,HTML_MESSAGE,MIME_HTML_ONLY X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO thor.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Sep 2010 15:30:20 +0000 Received: from thor (localhost [83.161.120.155]) by thor.apache.org (8.13.8+Sun/8.13.8) with ESMTP id o81FU06o011580 for <joseph67@example.org>; Wed, 1 Sep 2010 15:30:00 GMT Date: Wed, 1 Sep 2010 11:30:00 -0400 (EDT) From: joseph67@example.org To: joseph67@example.org Message-ID: <20861002.13446.1283355000195.JavaMail.confluence@thor> Subject: [CONF] Apache Sling > Towards Sling 6 MIME-Version: 1.0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 7bit Auto-Submitted: auto-generated <html> <head> <base href="https://cwiki.apache.org/confluence"> <link rel="stylesheet" href="/confluence/s/1810/9/1/_/styles/combined.css?spaceKey=SLING&amp;forWysiwyg=true" type="text/css"> </head> <body style="background: white;" bgcolor="white" class="email-body"> <div id="pageContent"> <div id="notificationFormat"> <div
{'source': 'Apache Software Foundation Public Mail Archives'}