svn commit: r915273 - /sling/trunk/launchpad/testing/pom.xml
Author: bdelacretaz Date: Tue Feb 23 10:43:44 2010 New Revision: 915273 URL: http://svn.apache.org/viewvc?rev=915273view=rev Log: SLING-1404 - use build-helper-maven-plugin to dynamically select port for testing Modified: sling/trunk/launchpad/testing/pom.xml Modified: sling/trunk/launchpad/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=915273r1=915272r2=915273view=diff == --- sling/trunk/launchpad/testing/pom.xml (original) +++ sling/trunk/launchpad/testing/pom.xml Tue Feb 23 10:43:44 2010 @@ -44,11 +44,6 @@ /scm properties -!-- -Jetty default port (override with -D) --- -http.port/http.port - !-- path suffix for HTTP access to Sling -- http.base.path / @@ -104,6 +99,25 @@ /configuration /plugin plugin +groupIdorg.codehaus.mojo/groupId +artifactIdbuild-helper-maven-plugin/artifactId +version1.5/version +executions +execution +idreserve-network-port/id +goals +goalreserve-network-port/goal +/goals +phaseprocess-resources/phase +configuration +portNames +portNamehttp.port/portName +/portNames +/configuration +/execution +/executions +/plugin +plugin groupIdorg.apache.maven.plugins/groupId artifactIdmaven-antrun-plugin/artifactId executions
svn commit: r915282 - in /sling/trunk: contrib/launchpad/testing/pom.xml launchpad/testing/pom.xml parent/pom.xml samples/inplace-integration-test/pom.xml
Author: bdelacretaz Date: Tue Feb 23 11:08:17 2010 New Revision: 915282 URL: http://svn.apache.org/viewvc?rev=915282view=rev Log: SLING-1404 - use build-helper-maven-plugin to select ports in all modules that do integration testing Modified: sling/trunk/contrib/launchpad/testing/pom.xml sling/trunk/launchpad/testing/pom.xml sling/trunk/parent/pom.xml sling/trunk/samples/inplace-integration-test/pom.xml Modified: sling/trunk/contrib/launchpad/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=915282r1=915281r2=915282view=diff == --- sling/trunk/contrib/launchpad/testing/pom.xml (original) +++ sling/trunk/contrib/launchpad/testing/pom.xml Tue Feb 23 11:08:17 2010 @@ -23,7 +23,7 @@ parent groupIdorg.apache.sling/groupId artifactIdsling/artifactId -version8/version +version9-SNAPSHOT/version relativePath../../parent/pom.xml/relativePath /parent @@ -52,11 +52,6 @@ /scm properties -!-- -Jetty default port (override with -D) --- -http.port/http.port - !-- path suffix for HTTP access to Sling -- http.base.path / @@ -113,6 +108,24 @@ /configuration /plugin plugin +groupIdorg.codehaus.mojo/groupId +artifactIdbuild-helper-maven-plugin/artifactId +executions +execution +idreserve-network-port/id +goals +goalreserve-network-port/goal +/goals +phaseprocess-resources/phase +configuration +portNames +portNamehttp.port/portName +/portNames +/configuration +/execution +/executions +/plugin +plugin groupIdorg.mortbay.jetty/groupId artifactIdmaven-jetty-plugin/artifactId configuration Modified: sling/trunk/launchpad/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=915282r1=915281r2=915282view=diff == --- sling/trunk/launchpad/testing/pom.xml (original) +++ sling/trunk/launchpad/testing/pom.xml Tue Feb 23 11:08:17 2010 @@ -101,7 +101,6 @@ plugin groupIdorg.codehaus.mojo/groupId artifactIdbuild-helper-maven-plugin/artifactId -version1.5/version executions execution idreserve-network-port/id Modified: sling/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=915282r1=915281r2=915282view=diff == --- sling/trunk/parent/pom.xml (original) +++ sling/trunk/parent/pom.xml Tue Feb 23 11:08:17 2010 @@ -310,6 +310,11 @@ /signature /configuration /plugin +plugin +groupIdorg.codehaus.mojo/groupId +artifactIdbuild-helper-maven-plugin/artifactId +version1.5/version +/plugin /plugins /pluginManagement /build Modified: sling/trunk/samples/inplace-integration-test/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/samples/inplace-integration-test/pom.xml?rev=915282r1=915281r2=915282view=diff == --- sling/trunk/samples/inplace-integration-test/pom.xml (original) +++ sling/trunk/samples/inplace-integration-test/pom.xml Tue Feb 23 11:08:17 2010 @@ -27,7 +27,6 @@ nameSample In-Place Integration Test/name descriptionSling Integration Test Demo Project/description properties -http.port/http.port jetty.scan.interval.seconds0/jetty.scan.interval.seconds jetty.sling.hometarget/sling/jetty.sling.home test.hostlocalhost/test.host @@ -45,6 +44,25 @@ build plugins plugin +groupIdorg.codehaus.mojo/groupId +artifactIdbuild-helper-maven-plugin/artifactId +version1.5/version +executions +execution +idreserve-network-port/id +goals +goalreserve-network-port/goal +/goals +phaseprocess-resources/phase +configuration +portNames +
svn commit: r915283 - /sling/trunk/samples/inplace-integration-test/
Author: bdelacretaz Date: Tue Feb 23 11:10:12 2010 New Revision: 915283 URL: http://svn.apache.org/viewvc?rev=915283view=rev Log: svn:ignore Modified: sling/trunk/samples/inplace-integration-test/ (props changed) Propchange: sling/trunk/samples/inplace-integration-test/ -- --- svn:ignore (added) +++ svn:ignore Tue Feb 23 11:10:12 2010 @@ -0,0 +1,12 @@ +target +bin +*.iml +*.ipr +*.iws +.settings +.project +.classpath +.externalToolBuilders +maven-eclipse.xml +sling +derby.log
svn commit: r915304 - /sling/tags/org.apache.sling.commons.mime-2.1.4/
Author: cziegeler Date: Tue Feb 23 12:37:26 2010 New Revision: 915304 URL: http://svn.apache.org/viewvc?rev=915304view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.mime-2.1.4 Added: sling/tags/org.apache.sling.commons.mime-2.1.4/ - copied from r915302, sling/trunk/bundles/commons/mime/
svn commit: r915305 - /sling/trunk/bundles/commons/mime/pom.xml
Author: cziegeler Date: Tue Feb 23 12:37:59 2010 New Revision: 915305 URL: http://svn.apache.org/viewvc?rev=915305view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/commons/mime/pom.xml Modified: sling/trunk/bundles/commons/mime/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/pom.xml?rev=915305r1=915304r2=915305view=diff == --- sling/trunk/bundles/commons/mime/pom.xml (original) +++ sling/trunk/bundles/commons/mime/pom.xml Tue Feb 23 12:37:59 2010 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.commons.mime/artifactId packagingbundle/packaging -version2.1.4/version +version2.1.5-SNAPSHOT/version nameApache Sling MIME type mapping support/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.mime-2.1.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.mime-2.1.4/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.mime-2.1.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/mime/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/mime/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/commons/mime/url /scm build
svn commit: r915307 - /sling/trunk/bundles/extensions/event/pom.xml
Author: cziegeler Date: Tue Feb 23 12:41:21 2010 New Revision: 915307 URL: http://svn.apache.org/viewvc?rev=915307view=rev Log: [maven-release-plugin] prepare release org.apache.sling.event-2.3.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=915307r1=915306r2=915307view=diff == --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Tue Feb 23 12:41:21 2010 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.event/artifactId packagingbundle/packaging -version2.2.1-SNAPSHOT/version +version2.3.0/version nameApache Sling Event Support/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.3.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.3.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-2.3.0/url /scm build
svn commit: r915308 - /sling/tags/org.apache.sling.event-2.3.0/
Author: cziegeler Date: Tue Feb 23 12:42:09 2010 New Revision: 915308 URL: http://svn.apache.org/viewvc?rev=915308view=rev Log: [maven-scm] copy for tag org.apache.sling.event-2.3.0 Added: sling/tags/org.apache.sling.event-2.3.0/ - copied from r915307, sling/trunk/bundles/extensions/event/
svn commit: r915309 - /sling/trunk/bundles/extensions/event/pom.xml
Author: cziegeler Date: Tue Feb 23 12:42:43 2010 New Revision: 915309 URL: http://svn.apache.org/viewvc?rev=915309view=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=915309r1=915308r2=915309view=diff == --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Tue Feb 23 12:42:43 2010 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.event/artifactId packagingbundle/packaging -version2.3.0/version +version2.3.1-SNAPSHOT/version nameApache Sling Event Support/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.3.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-2.3.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-2.3.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/url /scm build
svn commit: r915313 - /sling/trunk/bundles/scripting/core/pom.xml
Author: cziegeler Date: Tue Feb 23 12:48:11 2010 New Revision: 915313 URL: http://svn.apache.org/viewvc?rev=915313view=rev Log: [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.0.10 Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=915313r1=915312r2=915313view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Tue Feb 23 12:48:11 2010 @@ -27,7 +27,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.9-SNAPSHOT/version +version2.0.10/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -36,9 +36,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.10/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.10/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.10/url /scm build
svn commit: r915314 - /sling/tags/org.apache.sling.scripting.core-2.0.10/
Author: cziegeler Date: Tue Feb 23 12:50:27 2010 New Revision: 915314 URL: http://svn.apache.org/viewvc?rev=915314view=rev Log: [maven-scm] copy for tag org.apache.sling.scripting.core-2.0.10 Added: sling/tags/org.apache.sling.scripting.core-2.0.10/ - copied from r915313, sling/trunk/bundles/scripting/core/
svn commit: r915315 - /sling/trunk/bundles/scripting/core/pom.xml
Author: cziegeler Date: Tue Feb 23 12:51:00 2010 New Revision: 915315 URL: http://svn.apache.org/viewvc?rev=915315view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=915315r1=915314r2=915315view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Tue Feb 23 12:51:00 2010 @@ -27,7 +27,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.10/version +version2.0.11-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -36,9 +36,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.10/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.10/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.10/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url /scm build
svn commit: r915318 - /sling/trunk/bundles/extensions/fsresource/pom.xml
Author: cziegeler Date: Tue Feb 23 12:55:37 2010 New Revision: 915318 URL: http://svn.apache.org/viewvc?rev=915318view=rev Log: [maven-release-plugin] prepare release org.apache.sling.fsresource-1.0.0 Modified: sling/trunk/bundles/extensions/fsresource/pom.xml Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=915318r1=915317r2=915318view=diff == --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Tue Feb 23 12:55:37 2010 @@ -28,7 +28,7 @@ artifactIdorg.apache.sling.fsresource/artifactId packagingbundle/packaging -version0.9.3-SNAPSHOT/version +version1.0.0/version nameApache Sling Filesystem Resource Provider/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.0.0/url /scm build
[CONF] Apache Sling Website News
News Page edited by Bertrand Delacretaz News New release: Apache Sling Sample Path Based Resource Type Provider 2.0.4 New releases: Apache Sling Event 2.2.0, Apache Sling Scripting API 2.1.0, and Apache Sling Thread Dumper 0.2.0 (Feburary 19, 2010) New releases: Apache Sling JCR WebDav 2.0.8, Apache Sling JCR ContentLoader 2.0.6, Apache Sling JCR UserManager 2.0.4, Apache Sling JCR Server 2.0.6, Apache Sling JCR AccessManager 2.0.4, Apache Sling JCR Base 2.0.6 (February 17, 2010) New releases: Apache Sling Commons ClassLoader 1.1.4, and Apache Sling JCR ClassLoader 3.1.0 (February 8, 2010) New release: Apache Sling JCR API 2.0.6 (January 29, 2010) New releases: Apache Sling Commons ClassLoader 1.1.2, Apache Sling Commons Scheduler 2.2.0, Apache Sling Commons Threads 3.0.0, Apache Sling Event 2.1.0, and Apache Sling Servlets Get 2.0.8 (December 21, 2009) Apache Sling MIME type mapping support, Version 2.1.2, is released (December 15, 2009) Justin Edelson added as a committer (December 7, 2009) New releases: Apache Sling Commons HTML 1.0.0, Apache Sling Commons Compiler 1.0.0, Apache Sling JCR Compiler 1.0.0, Apache Sling JCR Prefs 1.0.0, and Apache Sling Scripting Java 1.0.0 (December 2, 2009) New releases: Apache Sling Parent POM 8, Apache Sling Launchpad Base 2.1.0, Apache Sling Commons ClassLoader 1.1.0, Apache Sling JCR ClassLoader 3.0.0, Apache Sling Scripting Core 2.0.8, Apache Sling Scripting JSP 2.0.8, Apache Sling Scripting JSP Taglib 2.0.6, and Apache Sling Scripting _javascript_ 2.0.6 (November 28, 2009) New releases: Apache Sling Engine 2.0.6, Apache Sling Adapter 2.0.4, Apache Sling JCR Resource 2.0.6, Apache Sling Commons ClassLoader 1.0.0, Apache Sling Event 2.0.6, Apache Sling JCR ClassLoader 2.0.6, Apache Sling Scripting Core 2.0.6, Apache Sling Servlets Resolver 2.0.8 (October 13, 2009) New releases: Apache Sling API 2.0.8, Apache Sling Commons HTML 0.9.0, Apache Sling Commons ClassLoader 0.9.0, Apache Sling Commons Scheduler 2.1.0, and Apache Sling Servlets Get 2.0.6 (October 02, 2009) New releases: Apache Sling API 2.0.6 and Apache Sling JCR API 2.0.4 (August 17, 2009) Apache Sling OSGi LogService Implementation, Version 2.0.6, is released (August 5, 2009) Ian Boston added as a member of the PMC (July 25, 2009) Ian Boston added as a committer (July 9, 2009) Sling site at http://sling.apache.org live (June 29, 2009) Mailing lists moved to dev(a)sling.apache.org and commits(a)sling.apache.org (June 29, 2009) SVN moved to http://svn.apache.org/repos/asf/sling (June 18, 2009) Apache Sling has graduated into a top level project! (June 17, 2009) Change Notification Preferences View Online | View Change | Add Comment
[CONF] Apache Sling Website News
News Page edited by Bertrand Delacretaz News New release: Apache Sling Sample Path Based Resource Type Provider 2.0.4 (February 22, 2010) New releases: Apache Sling Event 2.2.0, Apache Sling Scripting API 2.1.0, and Apache Sling Thread Dumper 0.2.0 (Feburary 19, 2010) New releases: Apache Sling JCR WebDav 2.0.8, Apache Sling JCR ContentLoader 2.0.6, Apache Sling JCR UserManager 2.0.4, Apache Sling JCR Server 2.0.6, Apache Sling JCR AccessManager 2.0.4, Apache Sling JCR Base 2.0.6 (February 17, 2010) New releases: Apache Sling Commons ClassLoader 1.1.4, and Apache Sling JCR ClassLoader 3.1.0 (February 8, 2010) New release: Apache Sling JCR API 2.0.6 (January 29, 2010) New releases: Apache Sling Commons ClassLoader 1.1.2, Apache Sling Commons Scheduler 2.2.0, Apache Sling Commons Threads 3.0.0, Apache Sling Event 2.1.0, and Apache Sling Servlets Get 2.0.8 (December 21, 2009) Apache Sling MIME type mapping support, Version 2.1.2, is released (December 15, 2009) Justin Edelson added as a committer (December 7, 2009) New releases: Apache Sling Commons HTML 1.0.0, Apache Sling Commons Compiler 1.0.0, Apache Sling JCR Compiler 1.0.0, Apache Sling JCR Prefs 1.0.0, and Apache Sling Scripting Java 1.0.0 (December 2, 2009) New releases: Apache Sling Parent POM 8, Apache Sling Launchpad Base 2.1.0, Apache Sling Commons ClassLoader 1.1.0, Apache Sling JCR ClassLoader 3.0.0, Apache Sling Scripting Core 2.0.8, Apache Sling Scripting JSP 2.0.8, Apache Sling Scripting JSP Taglib 2.0.6, and Apache Sling Scripting _javascript_ 2.0.6 (November 28, 2009) New releases: Apache Sling Engine 2.0.6, Apache Sling Adapter 2.0.4, Apache Sling JCR Resource 2.0.6, Apache Sling Commons ClassLoader 1.0.0, Apache Sling Event 2.0.6, Apache Sling JCR ClassLoader 2.0.6, Apache Sling Scripting Core 2.0.6, Apache Sling Servlets Resolver 2.0.8 (October 13, 2009) New releases: Apache Sling API 2.0.8, Apache Sling Commons HTML 0.9.0, Apache Sling Commons ClassLoader 0.9.0, Apache Sling Commons Scheduler 2.1.0, and Apache Sling Servlets Get 2.0.6 (October 02, 2009) New releases: Apache Sling API 2.0.6 and Apache Sling JCR API 2.0.4 (August 17, 2009) Apache Sling OSGi LogService Implementation, Version 2.0.6, is released (August 5, 2009) Ian Boston added as a member of the PMC (July 25, 2009) Ian Boston added as a committer (July 9, 2009) Sling site at http://sling.apache.org live (June 29, 2009) Mailing lists moved to dev(a)sling.apache.org and commits(a)sling.apache.org (June 29, 2009) SVN moved to http://svn.apache.org/repos/asf/sling (June 18, 2009) Apache Sling has graduated into a top level project! (June 17, 2009) Change Notification Preferences View Online | View Change | Add Comment
svn commit: r915325 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Tue Feb 23 13:05:36 2010 New Revision: 915325 URL: http://svn.apache.org/viewvc?rev=915325view=rev Log: Use current snapshot versions during release process. Modified: sling/trunk/launchpad/builder/src/main/bundles/list.xml 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=915325r1=915324r2=915325view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Feb 23 13:05:36 2010 @@ -29,7 +29,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.mime/artifactId -version2.1.3-SNAPSHOT/version +version2.1.5-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -111,7 +111,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.fsresource/artifactId -version0.9.2-incubator/version +version1.0.1-SNAPSHOT/version /bundle !-- Launchpad initial content -- @@ -130,7 +130,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.9-SNAPSHOT/version +version2.0.11-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
[CONF] Apache Sling Website Downloads
Downloads Page edited by Bertrand Delacretaz Add Path-based RTP sample 2.0.4 Add Path-based RTP sample 2.0.4 Downloads To get the latest development release of Apache Sling, you can check out the Source Code and Getting and Building Sling yourself. Otherwise, the releases below are available for download. To install, just download and extract. These KEYS can be used to verify the release archive. All Apache Sling products are distributed under the terms of The Apache Software License (version 2.0). See our license, or the LICENSE file included in each distribution. Mirrors Use the links below to download binary or source distributions of Apache Sling from one of our mirrors. You are currently using [preferred]. If you encounter a problem with this mirror, please select another mirror. If all mirrors are failing, there are backup mirrors (at the end of the mirrors list) that should be available. If the mirror displayed above is labeled preferred, then please reload this page by clicking here. Other mirrors: [if-any http] [for http][http][end] [end] [if-any ftp] [for ftp][ftp][end] [end] [if-any backup] [for backup][backup] (backup)[end] [end] Sling Application Artifact Version Provides Package Sling Standalone Application 5 A self-runnable Sling jar. org.apache.sling.launchpad.app-5-incubator-bin.tar.gz (asc, md5) org.apache.sling.launchpad.app-5-incubator-bin.zip (asc, md5) Sling Web Application 5 A ready-to run Sling webapp as a war file. org.apache.sling.launchpad.webapp-5-incubator.war (asc, md5) Sling Source Package 5 The released Sling source code. sling-5-incubator-source-release.tar.gz (asc, md5) sling-5-incubator-source-release.zip (asc, md5) Note that the above releases are relatively old (May 2009). If you want to experiment with bleeding edge code, building Sling yourself is not that hard. Note also that the included Apache Felix web console throws a null pointer exception in the configuration tab (SLING-959). It is recommended to update to a newer version (1.2.10+) of the web console, which you can get from the Apache Felix download page. If you are looking for previous releases of Apache Sling, have a look in the archives. For previous incubator releases of Apache Sling, have a look in the Incubator archives. Sling Components Artifact Version Binary Source Adapter 2.0.4 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Commons Classloader 1.1.4 jar (asc, md5) zip (asc, md5) Commons Compiler 1.0.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Commons HTML 1.0.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Commons Scheduler 2.2.0 jar (asc, md5) zip (asc, md5) Commons Threads 3.0.0 jar (asc, md5) zip (asc, md5) Engine 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Event 2.2.0 jar (asc, md5) zip (asc, md5) JCR Base 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR ClassLoader 3.1.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR ContentLoader 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR Compiler 1.0.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR Jackrabbit AccessManager 2.0.4 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR Jackrabbit Server 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR Jackrabbit UserManager 2.0.4 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR Resource 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR Prefs 1.0.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) JCR WebDAV 2.0.8 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Mime Type Service 2.1.2 jar (asc, md5) zip (asc, md5) Launchpad Base 2.1.0 jar (asc, md5) zip (asc, md5) Launchpad Base - Application Launcher 2.1.0 jar (asc, md5) zip (asc, md5) Launchpad Base - Web Launcher 2.1.0 war (asc, md5) zip (asc, md5) OSGi LogService Implementation 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Path-based RTP sample 2.0.4 jar (asc, md5) zip (asc, md5) Scripting API 2.1.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Scripting Core 2.0.8 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Scripting Java 1.0.0 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Scripting _javascript_ 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Scripting JSP 2.0.8 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Scripting JSP Taglib 2.0.6 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Servlets Get 2.0.8 jar (asc, md5) zip (asc, md5) Servlets Resolver 2.0.8 jar (asc, md5) tar.gz (asc, md5) zip (asc, md5) Sling API 2.0.8 jar (asc,
[CONF] Apache Sling Website Release Management
Release Management
Page edited by Bertrand Delacretaz
MEntion dist/sling replication
MEntion dist/sling replication
Release Management
Sling releases (and SNAPSHOTS) are deployed to the Nexus repository instead of the traditional deployment via the Maven 2 mirros source on people.apache.org. This makes the release process much leaner and simpler. In addtion we can benefit from the Apache Parent POM 6, which has most of the release profile setup built-in.
Most of the hard work of preparing and deploying the release is done by Maven.
Prerequisites
Staging the Release Candidates
Starting the Vote
Wait for the Results
Canceling the Release
Promoting the Release
Update JIRA
Create an Announcement
Related Links
Appendix A: Create and Add your key to http://www.apache.org/dist/sling/KEYS
Appendix B: preparing releases on Mac OS X
Appendix C: Deploy bundles on the Sling OBR
Prerequisites
To prepare or perform a release you MUST BE at least be an Apache Sling Committer.
Each and every release must be signed; therefore the public key should be cross signed by other Apache committers (not required but suggested) and this public key should be added to http://www.apache.org/dist/sling/KEYS (See Appendix A)
When preparing the release on Mac OS X, check out Appendix B before trying the steps in the next chapter.
Make sure you have all Apache servers defined in your settings.xml
Note: Listing the Apache servers in the settings.xml file also requires adding the password to that file. Starting with Maven 2.1 this password may be encrypted and needs not be give in plaintext. Please refer to Password Encryption for more information.
In the past we staged release candidates on our local machines using a semi-manual process. Now that we inherit from the Apache parent POM version 6, a repository manager will automatically handle staging for you. This means you now only need to specify your GPG passphrase in the release profile of your ${user.home}/.m2/settings.xml:
settings
...
profiles
profile
idapache-release/id
properties
gpg.passphrase !-- YOUR KEY PASSPHRASE -- /gpg.passphrase
/properties
/profile
/profiles
...
/settings
Everything else has been configured in the latest Sling Parent POM:
parent
groupIdorg.apache.sling/groupId
artifactIdsling/artifactId
version6/version
/parent
Staging the Release Candidates
First prepare your POMs for release:
Make sure there are no snapshots in the POMs to be released
Check that your POMs will not lose content when they are rewritten during the release process
$ mvn release:prepare -DdryRun=true
Compare the original pom.xml with the one called pom.xml.tag to see if the license or any other info has been removed. This has been known to happen if the starting project tag is not on a single line. The only things that should be different between these files are the version and scm elements. If there are any other changes, you must fix the original pom.xml file and commit before proceeding with the release.
Publish a snapshot
$ mvn deploy
...
[INFO] [deploy:deploy]
[INFO] Retrieving previous build number from apache.snapshots.https
...
If you experience an error during deployment like a HTTP 401 check your settings for the required server entries as outlined in the Prerequisites
Be sure that the generated artifacts respect the Apache release rules: NOTICE and LICENSE files should be present in the META-INF directory within the jar. For -sources artifacts, be sure that your POM does not use the maven-source-plugin:2.0.3 which is broken. The recommended version at this time is 2.0.4
You should verify the deployment under the snapshot repository on Apache
Prepare the release
$ mvn release:clean
$ mvn release:prepare
Preparing the release will create the new tag in SVN, automatically checking in on your behalf
If you get a build failure because of an SVN commit problem (namely The specified baseline is not the latest baseline, so it may not be checked out.), just repeat the mvn release:prepare command until SVN is happy. This is based on a known timing issue when using the European SVN mirror.
Stage the release for a vote
$ mvn release:perform
The release will automatically be inserted into a temporary staging repository for you, see the Nexus staging documentation for full details
You can continue to use mvn release:prepare and mvn release:perform on other sub-projects as necessary on the same machine and they will be combined in the same staging repository - this is useful when making a release of multiple Sling modules.
Close the staging repository
Login to https://repository.apache.org using your Apache SVN credentials. Click on Staging on the left. Then click on
svn commit: r915329 - /sling/site/obr/sling.xml
Author: bdelacretaz Date: Tue Feb 23 13:20:03 2010 New Revision: 915329 URL: http://svn.apache.org/viewvc?rev=915329view=rev Log: added new release: org.apache.sling.samples.path-based.rtp-2.0.4 Modified: sling/site/obr/sling.xml Modified: sling/site/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/obr/sling.xml?rev=915329r1=915328r2=915329view=diff == --- sling/site/obr/sling.xml (original) +++ sling/site/obr/sling.xml Tue Feb 23 13:20:03 2010 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=ISO-8859-1 standalone=yes? ?xml-stylesheet type=text/xml href=obr2html.xsl? -repository lastmodified=20090911100549.184 name=Apache Sling Release Repository +repository lastmodified=20100223141749.878 name=Apache Sling Release Repository resource id=org.apache.sling.api/2.0.2.incubator presentationname=Sling - Servlet Extension API symbolicname=org.apache.sling.api uri=http://people.apache.org/repo/m2-incubating-repository/org/apache/sling/org.apache.sling.api/2.0.2-incubator/org.apache.sling.api-2.0.2-incubator.jar; version=2.0.2.incubator descriptionThe Sling API defines an extension to the Servlet API 2.4 to provide access to content and unified access to requestparameters hiding the differences between the different methodsof transferring parameters from client to server. Note that theSling API bundle does not include the Servlet API but insteadrequires the API to be provided by the Servlet container inwhich the Sling framework is running or by another bundle./description size46754/size @@ -2648,4 +2648,31 @@ require extend=false filter=(amp;(package=javax.jcr)(versiongt;=0.0.0)) multiple=false name=package optional=falseImport package javax.jcr/require require extend=false filter=(amp;(package=org.apache.sling.jcr.api)(versiongt;=2.0.0)) multiple=false name=package optional=falseImport package org.apache.sling.jcr.api ;version=2.0.0/require /resource +resource id=org.apache.sling.samples.path-based.rtp/2.0.4 presentationname=Apache Sling Sample Path Based Resource Type Provider symbolicname=org.apache.sling.samples.path-based.rtp uri=http://repo1.maven.org/maven2/org/apache/sling/samples/org.apache.sling.samples.path-based.rtp/2.0.4/org.apache.sling.samples.path-based.rtp-2.0.4.jar; version=2.0.4 +descriptionProvides a configurable path-based sample resource type provider for resources which do not have an explicit one./description +size15412/size +documentationhttp://sling.apache.org/documentation +sourceorg/apache/sling/samples/org.apache.sling.samples.path-based.rtp/2.0.4/org.apache.sling.samples.path-based.rtp-2.0.4-sources.jar/source +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id=sling/ +category id=jcr/ +category id=org.apache.sling.samples/ +capability name=bundle +p n=manifestversion v=2/ +p n=presentationname v=Apache Sling Sample Path Based Resource Type Provider/ +p n=symbolicname v=org.apache.sling.samples.path-based.rtp/ +p n=version t=version v=2.0.4/ +/capability +capability name=package +p n=package v=org.apache.sling.samples.pathbasedrtp/ +p n=uses v=org.slf4j,javax.jcr.nodetype,org.osgi.service.component,javax.jcr,org.apache.sling.jcr.resource/ +p n=version t=version v=0.0.0/ +/capability +require extend=false filter=(amp;(package=javax.jcr)(versiongt;=1.0.0)) multiple=false name=package optional=falseImport package javax.jcr ;version=1.0.0/require +require extend=false filter=(amp;(package=javax.jcr.nodetype)(versiongt;=1.0.0)) multiple=false name=package optional=falseImport package javax.jcr.nodetype ;version=1.0.0/require +require extend=false filter=(amp;(package=org.apache.sling.jcr.resource)(versiongt;=2.0.6)) multiple=false name=package optional=falseImport package org.apache.sling.jcr.resource ;version=2.0.6/require +require extend=false filter=(amp;(package=org.apache.sling.samples.pathbasedrtp)(versiongt;=0.0.0)) multiple=false name=package optional=falseImport package org.apache.sling.samples.pathbasedrtp/require +require extend=false filter=(amp;(package=org.osgi.service.component)(versiongt;=1.0.0)) multiple=false name=package optional=falseImport package org.osgi.service.component ;version=1.0.0/require +require extend=false filter=(amp;(package=org.slf4j)(versiongt;=1.5.2)) multiple=false name=package optional=falseImport package org.slf4j ;version=1.5.2/require +/resource /repository
svn commit: r915371 - in /sling/trunk/bundles: jcr/webdav/pom.xml servlets/post/pom.xml
Author: justin Date: Tue Feb 23 15:11:23 2010 New Revision: 915371 URL: http://svn.apache.org/viewvc?rev=915371view=rev Log: SLING-1405 - fixing duplicate dependencies SLING-1405 - fixing duplicate depencencies removing dupe jcr dependency SLING-1405 - fixing jcr.webdav pom remove provided scope Modified: sling/trunk/bundles/jcr/webdav/pom.xml sling/trunk/bundles/servlets/post/pom.xml Modified: sling/trunk/bundles/jcr/webdav/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav/pom.xml?rev=915371r1=915370r2=915371view=diff == --- sling/trunk/bundles/jcr/webdav/pom.xml (original) +++ sling/trunk/bundles/jcr/webdav/pom.xml Tue Feb 23 15:11:23 2010 @@ -113,13 +113,7 @@ artifactIdorg.apache.sling.commons.mime/artifactId version2.0.2-incubator/version /dependency - -dependency -groupIdjavax.jcr/groupId -artifactIdjcr/artifactId -version2.0/version -scopeprovided/scope -/dependency + dependency groupIdorg.apache.jackrabbit/groupId artifactIdjackrabbit-jcr-server/artifactId @@ -130,6 +124,7 @@ dependency groupIdjavax.jcr/groupId artifactIdjcr/artifactId +version2.0/version /dependency dependency groupIdjavax.servlet/groupId Modified: sling/trunk/bundles/servlets/post/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/servlets/post/pom.xml?rev=915371r1=915370r2=915371view=diff == --- sling/trunk/bundles/servlets/post/pom.xml (original) +++ sling/trunk/bundles/servlets/post/pom.xml Tue Feb 23 15:11:23 2010 @@ -120,11 +120,6 @@ scopeprovided/scope /dependency dependency -groupIdjavax.jcr/groupId -artifactIdjcr/artifactId -scopeprovided/scope -/dependency -dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.resource/artifactId version2.0.6/version
svn commit: r915386 - in /sling/trunk/bundles/commons/testing: ./ src/main/java/org/apache/sling/commons/testing/jcr/ src/main/resources/ src/test/ src/test/java/ src/test/java/org/ src/test/java/org/
Author: cziegeler Date: Tue Feb 23 15:30:38 2010 New Revision: 915386 URL: http://svn.apache.org/viewvc?rev=915386view=rev Log: SLING-1406 : Upgrade to JCR 2.0/Jackrabbit 2.0 and add simple test case for the repository util. Added: sling/trunk/bundles/commons/testing/src/test/ sling/trunk/bundles/commons/testing/src/test/java/ sling/trunk/bundles/commons/testing/src/test/java/org/ sling/trunk/bundles/commons/testing/src/test/java/org/apache/ sling/trunk/bundles/commons/testing/src/test/java/org/apache/sling/ sling/trunk/bundles/commons/testing/src/test/java/org/apache/sling/commons/ sling/trunk/bundles/commons/testing/src/test/java/org/apache/sling/commons/testing/ sling/trunk/bundles/commons/testing/src/test/java/org/apache/sling/commons/testing/jcr/ sling/trunk/bundles/commons/testing/src/test/java/org/apache/sling/commons/testing/jcr/RepositoryUtilTest.java (with props) Modified: sling/trunk/bundles/commons/testing/pom.xml sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNodeType.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockProperty.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockPropertyDefinition.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockValue.java sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/RepositoryUtil.java sling/trunk/bundles/commons/testing/src/main/resources/jackrabbit-test-config.xml Modified: sling/trunk/bundles/commons/testing/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/pom.xml?rev=915386r1=915385r2=915386view=diff == --- sling/trunk/bundles/commons/testing/pom.xml (original) +++ sling/trunk/bundles/commons/testing/pom.xml Tue Feb 23 15:30:38 2010 @@ -60,7 +60,7 @@ groupIdorg.osgi/groupId artifactIdorg.osgi.compendium/artifactId /dependency - + !-- Dependencies required for testing and provided transitively to modules using this artifact @@ -80,18 +80,31 @@ dependency groupIdjavax.jcr/groupId artifactIdjcr/artifactId +version2.0/version scopecompile/scope /dependency dependency groupIdorg.apache.jackrabbit/groupId artifactIdjackrabbit-api/artifactId -version1.4/version +version2.0.0/version +scopecompile/scope +/dependency +dependency +groupIdorg.apache.jackrabbit/groupId +artifactIdjackrabbit-jcr-commons/artifactId +version2.0.0/version scopecompile/scope /dependency dependency groupIdorg.apache.jackrabbit/groupId artifactIdjackrabbit-core/artifactId -version1.4.6/version +version2.0.0/version +scopecompile/scope +/dependency +dependency +groupIdcommons-io/groupId +artifactIdcommons-io/artifactId +version1.4/version scopecompile/scope /dependency dependency Modified: sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java?rev=915386r1=915385r2=915386view=diff == --- sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java (original) +++ sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java Tue Feb 23 15:30:38 2010 @@ -18,15 +18,16 @@ */ package org.apache.sling.commons.testing.jcr; -import org.apache.jackrabbit.util.ChildrenCollectorFilter; - import java.io.InputStream; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Calendar; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.jcr.Binary; +import javax.jcr.InvalidLifecycleTransitionException; import javax.jcr.Item; import javax.jcr.ItemVisitor; import javax.jcr.Node; @@ -35,17 +36,21 @@ import javax.jcr.PropertyIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; +import javax.jcr.UnsupportedRepositoryOperationException; import javax.jcr.Value; import javax.jcr.ValueFormatException; import javax.jcr.lock.Lock; import javax.jcr.lock.LockException; import javax.jcr.nodetype.ConstraintViolationException; +import
svn commit: r915485 - /sling/trunk/launchpad/testing/src/test/resources/log4j.properties
Author: justin Date: Tue Feb 23 19:00:25 2010 New Revision: 915485 URL: http://svn.apache.org/viewvc?rev=915485view=rev Log: had logger cateogry name wrong for httpclient wire logging Modified: sling/trunk/launchpad/testing/src/test/resources/log4j.properties Modified: sling/trunk/launchpad/testing/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/resources/log4j.properties?rev=915485r1=915484r2=915485view=diff == --- sling/trunk/launchpad/testing/src/test/resources/log4j.properties (original) +++ sling/trunk/launchpad/testing/src/test/resources/log4j.properties Tue Feb 23 19:00:25 2010 @@ -23,4 +23,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -#log4j.category.http.wire=debug +log4j.category.httpclient.wire=debug
svn commit: r915487 - /sling/trunk/launchpad/testing/src/test/resources/log4j.properties
Author: justin Date: Tue Feb 23 19:00:39 2010 New Revision: 915487 URL: http://svn.apache.org/viewvc?rev=915487view=rev Log: seperating out header and content logging config Modified: sling/trunk/launchpad/testing/src/test/resources/log4j.properties Modified: sling/trunk/launchpad/testing/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/resources/log4j.properties?rev=915487r1=915486r2=915487view=diff == --- sling/trunk/launchpad/testing/src/test/resources/log4j.properties (original) +++ sling/trunk/launchpad/testing/src/test/resources/log4j.properties Tue Feb 23 19:00:39 2010 @@ -23,4 +23,10 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n -log4j.category.httpclient.wire=debug +# uncomment out these lines to log http headers +#log4j.category.httpclient.wire.header=debug, stdout +#log4j.additivity.httpclient.wire.header=false + +# uncomment out these lines to log http content +#log4j.category.httpclient.wire.content=debug, stdout +#log4j.additivity.httpclient.wire.content=false \ No newline at end of file
svn commit: r915489 - in /sling/trunk: bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/ launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integration
Author: justin
Date: Tue Feb 23 19:00:50 2010
New Revision: 915489
URL: http://svn.apache.org/viewvc?rev=915489view=rev
Log:
SLING-1407 - creating NameValuePairList utility class and adding method to
SlingIntegrationTestClient. This created one ambiguous method call in
PostRedirectTest.
Added:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePair.java
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
Modified:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
Added:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePair.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePair.java?rev=915489view=auto
==
---
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePair.java
(added)
+++
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePair.java
Tue Feb 23 19:00:50 2010
@@ -0,0 +1,59 @@
+/*
+ * 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.commons.testing.integration;
+
+
+/**
+ * A basic name-value pair class.
+ */
+public class NameValuePair {
+
+public NameValuePair() {
+this(null, null);
+}
+
+public NameValuePair(String name, String value) {
+this.name = name;
+this.value = value;
+}
+
+private String name = null;
+
+private String value = null;
+
+public void setName(String name) {
+this.name = name;
+}
+
+public String getName() {
+return name;
+}
+
+public void setValue(String value) {
+this.value = value;
+}
+
+public String getValue() {
+return value;
+}
+
+@Override
+public String toString() {
+return String.format(name=%s, value=%s, name, value);
+}
+
+}
Added:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java?rev=915489view=auto
==
---
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
(added)
+++
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
Tue Feb 23 19:00:50 2010
@@ -0,0 +1,101 @@
+/*
+ * 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.commons.testing.integration;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+
+/**
+ * A list of name-value pairs.
+ */
+public class NameValuePairList implements IterableNameValuePair {
+
+private final ListNameValuePair delegate;
+
+public NameValuePairList() {
+ delegate = new ArrayListNameValuePair();
+
svn commit: r915491 - in /sling/trunk/launchpad: test-services/src/main/resources/SLING-INF/content/ test-services/src/main/resources/SLING-INF/nodetypes/ testing/src/test/java/org/apache/sling/launch
Author: justin
Date: Tue Feb 23 19:01:08 2010
New Revision: 915491
URL: http://svn.apache.org/viewvc?rev=915491view=rev
Log:
improving integration test for SLING-1395
Modified:
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/content/property-types-test.json
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/nodetypes/test.cnd
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
Modified:
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/content/property-types-test.json
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/content/property-types-test.json?rev=915491r1=915490r2=915491view=diff
==
---
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/content/property-types-test.json
(original)
+++
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/content/property-types-test.json
Tue Feb 23 19:01:08 2010
@@ -1,8 +1,17 @@
{
test-node : {
jcr:primaryType : sling:propertySetTestNodeType,
+ string : Sling,
+ strings : [Apache, Sling],
+ long : 42,
+ longs : [4, 8, 15, 16, 23, 42],
+ boolean : true,
+ booleans : [true, false],
uri : http://www.google.com/;,
+ uris : [http://sling.apache.org/;, http://www.google.com/;],
name : sling:test,
- path :
/sling-test/initial-content-folder/folder-content-test
+ names : [jcr:base, sling:test],
+ path :
/sling-test/initial-content-folder/folder-content-test,
+ paths :
[/sling-test/initial-content-folder/folder-content-test, /apps]
}
}
Modified:
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/nodetypes/test.cnd
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/nodetypes/test.cnd?rev=915491r1=915490r2=915491view=diff
==
---
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/nodetypes/test.cnd
(original)
+++
sling/trunk/launchpad/test-services/src/main/resources/SLING-INF/nodetypes/test.cnd
Tue Feb 23 19:01:08 2010
@@ -19,6 +19,19 @@
sling = 'http://sling.apache.org/jcr/sling/1.0'
[sling:propertySetTestNodeType] nt:base
+ - string (string)
+ - long (long)
+ - boolean (boolean)
- uri (uri)
- path (path)
- - name (name)
\ No newline at end of file
+ - name (name)
+ - ref (reference)
+ - weakref (weakreference)
+ - strings (string) multiple
+ - longs (long) multiple
+ - booleans (boolean) multiple
+ - uris (uri) multiple
+ - paths (path) multiple
+ - names (name) multiple
+ - refs (reference) multiple
+ - weakrefs (weakreference) multiple
\ No newline at end of file
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java?rev=915491r1=915490r2=915491view=diff
==
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
Tue Feb 23 19:01:08 2010
@@ -21,55 +21,34 @@
import org.apache.sling.commons.testing.integration.HttpTestBase;
/**
- * Test that name, path, and (in JCR 2, uri) properties are set correctly.
+ * Test that property types are supported in initial content.
*/
public class ContentLoaderMiscPropertyTest extends HttpTestBase {
/**
- * Verify that the test node's node type is set correctly.
+ * Verify that the test node's properties are set correctly.
*/
-public void testLoadedNodeType() throws IOException {
-final String expected = sling:propertySetTestNodeType;
+public void testLoaded() throws IOException {
final String content = getContent(
HTTP_BASE_URL +
/sling-test/property-types-test/test-node.txt, CONTENT_TYPE_PLAIN);
-assertTrue(Content contains + expected + ( + content + ),
content.contains(expected));
-}
-/**
- * Verify that the URI-type property loaded correctly.
- *
- * This test is only really useful post-JCR 2 upgrade.
- */
-public void testLoadedURI() throws IOException {
-final String expected = http://www.google.com/;;
-final String content = getContent(
-HTTP_BASE_URL +
svn commit: r915493 - in /sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration: NameValuePairList.java SlingIntegrationTestClient.java
Author: justin
Date: Tue Feb 23 19:01:23 2010
New Revision: 915493
URL: http://svn.apache.org/viewvc?rev=915493view=rev
Log:
SLING-1407 - adding nullcheck and better default alignment with current behavior
Modified:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java
Modified:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java?rev=915493r1=915492r2=915493view=diff
==
---
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
(original)
+++
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/NameValuePairList.java
Tue Feb 23 19:01:23 2010
@@ -30,7 +30,7 @@
private final ListNameValuePair delegate;
public NameValuePairList() {
- delegate = new ArrayListNameValuePair();
+delegate = new ArrayListNameValuePair();
}
public NameValuePairList(ListNameValuePair init) {
@@ -43,14 +43,16 @@
public NameValuePairList(MapString, String clientNodeProperties) {
this();
-for (Map.EntryString,String e : clientNodeProperties.entrySet()) {
-add(e.getKey(), e.getValue());
+if (clientNodeProperties != null) {
+for (Map.EntryString, String e :
clientNodeProperties.entrySet()) {
+add(e.getKey(), e.getValue());
+}
}
}
public void add(String name, String value) {
delegate.add(new NameValuePair(name, value));
- }
+}
public void addIfNew(String name, String value) {
boolean found = false;
@@ -87,6 +89,12 @@
}
}
+public void addOrReplaceAll(NameValuePairList other) {
+for (NameValuePair nvp : other) {
+addOrReplace(nvp.getName(), nvp.getValue());
+}
+}
+
public void clear() {
delegate.clear();
}
@@ -95,6 +103,22 @@
return delegate.iterator();
}
+public void prependIfNew(String name, String value) {
+boolean found = false;
+for (ListIteratorNameValuePair li = delegate.listIterator();
li.hasNext();) {
+NameValuePair current = li.next();
+if (current.getName().equals(name)) {
+found = true;
+break;
+}
+}
+
+if (!found) {
+delegate.add(0, new NameValuePair(name, value));
+}
+
+}
+
public int size() {
return delegate.size();
}
Modified:
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java?rev=915493r1=915492r2=915493view=diff
==
---
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java
(original)
+++
sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/integration/SlingIntegrationTestClient.java
Tue Feb 23 19:01:23 2010
@@ -125,12 +125,14 @@
NameValuePairList nodeProperties = new
NameValuePairList(clientNodeProperties);
// add sling specific properties
-nodeProperties.addOrReplace(:redirect, *);
-nodeProperties.addOrReplace(:displayExtension, );
-nodeProperties.addOrReplace(:status, browser);
+nodeProperties.prependIfNew(:redirect, *);
+nodeProperties.prependIfNew(:displayExtension, );
+nodeProperties.prependIfNew(:status, browser);
// add fake property - otherwise the node is not created
-nodeProperties.addIfNew(jcr:created, );
+if (clientNodeProperties == null) {
+nodeProperties.add(jcr:created, );
+}
// force form encoding to UTF-8, which is what we use to convert the
// string parts into stream data
svn commit: r915494 - /sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java
Author: justin Date: Tue Feb 23 19:01:30 2010 New Revision: 915494 URL: http://svn.apache.org/viewvc?rev=915494view=rev Log: SLING-1333 - fixing integration test type hints Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java?rev=915494r1=915493r2=915494view=diff == --- sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java (original) +++ sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java Tue Feb 23 19:01:30 2010 @@ -58,10 +58,10 @@ props.add(w...@typehint, WeakReference); props.add(rs, firstPath); props.add(rs, secondPath); -props.add(r...@typehint, Reference); +props.add(r...@typehint, Reference[]); props.add(ws, firstPath); props.add(ws, secondPath); -props.add(w...@typehint, WeakReference); +props.add(w...@typehint, WeakReference[]); final String referencingNodeUrl = testClient.createNode(postUrl + SlingPostConstants.DEFAULT_CREATE_SUFFIX, props, null, false);
svn commit: r915492 - /sling/trunk/launchpad/testing/pom.xml
Author: justin
Date: Tue Feb 23 19:01:13 2010
New Revision: 915492
URL: http://svn.apache.org/viewvc?rev=915492view=rev
Log:
SLING-1404 - adding new property jetty.http.port to change jetty http port,
defaults to
Modified:
sling/trunk/launchpad/testing/pom.xml
Modified: sling/trunk/launchpad/testing/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=915492r1=915491r2=915492view=diff
==
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Tue Feb 23 19:01:13 2010
@@ -44,6 +44,9 @@
/scm
properties
+!-- HTTP port to use when running mvn jetty:run --
+jetty.http.port/jetty.http.port
+
!-- path suffix for HTTP access to Sling --
http.base.path /
@@ -154,7 +157,7 @@
connectors
connector
implementation=org.mortbay.jetty.nio.SelectChannelConnector
-port${http.port}/port
+port${jetty.http.port}/port
maxIdleTime6/maxIdleTime
/connector
/connectors
svn commit: r915495 - in /sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest: JspTestBase.java RenderingTestBase.java
Author: justin
Date: Tue Feb 23 19:01:38 2010
New Revision: 915495
URL: http://svn.apache.org/viewvc?rev=915495view=rev
Log:
marking 'base' test classes abstract
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java?rev=915495r1=915494r2=915495view=diff
==
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JspTestBase.java
Tue Feb 23 19:01:38 2010
@@ -19,7 +19,7 @@
/** Base class for tests that use JSP - configures the JSP
* scripting engine in a test-friendly way
*/
-public class JspTestBase extends RenderingTestBase {
+public abstract class JspTestBase extends RenderingTestBase {
public static final String SCRIPT = serverscripts/jsp-engine-setup.jsp;
private static boolean jspEngineConfigured;
Modified:
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java?rev=915495r1=915494r2=915495view=diff
==
---
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
(original)
+++
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
Tue Feb 23 19:01:38 2010
@@ -22,7 +22,7 @@
/** Base class for rendering tests
*/
-class RenderingTestBase extends HttpTestBase {
+abstract class RenderingTestBase extends HttpTestBase {
protected String scriptPath;
protected String testText;
protected String displayUrl;
@@ -36,4 +36,4 @@
fail(Content does not contain ' + expected + ' (content= +
content + ));
}
}
-}
\ No newline at end of file
+}
svn commit: r915670 - in /sling/trunk: bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ launchpad/testing/src/test/java/org/apache/sling/launchpad
Author: enorman
Date: Wed Feb 24 04:44:43 2010
New Revision: 915670
URL: http://svn.apache.org/viewvc?rev=915670view=rev
Log:
SLING-997 handle merges involving aggregate privileges properly
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/accessManager/ModifyAceTest.java
Modified:
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java?rev=915670r1=915669r2=915670view=diff
==
---
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
(original)
+++
sling/trunk/bundles/jcr/jackrabbit-accessmanager/src/main/java/org/apache/sling/jcr/jackrabbit/accessmanager/post/ModifyAceServlet.java
Wed Feb 24 04:44:43 2010
@@ -100,7 +100,6 @@
/* (non-Javadoc)
* @see
org.apache.sling.jackrabbit.accessmanager.post.AbstractAccessPostServlet#handleOperation(org.apache.sling.api.SlingHttpServletRequest,
org.apache.sling.api.servlets.HtmlResponse, java.util.List)
*/
- @SuppressWarnings(unchecked)
@Override
protected void handleOperation(SlingHttpServletRequest request,
HtmlResponse htmlResponse, ListModification changes)
@@ -133,12 +132,70 @@
}
}
+ try {
+ AccessControlManager accessControlManager =
AccessControlUtil.getAccessControlManager(session);
- ListString grantedPrivilegeNames = new ArrayListString();
- ListString deniedPrivilegeNames = new ArrayListString();
- //SLING-997: keep track of the privilege names that were
posted, so the others can be preserved
- SetString postedPrivilegeNames = new HashSetString();
- Enumeration parameterNames = request.getParameterNames();
+ //SLING-997: keep track of the privilege names that
were posted, so the others can be preserved
+ PrivilegesState privilegesInfo = new
PrivilegesState(log.isDebugEnabled());
+
+ //calculate which privileges were POSTed.
+ collectPostedPrivilegeNames(request,
+ accessControlManager,
+ privilegesInfo);
+
+ //find the existing ACL
+ AccessControlList updatedAcl =
getAccessControlList(accessControlManager, resourcePath, true);
+
+ //keep track of the existing ACEs for the target
principal
+ ListAccessControlEntry oldAces =
processExistingAccessControlEntries(resourcePath,
+ authorizable,
+ accessControlManager,
+ updatedAcl,
+ privilegesInfo);
+
+ //remove the old ACEs. Re-created below.
+ if (!oldAces.isEmpty()) {
+ for (AccessControlEntry ace : oldAces) {
+
updatedAcl.removeAccessControlEntry(ace);
+ }
+ }
+
+ //re-aggregate the granted/denied privileges into the
best matched aggregate privilege
+ reaggregatePrivileges(resourcePath,
+ accessControlManager,
+ privilegesInfo);
+
+ //add fresh ACEs with the granted privileges
+ buildFreshAccessControlEntries(authorizable,
+ accessControlManager,
+ updatedAcl,
+ privilegesInfo);
+
+ //store the updated ACL
+ accessControlManager.setPolicy(resourcePath,
updatedAcl);
+ if (session.hasPendingChanges()) {
+ session.save();
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug(Updated ACE for principalId {0} for
resource {1) from {2} to {3}, new Object [] {
+ authorizable.getID(),
resourcePath,
svn commit: r915677 - in /sling/trunk/bundles/extensions/formauth/src/main: java/org/apache/sling/formauth/AuthenticationFormServlet.java resources/org/apache/sling/formauth/login.html
Author: enorman
Date: Wed Feb 24 05:22:04 2010
New Revision: 915677
URL: http://svn.apache.org/viewvc?rev=915677view=rev
Log:
SLING-1116 make sure the login form action is an absolute path
Modified:
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html
Modified:
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java?rev=915677r1=915676r2=915677view=diff
==
---
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
(original)
+++
sling/trunk/bundles/extensions/formauth/src/main/java/org/apache/sling/formauth/AuthenticationFormServlet.java
Wed Feb 24 05:22:04 2010
@@ -112,6 +112,7 @@
form = form.replace(${resource}, getResource(request));
form = form.replace(${j_reason}, getReason(request));
+form = form.replace(${requestContextPath}, request.getContextPath());
return form;
}
Modified:
sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html?rev=915677r1=915676r2=915677view=diff
==
---
sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html
(original)
+++
sling/trunk/bundles/extensions/formauth/src/main/resources/org/apache/sling/formauth/login.html
Wed Feb 24 05:22:04 2010
@@ -58,7 +58,7 @@
div id=main!-- Login Form --
h3Login:/h3
-form id=loginform method=POST action=j_security_check
+form id=loginform method=POST
action=${requestContextPath}/j_security_check
enctype=multipart/form-data accept-charset=UTF-8
input type=hidden name=_charset_ value=UTF-8 /
