svn commit: r6491 - /release/sling/
Author: rombert Date: Fri Sep 12 19:39:58 2014 New Revision: 6491 Log: scripting.jsp.taglib 2.2.2 Added: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.asc (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-source-release.zip (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-source-release.zip.asc (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-source-release.zip.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-source-release.zip.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-sources.jar (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-sources.jar.asc (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-sources.jar.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-sources.jar.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.jar (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.jar.asc (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.jar.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.jar.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.pom (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.pom.asc (with props) release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.pom.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.pom.sha1 Removed: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-javadoc.jar release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-javadoc.jar.asc release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-javadoc.jar.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-javadoc.jar.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-source-release.zip release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-source-release.zip.asc release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-source-release.zip.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-source-release.zip.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-sources.jar release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-sources.jar.asc release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-sources.jar.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0-sources.jar.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.jar release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.jar.asc release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.jar.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.jar.sha1 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.pom release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.pom.asc release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.pom.md5 release/sling/org.apache.sling.scripting.jsp.taglib-2.2.0.pom.sha1 Added: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.md5 == --- release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.md5 Fri Sep 12 19:39:58 2014 @@ -0,0 +1 @@ +a380db90e2a1c25bc771d80972aa7c81 \ No newline at end of file Added: release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.sha1 == --- release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.scripting.jsp.taglib-2.2.2-javadoc.jar.sha1 Fri Sep 12 19:39:58 2014 @@ -0,0 +1 @@ +70a787f7e72c5b7fdf44cbebf1a0f1ce6d35ff3c \ No newline at end of file Added: release/sling
svn commit: r1624626 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: rombert Date: Fri Sep 12 19:40:40 2014 New Revision: 1624626 URL: http://svn.apache.org/r1624626 Log: scripting.jsp.taglib 2.2.2 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1624626r1=1624625r2=1624626view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Sep 12 19:40:40 2014 @@ -127,7 +127,7 @@ Scripting Core|org.apache.sling.scriptin Scripting Java|org.apache.sling.scripting.java|2.0.10 Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.14 Scripting JSP|org.apache.sling.scripting.jsp|2.1.4 -Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.0 +Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.2 Scripting JST|org.apache.sling.scripting.jst|2.0.6 Scripting Thymeleaf|org.apache.sling.scripting.thymeleaf|0.0.2 Security|org.apache.sling.security|1.0.6 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1624626r1=1624625r2=1624626view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Sep 12 19:40:40 2014 @@ -1,6 +1,6 @@ Title: News -* New Releases: Apache Sling Filesystem Resource Provider 1.1.4, Apache Sling Launchpad Content 2.0.8 (September 12th, 2014) +* New Releases: Apache Sling Filesystem Resource Provider 1.1.4, Apache Sling Launchpad Content 2.0.8, Apache Sling JSP Tag Library 2.2.2 (September 12th, 2014) * New Release: Apache Sling Auth Core 1.2.0 (September 8th, 2014) * New Releases: Apache Sling Models API 1.1.0 and Apache Sling Models Impl 1.1.0 (September 5th, 2014) * New Releases: Apache Sling Crankstart Launcher (initial release), Apache Sling Health Check Annotations 1.0.2, Apache Sling Health Check Core 1.1.2, Apache Sling Health Check JUnit Bridge 1.0.2, Apache Sling Health Check Samples 1.0.6 (September 5th, 2014)
svn commit: r1624627 - /sling/site/trunk/content/obr/sling.xml
Author: rombert Date: Fri Sep 12 19:41:49 2014 New Revision: 1624627 URL: http://svn.apache.org/r1624627 Log: obr: org.apache.sling.scripting.jsp.taglib/2.2.2 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1624627r1=1624626r2=1624627view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Fri Sep 12 19:41:49 2014 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20140912103204.146' +repository name='Apache Sling Release Repository' lastmodified='20140912104119.481' resource id='org.apache.sling.api/2.0.4.incubator' symbolicname='org.apache.sling.api' presentationname='Apache Sling API' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator.jar' version='2.0.4.incubator' descriptionThe Apache Sling API defines an extension to the Servlet API 2.4 to provide access to content and unified accessto request parameters hiding the differences between thedifferent methods of transferring parameters from clientto server. Note that the Apache Sling API bundle does notinclude the Servlet API but instead requires the API tobe provided by the Servlet container in which the Apache Sling framework is running or by another bundle./description size52065/size @@ -1521,6 +1521,57 @@ require name='package' filter='(amp;(package=org.apache.sling.scripting.jsp.util)(versiongt;=2.0.0))' extend='false' multiple='false' optional='false'Import package org.apache.sling.scripting.jsp.util ;version=2.0.0/require require name='package' filter='(amp;(package=org.slf4j)(versiongt;=1.5.0))' extend='false' multiple='false' optional='false'Import package org.slf4j ;version=1.5.0/require /resource + resource id='org.apache.sling.scripting.jsp.taglib/2.2.2' symbolicname='org.apache.sling.scripting.jsp.taglib' presentationname='Apache Sling JSP Tag Library' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.jsp.taglib-2.2.2.jar' version='2.2.2' +descriptionCore Tag Library for Apache Sling JSP support/description +size437038/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.scripting.jsp.taglib'/ + p n='presentationname' v='Apache Sling JSP Tag Library'/ + p n='version' t='version' v='2.2.2'/ + p n='manifestversion' v='2'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.jsp.taglib'/ + p n='version' t='version' v='2.2.0'/ + p n='uses:' v='javax.servlet,javax.servlet.jsp,javax.servlet.jsp.tagext,org.apache.sling.api.adapter,org.apache.sling.api.resource'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.jsp.taglib.helpers'/ + p n='version' t='version' v='2.2.0'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.jsp.taglib.tei'/ + p n='version' t='version' v='2.2.0'/ + p n='uses:' v='javax.servlet.jsp.tagext'/ +/capability +require name='package' filter='(amp;(package=javax.servlet.jsp)(versiongt;=2.0.0))' extend='false' multiple='false' optional='false'Import package javax.servlet.jsp;version=2.0/require +require name='package' filter='(amp;(package=javax.servlet.jsp.tagext)(versiongt;=2.0.0))' extend='false' multiple='false' optional='false'Import package javax.servlet.jsp.tagext;version=2.0/require +require name='package' filter='(amp;(package=javax.crypto))' extend='false' multiple='false' optional='false'Import package javax.crypto/require +require name='package' filter='(amp;(package=javax.crypto.spec))' extend='false' multiple='false' optional='false'Import package javax.crypto.spec/require +require name='package' filter='(amp;(package=javax.servlet))' extend='false' multiple='false' optional='false'Import package javax.servlet/require +require name='package' filter='(amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'Import package javax.servlet.http/require +require name='package' filter='(amp;(package=org.apache.commons.collections.iterators)(versiongt;=3.2.0)(!(versiongt;=4.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.commons.collections.iterators;version=[3.2,4)/require +require name='package' filter='(amp;(package=org.apache.commons.fileupload))' extend='false' multiple='false' optional='false'Import package org.apache.commons.fileupload/require
svn commit: r6492 - /release/sling/
Author: rombert Date: Fri Sep 12 19:46:45 2014 New Revision: 6492 Log: scripting.groovy 1.0.0 Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.asc (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.md5 release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.sha1 release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.asc (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.md5 release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.sha1 release/sling/org.apache.sling.scripting.groovy-1.0.0-sources.jar (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0-sources.jar.asc (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0-sources.jar.md5 release/sling/org.apache.sling.scripting.groovy-1.0.0-sources.jar.sha1 release/sling/org.apache.sling.scripting.groovy-1.0.0.jar (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0.jar.asc (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0.jar.md5 release/sling/org.apache.sling.scripting.groovy-1.0.0.jar.sha1 release/sling/org.apache.sling.scripting.groovy-1.0.0.pom (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0.pom.asc (with props) release/sling/org.apache.sling.scripting.groovy-1.0.0.pom.md5 release/sling/org.apache.sling.scripting.groovy-1.0.0.pom.sha1 Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.md5 Fri Sep 12 19:46:45 2014 @@ -0,0 +1 @@ +bc8fb19c978883e985f11bdd11d68ecc \ No newline at end of file Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.sha1 == --- release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.scripting.groovy-1.0.0-javadoc.jar.sha1 Fri Sep 12 19:46:45 2014 @@ -0,0 +1 @@ +de2b07c2b8fae22ae7fcaa68aa0a70e3a114a3e3 \ No newline at end of file Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.md5 == --- release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.md5 (added) +++ release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.md5 Fri Sep 12 19:46:45 2014 @@ -0,0 +1 @@ +a07526e6c56b4f301de92305dcff8124 \ No newline at end of file Added: release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.sha1 == --- release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.sha1 (added) +++ release/sling/org.apache.sling.scripting.groovy-1.0.0-source-release.zip.sha1 Fri Sep 12 19:46:45 2014 @@ -0,0 +1 @@ +ecc37f4b1dd52cae103330f24bf219c734c02c09 \ No newline
svn commit: r1624628 - /sling/site/trunk/content/obr/sling.xml
Author: rombert Date: Fri Sep 12 19:47:42 2014 New Revision: 1624628 URL: http://svn.apache.org/r1624628 Log: obr: org.apache.sling.scripting.groovy/1.0.0 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1624628r1=1624627r2=1624628view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Fri Sep 12 19:47:42 2014 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20140912104119.481' +repository name='Apache Sling Release Repository' lastmodified='20140912104725.563' resource id='org.apache.sling.api/2.0.4.incubator' symbolicname='org.apache.sling.api' presentationname='Apache Sling API' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator.jar' version='2.0.4.incubator' descriptionThe Apache Sling API defines an extension to the Servlet API 2.4 to provide access to content and unified accessto request parameters hiding the differences between thedifferent methods of transferring parameters from clientto server. Note that the Apache Sling API bundle does notinclude the Servlet API but instead requires the API tobe provided by the Servlet container in which the Apache Sling framework is running or by another bundle./description size52065/size @@ -2343,6 +2343,26 @@ require name='package' filter='(amp;(package=org.osgi.service.component))' extend='false' multiple='false' optional='false'Import package org.osgi.service.component/require require name='package' filter='(amp;(package=org.slf4j))' extend='false' multiple='false' optional='false'Import package org.slf4j/require /resource + resource id='org.apache.sling.scripting.groovy/1.0.0' symbolicname='org.apache.sling.scripting.groovy' presentationname='Apache Sling Scripting Groovy Support' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.groovy-1.0.0.jar' version='1.0.0' +descriptionSupport for scripting with Groovy/description +size13890/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.scripting.groovy'/ + p n='presentationname' v='Apache Sling Scripting Groovy Support'/ + p n='version' t='version' v='1.0.0'/ + p n='manifestversion' v='2'/ +/capability +require name='package' filter='(amp;(package=groovy.json)(versiongt;=1.8.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package groovy.json;version=[1.8,2)/require +require name='package' filter='(amp;(package=groovy.lang)(versiongt;=1.8.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package groovy.lang;version=[1.8,2)/require +require name='package' filter='(amp;(package=groovy.text)(versiongt;=1.8.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package groovy.text;version=[1.8,2)/require +require name='package' filter='(amp;(package=javax.script))' extend='false' multiple='false' optional='false'Import package javax.script/require +require name='package' filter='(amp;(package=org.apache.sling.commons.classloader)(versiongt;=1.0.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.classloader;version=[1.0,2)/require +require name='package' filter='(amp;(package=org.apache.sling.scripting.api)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.scripting.api;version=[2.0,3)/require +require name='ee' filter='(|(ee=J2SE-1.5))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=J2SE-1.5))/require + /resource resource id='org.apache.sling.scripting.javascript/2.0.4.incubator' symbolicname='org.apache.sling.scripting.javascript' presentationname='Apache Sling Scripting JavaScript Support' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.javascript/2.0.4-incubator/org.apache.sling.scripting.javascript-2.0.4-incubator.jar' version='2.0.4.incubator' descriptionSupport for JavaScript scripting/description size814277/size
svn commit: r1624630 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: rombert Date: Fri Sep 12 19:49:38 2014 New Revision: 1624630 URL: http://svn.apache.org/r1624630 Log: scripting.groovy 1.0.0 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1624630r1=1624629r2=1624630view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Sep 12 19:49:38 2014 @@ -129,6 +129,7 @@ Scripting JavaScript|org.apache.sling.sc Scripting JSP|org.apache.sling.scripting.jsp|2.1.4 Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.2 Scripting JST|org.apache.sling.scripting.jst|2.0.6 +Scripting Groovy|org.apache.sling.scripting.groovy|1.0.0 Scripting Thymeleaf|org.apache.sling.scripting.thymeleaf|0.0.2 Security|org.apache.sling.security|1.0.6 Service User Mapper|org.apache.sling.serviceusermapper|1.0.4 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1624630r1=1624629r2=1624630view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Sep 12 19:49:38 2014 @@ -1,6 +1,6 @@ Title: News -* New Releases: Apache Sling Filesystem Resource Provider 1.1.4, Apache Sling Launchpad Content 2.0.8, Apache Sling JSP Tag Library 2.2.2 (September 12th, 2014) +* New Releases: Apache Sling Filesystem Resource Provider 1.1.4, Apache Sling Launchpad Content 2.0.8, Apache Sling JSP Tag Library 2.2.2, Apache Sling Scripting Groovy Support 1.0.0 (September 12th, 2014) * New Release: Apache Sling Auth Core 1.2.0 (September 8th, 2014) * New Releases: Apache Sling Models API 1.1.0 and Apache Sling Models Impl 1.1.0 (September 5th, 2014) * New Releases: Apache Sling Crankstart Launcher (initial release), Apache Sling Health Check Annotations 1.0.2, Apache Sling Health Check Core 1.1.2, Apache Sling Health Check JUnit Bridge 1.0.2, Apache Sling Health Check Samples 1.0.6 (September 5th, 2014)
svn commit: r1624953 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Mon Sep 15 07:33:23 2014 New Revision: 1624953 URL: http://svn.apache.org/r1624953 Log: Use latest releases for scripting.jsp.taglib, launchpad.content and fsresource 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=1624953r1=1624952r2=1624953view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Sep 15 07:33:23 2014 @@ -260,14 +260,14 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.fsresource/artifactId -version1.1.5-SNAPSHOT/version +version1.1.4/version /bundle !-- Launchpad initial content -- bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.launchpad.content/artifactId -version2.0.7-SNAPSHOT/version +version2.0.8/version /bundle !-- scripting -- @@ -294,7 +294,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.jsp.taglib/artifactId -version2.2.3-SNAPSHOT/version +version2.2.2/version /bundle bundle groupIdorg.apache.geronimo.bundles/groupId
svn commit: r1625490 - in /sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl: PathBasedHolderCache.java SlingAuthenticator.java
Author: rombert
Date: Wed Sep 17 08:56:19 2014
New Revision: 1625490
URL: http://svn.apache.org/r1625490
Log:
SLING-3936 - Poor performance when adding a large (?) number of
sling.auth.requirements services
Replace ArrayList + explicit sort with TreeSet.
Modified:
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.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/PathBasedHolderCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java?rev=1625490r1=1625489r2=1625490view=diff
==
---
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java
(original)
+++
sling/trunk/bundles/auth/core/src/main/java/org/apache/sling/auth/core/impl/PathBasedHolderCache.java
Wed Sep 17 08:56:19 2014
@@ -19,17 +19,19 @@
package org.apache.sling.auth.core.impl;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.SortedSet;
+import java.util.TreeSet;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.servlet.http.HttpServletRequest;
public class PathBasedHolderCacheType extends PathBasedHolder {
-private final MapString, MapString, ListType cache = new
HashMapString, MapString, ListType();
+private final MapString, MapString, SortedSetType cache = new
HashMapString, MapString, SortedSetType();
/** Read/write lock to synchronize the cache access. */
private final ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
@@ -47,28 +49,25 @@ public class PathBasedHolderCacheType e
this.rwLock.writeLock().lock();
try {
-MapString, ListType byHostMap = cache.get(holder.protocol);
+MapString, SortedSetType byHostMap =
cache.get(holder.protocol);
if (byHostMap == null) {
-byHostMap = new HashMapString, ListType();
+byHostMap = new HashMapString, SortedSetType();
cache.put(holder.protocol, byHostMap);
}
-final ListType byPathList = new ArrayListType();
+final SortedSetType byPathSet = new TreeSetType();
// preset with current list
-final ListType currentPathList = byHostMap.get(holder.host);
-if (currentPathList != null) {
-byPathList.addAll(currentPathList);
+final SortedSetType currentPathSet = byHostMap.get(holder.host);
+if (currentPathSet != null) {
+byPathSet.addAll(currentPathSet);
}
// add the new holder
-byPathList.add(holder);
+byPathSet.add(holder);
-// sort the list according to the path length (longest path first)
-Collections.sort(byPathList);
-
-// replace old list with new list
-byHostMap.put(holder.host, byPathList);
+// replace old set with new set
+byHostMap.put(holder.host, byPathSet);
} finally {
this.rwLock.writeLock().unlock();
}
@@ -77,21 +76,21 @@ public class PathBasedHolderCacheType e
public void removeHolder(final Type holder) {
this.rwLock.writeLock().lock();
try {
-final MapString, ListType byHostMap =
cache.get(holder.protocol);
+final MapString, SortedSetType byHostMap =
cache.get(holder.protocol);
if (byHostMap != null) {
-final ListType byPathList = byHostMap.get(holder.host);
-if (byPathList != null) {
+final SortedSetType byPathSet = byHostMap.get(holder.host);
+if (byPathSet != null) {
-// create a new list without the removed holder
-final ListType list = new ArrayListType();
-list.addAll(byPathList);
-list.remove(holder);
+// create a new set without the removed holder
+final SortedSetType set = new TreeSetType();
+set.addAll(byPathSet);
+set.remove(holder);
-// replace the old list with the new one (or remove if
empty)
-if (list.isEmpty()) {
+// replace the old set with the new one (or remove if
empty)
+if (set.isEmpty()) {
byHostMap.remove(holder.host);
} else {
-byHostMap.put(holder.host, list);
+byHostMap.put(holder.host, set
svn commit: r1625545 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Wed Sep 17 12:17:40 2014 New Revision: 1625545 URL: http://svn.apache.org/r1625545 Log: Use org.apache.sling.scripting.javascript 2.0.14 that was released some time ago 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=1625545r1=1625544r2=1625545view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Sep 17 12:17:40 2014 @@ -284,7 +284,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.12/version +version2.0.14/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1625722 - /sling/tags/org.apache.sling.jcr.davex-1.2.2/
Author: rombert Date: Wed Sep 17 18:28:03 2014 New Revision: 1625722 URL: http://svn.apache.org/r1625722 Log: [maven-release-plugin] copy for tag org.apache.sling.jcr.davex-1.2.2 Added: sling/tags/org.apache.sling.jcr.davex-1.2.2/ - copied from r1625721, sling/trunk/bundles/jcr/davex/
svn commit: r1625723 - /sling/trunk/bundles/jcr/davex/pom.xml
Author: rombert Date: Wed Sep 17 18:28:06 2014 New Revision: 1625723 URL: http://svn.apache.org/r1625723 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/jcr/davex/pom.xml Modified: sling/trunk/bundles/jcr/davex/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/pom.xml?rev=1625723r1=1625722r2=1625723view=diff == --- sling/trunk/bundles/jcr/davex/pom.xml (original) +++ sling/trunk/bundles/jcr/davex/pom.xml Wed Sep 17 18:28:06 2014 @@ -19,7 +19,7 @@ artifactIdorg.apache.sling.jcr.davex/artifactId packagingbundle/packaging -version1.2.2/version +version1.2.3-SNAPSHOT/version nameApache Sling DavEx Access to repositories/name description @@ -27,9 +27,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.davex-1.2.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.davex-1.2.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.davex-1.2.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/davex/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/davex/developerConnection +urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/url /scm build
svn commit: r1625721 - /sling/trunk/bundles/jcr/davex/pom.xml
Author: rombert Date: Wed Sep 17 18:28:00 2014 New Revision: 1625721 URL: http://svn.apache.org/r1625721 Log: [maven-release-plugin] prepare release org.apache.sling.jcr.davex-1.2.2 Modified: sling/trunk/bundles/jcr/davex/pom.xml Modified: sling/trunk/bundles/jcr/davex/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/pom.xml?rev=1625721r1=1625720r2=1625721view=diff == --- sling/trunk/bundles/jcr/davex/pom.xml (original) +++ sling/trunk/bundles/jcr/davex/pom.xml Wed Sep 17 18:28:00 2014 @@ -19,7 +19,7 @@ artifactIdorg.apache.sling.jcr.davex/artifactId packagingbundle/packaging -version1.2.1-SNAPSHOT/version +version1.2.2/version nameApache Sling DavEx Access to repositories/name description @@ -27,9 +27,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/davex/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/davex/developerConnection -urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/jcr/davex/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.davex-1.2.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.davex-1.2.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.davex-1.2.2/url /scm build
svn commit: r1625725 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Wed Sep 17 18:33:13 2014 New Revision: 1625725 URL: http://svn.apache.org/r1625725 Log: jcr.davex: use next SNAPSHOT during release 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=1625725r1=1625724r2=1625725view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Sep 17 18:33:13 2014 @@ -539,7 +539,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.davex/artifactId -version1.2.1-SNAPSHOT/version +version1.2.3-SNAPSHOT/version /bundle /startLevel
svn commit: r1625728 - /sling/trunk/bundles/extensions/adapter/pom.xml
Author: rombert Date: Wed Sep 17 18:35:14 2014 New Revision: 1625728 URL: http://svn.apache.org/r1625728 Log: [maven-release-plugin] prepare release org.apache.sling.adapter-2.1.2 Modified: sling/trunk/bundles/extensions/adapter/pom.xml Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1625728r1=1625727r2=1625728view=diff == --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Wed Sep 17 18:35:14 2014 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.adapter/artifactId packagingbundle/packaging -version2.1.1-SNAPSHOT/version +version2.1.2/version nameApache Sling Adapter Manager Implementation/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.adapter-2.1.2/url /scm properties
svn commit: r1625729 - /sling/tags/org.apache.sling.adapter-2.1.2/
Author: rombert Date: Wed Sep 17 18:35:17 2014 New Revision: 1625729 URL: http://svn.apache.org/r1625729 Log: [maven-release-plugin] copy for tag org.apache.sling.adapter-2.1.2 Added: sling/tags/org.apache.sling.adapter-2.1.2/ - copied from r1625728, sling/trunk/bundles/extensions/adapter/
svn commit: r1625730 - /sling/trunk/bundles/extensions/adapter/pom.xml
Author: rombert Date: Wed Sep 17 18:35:20 2014 New Revision: 1625730 URL: http://svn.apache.org/r1625730 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/adapter/pom.xml Modified: sling/trunk/bundles/extensions/adapter/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/pom.xml?rev=1625730r1=1625729r2=1625730view=diff == --- sling/trunk/bundles/extensions/adapter/pom.xml (original) +++ sling/trunk/bundles/extensions/adapter/pom.xml Wed Sep 17 18:35:20 2014 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.adapter/artifactId packagingbundle/packaging -version2.1.2/version +version2.1.3-SNAPSHOT/version nameApache Sling Adapter Manager Implementation/name description @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.adapter-2.1.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.adapter-2.1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/adapter/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/adapter/url /scm properties
svn commit: r1625738 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Wed Sep 17 18:46:56 2014 New Revision: 1625738 URL: http://svn.apache.org/r1625738 Log: adapter: use next SNAPSHOT during release 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=1625738r1=1625737r2=1625738view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Sep 17 18:46:56 2014 @@ -220,7 +220,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.adapter/artifactId -version2.1.1-SNAPSHOT/version +version2.1.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1625742 - /sling/trunk/bundles/scripting/core/pom.xml
Author: rombert Date: Wed Sep 17 18:48:22 2014 New Revision: 1625742 URL: http://svn.apache.org/r1625742 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=1625742r1=1625741r2=1625742view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Wed Sep 17 18:48:22 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.28/version +version2.0.29-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -44,9 +44,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.28/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.28/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.28/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: r1625740 - /sling/trunk/bundles/scripting/core/pom.xml
Author: rombert Date: Wed Sep 17 18:48:17 2014 New Revision: 1625740 URL: http://svn.apache.org/r1625740 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.0.28 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=1625740r1=1625739r2=1625740view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Wed Sep 17 18:48:17 2014 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.27-SNAPSHOT/version +version2.0.28/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -44,9 +44,9 @@ /properties 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.28/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.28/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.28/url /scm build
svn commit: r1625741 - /sling/tags/org.apache.sling.scripting.core-2.0.28/
Author: rombert Date: Wed Sep 17 18:48:20 2014 New Revision: 1625741 URL: http://svn.apache.org/r1625741 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.core-2.0.28 Added: sling/tags/org.apache.sling.scripting.core-2.0.28/ - copied from r1625740, sling/trunk/bundles/scripting/core/
svn commit: r1625748 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Wed Sep 17 18:52:35 2014 New Revision: 1625748 URL: http://svn.apache.org/r1625748 Log: scripting.core: use next SNAPSHOT during release 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=1625748r1=1625747r2=1625748view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Sep 17 18:52:35 2014 @@ -279,7 +279,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.27-SNAPSHOT/version +version2.0.29-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1625813 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: rombert Date: Wed Sep 17 20:41:08 2014 New Revision: 1625813 URL: http://svn.apache.org/r1625813 Log: event ITs: use current SNAPSHOT for jcr.jackrabbit.server Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1625813r1=1625812r2=1625813view=diff == --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Wed Sep 17 20:41:08 2014 @@ -147,7 +147,7 @@ public abstract class AbstractJobHandlin mavenBundle(org.apache.jackrabbit, jackrabbit-spi-commons, 2.6.5), mavenBundle(org.apache.jackrabbit, jackrabbit-jcr-rmi, 2.6.5), mavenBundle(org.apache.derby, derby, 10.5.3.0_1), -mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.3-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.5-SNAPSHOT), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2),
svn commit: r1625815 - /sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
Author: rombert Date: Wed Sep 17 20:42:04 2014 New Revision: 1625815 URL: http://svn.apache.org/r1625815 Log: Oak ITs: use current SNAPSHOT for jcr.jackrabbit.server Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java?rev=1625815r1=1625814r2=1625815view=diff == --- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java (original) +++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java Wed Sep 17 20:42:04 2014 @@ -108,7 +108,7 @@ public class JackrabbitRepositoryIT exte mavenBundle(org.apache.jackrabbit, jackrabbit-spi-commons, 2.6.5), mavenBundle(org.apache.jackrabbit, jackrabbit-jcr-rmi, 2.6.5), mavenBundle(org.apache.derby, derby, 10.5.3.0_1), -mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.3-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.5-SNAPSHOT), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2),
svn commit: r1625822 - in /sling/trunk/bundles: extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repositor
Author: rombert Date: Wed Sep 17 20:53:28 2014 New Revision: 1625822 URL: http://svn.apache.org/r1625822 Log: Use correct SNAPSHOT version for org.apache.sling.jcr.jackrabbit.server Thanks to Oliver Lietz for spotting the mistake. Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1625822r1=1625821r2=1625822view=diff == --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Wed Sep 17 20:53:28 2014 @@ -147,7 +147,7 @@ public abstract class AbstractJobHandlin mavenBundle(org.apache.jackrabbit, jackrabbit-spi-commons, 2.6.5), mavenBundle(org.apache.jackrabbit, jackrabbit-jcr-rmi, 2.6.5), mavenBundle(org.apache.derby, derby, 10.5.3.0_1), -mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.5-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.2.1-SNAPSHOT), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2), Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java?rev=1625822r1=1625821r2=1625822view=diff == --- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java (original) +++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java Wed Sep 17 20:53:28 2014 @@ -108,7 +108,7 @@ public class JackrabbitRepositoryIT exte mavenBundle(org.apache.jackrabbit, jackrabbit-spi-commons, 2.6.5), mavenBundle(org.apache.jackrabbit, jackrabbit-jcr-rmi, 2.6.5), mavenBundle(org.apache.derby, derby, 10.5.3.0_1), -mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.1.5-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.2.1-SNAPSHOT), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2),
svn commit: r1626196 - /sling/trunk/tooling/ide/eclipse-m2e-ui/plugin.xml
Author: rombert Date: Fri Sep 19 12:46:42 2014 New Revision: 1626196 URL: http://svn.apache.org/r1626196 Log: SLING-3807 - Consider adding the Maven central artifact repository by default Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/plugin.xml Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/plugin.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/plugin.xml?rev=1626196r1=1626195r2=1626196view=diff == --- sling/trunk/tooling/ide/eclipse-m2e-ui/plugin.xml (original) +++ sling/trunk/tooling/ide/eclipse-m2e-ui/plugin.xml Fri Sep 19 12:46:42 2014 @@ -53,4 +53,8 @@ secondaryTo=maven-bundle-plugin /configurator /extension -/plugin + extension point=org.eclipse.m2e.core.archetypeCatalogs + remote url=http://repo1.maven.org/maven2/; + description=Maven Central/ + /extension +/plugin
svn commit: r1626215 - /sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF
Author: rombert Date: Fri Sep 19 13:43:11 2014 New Revision: 1626215 URL: http://svn.apache.org/r1626215 Log: SLING-3957 - Support m2e 1.6 or newer Use Require-Bundle instead of Import-Package for stuff provided by m2e . This works around that org.apache.maven, org.codehaus and other packages are exported with mandatory provider=m2e attribute. Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF?rev=1626215r1=1626214r2=1626215view=diff == --- sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF (original) +++ sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF Fri Sep 19 13:43:11 2014 @@ -6,25 +6,15 @@ Bundle-Activator: org.apache.sling.ide.e Bundle-Version: 1.0.3.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ClassPath: . +Require-Bundle: org.eclipse.m2e.core;bundle-version=1.4.0, + org.eclipse.m2e.archetype.common;bundle-version=1.4.0, + org.eclipse.m2e.maven.runtime;bundle-version=1.4.0 Import-Package: org.apache.commons.httpclient;version=3.1.0, org.apache.commons.httpclient.auth;version=3.1.0, org.apache.commons.httpclient.methods;version=3.1.0, org.apache.commons.httpclient.methods.multipart;version=3.1.0, org.apache.commons.httpclient.params;version=3.1.0, org.apache.commons.io;version=2.0.1, - org.apache.maven, - org.apache.maven.archetype, - org.apache.maven.archetype.catalog, - org.apache.maven.archetype.metadata, - org.apache.maven.artifact, - org.apache.maven.artifact.handler, - org.apache.maven.artifact.installer, - org.apache.maven.artifact.repository, - org.apache.maven.artifact.versioning, - org.apache.maven.execution, - org.apache.maven.model, - org.apache.maven.plugin, - org.apache.maven.project, org.apache.sling.ide.artifacts, org.apache.sling.ide.eclipse.core, org.apache.sling.ide.eclipse.core.debug, @@ -34,7 +24,6 @@ Import-Package: org.apache.commons.httpc org.apache.sling.ide.log, org.apache.sling.ide.osgi, org.apache.sling.ide.transport, - org.codehaus.plexus, org.eclipse.core.resources, org.eclipse.core.runtime;version=3.4.0, org.eclipse.core.runtime.jobs, @@ -47,15 +36,6 @@ Import-Package: org.apache.commons.httpc org.eclipse.jface.resource, org.eclipse.jface.viewers, org.eclipse.jface.wizard, - org.eclipse.m2e.core, - org.eclipse.m2e.core.embedder, - org.eclipse.m2e.core.internal, - org.eclipse.m2e.core.internal.archetype, - org.eclipse.m2e.core.internal.embedder, - org.eclipse.m2e.core.internal.index, - org.eclipse.m2e.core.project, - org.eclipse.m2e.core.project.configurator, - org.eclipse.m2e.core.repository, org.eclipse.swt, org.eclipse.swt.events, org.eclipse.swt.layout,
svn commit: r1626217 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
Author: rombert
Date: Fri Sep 19 13:50:33 2014
New Revision: 1626217
URL: http://svn.apache.org/r1626217
Log:
Fix typo in InstallEditorSection
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java?rev=1626217r1=1626216r2=1626217view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/InstallEditorSection.java
Fri Sep 19 13:50:33 2014
@@ -289,7 +289,7 @@ public class InstallEditorSection extend
private void updateActionArea(Version serverVersion, final Version
embeddedVersion) {
if (serverVersion == null || embeddedVersion.compareTo(serverVersion)
0) {
supportBundleVersionLabel
-.setText(Installation support bundle is not present our
outdated, deployment will not work);
+.setText(Installation support bundle is not present or
outdated, deployment will not work);
installOrUpdateSupportBundleLink.setText((Install));
installOrUpdateSupportBundleLink.setEnabled(true);
} else {
svn commit: r6617 - /release/sling/
Author: rombert Date: Mon Sep 22 09:33:24 2014 New Revision: 6617 Log: jcr.davex 1.2.2 Added: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar (with props) release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.asc (with props) release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.md5 release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.sha1 release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip (with props) release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip.asc (with props) release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip.md5 release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip.sha1 release/sling/org.apache.sling.jcr.davex-1.2.2-sources.jar (with props) release/sling/org.apache.sling.jcr.davex-1.2.2-sources.jar.asc (with props) release/sling/org.apache.sling.jcr.davex-1.2.2-sources.jar.md5 release/sling/org.apache.sling.jcr.davex-1.2.2-sources.jar.sha1 release/sling/org.apache.sling.jcr.davex-1.2.2.jar (with props) release/sling/org.apache.sling.jcr.davex-1.2.2.jar.asc (with props) release/sling/org.apache.sling.jcr.davex-1.2.2.jar.md5 release/sling/org.apache.sling.jcr.davex-1.2.2.jar.sha1 release/sling/org.apache.sling.jcr.davex-1.2.2.pom (with props) release/sling/org.apache.sling.jcr.davex-1.2.2.pom.asc (with props) release/sling/org.apache.sling.jcr.davex-1.2.2.pom.md5 release/sling/org.apache.sling.jcr.davex-1.2.2.pom.sha1 Removed: release/sling/org.apache.sling.jcr.davex-1.2.0-javadoc.jar release/sling/org.apache.sling.jcr.davex-1.2.0-javadoc.jar.asc release/sling/org.apache.sling.jcr.davex-1.2.0-javadoc.jar.md5 release/sling/org.apache.sling.jcr.davex-1.2.0-javadoc.jar.sha1 release/sling/org.apache.sling.jcr.davex-1.2.0-source-release.zip release/sling/org.apache.sling.jcr.davex-1.2.0-source-release.zip.asc release/sling/org.apache.sling.jcr.davex-1.2.0-source-release.zip.md5 release/sling/org.apache.sling.jcr.davex-1.2.0-source-release.zip.sha1 release/sling/org.apache.sling.jcr.davex-1.2.0-sources.jar release/sling/org.apache.sling.jcr.davex-1.2.0-sources.jar.asc release/sling/org.apache.sling.jcr.davex-1.2.0-sources.jar.md5 release/sling/org.apache.sling.jcr.davex-1.2.0-sources.jar.sha1 release/sling/org.apache.sling.jcr.davex-1.2.0.jar release/sling/org.apache.sling.jcr.davex-1.2.0.jar.asc release/sling/org.apache.sling.jcr.davex-1.2.0.jar.md5 release/sling/org.apache.sling.jcr.davex-1.2.0.jar.sha1 release/sling/org.apache.sling.jcr.davex-1.2.0.pom release/sling/org.apache.sling.jcr.davex-1.2.0.pom.asc release/sling/org.apache.sling.jcr.davex-1.2.0.pom.md5 release/sling/org.apache.sling.jcr.davex-1.2.0.pom.sha1 Added: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.md5 == --- release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.md5 Mon Sep 22 09:33:24 2014 @@ -0,0 +1 @@ +7230ca74fcfb4ce03632cffca03772cf \ No newline at end of file Added: release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.sha1 == --- release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.jcr.davex-1.2.2-javadoc.jar.sha1 Mon Sep 22 09:33:24 2014 @@ -0,0 +1 @@ +29ff328c24c93c9bf525bae4920ba3c9699e7e6e \ No newline at end of file Added: release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.jcr.davex-1.2.2-source-release.zip.asc == Binary file - no diff available. Propchange: release/sling
svn commit: r1626712 - /sling/site/trunk/content/obr/sling.xml
Author: rombert Date: Mon Sep 22 09:39:57 2014 New Revision: 1626712 URL: http://svn.apache.org/r1626712 Log: obr: org.apache.sling.jcr.davex/1.2.2 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1626712r1=1626711r2=1626712view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Mon Sep 22 09:39:57 2014 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20140917080350.774' +repository name='Apache Sling Release Repository' lastmodified='20140922123701.857' resource id='org.apache.sling.api/2.0.4.incubator' symbolicname='org.apache.sling.api' presentationname='Apache Sling API' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.api/2.0.4-incubator/org.apache.sling.api-2.0.4-incubator.jar' version='2.0.4.incubator' descriptionThe Apache Sling API defines an extension to the Servlet API 2.4 to provide access to content and unified accessto request parameters hiding the differences between thedifferent methods of transferring parameters from clientto server. Note that the Apache Sling API bundle does notinclude the Servlet API but instead requires the API tobe provided by the Servlet container in which the Apache Sling framework is running or by another bundle./description size52065/size @@ -302,6 +302,72 @@ require name='package' filter='(amp;(package=org.xml.sax.ext))' extend='false' multiple='false' optional='false'Import package org.xml.sax.ext/require require name='package' filter='(amp;(package=org.xml.sax.helpers))' extend='false' multiple='false' optional='false'Import package org.xml.sax.helpers/require /resource + resource id='org.apache.sling.jcr.davex/1.2.2' symbolicname='org.apache.sling.jcr.davex' presentationname='Apache Sling DavEx Access to repositories' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.jcr.davex-1.2.2.jar' version='1.2.2' +descriptionBundle to access JCR repositories over DavEx/description +size255303/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +category id='jcr'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.jcr.davex'/ + p n='presentationname' v='Apache Sling DavEx Access to repositories'/ + p n='version' t='version' v='1.2.2'/ + p n='manifestversion' v='2'/ +/capability +require name='package' filter='(amp;(package=javax.jcr)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package javax.jcr;version=[2.0,3)/require +require name='package' filter='(amp;(package=javax.jcr.lock)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package javax.jcr.lock;version=[2.0,3)/require +require name='package' filter='(amp;(package=javax.jcr.nodetype)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package javax.jcr.nodetype;version=[2.0,3)/require +require name='package' filter='(amp;(package=javax.jcr.observation)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package javax.jcr.observation;version=[2.0,3)/require +require name='package' filter='(amp;(package=javax.jcr.query)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package javax.jcr.query;version=[2.0,3)/require +require name='package' filter='(amp;(package=javax.jcr.version)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package javax.jcr.version;version=[2.0,3)/require +require name='package' filter='(amp;(package=javax.servlet))' extend='false' multiple='false' optional='false'Import package javax.servlet/require +require name='package' filter='(amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'Import package javax.servlet.http/require +require name='package' filter='(amp;(package=javax.transaction.xa))' extend='false' multiple='false' optional='false'Import package javax.transaction.xa/require +require name='package' filter='(amp;(package=javax.xml.parsers))' extend='false' multiple='false' optional='false'Import package javax.xml.parsers/require +require name='package' filter='(amp;(package=javax.xml.transform))' extend='false' multiple='false' optional='false'Import package javax.xml.transform/require +require name='package' filter='(amp;(package=javax.xml.transform.dom))' extend='false' multiple='false' optional='false'Import package
svn commit: r1626714 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: rombert Date: Mon Sep 22 09:41:35 2014 New Revision: 1626714 URL: http://svn.apache.org/r1626714 Log: DavEx Access to repositories 1.2.2 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1626714r1=1626713r2=1626714view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Mon Sep 22 09:41:35 2014 @@ -84,7 +84,7 @@ JCR Base|org.apache.sling.jcr.base|2.2.2 JCR ClassLoader|org.apache.sling.jcr.classloader|3.2.2 JCR Compiler|org.apache.sling.jcr.compiler|2.1.0 JCR ContentLoader|org.apache.sling.jcr.contentloader|2.1.10 -JCR DavEx|org.apache.sling.jcr.davex|1.2.0 +JCR DavEx|org.apache.sling.jcr.davex|1.2.2 JCR Jackrabbit AccessManager|org.apache.sling.jcr.jackrabbit.accessmanager|2.1.2 JCR Jackrabbit Server|org.apache.sling.jcr.jackrabbit.server|2.2.0 JCR Jackrabbit UserManager|org.apache.sling.jcr.jackrabbit.usermanager|2.2.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1626714r1=1626713r2=1626714view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Mon Sep 22 09:41:35 2014 @@ -1,5 +1,6 @@ Title: News +* New Releases: Apache Sling DavEx Access to repositories 1.2.2 ( September 22, 2014 ) * New Releases: Apache Sling JCR ContentLoader 2.1.0, and Apache Sling Web Console Security Provider 1.1.4 (September 21st, 2014) * New Releases: Apache Sling Resource Access Security 1.0.0, and Apache Sling Auth Core 1.3.0 (September 20th, 2014) * New Releases: Apache Sling Engine 2.3.6, Apache Sling JCR ClassLoader 3.2.2, Apache Sling JCR Jackrabbit Access Manager 2.1.2, Apache Sling JCR Jackrabbit Server 2.2.0, Apache Sling JCR Jackrabbit User Manager 2.2.2, Apache Sling JCR Registration 1.0.2, Apache Sling JCR Web Console 1.0.2 (September 19th, 2014)
svn commit: r1626715 - /sling/site/trunk/content/obr/sling.xml
Author: rombert Date: Mon Sep 22 09:47:32 2014 New Revision: 1626715 URL: http://svn.apache.org/r1626715 Log: obr: org.apache.sling.adapter/2.1.2 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1626715r1=1626714r2=1626715view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Mon Sep 22 09:47:32 2014 @@ -1,4 +1,36 @@ -repository name='Apache Sling Release Repository' lastmodified='20140922123701.857' +repository name='Apache Sling Release Repository' lastmodified='20140922124710.359' + resource id='org.apache.sling.adapter/2.1.2' symbolicname='org.apache.sling.adapter' presentationname='Apache Sling Adapter Manager Implementation' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.adapter-2.1.2.jar' version='2.1.2' +descriptionBundle implementing the AdapterManager and provides a convenienceimplementation of the Adaptable interface to make use of thisAdapterManager./description +size26558/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.adapter'/ + p n='presentationname' v='Apache Sling Adapter Manager Implementation'/ + p n='version' t='version' v='2.1.2'/ + p n='manifestversion' v='2'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.adapter'/ + p n='version' t='version' v='2.0.6'/ + p n='uses:' v='org.apache.sling.api.adapter'/ +/capability +require name='package' filter='(amp;(package=org.apache.sling.api.adapter)(versiongt;=2.2.0)(!(versiongt;=2.3.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.adapter;version=[2.2,2.3)/require +require name='package' filter='(amp;(package=javax.servlet))' extend='false' multiple='false' optional='false'Import package javax.servlet/require +require name='package' filter='(amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'Import package javax.servlet.http/require +require name='package' filter='(amp;(package=org.apache.commons.io)(versiongt;=1.4.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.commons.io;version=[1.4,2)/require +require name='package' filter='(amp;(package=org.apache.commons.lang.builder)(versiongt;=2.5.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.commons.lang.builder;version=[2.5,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.resource)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.resource;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.json)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.json;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.osgi)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.osgi;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.osgi.framework)(versiongt;=1.4.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.osgi.framework;version=[1.4,2)/require +require name='package' filter='(amp;(package=org.osgi.service.component)(versiongt;=1.0.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.osgi.service.component;version=[1.0,2)/require +require name='package' filter='(amp;(package=org.osgi.service.event)(versiongt;=1.1.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.osgi.service.event;version=[1.1,2)/require +require name='package' filter='(amp;(package=org.osgi.util.tracker)(versiongt;=1.3.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.osgi.util.tracker;version=[1.3,2)/require +require name='package' filter='(amp;(package=org.slf4j)(versiongt;=1.5.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.slf4j;version=[1.5,2)/require +require name='ee' filter='(|(ee=J2SE-1.5))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=J2SE-1.5))/require + /resource resource id='org.apache.sling.api/2.0.4.incubator' symbolicname='org.apache.sling.api' presentationname='Apache Sling API' uri='http
svn commit: r6619 - /release/sling/
Author: rombert Date: Mon Sep 22 09:51:34 2014 New Revision: 6619 Log: scripting.core 2.0.28 Added: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar (with props) release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.asc (with props) release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.md5 release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.sha1 release/sling/org.apache.sling.scripting.core-2.0.28-source-release.zip (with props) release/sling/org.apache.sling.scripting.core-2.0.28-source-release.zip.asc (with props) release/sling/org.apache.sling.scripting.core-2.0.28-source-release.zip.md5 release/sling/org.apache.sling.scripting.core-2.0.28-source-release.zip.sha1 release/sling/org.apache.sling.scripting.core-2.0.28-sources.jar (with props) release/sling/org.apache.sling.scripting.core-2.0.28-sources.jar.asc (with props) release/sling/org.apache.sling.scripting.core-2.0.28-sources.jar.md5 release/sling/org.apache.sling.scripting.core-2.0.28-sources.jar.sha1 release/sling/org.apache.sling.scripting.core-2.0.28.jar (with props) release/sling/org.apache.sling.scripting.core-2.0.28.jar.asc (with props) release/sling/org.apache.sling.scripting.core-2.0.28.jar.md5 release/sling/org.apache.sling.scripting.core-2.0.28.jar.sha1 release/sling/org.apache.sling.scripting.core-2.0.28.pom (with props) release/sling/org.apache.sling.scripting.core-2.0.28.pom.asc (with props) release/sling/org.apache.sling.scripting.core-2.0.28.pom.md5 release/sling/org.apache.sling.scripting.core-2.0.28.pom.sha1 Removed: release/sling/org.apache.sling.scripting.core-2.0.26-javadoc.jar release/sling/org.apache.sling.scripting.core-2.0.26-javadoc.jar.asc release/sling/org.apache.sling.scripting.core-2.0.26-javadoc.jar.md5 release/sling/org.apache.sling.scripting.core-2.0.26-javadoc.jar.sha1 release/sling/org.apache.sling.scripting.core-2.0.26-source-release.zip release/sling/org.apache.sling.scripting.core-2.0.26-source-release.zip.asc release/sling/org.apache.sling.scripting.core-2.0.26-source-release.zip.md5 release/sling/org.apache.sling.scripting.core-2.0.26-source-release.zip.sha1 release/sling/org.apache.sling.scripting.core-2.0.26-sources.jar release/sling/org.apache.sling.scripting.core-2.0.26-sources.jar.asc release/sling/org.apache.sling.scripting.core-2.0.26-sources.jar.md5 release/sling/org.apache.sling.scripting.core-2.0.26-sources.jar.sha1 release/sling/org.apache.sling.scripting.core-2.0.26.jar release/sling/org.apache.sling.scripting.core-2.0.26.jar.asc release/sling/org.apache.sling.scripting.core-2.0.26.jar.md5 release/sling/org.apache.sling.scripting.core-2.0.26.jar.sha1 release/sling/org.apache.sling.scripting.core-2.0.26.pom release/sling/org.apache.sling.scripting.core-2.0.26.pom.asc release/sling/org.apache.sling.scripting.core-2.0.26.pom.md5 release/sling/org.apache.sling.scripting.core-2.0.26.pom.sha1 Added: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.md5 == --- release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.md5 Mon Sep 22 09:51:34 2014 @@ -0,0 +1 @@ +136a4f037e760bfd1afd85d8767f9577 \ No newline at end of file Added: release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.sha1 == --- release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.sha1 (added) +++ release/sling/org.apache.sling.scripting.core-2.0.28-javadoc.jar.sha1 Mon Sep 22 09:51:34 2014 @@ -0,0 +1 @@ +65c82e2c86869ec8336646be6f25e0c3ebd2 \ No newline at end of file Added: release/sling/org.apache.sling.scripting.core-2.0.28-source-release.zip == Binary file - no diff available. Propchange: release/sling/org.apache.sling.scripting.core-2.0.28-source-release.zip
svn commit: r1626717 - /sling/site/trunk/content/obr/sling.xml
Author: rombert Date: Mon Sep 22 09:54:03 2014 New Revision: 1626717 URL: http://svn.apache.org/r1626717 Log: org.apache.sling.scripting.core/2.0.28 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1626717r1=1626716r2=1626717view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Mon Sep 22 09:54:03 2014 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20140922124710.359' +repository name='Apache Sling Release Repository' lastmodified='20140922125344.738' resource id='org.apache.sling.adapter/2.1.2' symbolicname='org.apache.sling.adapter' presentationname='Apache Sling Adapter Manager Implementation' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.adapter-2.1.2.jar' version='2.1.2' descriptionBundle implementing the AdapterManager and provides a convenienceimplementation of the Adaptable interface to make use of thisAdapterManager./description size26558/size @@ -2439,6 +2439,40 @@ require name='package' filter='(amp;(package=org.osgi.util.tracker)(versiongt;=1.3.0))' extend='false' multiple='false' optional='false'Import package org.osgi.util.tracker ;version=1.3.0/require require name='package' filter='(amp;(package=org.slf4j)(versiongt;=1.5.0))' extend='false' multiple='false' optional='false'Import package org.slf4j ;version=1.5.0/require /resource + resource id='org.apache.sling.scripting.core/2.0.28' symbolicname='org.apache.sling.scripting.core' presentationname='Apache Sling Scripting Core implementation' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.core-2.0.28.jar' version='2.0.28' +descriptionSling Scripting core functionality/description +size65342/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.scripting.core'/ + p n='presentationname' v='Apache Sling Scripting Core implementation'/ + p n='version' t='version' v='2.0.28'/ + p n='manifestversion' v='2'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.core'/ + p n='version' t='version' v='2.0.8'/ + p n='uses:' v='org.apache.sling.api,org.apache.sling.api.request,org.apache.sling.api.resource,org.apache.sling.api.scripting,org.osgi.framework'/ +/capability +require name='package' filter='(amp;(package=javax.script))' extend='false' multiple='false' optional='false'Import package javax.script/require +require name='package' filter='(amp;(package=javax.servlet))' extend='false' multiple='false' optional='false'Import package javax.servlet/require +require name='package' filter='(amp;(package=org.apache.sling.api)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.adapter)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.adapter;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.request)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.request;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.resource)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.resource;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.scripting)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.scripting;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.wrappers)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.wrappers;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.mime)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.mime;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.scripting.api)(versiongt;=2.2.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.scripting.api;version=[2.2,3)/require +require name='package' filter='(amp
svn commit: r1626718 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: rombert Date: Mon Sep 22 09:55:12 2014 New Revision: 1626718 URL: http://svn.apache.org/r1626718 Log: Apache Sling Scripting Core implementation 2.0.28 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1626718r1=1626717r2=1626718view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Mon Sep 22 09:55:12 2014 @@ -122,7 +122,7 @@ Sample Integration Tests|org.apache.slin Sample Server-Side Tests|org.apache.sling.testing.samples.sampletests|1.0.6 Scripting API|org.apache.sling.scripting.api|2.1.6 Scripting Console|org.apache.sling.scripting.console|1.0.0 -Scripting Core|org.apache.sling.scripting.core|2.0.26 +Scripting Core|org.apache.sling.scripting.core|2.0.28 Scripting Java|org.apache.sling.scripting.java|2.0.10 Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.14 Scripting JSP|org.apache.sling.scripting.jsp|2.1.4 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1626718r1=1626717r2=1626718view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Mon Sep 22 09:55:12 2014 @@ -1,6 +1,6 @@ Title: News -* New Releases: Apache Sling DavEx Access to repositories 1.2.2, Apache Sling Adapter Manager Implementation 2.1.2 ( September 22, 2014 ) +* New Releases: Apache Sling DavEx Access to repositories 1.2.2, Apache Sling Adapter Manager Implementation 2.1.2, Apache Sling Scripting Core implementation 2.0.28 (September 22, 2014) * New Releases: Apache Sling JCR ContentLoader 2.1.0, and Apache Sling Web Console Security Provider 1.1.4 (September 21st, 2014) * New Releases: Apache Sling Resource Access Security 1.0.0, and Apache Sling Auth Core 1.3.0 (September 20th, 2014) * New Releases: Apache Sling Engine 2.3.6, Apache Sling JCR ClassLoader 3.2.2, Apache Sling JCR Jackrabbit Access Manager 2.1.2, Apache Sling JCR Jackrabbit Server 2.2.0, Apache Sling JCR Jackrabbit User Manager 2.2.2, Apache Sling JCR Registration 1.0.2, Apache Sling JCR Web Console 1.0.2 (September 19th, 2014)
svn commit: r1626722 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Mon Sep 22 10:20:27 2014 New Revision: 1626722 URL: http://svn.apache.org/r1626722 Log: Use released versions for jcr.davex, scripting.core and adapter 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=1626722r1=1626721r2=1626722view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Sep 22 10:20:27 2014 @@ -220,7 +220,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.adapter/artifactId -version2.1.3-SNAPSHOT/version +version2.1.2/version /bundle bundle groupIdorg.apache.sling/groupId @@ -279,7 +279,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.29-SNAPSHOT/version +version2.0.28/version /bundle bundle groupIdorg.apache.sling/groupId @@ -539,7 +539,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.davex/artifactId -version1.2.3-SNAPSHOT/version +version1.2.2/version /bundle /startLevel
svn commit: r923189 - /websites/production/sling/content/
Author: rombert Date: Mon Sep 22 11:25:05 2014 New Revision: 923189 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r923188, websites/staging/sling/trunk/content/
svn commit: r1626756 - /sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java
Author: rombert Date: Mon Sep 22 12:36:22 2014 New Revision: 1626756 URL: http://svn.apache.org/r1626756 Log: Oak ITs: use released version of org.apache.sling.jcr.jackrabbit.server Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java?rev=1626756r1=1626755r2=1626756view=diff == --- sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java (original) +++ sling/trunk/bundles/jcr/it-jackrabbit-oak/src/test/java/org/apache/sling/jcr/repository/it/JackrabbitRepositoryIT.java Mon Sep 22 12:36:22 2014 @@ -108,7 +108,7 @@ public class JackrabbitRepositoryIT exte mavenBundle(org.apache.jackrabbit, jackrabbit-spi-commons, 2.6.5), mavenBundle(org.apache.jackrabbit, jackrabbit-jcr-rmi, 2.6.5), mavenBundle(org.apache.derby, derby, 10.5.3.0_1), -mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.2.1-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.2.0), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2),
svn commit: r1626755 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
Author: rombert Date: Mon Sep 22 12:36:10 2014 New Revision: 1626755 URL: http://svn.apache.org/r1626755 Log: Event ITs: use released version of org.apache.sling.jcr.jackrabbit.server Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1626755r1=1626754r2=1626755view=diff == --- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original) +++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Mon Sep 22 12:36:10 2014 @@ -147,7 +147,7 @@ public abstract class AbstractJobHandlin mavenBundle(org.apache.jackrabbit, jackrabbit-spi-commons, 2.6.5), mavenBundle(org.apache.jackrabbit, jackrabbit-jcr-rmi, 2.6.5), mavenBundle(org.apache.derby, derby, 10.5.3.0_1), -mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.2.1-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.jcr.jackrabbit.server, 2.2.0), mavenBundle(org.apache.sling, org.apache.sling.testing.tools, 1.0.6), mavenBundle(org.apache.httpcomponents, httpcore-osgi, 4.1.2),
svn commit: r1627053 - in /sling/trunk/tooling/ide: api/src/org/apache/sling/ide/osgi/impl/ eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ eclipse-test/src/org/apache/sling/ide/test/impl
Author: rombert
Date: Tue Sep 23 15:25:55 2014
New Revision: 1627053
URL: http://svn.apache.org/r1627053
Log:
SLING-3826 - Do not use HttpMethod.getResponseBodyAsString
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/ExternalSlingLaunchpad.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/RepositoryAccessor.java
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java?rev=1627053r1=1627052r2=1627053view=diff
==
---
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
(original)
+++
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
Tue Sep 23 15:25:55 2014
@@ -20,6 +20,7 @@ package org.apache.sling.ide.osgi.impl;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.List;
@@ -44,6 +45,7 @@ import org.apache.sling.ide.transport.Re
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
+import org.json.JSONTokener;
import org.osgi.framework.Version;
public class HttpOsgiClient implements OsgiClient {
@@ -60,6 +62,7 @@ public class HttpOsgiClient implements O
GetMethod method = new GetMethod(repositoryInfo.getUrl() +
system/console/bundles.json);
HttpClient client = getHttpClient();
+InputStream input = null;
try {
int result = client.executeMethod(method);
@@ -67,7 +70,9 @@ public class HttpOsgiClient implements O
throw new HttpException(Got status code + result + for
call to + method.getURI());
}
-JSONObject object = new
JSONObject(method.getResponseBodyAsString());
+input = method.getResponseBodyAsStream();
+
+JSONObject object = new JSONObject(new JSONTokener(new
InputStreamReader(input)));
JSONArray bundleData = object.getJSONArray(data);
for (int i = 0; i bundleData.length(); i++) {
@@ -88,6 +93,7 @@ public class HttpOsgiClient implements O
} catch (JSONException e) {
throw new OsgiClientException(e);
} finally {
+IOUtils.closeQuietly(input);
method.releaseConnection();
}
}
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java?rev=1627053r1=1627052r2=1627053view=diff
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/BundleStateHelper.java
Tue Sep 23 15:25:55 2014
@@ -16,6 +16,8 @@
*/
package org.apache.sling.ide.eclipse.core.internal;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.util.jar.Manifest;
import org.apache.commons.httpclient.Credentials;
@@ -24,6 +26,7 @@ import org.apache.commons.httpclient.Htt
import org.apache.commons.httpclient.UsernamePasswordCredentials;
import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@@ -34,6 +37,7 @@ import org.eclipse.jdt.core.IJavaProject
import org.eclipse.wst.server.core.IServer;
import org.json.JSONArray;
import org.json.JSONObject;
+import org.json.JSONTokener;
public class BundleStateHelper {
@@ -86,6 +90,9 @@ public class BundleStateHelper {
}
private static Object doRecalcDecorationState(IServer server, IProject
project) {
+
+InputStream input = null;
+
try {
if (!ProjectHelper.isBundleProject(project)) {
return EMPTY_STATE;
@@ -121,15 +128,18 @@ public class BundleStateHelper {
if (resultCode!=HttpStatus.SC_OK) {
return [+resultCode+];
}
-String responseBodyAsString = method.getResponseBodyAsString(); //
explicitly not limiting buffer here - even though this results in a warning
svn commit: r1627073 - /sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
Author: rombert
Date: Tue Sep 23 16:00:07 2014
New Revision: 1627073
URL: http://svn.apache.org/r1627073
Log:
SLING-3767 - [tooling] Add timeouts to HttpOsgiClient
Hardcode timeouts to 30 seconds.
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
Modified:
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java?rev=1627073r1=1627072r2=1627073view=diff
==
---
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
(original)
+++
sling/trunk/tooling/ide/api/src/org/apache/sling/ide/osgi/impl/HttpOsgiClient.java
Tue Sep 23 16:00:07 2014
@@ -50,6 +50,9 @@ import org.osgi.framework.Version;
public class HttpOsgiClient implements OsgiClient {
+private static final int DEFAULT_SOCKET_TIMEOUT_SECONDS = 30;
+private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 30;
+
private RepositoryInfo repositoryInfo;
public HttpOsgiClient(RepositoryInfo repositoryInfo) {
@@ -101,6 +104,8 @@ public class HttpOsgiClient implements O
private HttpClient getHttpClient() {
HttpClient client = new HttpClient();
+
client.getHttpConnectionManager().getParams().setConnectionTimeout(DEFAULT_CONNECT_TIMEOUT_SECONDS
* 1000);
+
client.getHttpConnectionManager().getParams().setSoTimeout(DEFAULT_SOCKET_TIMEOUT_SECONDS
* 1000);
client.getParams().setAuthenticationPreemptive(true);
Credentials defaultcreds = new
UsernamePasswordCredentials(repositoryInfo.getUsername(),
repositoryInfo.getPassword());
svn commit: r1627289 - in /sling/trunk/contrib/extensions/sling-query/src: main/java/org/apache/sling/query/resource/jcr/query/ test/java/org/apache/sling/query/selector/parser/
Author: rombert
Date: Wed Sep 24 12:17:24 2014
New Revision: 1627289
URL: http://svn.apache.org/r1627289
Log:
SLING-3971 - SlingQuery doesn't escape paths in the JCR queries
Submitted by: Tomek Rękawek
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/jcr/query/JcrQueryBuilder.java
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrMultiSelectorTest.java
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrSelectorTest.java
Modified:
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/jcr/query/JcrQueryBuilder.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/jcr/query/JcrQueryBuilder.java?rev=1627289r1=1627288r2=1627289view=diff
==
---
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/jcr/query/JcrQueryBuilder.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/main/java/org/apache/sling/query/resource/jcr/query/JcrQueryBuilder.java
Wed Sep 24 12:17:24 2014
@@ -55,7 +55,7 @@ public class JcrQueryBuilder {
Formula formula = prepareAlternativeConditions(segments);
if (StringUtils.isNotBlank(rootPath) !/.equals(rootPath)) {
ListTerm conditions = new ArrayListTerm();
- conditions.add(new
Atomic(String.format(ISDESCENDANTNODE([%s]), rootPath)));
+ conditions.add(new
Atomic(String.format(ISDESCENDANTNODE(['%s']), rootPath)));
if (formula != null) {
conditions.add(formula);
}
Modified:
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrMultiSelectorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrMultiSelectorTest.java?rev=1627289r1=1627288r2=1627289view=diff
==
---
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrMultiSelectorTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrMultiSelectorTest.java
Wed Sep 24 12:17:24 2014
@@ -52,7 +52,7 @@ public class JcrMultiSelectorTest {
@Test
public void attributesWithPath() {
final String selector = [x=y][y=z], [a=b][c=d];
- final String jcrQuery = SELECT * FROM [nt:base] AS s WHERE
(ISDESCENDANTNODE([/content]) AND ((s.[x] = 'y' AND s.[y] = 'z') OR (s.[a] =
'b' AND s.[c] = 'd')));
+ final String jcrQuery = SELECT * FROM [nt:base] AS s WHERE
(ISDESCENDANTNODE(['/content']) AND ((s.[x] = 'y' AND s.[y] = 'z') OR (s.[a] =
'b' AND s.[c] = 'd')));
Assert.assertEquals(jcrQuery, parse(selector, /content));
}
}
Modified:
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrSelectorTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrSelectorTest.java?rev=1627289r1=1627288r2=1627289view=diff
==
---
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrSelectorTest.java
(original)
+++
sling/trunk/contrib/extensions/sling-query/src/test/java/org/apache/sling/query/selector/parser/JcrSelectorTest.java
Wed Sep 24 12:17:24 2014
@@ -47,7 +47,7 @@ public class JcrSelectorTest {
@Test
public void parsePath() {
final String selector = cq:Page;
- final String jcrQuery = SELECT * FROM [cq:Page] AS s WHERE
ISDESCENDANTNODE([/content]);
+ final String jcrQuery = SELECT * FROM [cq:Page] AS s WHERE
ISDESCENDANTNODE(['/content']);
Assert.assertEquals(jcrQuery, parse(selector, /content));
}
@@ -117,14 +117,14 @@ public class JcrSelectorTest {
@Test
public void parseMultipleConditionsWithResourceTypeAndPath() {
final String selector =
foundation/components/parsys[key1=value1][key2=value2];
- final String jcrQuery = SELECT * FROM [nt:base] AS s WHERE
(ISDESCENDANTNODE([/content]) AND (s.[sling:resourceType] =
'foundation/components/parsys' AND s.[key1] = 'value1' AND s.[key2] =
'value2'));
+ final String jcrQuery = SELECT * FROM [nt:base] AS s WHERE
(ISDESCENDANTNODE(['/content']) AND (s.[sling:resourceType] =
'foundation/components/parsys' AND s.[key1] = 'value1' AND s
svn commit: r1627654 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Thu Sep 25 20:34:09 2014 New Revision: 1627654 URL: http://svn.apache.org/r1627654 Log: Use released version for org.apache.sling.scripting.jsp.taglib 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=1627654r1=1627653r2=1627654view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Sep 25 20:34:09 2014 @@ -284,7 +284,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.jsp.taglib/artifactId -version2.2.3-SNAPSHOT/version +version2.2.4/version /bundle bundle groupIdorg.apache.geronimo.bundles/groupId
svn commit: r1627869 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Fri Sep 26 19:55:01 2014 New Revision: 1627869 URL: http://svn.apache.org/r1627869 Log: Use released version for org.apache.sling.resourceresolver 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=1627869r1=1627868r2=1627869view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Fri Sep 26 19:55:01 2014 @@ -190,7 +190,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.resourceresolver/artifactId -version1.1.5-SNAPSHOT/version +version1.1.4/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1628163 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Mon Sep 29 11:38:53 2014 New Revision: 1628163 URL: http://svn.apache.org/r1628163 Log: SLING-3933 - Add OSGi Bundle Repository support back again to the web console 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=1628163r1=1628162r2=1628163view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Sep 29 11:38:53 2014 @@ -365,6 +365,11 @@ /bundle bundle groupIdorg.apache.felix/groupId +artifactIdorg.apache.felix.webconsole.plugins.obr/artifactId +version1.0.2/version +/bundle +bundle +groupIdorg.apache.felix/groupId artifactIdorg.apache.felix.webconsole.plugins.packageadmin/artifactId version1.0.0/version /bundle
svn commit: r6683 - /release/sling/
Author: rombert Date: Mon Sep 29 14:36:20 2014 New Revision: 6683 Log: testing.resourceresolver-mock 0.3.0 Added: release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.asc (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-source-release.zip (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-source-release.zip.asc (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-source-release.zip.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-source-release.zip.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-sources.jar (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-sources.jar.asc (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-sources.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-sources.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.jar (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.jar.asc (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.pom (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.pom.asc (with props) release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.pom.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0.pom.sha1 Removed: release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-javadoc.jar release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-javadoc.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-javadoc.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-javadoc.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-source-release.zip release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-source-release.zip.asc release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-source-release.zip.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-source-release.zip.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-sources.jar release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-sources.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-sources.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0-sources.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.jar release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.jar.asc release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.jar.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.jar.sha1 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.pom release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.pom.asc release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.pom.md5 release/sling/org.apache.sling.testing.resourceresolver-mock-0.2.0.pom.sha1 Added: release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar == Binary file - no diff available. Propchange: release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar -- svn:mime-type = application/zip Added: release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.md5 == --- release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.md5 (added) +++ release/sling/org.apache.sling.testing.resourceresolver-mock-0.3.0-javadoc.jar.md5 Mon Sep 29 14:36:20 2014 @@ -0,0 +1 @@ +6ab9531941c7b6a95f749ea1c3736635 \ No newline at end of file Added: release
svn commit: r1628520 - /sling/trunk/launchpad/builder/pom.xml
Author: rombert Date: Tue Sep 30 19:45:27 2014 New Revision: 1628520 URL: http://svn.apache.org/r1628520 Log: [maven-release-plugin] prepare release org.apache.sling.launchpad-7 Modified: sling/trunk/launchpad/builder/pom.xml Modified: sling/trunk/launchpad/builder/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1628520r1=1628519r2=1628520view=diff == --- sling/trunk/launchpad/builder/pom.xml (original) +++ sling/trunk/launchpad/builder/pom.xml Tue Sep 30 19:45:27 2014 @@ -22,7 +22,7 @@ artifactIdorg.apache.sling.launchpad/artifactId packagingwar/packaging -version7-SNAPSHOT/version +version7/version nameApache Sling Launchpad Application Builder/name description @@ -30,9 +30,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder/developerConnection -urlhttp://svn.apache.org/viewvc/sling/trunk/launchpad/builder/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad-7/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad-7/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad-7/url /scm
svn commit: r1628522 - /sling/trunk/launchpad/builder/pom.xml
Author: rombert Date: Tue Sep 30 19:45:32 2014 New Revision: 1628522 URL: http://svn.apache.org/r1628522 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/launchpad/builder/pom.xml Modified: sling/trunk/launchpad/builder/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/pom.xml?rev=1628522r1=1628521r2=1628522view=diff == --- sling/trunk/launchpad/builder/pom.xml (original) +++ sling/trunk/launchpad/builder/pom.xml Tue Sep 30 19:45:32 2014 @@ -22,7 +22,7 @@ artifactIdorg.apache.sling.launchpad/artifactId packagingwar/packaging -version7/version +version8-SNAPSHOT/version nameApache Sling Launchpad Application Builder/name description @@ -30,9 +30,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad-7/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad-7/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad-7/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/launchpad/builder/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/launchpad/builder/developerConnection +urlhttp://svn.apache.org/viewvc/sling/trunk/launchpad/builder/url /scm
svn commit: r1628521 - /sling/tags/org.apache.sling.launchpad-7/
Author: rombert Date: Tue Sep 30 19:45:30 2014 New Revision: 1628521 URL: http://svn.apache.org/r1628521 Log: [maven-release-plugin] copy for tag org.apache.sling.launchpad-7 Added: sling/tags/org.apache.sling.launchpad-7/ - copied from r1628520, sling/trunk/launchpad/builder/
svn commit: r1628812 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
Author: rombert
Date: Wed Oct 1 19:02:51 2014
New Revision: 1628812
URL: http://svn.apache.org/r1628812
Log:
Minor code cleanup in GenericJcrRootFile
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1628812r1=1628811r2=1628812view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
Wed Oct 1 19:02:51 2014
@@ -24,7 +24,6 @@ import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.eclipse.core.internal.Activator;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -34,10 +33,6 @@ import org.xml.sax.SAXException;
import de.pdark.decentxml.Document;
import de.pdark.decentxml.Element;
-import de.pdark.decentxml.XMLParser;
-import de.pdark.decentxml.XMLSource;
-import de.pdark.decentxml.XMLStringSource;
-import de.pdark.decentxml.XMLTokenizer;
import de.pdark.decentxml.XMLTokenizer.Type;
/** WIP: model object for a [.content.xml] shown in the content package view
in project explorer **/
@@ -163,7 +158,7 @@ public class GenericJcrRootFile extends
for (IteratorObject it = membersList.iterator();
it.hasNext();) {
final IResource resource = (IResource) it.next();
final String resName = resource.getName();
- Iterator it2;
+Iterator? it2;
if (isRootContentXml()) {
it2 = parent.children.iterator();
} else {
svn commit: r1628819 - in /sling/trunk/tooling/ide: eclipse-test/src/org/apache/sling/ide/test/impl/JcrNodeCreationTest.java eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Author: rombert
Date: Wed Oct 1 19:44:32 2014
New Revision: 1628819
URL: http://svn.apache.org/r1628819
Log:
SLING-3989 - Content Navigator can't create full coverage nodes under
partial coverage nodes
Fix and tests
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrNodeCreationTest.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrNodeCreationTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrNodeCreationTest.java?rev=1628819view=auto
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrNodeCreationTest.java
(added)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/JcrNodeCreationTest.java
Wed Oct 1 19:44:32 2014
@@ -0,0 +1,137 @@
+/*
+ * 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.ide.test.impl;
+
+import static
org.apache.sling.ide.test.impl.helpers.EclipseResourceMatchers.hasFile;
+import static
org.apache.sling.ide.test.impl.helpers.EclipseResourceMatchers.hasFolder;
+import static org.junit.Assert.assertThat;
+
+import java.io.InputStream;
+
+import org.apache.sling.ide.eclipse.ui.nav.model.JcrNode;
+import org.apache.sling.ide.eclipse.ui.nav.model.SyncDir;
+import org.apache.sling.ide.test.impl.helpers.DisableDebugStatusHandlers;
+import org.apache.sling.ide.test.impl.helpers.ExternalSlingLaunchpad;
+import org.apache.sling.ide.test.impl.helpers.LaunchpadConfig;
+import org.apache.sling.ide.test.impl.helpers.ProjectAdapter;
+import org.apache.sling.ide.test.impl.helpers.RepositoryAccessor;
+import org.apache.sling.ide.test.impl.helpers.ServerAdapter;
+import org.apache.sling.ide.test.impl.helpers.SlingWstServer;
+import org.apache.sling.ide.test.impl.helpers.TemporaryProject;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.Path;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+
+/**
+ * The ttJcrNodeCreationTest/tt tests node creation scenarios
+ *
+ */
+public class JcrNodeCreationTest {
+
+private final LaunchpadConfig config = LaunchpadConfig.getInstance();
+
+private final SlingWstServer wstServer = new SlingWstServer(config);
+
+@Rule
+public TestRule chain = RuleChain.outerRule(new
ExternalSlingLaunchpad(config)).around(wstServer);
+
+@Rule
+public TemporaryProject projectRule = new TemporaryProject();
+
+@Rule
+public DisableDebugStatusHandlers disableDebugHandlers = new
DisableDebugStatusHandlers();
+
+private SyncDir syncDirNode;
+
+@Before
+public void prepareProjectAndContent() throws Exception {
+
+wstServer.waitForServerToStart();
+
+// create faceted project
+IProject contentProject = projectRule.getProject();
+
+ProjectAdapter project = new ProjectAdapter(contentProject);
+project.addNatures(org.eclipse.wst.common.project.facet.core.nature);
+
+// install content facet
+project.installFacet(sling.content, 1.0);
+
+ServerAdapter server = new ServerAdapter(wstServer.getServer());
+server.installModule(contentProject);
+
+// create .content.xml structure
+InputStream contentXml =
getClass().getResourceAsStream(content-nested-structure.xml);
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/content/test-root/en.xml),
contentXml);
+
+// directly create the root node
+syncDirNode = new SyncDir((IFolder)
contentProject.findMember(jcr_root));
+
+}
+
+@Test
+public void createNtFolderNode() throws Exception {
+
+JcrNode contentNode = syncDirNode.getNode(/content/test-root);
+contentNode.createChild(folder, nt:folder);
+
+assertThat(projectRule.getProject(),
hasFolder(/jcr_root/content/test-root/folder));
+}
+
+@Test
+public
svn commit: r1628832 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serializatio
Author: rombert
Date: Wed Oct 1 20:38:50 2014
New Revision: 1628832
URL: http://svn.apache.org/r1628832
Log:
SLING-3979 - [tooling] multi valued properties are still not correctly
exported to the server
If a property is marked explicitly as multi-value, preserve that
information even if it only has one value.
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java?rev=1628832r1=1628831r2=1628832view=diff
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
Wed Oct 1 20:38:50 2014
@@ -102,6 +102,29 @@ public class ContentXmlHandlerTest {
}
@Test
+@SuppressWarnings(unchecked)
+public void parseSingleExplicitMultiValuedProperties() throws
ParserConfigurationException, SAXException,
+IOException {
+
+MapString, Object properties =
parseContentXmlFile(single-explicit-multivalued-properties-content.xml, /)
+.getProperties();
+
+assertThat(properties.size, properties.size(), is(7));
+assertThat(properties[values], (String[]) properties.get(values),
+Matchers.is(new String[] { first}));
+assertThat(properties[decimals], (BigDecimal[])
properties.get(decimals),
+Matchers.is(new BigDecimal[] { new BigDecimal(5.10)}));
+assertThat(properties[doubles], (Double[]) properties.get(doubles),
+Matchers.is(new Double[] { new Double(5.1) }));
+assertThat(properties[flags], (Boolean[]) properties.get(flags),
+Matchers.is(new Boolean[] { Boolean.FALSE }));
+assertThat(properties[longs], (Long[]) properties.get(longs),
+Matchers.is(new Long[] { Long.valueOf(15)}));
+assertThat(properties[dates], (Calendar[]) properties.get(dates),
+array(millis(137798280l)));
+}
+
+@Test
public void parseFullCoverageXmlFile() throws
ParserConfigurationException, SAXException, IOException {
ResourceProxy root = parseContentXmlFile(full-coverage.xml,
/apps/full-coverage);
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml?rev=1628832view=auto
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
(added)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/single-explicit-multivalued-properties-content.xml
Wed Oct 1 20:38:50 2014
@@ -0,0 +1,25 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+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.
+--
+jcr:root xmlns:jcr=http://www.jcp.org/jcr/1.0;
xmlns:nt=http://www.jcp.org/jcr/nt/1.0;
+jcr:primaryType=nt:unstructured
+dates={Date}[2013-09-01T00:00:00.000+03:00]
+decimals={Decimal}[5.10]
+doubles={Double}[5.1]
+flags={Boolean}[false]
+longs={Long}[15]
+values=[first]/
\ No newline at end of file
Modified:
sling/trunk/tooling/ide/impl-vlt/src
svn commit: r1628836 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNode
Author: rombert
Date: Wed Oct 1 21:08:21 2014
New Revision: 1628836
URL: http://svn.apache.org/r1628836
Log:
SLING-3979 - [tooling] multi valued properties are still not correctly
exported to the server
Use a better means of detecting whether the property definition matches
what we want to write and delete the existing property if it does not.
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java?rev=1628836r1=1628835r2=1628836view=diff
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
Wed Oct 1 21:08:21 2014
@@ -80,19 +80,13 @@ public class AddOrUpdateNodeCommandTest
Property newProp =
session.getNode(/content).getProperty(PROP_NAME);
if (newPropertyValues instanceof String) {
-if (newProp.isMultiple()) {
-Value[] values =
session.getNode(/content).getProperty(PROP_NAME).getValues();
-
-assertThat(values.length, equalTo(1));
-assertThat(values[0].getString(),
equalTo(newPropertyValues));
-
-} else {
-assertThat(newProp.getString(), equalTo((String)
newPropertyValues));
-}
+assertThat(property.isMultiple, newProp.isMultiple(),
equalTo(Boolean.FALSE));
+assertThat(newProp.getString(), equalTo((String)
newPropertyValues));
} else {
String[] expectedValues = (String[]) newPropertyValues;
+assertThat(property.isMultiple, newProp.isMultiple(),
equalTo(Boolean.TRUE));
Value[] values =
session.getNode(/content).getProperty(PROP_NAME).getValues();
Modified:
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java?rev=1628836r1=1628835r2=1628836view=diff
==
---
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
Wed Oct 1 21:08:21 2014
@@ -51,6 +51,7 @@ import javax.jcr.Session;
import javax.jcr.Value;
import javax.jcr.ValueFactory;
import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.PropertyDefinition;
import org.apache.jackrabbit.vault.util.JcrConstants;
import org.apache.jackrabbit.vault.util.Text;
@@ -220,74 +221,54 @@ public class AddOrUpdateNodeCommand exte
continue;
}
-// TODO - we don't handle the case where the input no longer
matches the property definition, e.g. type
-// change or multiplicity change
-
-boolean isMultiple = property != null
property.getDefinition().isMultiple();
-
ValueFactory valueFactory = session.getValueFactory();
Value value = null;
Value[] values = null;
if (propertyValue instanceof String) {
-if (isMultiple) {
-values = toValueArray(new String[] { (String)
propertyValue }, session);
-} else {
-value = valueFactory.createValue((String) propertyValue);
-}
+value = valueFactory.createValue((String) propertyValue);
+ensurePropertyDefinitionMatchers(property,
PropertyType.STRING, false);
} else if (propertyValue instanceof String[]) {
values = toValueArray((String[]) propertyValue, session);
+ensurePropertyDefinitionMatchers(property,
PropertyType.STRING, true);
} else if (propertyValue instanceof Boolean) {
-if (isMultiple) {
-values = toValueArray(new Boolean[] { (Boolean)
propertyValue }, session);
-} else {
-value = valueFactory.createValue((Boolean) propertyValue);
-}
+value = valueFactory.createValue((Boolean) propertyValue);
+ensurePropertyDefinitionMatchers(property,
PropertyType.BOOLEAN, false);
} else if (propertyValue instanceof Boolean
svn commit: r1628993 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java
Author: rombert Date: Thu Oct 2 15:02:31 2014 New Revision: 1628993 URL: http://svn.apache.org/r1628993 Log: SLING-3996 - New maven project wizard should not allow early finish, before performing serve operations SetupServerWizardPage is now by default not complete, which forces the user to visit it before finishing the wizard. Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java?rev=1628993r1=1628992r2=1628993view=diff == --- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java (original) +++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java Thu Oct 2 15:02:31 2014 @@ -206,6 +206,8 @@ public class SetupServerWizardPage exten installToolingSupportBundle.setSelection(true); updateEnablements(); + +setPageComplete(false); setControl(container); }
svn commit: r1629054 - /sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
Author: rombert Date: Thu Oct 2 19:37:03 2014 New Revision: 1629054 URL: http://svn.apache.org/r1629054 Log: SLING-3998 - Unable to download archetypes which are not locally cached Don't pass a meaninfgul progress monitor to createArchetypeProjects() Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java?rev=1629054r1=1629053r2=1629054view=diff == --- sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java (original) +++ sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java Thu Oct 2 19:37:03 2014 @@ -31,6 +31,7 @@ import org.eclipse.core.resources.Resour import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.wst.server.core.IServer; @@ -89,7 +90,8 @@ public abstract class AbstractNewMavenBa advance(monitor, 1); ListIProject projects = MavenPlugin.getProjectConfigurationManager().createArchetypeProjects(location, -archetype, groupId, artifactId, version, javaPackage, properties, configuration, monitor); +archetype, groupId, artifactId, version, javaPackage, properties, configuration, +new NullProgressMonitor()); monitor.worked(3);
svn commit: r1629060 - in /sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np: AbstractNewMavenBasedSlingApplicationWizard.java ArchetypeParametersWizardPage.java
Author: rombert
Date: Thu Oct 2 19:59:50 2014
New Revision: 1629060
URL: http://svn.apache.org/r1629060
Log:
SLING-3999 - Bundle creation wizard should warn early if a project with
the same name exists
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java?rev=1629060r1=1629059r2=1629060view=diff
==
---
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
(original)
+++
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/AbstractNewMavenBasedSlingApplicationWizard.java
Thu Oct 2 19:59:50 2014
@@ -84,7 +84,7 @@ public abstract class AbstractNewMavenBa
IProject existingProject =
ResourcesPlugin.getWorkspace().getRoot().getProject(artifactId);
if (existingProject!=null existingProject.exists()) {
-throw new IllegalStateException(Project already exists with name
+artifactId);
+throw new IllegalStateException(A project with the name +
artifactId + already exists.);
}
advance(monitor, 1);
Modified:
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java?rev=1629060r1=1629059r2=1629060view=diff
==
---
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java
(original)
+++
sling/trunk/tooling/ide/eclipse-m2e-ui/src/org/apache/sling/ide/eclipse/ui/wizards/np/ArchetypeParametersWizardPage.java
Thu Oct 2 19:59:50 2014
@@ -24,6 +24,8 @@ import java.util.StringTokenizer;
import org.apache.maven.archetype.catalog.Archetype;
import org.apache.maven.archetype.metadata.RequiredProperty;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.jface.dialogs.IDialogPage;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.CellNavigationStrategy;
@@ -313,6 +315,14 @@ public class ArchetypeParametersWizardPa
updateStatus(package must be specified);
return;
}
+
+IProject existingProject =
ResourcesPlugin.getWorkspace().getRoot().getProject(artifactId.getText());
+
+if (existingProject.exists()) {
+updateStatus(A project with the name + artifactId.getText() +
already exists.);
+return;
+}
+
int cnt = propertiesTable.getItemCount();
for(int i=0; icnt; i++) {
TableItem item = propertiesTable.getItem(i);
svn commit: r1629064 - in /sling/trunk/tooling/ide/eclipse-core: ./ src/org/apache/sling/ide/eclipse/core/internal/ src/org/apache/sling/ide/eclipse/internal/validation/
Author: rombert
Date: Thu Oct 2 20:36:56 2014
New Revision: 1629064
URL: http://svn.apache.org/r1629064
Log:
SLING-4000 - Add error marker on the project when content sync root does
not exist
Added:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectDescriptionManager.java
- copied, changed from r1629060,
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/internal/validation/ContentProjectValidator.java
Modified:
sling/trunk/tooling/ide/eclipse-core/plugin.xml
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingContentFacetInstallDelegate.java
Modified: sling/trunk/tooling/ide/eclipse-core/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/plugin.xml?rev=1629064r1=1629063r2=1629064view=diff
==
--- sling/trunk/tooling/ide/eclipse-core/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-core/plugin.xml Thu Oct 2 20:36:56 2014
@@ -213,4 +213,19 @@
/include
/validator
/extension
+
+ extension
+ id=contentProjectValidator
+ point=org.eclipse.wst.validation.validatorV2
+ name=Sling Content Project Validator
+ validator
class=org.apache.sling.ide.eclipse.internal.validation.ContentProjectValidator
+ include
+ rules
+ facet
+ id=sling.content
+ /facet
+ /rules
+ /include
+ /validator
+ /extension
/plugin
Copied:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectDescriptionManager.java
(from r1629060,
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectDescriptionManager.java?p2=sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectDescriptionManager.javap1=sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.javar1=1629060r2=1629064rev=1629064view=diff
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingBundleFacetInstallDelegate.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ProjectDescriptionManager.java
Thu Oct 2 20:36:56 2014
@@ -22,31 +22,33 @@ import org.eclipse.core.resources.IProje
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-public class SlingBundleFacetInstallDelegate implements IDelegate {
+/**
+ * The ttProjectDescriptionManager/tt exposes convenient APIs for managing
a project's description
+ *
+ */
+public class ProjectDescriptionManager {
private static final String VALIDATION_BUILDER_NAME =
org.eclipse.wst.validation.validationbuilder;
-@Override
-public void execute(IProject project, IProjectFacetVersion facetVersion,
Object config, IProgressMonitor monitor)
-throws CoreException {
+private final Logger logger;
-Logger pluginLogger = Activator.getDefault().getPluginLogger();
+public ProjectDescriptionManager(Logger logger) {
+this.logger = logger;
+}
-pluginLogger.trace(Installing facet {0} on project {1},
facetVersion, project);
+public void enableValidationBuilderAndCommand(IProject project,
IProgressMonitor monitor) throws CoreException {
IProjectDescription description = project.getDescription();
ICommand[] builders = description.getBuildSpec();
for (ICommand builder : builders) {
if (builder.getBuilderName().equals(VALIDATION_BUILDER_NAME)) {
-pluginLogger.trace(Validation builder already installed,
skipping);
+logger.trace(Validation builder already installed, skipping);
return;
}
}
-pluginLogger.trace(Installing validation builder);
+logger.trace(Installing validation builder);
ICommand[] newBuilders = new ICommand[builders.length + 1];
System.arraycopy(builders, 0, newBuilders, 0, builders.length);
@@ -58,8 +60,6 @@ public class SlingBundleFacetInstallDele
project.setDescription
svn commit: r6719 - /release/sling/
Author: rombert Date: Fri Oct 3 20:52:33 2014 New Revision: 6719 Log: launchpad 7 Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz (with props) release/sling/org.apache.sling.launchpad-7-bin.tar.gz.asc (with props) release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 release/sling/org.apache.sling.launchpad-7-bin.zip (with props) release/sling/org.apache.sling.launchpad-7-bin.zip.asc (with props) release/sling/org.apache.sling.launchpad-7-bin.zip.md5 release/sling/org.apache.sling.launchpad-7-bin.zip.sha1 release/sling/org.apache.sling.launchpad-7-bundlelist.xml (with props) release/sling/org.apache.sling.launchpad-7-bundlelist.xml.asc (with props) release/sling/org.apache.sling.launchpad-7-bundlelist.xml.md5 release/sling/org.apache.sling.launchpad-7-bundlelist.xml.sha1 release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip (with props) release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip.asc (with props) release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip.md5 release/sling/org.apache.sling.launchpad-7-bundlelistconfig.zip.sha1 release/sling/org.apache.sling.launchpad-7-bundles.jar (with props) release/sling/org.apache.sling.launchpad-7-bundles.jar.asc (with props) release/sling/org.apache.sling.launchpad-7-bundles.jar.md5 release/sling/org.apache.sling.launchpad-7-bundles.jar.sha1 release/sling/org.apache.sling.launchpad-7-source-release.zip (with props) release/sling/org.apache.sling.launchpad-7-source-release.zip.asc (with props) release/sling/org.apache.sling.launchpad-7-source-release.zip.md5 release/sling/org.apache.sling.launchpad-7-source-release.zip.sha1 release/sling/org.apache.sling.launchpad-7-sources.jar (with props) release/sling/org.apache.sling.launchpad-7-sources.jar.asc (with props) release/sling/org.apache.sling.launchpad-7-sources.jar.md5 release/sling/org.apache.sling.launchpad-7-sources.jar.sha1 release/sling/org.apache.sling.launchpad-7-standalone.jar (with props) release/sling/org.apache.sling.launchpad-7-standalone.jar.asc (with props) release/sling/org.apache.sling.launchpad-7-standalone.jar.md5 release/sling/org.apache.sling.launchpad-7-standalone.jar.sha1 release/sling/org.apache.sling.launchpad-7.pom (with props) release/sling/org.apache.sling.launchpad-7.pom.asc (with props) release/sling/org.apache.sling.launchpad-7.pom.md5 release/sling/org.apache.sling.launchpad-7.pom.sha1 release/sling/org.apache.sling.launchpad-7.war (with props) release/sling/org.apache.sling.launchpad-7.war.asc (with props) release/sling/org.apache.sling.launchpad-7.war.md5 release/sling/org.apache.sling.launchpad-7.war.sha1 Removed: release/sling/org.apache.sling.launchpad-6-standalone.jar release/sling/org.apache.sling.launchpad-6-standalone.jar.asc release/sling/org.apache.sling.launchpad-6-standalone.jar.md5 release/sling/org.apache.sling.launchpad-6-standalone.jar.sha1 release/sling/org.apache.sling.launchpad-6.war release/sling/org.apache.sling.launchpad-6.war.asc release/sling/org.apache.sling.launchpad-6.war.md5 release/sling/org.apache.sling.launchpad-6.war.sha1 Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz == Binary file - no diff available. Propchange: release/sling/org.apache.sling.launchpad-7-bin.tar.gz -- svn:mime-type = application/x-gzip Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.asc == Binary file - no diff available. Propchange: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 == --- release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 (added) +++ release/sling/org.apache.sling.launchpad-7-bin.tar.gz.md5 Fri Oct 3 20:52:33 2014 @@ -0,0 +1 @@ +f343ad724b363cb6857b2d61b7d03b6b \ No newline at end of file Added: release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 == --- release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 (added) +++ release/sling/org.apache.sling.launchpad-7-bin.tar.gz.sha1 Fri Oct 3 20:52:33 2014 @@ -0,0 +1 @@ +ced61e7c13d9b4b7f94adae843558618e05ba0d4 \ No newline at end of file Added: release/sling/org.apache.sling.launchpad-7-bin.zip
svn commit: r1629325 - /sling/trunk/tooling/ide/eclipse-test/pom.xml
Author: rombert
Date: Fri Oct 3 21:23:03 2014
New Revision: 1629325
URL: http://svn.apache.org/r1629325
Log:
SLING-3825 - Eclipse-based tests depend on SNAPSHOT version of the Sling
Launchpad
Sling 7 is released, so use that as a dependency.
Modified:
sling/trunk/tooling/ide/eclipse-test/pom.xml
Modified: sling/trunk/tooling/ide/eclipse-test/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/pom.xml?rev=1629325r1=1629324r2=1629325view=diff
==
--- sling/trunk/tooling/ide/eclipse-test/pom.xml (original)
+++ sling/trunk/tooling/ide/eclipse-test/pom.xml Fri Oct 3 21:23:03 2014
@@ -111,7 +111,7 @@
artifactItem
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.launchpad/artifactId
-version7-SNAPSHOT/version
+version7/version
typewar/type
overWritefalse/overWrite
outputDirectory${project.build.directory}/outputDirectory
svn commit: r1629844 - in /sling/trunk/tooling/release: ./ bundleList-to-tagNames.xslt generate_javadoc_for_release.sh patches/ patches/org.apache.sling.discovery.impl-1.0.10
Author: rombert Date: Tue Oct 7 09:52:41 2014 New Revision: 1629844 URL: http://svn.apache.org/r1629844 Log: SLING-4005 - Deploy API documentation for Sling 7 Add the release tooling to SVN Added: sling/trunk/tooling/release/ (with props) sling/trunk/tooling/release/bundleList-to-tagNames.xslt (with props) sling/trunk/tooling/release/generate_javadoc_for_release.sh (with props) sling/trunk/tooling/release/patches/ sling/trunk/tooling/release/patches/org.apache.sling.discovery.impl-1.0.10 Propchange: sling/trunk/tooling/release/ -- --- svn:ignore (added) +++ svn:ignore Tue Oct 7 09:52:41 2014 @@ -0,0 +1 @@ +out Added: sling/trunk/tooling/release/bundleList-to-tagNames.xslt URL: http://svn.apache.org/viewvc/sling/trunk/tooling/release/bundleList-to-tagNames.xslt?rev=1629844view=auto == Binary file - no diff available. Propchange: sling/trunk/tooling/release/bundleList-to-tagNames.xslt -- svn:mime-type = application/xml Added: sling/trunk/tooling/release/generate_javadoc_for_release.sh URL: http://svn.apache.org/viewvc/sling/trunk/tooling/release/generate_javadoc_for_release.sh?rev=1629844view=auto == --- sling/trunk/tooling/release/generate_javadoc_for_release.sh (added) +++ sling/trunk/tooling/release/generate_javadoc_for_release.sh Tue Oct 7 09:52:41 2014 @@ -0,0 +1,85 @@ +#!/bin/bash -e + +VERSION=7 +WORKDIR=out + +# create work directory +if [ ! -d $WORKDIR ] ; then +mkdir -p $WORKDIR +fi + +# get bundle list +if [ -f $WORKDIR/bundleList.xml ] ; then +echo bundleList.xml already present, not downloading; +else +echo Downloading bundleList for Sling $VERSION +wget https://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.launchpad/$VERSION/org.apache.sling.launchpad-$VERSION-bundlelist.xml -O $WORKDIR/bundleList.xml +fi + +# checkout tags +artifacts=$(xsltproc bundleList-to-tagNames.xslt $WORKDIR/bundleList.xml) + +for artifact in $artifacts; do +if [ -d $WORKDIR/$artifact ] ; then +echo Not checking out $artifact, already present; +else +echo Exporting $artifact from source control +svn export https://svn.apache.org/repos/asf/sling/tags/$artifact $WORKDIR/$artifact +if [ -f patches/$artifact ]; then +echo Applying patch +pushd $WORKDIR/$artifact +patch -p0 ../../patches/$artifact +popd +fi +fi +done + +# generate dummy pom.xml + +echo Generating pom.xml + +POM=$WORKDIR/pom.xml +echo project $POM +echo modelVersion4.0.0/modelVersion $POM +echo groupIdorg.apache.sling/groupId $POM +echo artifactIdorg.apache.sling.javadoc-builder/artifactId $POM +echo packagingpom/packaging $POM +echo version$VERSION/version $POM +echo $POM +echo parent $POM +echo groupIdorg.apache/groupId $POM +echo artifactIdapache/artifactId $POM +echo version8/version $POM +echo /parent $POM +echo $POM +echo nameApache Sling/name $POM +echo $POM +echo properties $POM +echo project.build.sourceEncodingUTF-8/project.build.sourceEncoding $POM +echo /properties $POM +echo $POM +echo modules $POM + +for artifact in $artifacts; do +echo module$artifact/module $POM +done + +echo /modules $POM +echo /project $POM + +if [ ! -f $WORKDIR/src/main/javadoc/overview.html ] ; then +echo Downloading javadoc overview file +mkdir -p $WORKDIR/src/main/javadoc +wget https://svn.apache.org/repos/asf/sling/trunk/src/main/javadoc/overview.html -O $WORKDIR/src/main/javadoc/overview.html +fi + +# generate javadoc + +echo Starting javadoc generation + +pushd $WORKDIR +mvn -DexcludePackageNames=*.impl:*.internal:*.jsp:sun.misc:*.juli:*.testservices:*.integrationtest:*.maven:javax.*:org.osgi.* \ + org.apache.maven.plugins:maven-javadoc-plugin:2.9.1:aggregate +popd + +echo Generated Javadocs can be found in $WORKDIR/target/site/apidocs/ Propchange: sling/trunk/tooling/release/generate_javadoc_for_release.sh -- svn:executable = * Added: sling/trunk/tooling/release/patches/org.apache.sling.discovery.impl-1.0.10 URL: http://svn.apache.org/viewvc/sling/trunk/tooling/release/patches/org.apache.sling.discovery.impl-1.0.10?rev=1629844view=auto == --- sling/trunk/tooling/release/patches/org.apache.sling.discovery.impl-1.0.10 (added) +++ sling/trunk/tooling/release/patches/org.apache.sling.discovery.impl-1.0.10 Tue Oct 7 09:52:41 2014 @@ -0,0 +1,10 @@ +--- pom.xml.orig 2014-10-05 23:20:24.955180364 +0300 pom.xml2014-10-05 23:20
svn commit: r1629851 - in /sling/site/trunk/content/apidocs/sling7: ./ org/ org/apache/ org/apache/sling/ org/apache/sling/adapter/ org/apache/sling/adapter/class-use/ org/apache/sling/api/ org/apache
Author: rombert Date: Tue Oct 7 10:25:14 2014 New Revision: 1629851 URL: http://svn.apache.org/r1629851 Log: SLING-4005 - Deploy API documentation for Sling 7 [This commit notification would consist of 185 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r924923 - /websites/production/sling/content/
Author: rombert Date: Tue Oct 7 10:30:35 2014 New Revision: 924923 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r924922, websites/staging/sling/trunk/content/
svn commit: r924926 - /websites/production/sling/content/
Author: rombert Date: Tue Oct 7 10:38:15 2014 New Revision: 924926 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r924925, websites/staging/sling/trunk/content/
svn commit: r1630165 - in /sling/trunk: bundles/jcr/oak-server/pom.xml launchpad/builder/src/main/bundles/list.xml
Author: rombert Date: Wed Oct 8 16:25:32 2014 New Revision: 1630165 URL: http://svn.apache.org/r1630165 Log: SLING-3479 - Upgrade to Oak 1.0 Upgraded to Oak 1.0.6 Modified: sling/trunk/bundles/jcr/oak-server/pom.xml sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/bundles/jcr/oak-server/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1630165r1=1630164r2=1630165view=diff == --- sling/trunk/bundles/jcr/oak-server/pom.xml (original) +++ sling/trunk/bundles/jcr/oak-server/pom.xml Wed Oct 8 16:25:32 2014 @@ -38,7 +38,7 @@ properties sling.java.version6/sling.java.version -oak.version1.0.0/oak.version +oak.version1.0.6/oak.version /properties build 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=1630165r1=1630164r2=1630165view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Oct 8 16:25:32 2014 @@ -555,7 +555,7 @@ bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-core/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle !-- embedded in oak.server for now @@ -569,37 +569,37 @@ bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-commons/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-mk/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-mk-api/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-mk-remote/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-lucene/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle bundle groupIdorg.apache.jackrabbit/groupId artifactIdoak-blob/artifactId -version1.0.0/version +version1.0.6/version runModesoak/runModes /bundle /startLevel
svn commit: r1630220 - /sling/trunk/launchpad/testing/pom.xml
Author: rombert
Date: Wed Oct 8 20:00:41 2014
New Revision: 1630220
URL: http://svn.apache.org/r1630220
Log:
SLING-3479 - Upgrade to Oak 1.0
Pick up the latest launchpad version in launchpad/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=1630220r1=1630219r2=1630220view=diff
==
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Wed Oct 8 20:00:41 2014
@@ -160,7 +160,7 @@
/executions
configuration
defaultBundleList
-version${project.version}/version
+version8-SNAPSHOT/version
/defaultBundleList
jarWebSupport
groupIdorg.apache.felix/groupId
svn commit: r1630234 - in /sling/trunk: bundles/jcr/it-jackrabbit-oak/.gitignore contrib/validation/it-http/.gitignore
Author: rombert Date: Wed Oct 8 21:11:44 2014 New Revision: 1630234 URL: http://svn.apache.org/r1630234 Log: Tweak gitignore files Added: sling/trunk/contrib/validation/it-http/.gitignore Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/.gitignore Modified: sling/trunk/bundles/jcr/it-jackrabbit-oak/.gitignore URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/it-jackrabbit-oak/.gitignore?rev=1630234r1=1630233r2=1630234view=diff == --- sling/trunk/bundles/jcr/it-jackrabbit-oak/.gitignore (original) +++ sling/trunk/bundles/jcr/it-jackrabbit-oak/.gitignore Wed Oct 8 21:11:44 2014 @@ -1,2 +1,3 @@ /jackrabbit /oak +/sling Added: sling/trunk/contrib/validation/it-http/.gitignore URL: http://svn.apache.org/viewvc/sling/trunk/contrib/validation/it-http/.gitignore?rev=1630234view=auto == --- sling/trunk/contrib/validation/it-http/.gitignore (added) +++ sling/trunk/contrib/validation/it-http/.gitignore Wed Oct 8 21:11:44 2014 @@ -0,0 +1 @@ +/sling
svn commit: r1630341 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java impl-vlt/src/org/apache/sling/ide/impl/vlt/
Author: rombert
Date: Thu Oct 9 09:16:12 2014
New Revision: 1630341
URL: http://svn.apache.org/r1630341
Log:
SLING-4002 - Deleting a file throws a 'Could not publish' error
The VltSerializationManager now assumes that missing files with the XML
extension are full serialization aggregates.
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java?rev=1630341r1=1630340r2=1630341view=diff
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManagerTest.java
Thu Oct 9 09:16:12 2014
@@ -71,7 +71,7 @@ public class VltSerializationManagerTest
File current = parent;
for (String segment : segments) {
-current = new File(parent, segment);
+current = new File(current, segment);
}
return current;
}
@@ -135,4 +135,12 @@ public class VltSerializationManagerTest
public void getRepositoryPath_SerializationDir() {
assertThat(serializationManager.getRepositoryPath(/content/test.dir/file),
is(/content/test/file));
}
+
+@Test
+public void getBaseResourcePath_MissingXmlFile() {
+File f = newFile(findFilesystemRoot(), apps, sling, servlet,
default, config.xml);
+
+
assertThat(serializationManager.getBaseResourcePath(f.getAbsolutePath()),
+is(f.getAbsolutePath().replace(.xml, )));
+}
}
Modified:
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java?rev=1630341r1=1630340r2=1630341view=diff
==
---
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
Thu Oct 9 09:16:12 2014
@@ -128,6 +128,12 @@ public class VltSerializationManager imp
return file.getAbsolutePath();
}
+// assume that delete file with the xml extension is a full
serialization aggregate
+// TODO - this can generate false results
+if (!file.exists()) {
+return getPathWithoutXmlExtension(file);
+}
+
// TODO - refrain from doing I/O here
// TODO - copied from TransactionImpl
InputStream in = null;
@@ -135,7 +141,7 @@ public class VltSerializationManager imp
in = new BufferedInputStream(new FileInputStream(file));
SerializationType serType = XmlAnalyzer.analyze(new
InputSource(in));
if (serType == SerializationType.XML_DOCVIEW) {
-return file.getAbsolutePath().substring(0,
file.getAbsolutePath().length() - EXTENSION_XML.length());
+return getPathWithoutXmlExtension(file);
}
return file.getAbsolutePath();
@@ -146,6 +152,10 @@ public class VltSerializationManager imp
}
}
+private String getPathWithoutXmlExtension(File file) {
+return file.getAbsolutePath().substring(0,
file.getAbsolutePath().length() - EXTENSION_XML.length());
+}
+
@Override
public String getSerializationFilePath(String baseFilePath,
SerializationKind serializationKind) {
svn commit: r1630400 - /sling/trunk/tooling/release/.gitignore
Author: rombert Date: Thu Oct 9 12:27:25 2014 New Revision: 1630400 URL: http://svn.apache.org/r1630400 Log: tooling/release: add .gitignore Added: sling/trunk/tooling/release/.gitignore Added: sling/trunk/tooling/release/.gitignore URL: http://svn.apache.org/viewvc/sling/trunk/tooling/release/.gitignore?rev=1630400view=auto == --- sling/trunk/tooling/release/.gitignore (added) +++ sling/trunk/tooling/release/.gitignore Thu Oct 9 12:27:25 2014 @@ -0,0 +1 @@ +/out/
svn commit: r1630401 - in /sling/trunk/tooling/ide: eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/ eclipse-test/src/org/apache/sling/ide/test/impl/ eclipse-test/src/org/apache/sling/ide/
Author: rombert
Date: Thu Oct 9 12:27:42 2014
New Revision: 1630401
URL: http://svn.apache.org/r1630401
Log:
SLING-3586 - Publishing content fails if intermediate nodes are not
present in the repository
Ensure that when a resource is published all its parents, up to the
repository root, are created.
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/jcr/NtFileContentMatcher.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/jcr/JcrMatchers.java
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1630401r1=1630400r2=1630401view=diff
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Thu Oct 9 12:27:42 2014
@@ -21,7 +21,9 @@ import java.io.InputStream;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.artifacts.EmbeddedArtifact;
@@ -379,6 +381,9 @@ public class SlingLaunchpadBehaviour ext
// would be an incorrect ( or at least suprising ) behaviour at
development time
ListIModuleResource addedOrUpdatedResources = new
ArrayListIModuleResource();
+IModuleResource[] allResources = getResources(module);
+IModuleResource[] publishedResources = getPublishedResources(module);
+SetIPath handledPaths = new HashSetIPath();
switch (deltaKind) {
case ServerBehaviourDelegate.CHANGED:
@@ -412,6 +417,8 @@ public class SlingLaunchpadBehaviour ext
case IModuleResourceDelta.ADDED:
case IModuleResourceDelta.CHANGED:
case IModuleResourceDelta.NO_CHANGE: // TODO is this
needed?
+
ensureParentIsPublished(resourceDelta.getModuleResource(), repository,
allResources,
+publishedResources, handledPaths);
execute(addFileCommand(repository,
resourceDelta.getModuleResource()));
addedOrUpdatedResources.add(resourceDelta.getModuleResource());
break;
@@ -448,6 +455,73 @@ public class SlingLaunchpadBehaviour ext
//setServerPublishState(IServer.PUBLISH_STATE_NONE);
}
+/**
+ * Ensures that the parent of this resource has been published to the
repository
+ *
+ * p
+ * Note that the parents explicitly do not have their child nodes
reordered, this will happen when they are
+ * published due to a resource change
+ * /p
+ *
+ * @param moduleResource the current resource
+ * @param repository the repository to publish to
+ * @param allResources all of the module's resources
+ * @param publishedResources the resources which have been already
published
+ * @param handledPaths the paths that have been handled already in this
publish operation, but possibly not
+ *registered as published
+ * @throws IOException
+ * @throws SerializationException
+ * @throws CoreException
+ */
+private void ensureParentIsPublished(IModuleResource moduleResource,
Repository repository,
+IModuleResource[] allResources, IModuleResource[]
publishedResources, SetIPath handledPaths)
+throws CoreException, SerializationException, IOException {
+
+Logger logger = Activator.getDefault().getPluginLogger();
+
+IPath currentPath = moduleResource.getModuleRelativePath();
+
+logger.trace(Ensuring that parent of path {0} is published,
currentPath);
+
+// we assume the root is always published
+if (currentPath.segmentCount() == 0) {
+logger.trace(Path {0} can not have a parent, skipping,
currentPath);
+return;
+}
+
+IPath parentPath = currentPath.removeLastSegments(1);
+
+// already published by us, a parent of another resource that was
published in this execution
+if (handledPaths.contains(parentPath)) {
+logger.trace(Parent path {0} was already handled, skipping,
parentPath);
+return;
+}
+
+// already published earlier as part
svn commit: r1630601 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java
Author: rombert Date: Thu Oct 9 22:05:02 2014 New Revision: 1630601 URL: http://svn.apache.org/r1630601 Log: Fix possible NPE in ConvertToContentPackageAction Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java?rev=1630601r1=1630600r2=1630601view=diff == --- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java (original) +++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/ConvertToContentPackageAction.java Thu Oct 9 22:05:02 2014 @@ -166,6 +166,7 @@ public class ConvertToContentPackageActi jcr_root not found under + container + (or not a Folder)); +return; } ConfigurationHelper .convertToContentPackageProject(
svn commit: r1630603 - in /sling/trunk/tooling/ide: eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryConte
Author: rombert
Date: Thu Oct 9 22:05:24 2014
New Revision: 1630603
URL: http://svn.apache.org/r1630603
Log:
SLING-4023 - Files with a colon in their names are imported with an
incorrect name
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java?rev=1630603r1=1630602r2=1630603view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
Thu Oct 9 22:05:24 2014
@@ -421,6 +421,35 @@ public class ContentImportTest {
}
+@Test
+public void importFileWithNamespacedName() throws Exception {
+
+RepositoryAccessor repo = new RepositoryAccessor(config);
+
+// create faceted project
+IProject contentProject = projectRule.getProject();
+
+ProjectAdapter project = new ProjectAdapter(contentProject);
+project.addNatures(JavaCore.NATURE_ID,
org.eclipse.wst.common.project.facet.core.nature);
+
+// install bundle facet
+project.installFacet(sling.content, 1.0);
+
+wstServer.waitForServerToStart();
+
+ServerAdapter server = new ServerAdapter(wstServer.getServer());
+server.installModule(contentProject);
+
+project.createVltFilterWithRoots(/content/test-root);
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/content/test-root/hello.txt),
+new ByteArrayInputStream(hello, world.getBytes()));
+
+repo.createFile(/content/test-root/sling:file,
some_content.getBytes());
+
+runImport(contentProject);
+
+assertThat(contentProject,
hasFile(jcr_root/content/test-root/_sling_file));
+}
@Before
public void setUp() throws Exception {
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java?rev=1630603r1=1630602r2=1630603view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Thu Oct 9 22:05:24 2014
@@ -392,7 +392,11 @@ public class ImportRepositoryContentActi
*/
private IPath getPathForPlainFileNode(ResourceProxy resource, IPath
serializationFolderPath) {
-return
serializationFolderPath.removeLastSegments(1).append(Text.getName(resource.getPath()));
+// TODO - can we just use the serializationFolderPath ?
+
+String name =
serializationManager.getOsPath(Text.getName(resource.getPath()));
+
+return serializationFolderPath.removeLastSegments(1).append(name);
}
private void parseIgnoreFiles(IFolder folder, String path) throws
IOException, CoreException {
svn commit: r1630609 - in /sling/trunk/tooling/ide/eclipse-ui: META-INF/MANIFEST.MF plugin.xml src/org/apache/sling/ide/eclipse/ui/wizards/OverridePublishIntervalFragment.java
Author: rombert
Date: Thu Oct 9 22:31:40 2014
New Revision: 1630609
URL: http://svn.apache.org/r1630609
Log:
SLING-4021 - Set publish interval to 0 when creating a new server
Added:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/OverridePublishIntervalFragment.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/eclipse-ui/plugin.xml
Modified: sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF?rev=1630609r1=1630608r2=1630609view=diff
==
--- sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF Thu Oct 9 22:31:40
2014
@@ -68,6 +68,7 @@ Import-Package: javax.jcr,
org.eclipse.wst.server.ui,
org.eclipse.wst.server.ui.editor,
org.eclipse.wst.server.ui.internal,
+ org.eclipse.wst.server.ui.wizard,
org.osgi.framework,
org.osgi.service.component,
org.osgi.service.event;version=1.3.0,
Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1630609r1=1630608r2=1630609view=diff
==
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Thu Oct 9 22:31:40 2014
@@ -70,7 +70,17 @@
typeIds=org.apache.sling.ide.launchpadServer
class=org.apache.sling.ide.eclipse.ui.internal.InstallEditorSection
/section
- /extension
+ /extension
+
+ !-- hook in the server creation wizard --
+extension
+ point=org.eclipse.wst.server.ui.wizardFragments
+ fragment
+
class=org.apache.sling.ide.eclipse.ui.wizards.OverridePublishIntervalFragment
+ id=org.apache.sling.ide.eclipse.ui.wizards.SomeWizardFragment
+ typeIds=org.apache.sling.ide.launchpadServer
+ /fragment
+/extension
!-- Runtime images --
extension point=org.eclipse.wst.common.project.facet.ui.images
Added:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/OverridePublishIntervalFragment.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/OverridePublishIntervalFragment.java?rev=1630609view=auto
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/OverridePublishIntervalFragment.java
(added)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/OverridePublishIntervalFragment.java
Thu Oct 9 22:31:40 2014
@@ -0,0 +1,50 @@
+/*
+ * 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.ide.eclipse.ui.wizards;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.TaskModel;
+import org.eclipse.wst.server.ui.wizard.WizardFragment;
+
+/**
+ * The ttOverridePublishIntervalFragment/tt ensures that the publish
interval is set to 0 when creating a Sling
+ * Runtime
+ *
+ */
+public class OverridePublishIntervalFragment extends WizardFragment {
+
+@Override
+public boolean hasComposite() {
+return false;
+}
+
+@Override
+public void performFinish(IProgressMonitor monitor) throws CoreException {
+
+IServer server = (IServer)
getTaskModel().getObject(TaskModel.TASK_SERVER);
+if (server instanceof IServerWorkingCopy) {
+IServerWorkingCopy wc = (IServerWorkingCopy) server;
+wc.setAttribute(auto-publish-time, 0);
+wc.save(true, monitor);
+}
+
+}
+
+}
svn commit: r1630975 - in /sling/trunk/tooling/ide/eclipse-test: META-INF/MANIFEST.MF src/org/apache/sling/ide/test/impl/helpers/FailOnModificationEventsRule.java
Author: rombert
Date: Fri Oct 10 20:25:33 2014
New Revision: 1630975
URL: http://svn.apache.org/r1630975
Log:
SLING-4020 - Importing content from the repository triggers publish
operations
Added a FailOnModificationEventsRule which fails tests when modification
events are received.
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/FailOnModificationEventsRule.java
Modified:
sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
Modified: sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF?rev=1630975r1=1630974r2=1630975view=diff
==
--- sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF (original)
+++ sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF Fri Oct 10
20:25:33 2014
@@ -26,6 +26,7 @@ Require-Bundle: org.junit,
Import-Package: javax.jcr,
javax.jcr.nodetype,
org.apache.jackrabbit.util,
- org.apache.sling.ide.jcr
+ org.apache.sling.ide.jcr,
+ org.osgi.service.event;version=1.3.0
Bundle-Activator: org.apache.sling.ide.test.impl.Activator
Bundle-ActivationPolicy: lazy
Added:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/FailOnModificationEventsRule.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/FailOnModificationEventsRule.java?rev=1630975view=auto
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/FailOnModificationEventsRule.java
(added)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/helpers/FailOnModificationEventsRule.java
Fri Oct 10 20:25:33 2014
@@ -0,0 +1,106 @@
+/*
+ * 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.ide.test.impl.helpers;
+
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.apache.sling.ide.eclipse.core.internal.Activator;
+import org.apache.sling.ide.transport.CommandExecutionProperties;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+import org.osgi.framework.ServiceRegistration;
+import org.osgi.service.event.Event;
+import org.osgi.service.event.EventHandler;
+
+/**
+ * The ttFailOnModificationEventsRule/tt registers an event listener and
fails the test under execution if
+ * modification events are fired, whether they are successful or not
+ *
+ */
+public class FailOnModificationEventsRule implements EventHandler, TestRule {
+
+private ServiceRegistrationEventHandler registration;
+private ListEvent unexpectedEvents = new ArrayListEvent();
+
+public Statement apply(Statement base, Description description) {
+return statement(base);
+}
+
+private Statement statement(final Statement base) {
+return new Statement() {
+@Override
+public void evaluate() throws Throwable {
+before();
+try {
+base.evaluate();
+} finally {
+after();
+}
+}
+};
+}
+
+protected void before() {
+
+DictionaryString, Object props = new HashtableString, Object();
+props.put(event.topics, org/apache/sling/ide/transport);
+registration = Activator.getDefault().getBundle().getBundleContext()
+.registerService(EventHandler.class, this, props);
+
+}
+
+protected void after() {
+
+if (registration != null) {
+registration.unregister();
+}
+
+if (unexpectedEvents.isEmpty()) {
+return;
+}
+
+StringBuilder desc = new StringBuilder();
+desc.append(Unexpected events captured during import : );
+for (Event event : unexpectedEvents) {
+desc.append('\n');
+
desc.append(event.getProperty(CommandExecutionProperties.ACTION_TYPE
svn commit: r1630977 - in /sling/trunk/tooling/ide: eclipse-core/.options eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java eclipse-m2e-ui/.options eclipse-ui/.options impl-vlt
Author: rombert
Date: Fri Oct 10 20:25:57 2014
New Revision: 1630977
URL: http://svn.apache.org/r1630977
Log:
SLING-4028 - Allow printing tracing output to the console
All bundles now have a /debug/console flag which, when enabled,
instructs the Tracer to also print the trace messages on System.out .
Modified:
sling/trunk/tooling/ide/eclipse-core/.options
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
sling/trunk/tooling/ide/eclipse-m2e-ui/.options
sling/trunk/tooling/ide/eclipse-ui/.options
sling/trunk/tooling/ide/impl-vlt/.options
Modified: sling/trunk/tooling/ide/eclipse-core/.options
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/.options?rev=1630977r1=1630976r2=1630977view=diff
==
--- sling/trunk/tooling/ide/eclipse-core/.options (original)
+++ sling/trunk/tooling/ide/eclipse-core/.options Fri Oct 10 20:25:57 2014
@@ -1 +1,2 @@
-org.apache.sling.ide.eclipse-core/debug=false
\ No newline at end of file
+org.apache.sling.ide.eclipse-core/debug=false
+org.apache.sling.ide.eclipse-core/debug/console=false
\ No newline at end of file
Modified:
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java?rev=1630977r1=1630976r2=1630977view=diff
==
---
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
(original)
+++
sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/debug/impl/Tracer.java
Fri Oct 10 20:25:57 2014
@@ -16,6 +16,8 @@
*/
package org.apache.sling.ide.eclipse.core.debug.impl;
+import java.util.Date;
+
import org.apache.sling.ide.log.Logger;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Plugin;
@@ -32,6 +34,7 @@ public class Tracer implements DebugOpti
private final Plugin plugin;
private boolean debugEnabled;
+private boolean consoleEnabled;
private DebugTrace trace;
public Tracer(Plugin plugin) {
@@ -44,18 +47,31 @@ public class Tracer implements DebugOpti
String pluginId = plugin.getBundle().getSymbolicName();
debugEnabled = options.getBooleanOption(pluginId + /debug, false);
+consoleEnabled = options.getBooleanOption(pluginId + /debug/console,
false) debugEnabled;
trace = options.newDebugTrace(pluginId, getClass());
}
@Override
public void trace(String message, Object... arguments) {
- if ( !debugEnabled )
- return;
-
+
+if (!debugEnabled)
+return;
+
if ( arguments.length 0 )
message = NLS.bind(message, arguments);
trace.trace(/debug, message);
+
+if (consoleEnabled)
+writeToConsole(message, null);
+}
+
+private void writeToConsole(String message, Throwable t) {
+
+System.out.println([ + Thread.currentThread().getName() + ] + new
Date() +
++ plugin.getBundle().getSymbolicName() + : + message);
+if (t != null)
+t.printStackTrace(System.out);
}
@Override
@@ -64,6 +80,9 @@ public class Tracer implements DebugOpti
return;
trace.trace(/debug, message, error);
+
+if (consoleEnabled)
+writeToConsole(message, error);
}
@Override
Modified: sling/trunk/tooling/ide/eclipse-m2e-ui/.options
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-m2e-ui/.options?rev=1630977r1=1630976r2=1630977view=diff
==
--- sling/trunk/tooling/ide/eclipse-m2e-ui/.options (original)
+++ sling/trunk/tooling/ide/eclipse-m2e-ui/.options Fri Oct 10 20:25:57 2014
@@ -1 +1,2 @@
-org.apache.sling.ide.eclipse-m2e-ui/debug=false
\ No newline at end of file
+org.apache.sling.ide.eclipse-m2e-ui/debug=false
+org.apache.sling.ide.eclipse-m2e-ui/debug/console=false
\ No newline at end of file
Modified: sling/trunk/tooling/ide/eclipse-ui/.options
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/.options?rev=1630977r1=1630976r2=1630977view=diff
==
--- sling/trunk/tooling/ide/eclipse-ui/.options (original)
+++ sling/trunk/tooling/ide/eclipse-ui/.options Fri Oct 10 20:25:57 2014
@@ -1 +1,2 @@
-org.apache.sling.ide.eclipse-ui/debug=false
\ No newline at end of file
+org.apache.sling.ide.eclipse-ui/debug=false
+org.apache.sling.ide.eclipse-ui/debug/console=false
\ No newline at end of file
Modified: sling/trunk/tooling/ide/impl-vlt/.options
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt
svn commit: r1631124 - /sling/trunk/tooling/ide/source-bundle/assembly.xml
Author: rombert Date: Sat Oct 11 21:25:20 2014 New Revision: 1631124 URL: http://svn.apache.org/r1631124 Log: SLING-3685 - Document and further automate the IDE tooling release process Updated assembly rules in source-release Modified: sling/trunk/tooling/ide/source-bundle/assembly.xml Modified: sling/trunk/tooling/ide/source-bundle/assembly.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/source-bundle/assembly.xml?rev=1631124r1=1631123r2=1631124view=diff == --- sling/trunk/tooling/ide/source-bundle/assembly.xml (original) +++ sling/trunk/tooling/ide/source-bundle/assembly.xml Sat Oct 11 21:25:20 2014 @@ -30,6 +30,11 @@ excludes exclude**/target/**/exclude exclude**/*.jar/exclude +exclude**/.project/exclude +exclude**/.classpath/exclude +exclude**/.settings/**/exclude +exclude**/*.class/exclude +exclude**/derby.log/exclude /excludes /fileSet !-- additionally include the required license files -- @@ -38,4 +43,4 @@ outputDirectory/outputDirectory /fileSet /fileSets -/assembly \ No newline at end of file +/assembly
svn commit: r1631127 - /sling/site/trunk/content/documentation/development/release-management.mdtext
Author: rombert
Date: Sat Oct 11 21:30:57 2014
New Revision: 1631127
URL: http://svn.apache.org/r1631127
Log:
SLING-3685 - Document and further automate the IDE tooling release process
Include Sling IDE Tooling docs in the release management page
Modified:
sling/site/trunk/content/documentation/development/release-management.mdtext
Modified:
sling/site/trunk/content/documentation/development/release-management.mdtext
URL:
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/release-management.mdtext?rev=1631127r1=1631126r2=1631127view=diff
==
---
sling/site/trunk/content/documentation/development/release-management.mdtext
(original)
+++
sling/site/trunk/content/documentation/development/release-management.mdtext
Sat Oct 11 21:30:57 2014
@@ -237,6 +237,49 @@ releases which are just announced on our
1.
[http://www.apache.org/dev/release-signing.html](http://www.apache.org/dev/release-signing.html)
1.
[http://wiki.apache.org/incubator/SigningReleases](http://wiki.apache.org/incubator/SigningReleases)
+## Releasing the Sling IDE Tooling
+
+While the Sling IDE tooling is built using Maven, the toolchain that it is
based around does not cooperate well with the maven-release-plugin. As such,
the release preparation and execution are slightly different. The whole process
is outlined below, assuming that we start with a development version of
1.0.1-SNAPSHOT.
+
+1. set the fix version as released: `mvn tycho-versions:set-version
-DnewVersion=1.0.2`
+1. update the version of the source-bundle project to 1.0.2
+1. commit the change to svn
+1. manually tag in svn using `svn copy
https://svn.apache.org/repos/asf/sling/trunk/tooling/ide
https://svn.apache.org/repos/asf/sling/tags/sling-ide-tooling-1.0.2`
+1. Checkout the version from the tag and proceed with the build from there
`https://svn.apache.org/repos/asf/sling/tags/sling-ide-tooling-1.0.2`
+1. build the project with p2/gpg signing enabled: `mvn clean package -Psign`
+1. build the source bundle from the source-bundle directory: `mvn clean
package`
+1. copy the following artifacts to
https://dist.apache.org/repos/dist/dev/sling/ide-tooling-1.0.2
+1. source bundle ( org.apache.sling.ide.source-bundle-1.0.2.zip )
+1. zipped p2 repository ( org.apache.sling.ide.p2update-1.0.2.zip )
+1. ensure the artifacts are checksummed and gpg-signed
+1. call the vote
+1. Update to next version: `mvn tycho-versions:set-version
-DnewVersion=1.0.3-SNAPSHOT`
+
+Once the release has passed, the following must be done:
+
+1. upload p2update.zip* to https://dist.apache.org/repos/dist/release/sling/
+1. upload unzipped update site to
https://dist.apache.org/repos/dist/release/sling/eclipse/1.0.2
+1. upload the source bundle to
https://dist.apache.org/repos/dist/release/sling/eclipse/1.0.2
+1. create GPG signatures and checksums for all uploaded jars ( see below
for a script example )
+1. update
https://dist.apache.org/repos/dist/release/sling/eclipse/composite\{Content,Artifacts}.xml
to point version 1.0.2
+1. archive the old artifact versions but leave pointers to archive.apache.org,
using compositeArtifacts.xml/compositeContent.xml , with a single child entry
pointing to https://archive.apache.org/dist/sling/eclipse/1.0.0/
+
+The GPG signatures can be generated using a script such as the one below
+
+ #!/bin/bash
+
+ for jarfile in `find . -name \*.jar -o -name \*.zip | xargs basename`
; do
+ if [ ! -f $jarfile.md5 ] ; then
+ md5sum $jarfile $jarfile.md5
+ fi
+ if [ ! -f $jarfile.sha1 ] ; then
+ sha1sum $jarfile $jarfile.sha1
+ fi
+ if [ ! -f $jarfile.asc ] ; then
+ gpg --detach-sign -a $jarfile
+ fi
+ done
+
## Appendix A: Create and Add your key to
[https://people.apache.org/keys/group/sling.asc](https://people.apache.org/keys/group/sling.asc)
Considering that you are using a \*nix system with a working OpenSSH, GnuPG,
and bash you can create and add your own key with the following command:
@@ -320,4 +363,6 @@ To update the OBR you may use the Apache
Then go to the CMS at
[https://cms.apache.org/redirect?uri=http://sling.apache.org/obr](https://cms.apache.org/redirect?uri=http://sling.apache.org/obr)
,
update your checkout and then publish the site.
+## Appendix D: Releasing the Sling IDE Tooling
+
[1]: https://dist.apache.org/repos/dist/release/sling/
svn commit: r925431 - /websites/production/sling/content/
Author: rombert Date: Sat Oct 11 21:33:42 2014 New Revision: 925431 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r925430, websites/staging/sling/trunk/content/
svn commit: r1631261 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/ impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/ impl-vlt/src/org/apache/s
Author: rombert
Date: Sun Oct 12 22:26:20 2014
New Revision: 1631261
URL: http://svn.apache.org/r1631261
Log:
SLING-4035 - Changing the jcr primary type does not work if properties
are added
Change the jcr primary type earlier in the AddOrUpdateNodeCommand .
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/folder.cnd
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommand.java
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java?rev=1631261r1=1631260r2=1631261view=diff
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
Sun Oct 12 22:26:20 2014
@@ -20,6 +20,8 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import javax.jcr.Node;
import javax.jcr.Property;
@@ -29,6 +31,8 @@ import javax.jcr.SimpleCredentials;
import javax.jcr.Value;
import javax.jcr.nodetype.NodeType;
+import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.commons.cnd.CndImporter;
import org.apache.jackrabbit.core.TransientRepository;
import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.transport.ResourceProxy;
@@ -122,6 +126,78 @@ public class AddOrUpdateNodeCommandTest
doPropertyChangeTest(new String[] { Title, Title 2 }, Title);
}
+@Test
+public void changeNtFolderToSlingFolderWithAddedProperty() throws
Exception {
+
+File out = new File(new File(target), jackrabbit);
+TransientRepository repo = new TransientRepository(new File(out,
repository.xml), new File(out, repository));
+SimpleCredentials credentials = new SimpleCredentials(admin,
admin.toCharArray());
+Session session = repo.login(credentials);
+
+InputStream cndInput = getClass().getResourceAsStream(folder.cnd);
+CndImporter.registerNodeTypes(new InputStreamReader(cndInput),
session);
+
+try {
+session.getRootNode().addNode(content, nt:folder);
+
+session.save();
+
+ResourceProxy resource = newResource(/content, sling:Folder);
+resource.getProperties().put(newProperty, some/value);
+
+AddOrUpdateNodeCommand cmd = new AddOrUpdateNodeCommand(repo,
credentials, null, resource, logger);
+cmd.execute().get();
+
+session.refresh(false);
+
+Node content = session.getRootNode().getNode(content);
+assertThat(content.getPrimaryNodeType().getName(),
equalTo(sling:Folder));
+
+} finally {
+session.removeItem(/content);
+session.save();
+session.logout();
+
+IOUtils.closeQuietly(cndInput);
+}
+}
+
+@Test
+public void changeSlingFolderToNtFolderWithExistingProperty() throws
Exception {
+
+File out = new File(new File(target), jackrabbit);
+TransientRepository repo = new TransientRepository(new File(out,
repository.xml), new File(out, repository));
+SimpleCredentials credentials = new SimpleCredentials(admin,
admin.toCharArray());
+Session session = repo.login(credentials);
+
+InputStream cndInput = getClass().getResourceAsStream(folder.cnd);
+CndImporter.registerNodeTypes(new InputStreamReader(cndInput),
session);
+
+try {
+Node content = session.getRootNode().addNode(content,
sling:Folder);
+content.setProperty(newProperty, some/value);
+
+session.save();
+
+ResourceProxy resource = newResource(/content, nt:folder);
+
+AddOrUpdateNodeCommand cmd = new AddOrUpdateNodeCommand(repo,
credentials, null, resource, logger);
+cmd.execute().get();
+
+session.refresh(false);
+
+content = session.getRootNode().getNode(content);
+assertThat(content.getPrimaryNodeType().getName(),
equalTo(nt:folder));
+
+} finally {
+session.removeItem(/content);
+session.save();
+session.logout();
+
+IOUtils.closeQuietly(cndInput);
+}
+}
+
private ResourceProxy newResource(String path, String primaryType) {
ResourceProxy resource = new ResourceProxy(path);
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache
svn commit: r1631262 - in /sling/trunk/tooling/ide/impl-vlt-test/src/test: java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java resources/org/apache/sling/ide/impl/vlt/mandatory.cnd
Author: rombert
Date: Sun Oct 12 22:26:29 2014
New Revision: 1631262
URL: http://svn.apache.org/r1631262
Log:
SLING-4036 - Changing the jcr primary type does not work if mandatory
properties are added
Added an ignored test
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/mandatory.cnd
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java?rev=1631262r1=1631261r2=1631262view=diff
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/AddOrUpdateNodeCommandTest.java
Sun Oct 12 22:26:29 2014
@@ -36,6 +36,7 @@ import org.apache.jackrabbit.commons.cnd
import org.apache.jackrabbit.core.TransientRepository;
import org.apache.sling.ide.log.Logger;
import org.apache.sling.ide.transport.ResourceProxy;
+import org.junit.Ignore;
import org.junit.Test;
public class AddOrUpdateNodeCommandTest {
@@ -198,6 +199,43 @@ public class AddOrUpdateNodeCommandTest
}
}
+@Test
+@Ignore(SLING-4036)
+public void updateNtUnstructuredToNodeWithRequiredProperty() throws
Exception {
+
+File out = new File(new File(target), jackrabbit);
+TransientRepository repo = new TransientRepository(new File(out,
repository.xml), new File(out, repository));
+SimpleCredentials credentials = new SimpleCredentials(admin,
admin.toCharArray());
+Session session = repo.login(credentials);
+
+InputStream cndInput =
getClass().getResourceAsStream(mandatory.cnd); // TODO - should be
test-definitions.cnd
+CndImporter.registerNodeTypes(new InputStreamReader(cndInput),
session);
+
+try {
+Node content = session.getRootNode().addNode(content,
nt:unstructured);
+
+session.save();
+
+ResourceProxy resource = newResource(/content, custom);
+resource.getProperties().put(attribute, some value);
+
+AddOrUpdateNodeCommand cmd = new AddOrUpdateNodeCommand(repo,
credentials, null, resource, logger);
+cmd.execute().get();
+
+session.refresh(false);
+
+content = session.getRootNode().getNode(content);
+assertThat(content.getPrimaryNodeType().getName(),
equalTo(custom));
+
+} finally {
+session.removeItem(/content);
+session.save();
+session.logout();
+
+IOUtils.closeQuietly(cndInput);
+}
+}
+
private ResourceProxy newResource(String path, String primaryType) {
ResourceProxy resource = new ResourceProxy(path);
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/mandatory.cnd
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/mandatory.cnd?rev=1631262view=auto
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/mandatory.cnd
(added)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/mandatory.cnd
Sun Oct 12 22:26:29 2014
@@ -0,0 +1,23 @@
+//
+// 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.
+//
+
+//-
+// Simple node type with a mandatory property
+[custom]
+- attribute (string) mandatory
\ No newline at end of file
svn commit: r1631346 - in /sling/site/trunk/content/apidocs/sling7: ./ org/apache/sling/adapter/ org/apache/sling/adapter/class-use/ org/apache/sling/api/ org/apache/sling/api/adapter/ org/apache/slin
Author: rombert Date: Mon Oct 13 10:59:44 2014 New Revision: 1631346 URL: http://svn.apache.org/r1631346 Log: Regenerate Javadoc using Java 8 [This commit notification would consist of 338 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r925589 - /websites/production/sling/content/
Author: rombert Date: Mon Oct 13 11:11:29 2014 New Revision: 925589 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r925588, websites/staging/sling/trunk/content/
svn commit: r1631351 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serializatio
Author: rombert
Date: Mon Oct 13 11:34:37 2014
New Revision: 1631351
URL: http://svn.apache.org/r1631351
Log:
SLING-4041 - Escaped braces at the start of a property value are not
unescaped
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
Modified:
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java?rev=1631351r1=1631350r2=1631351view=diff
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandlerTest.java
Mon Oct 13 11:34:37 2014
@@ -179,6 +179,15 @@ public class ContentXmlHandlerTest {
assertThat(root has 1 property, binary property is ignored,
root.getProperties().entrySet(), hasSize(1));
}
+@Test
+public void escapedBraceAtStartOfPropertyValue() throws Exception {
+
+ResourceProxy root =
parseContentXmlFile(escaped-braces-at-start-of-property.xml, /);
+assertThat(properties[org.apache.sling.commons.log.pattern],
+root.getProperties(),
hasEntry(org.apache.sling.commons.log.pattern,
+(Object) {0,date,dd.MM. HH:mm:ss.SSS} *{4}* [{2}]
{3} {5}));
+}
+
private static MatcherCalendar millis(long millis) {
return new CalendarTimeInMillisMatcher(millis);
Added:
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml?rev=1631351view=auto
==
---
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
(added)
+++
sling/trunk/tooling/ide/impl-vlt-test/src/test/resources/org/apache/sling/ide/impl/vlt/serialization/escaped-braces-at-start-of-property.xml
Mon Oct 13 11:34:37 2014
@@ -0,0 +1,23 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+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.
+--
+jcr:root xmlns:sling=http://sling.apache.org/jcr/sling/1.0;
xmlns:jcr=http://www.jcp.org/jcr/1.0;
+jcr:primaryType=sling:OsgiConfig
+org.apache.sling.commons.log.file=logs/missing.log
+org.apache.sling.commons.log.level=info
+org.apache.sling.commons.log.names=[org.apache.sling.missing]
+org.apache.sling.commons.log.pattern=\{0,date,dd.MM. HH:mm:ss.SSS}
*{4}* [{2}] {3} {5}/
Modified:
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java?rev=1631351r1=1631350r2=1631351view=diff
==
---
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/ContentXmlHandler.java
Mon Oct 13 11:34:37 2014
@@ -239,7 +239,9 @@ public class ContentXmlHandler extends D
values = new String[] { rawValue };
}
+// no hint - string type
if (hintEnd == -1) {
+unescape(values);
if (values.length == 1 !explicitMultiValue
svn commit: r1631782 - in /sling/trunk/tooling/ide: ./ api-test/ api/ api/META-INF/ artifacts/ artifacts/META-INF/ eclipse-core/ eclipse-core/META-INF/ eclipse-m2e-test/ eclipse-m2e-test/META-INF/ ecl
Author: rombert Date: Tue Oct 14 15:15:33 2014 New Revision: 1631782 URL: http://svn.apache.org/r1631782 Log: Set version to 1.0.4 in preparation of release Modified: sling/trunk/tooling/ide/api-test/pom.xml sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF sling/trunk/tooling/ide/api/pom.xml sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF sling/trunk/tooling/ide/artifacts/pom.xml sling/trunk/tooling/ide/eclipse-core/META-INF/MANIFEST.MF sling/trunk/tooling/ide/eclipse-core/pom.xml sling/trunk/tooling/ide/eclipse-m2e-test/META-INF/MANIFEST.MF sling/trunk/tooling/ide/eclipse-m2e-test/pom.xml sling/trunk/tooling/ide/eclipse-m2e-ui/META-INF/MANIFEST.MF sling/trunk/tooling/ide/eclipse-m2e-ui/pom.xml sling/trunk/tooling/ide/eclipse-test/META-INF/MANIFEST.MF sling/trunk/tooling/ide/eclipse-test/pom.xml sling/trunk/tooling/ide/eclipse-ui/META-INF/MANIFEST.MF sling/trunk/tooling/ide/eclipse-ui/pom.xml sling/trunk/tooling/ide/feature/feature.xml sling/trunk/tooling/ide/feature/pom.xml sling/trunk/tooling/ide/impl-resource-test/pom.xml sling/trunk/tooling/ide/impl-resource/META-INF/MANIFEST.MF sling/trunk/tooling/ide/impl-resource/pom.xml sling/trunk/tooling/ide/impl-vlt-test/pom.xml sling/trunk/tooling/ide/impl-vlt/META-INF/MANIFEST.MF sling/trunk/tooling/ide/impl-vlt/pom.xml sling/trunk/tooling/ide/m2e-feature/feature.xml sling/trunk/tooling/ide/m2e-feature/pom.xml sling/trunk/tooling/ide/p2update/pom.xml sling/trunk/tooling/ide/pom.xml sling/trunk/tooling/ide/source-bundle/pom.xml sling/trunk/tooling/ide/target-definition/pom.xml sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF sling/trunk/tooling/ide/vlt-wrapper/pom.xml Modified: sling/trunk/tooling/ide/api-test/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api-test/pom.xml?rev=1631782r1=1631781r2=1631782view=diff == --- sling/trunk/tooling/ide/api-test/pom.xml (original) +++ sling/trunk/tooling/ide/api-test/pom.xml Tue Oct 14 15:15:33 2014 @@ -19,7 +19,7 @@ parent groupIdorg.apache.sling.ide/groupId artifactIdreactor/artifactId -version1.0.3-SNAPSHOT/version +version1.0.4/version /parent artifactIdorg.apache.sling.ide.api-test/artifactId nameSling IDE Tools: API Tests/name Modified: sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF?rev=1631782r1=1631781r2=1631782view=diff == --- sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF (original) +++ sling/trunk/tooling/ide/api/META-INF/MANIFEST.MF Tue Oct 14 15:15:33 2014 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Slingclipse-api Bundle-SymbolicName: org.apache.sling.ide.api -Bundle-Version: 1.0.3.qualifier +Bundle-Version: 1.0.4 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.apache.sling.ide.filter, Modified: sling/trunk/tooling/ide/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/api/pom.xml?rev=1631782r1=1631781r2=1631782view=diff == --- sling/trunk/tooling/ide/api/pom.xml (original) +++ sling/trunk/tooling/ide/api/pom.xml Tue Oct 14 15:15:33 2014 @@ -21,7 +21,7 @@ parent groupIdorg.apache.sling.ide/groupId artifactIdreactor/artifactId -version1.0.3-SNAPSHOT/version +version1.0.4/version /parent artifactIdorg.apache.sling.ide.api/artifactId packagingeclipse-plugin/packaging Modified: sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF?rev=1631782r1=1631781r2=1631782view=diff == --- sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF (original) +++ sling/trunk/tooling/ide/artifacts/META-INF/MANIFEST.MF Tue Oct 14 15:15:33 2014 @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.apache.sling.ide.artifacts -Bundle-Version: 1.0.3.qualifier +Bundle-Version: 1.0.4 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: org.osgi.service.component, Modified: sling/trunk/tooling/ide/artifacts/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/artifacts/pom.xml?rev=1631782r1=1631781r2=1631782view=diff == --- sling/trunk/tooling/ide/artifacts/pom.xml (original) +++ sling/trunk/tooling/ide/artifacts/pom.xml Tue Oct 14 15:15:33 2014 @@ -22,7 +22,7 @@ parent groupIdorg.apache.sling.ide/groupId artifactIdreactor/artifactId
svn commit: r925758 - /websites/production/sling/content/
Author: rombert Date: Tue Oct 14 15:47:50 2014 New Revision: 925758 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r925757, websites/staging/sling/trunk/content/
svn commit: r925762 - /websites/production/sling/content/
Author: rombert Date: Tue Oct 14 15:51:37 2014 New Revision: 925762 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r925761, websites/staging/sling/trunk/content/
svn commit: r1631801 - /sling/site/trunk/content/documentation/development/release-management.mdtext
Author: rombert Date: Tue Oct 14 15:51:15 2014 New Revision: 1631801 URL: http://svn.apache.org/r1631801 Log: Small syntax cleanups Modified: sling/site/trunk/content/documentation/development/release-management.mdtext Modified: sling/site/trunk/content/documentation/development/release-management.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/release-management.mdtext?rev=1631801r1=1631800r2=1631801view=diff == --- sling/site/trunk/content/documentation/development/release-management.mdtext (original) +++ sling/site/trunk/content/documentation/development/release-management.mdtext Tue Oct 14 15:51:15 2014 @@ -177,7 +177,7 @@ If the vote fails, or you decide to redo If the vote passes: -1. Commit the released artifacts to [https://dist.apache.org/repos/dist/release/sling/][1] which is replicated to [http://www.apache.org/dist/sling/](http://www.apache.org/dist/sling/) quickly via svnpubsub. Hint: use svn import to avoid having to checkout the whole folder first. The easiest to do this is to get the released artifact using the check script (check#95;staged#95;release.sh) and then simply copy the artifacts from the downloaded folder to your local checkout folder. Make sure to not add the checksum files for the signature file \*.asc.\*). +1. Commit the released artifacts to [https://dist.apache.org/repos/dist/release/sling/](https://dist.apache.org/repos/dist/release/sling/) which is replicated to [http://www.apache.org/dist/sling/](http://www.apache.org/dist/sling/) quickly via svnpubsub. Hint: use svn import to avoid having to checkout the whole folder first. The easiest to do this is to get the released artifact using the check script (check#95;staged#95;release.sh) and then simply copy the artifacts from the downloaded folder to your local checkout folder. Make sure to not add the checksum files for the signature file \*.asc.\*). 1. Delete the old release artifacts from that same dist.apache.org svn folder (the dist directory is archived) 1. Login to [https://repository.apache.org](https://repository.apache.org) with your Apache SVN credentials. Click on *Staging*. Find your closed staging repository and select it by checking the select box. Select the *Releases* repository from the drop-down list and click *Release* from the menu above. 1. Once the release is promoted click on *Repositories*, select the *Releases* repository and validate that your artifacts are all there. @@ -257,8 +257,8 @@ While the Sling IDE tooling is built usi Once the release has passed, the following must be done: -1. announce the result of the vote, see [Wait for the results](#WaitfortheResults) -1. update versions in jira, see [Update JIRA](#UpdateJIRA) +1. announce the result of the vote, see [Wait for the results](#wait-for-the-results) +1. update versions in jira, see [Update JIRA](#update-jira) 1. upload p2update.zip* to https://dist.apache.org/repos/dist/release/sling/ 1. upload unzipped update site to https://dist.apache.org/repos/dist/release/sling/eclipse/1.0.2 1. upload the source bundle to https://dist.apache.org/repos/dist/release/sling/eclipse/1.0.2 @@ -364,7 +364,3 @@ To update the OBR you may use the Apache Wait for the buildbot to update the staging area with your site update (see dev list for an email). Then go to the CMS at [https://cms.apache.org/redirect?uri=http://sling.apache.org/obr](https://cms.apache.org/redirect?uri=http://sling.apache.org/obr) , update your checkout and then publish the site. - -## Appendix D: Releasing the Sling IDE Tooling - -[1]: https://dist.apache.org/repos/dist/release/sling/
svn commit: r6788 - /dev/sling/ide-tooling-1.0.4/
Author: rombert Date: Fri Oct 17 21:15:34 2014 New Revision: 6788 Log: Unstage IDE Tooling 1.0.4 after vote is complete Removed: dev/sling/ide-tooling-1.0.4/
svn commit: r6789 - in /release/sling: ./ eclipse/ eclipse/1.0.2/ eclipse/1.0.2/features/ eclipse/1.0.2/plugins/ eclipse/1.0.2/web/ eclipse/1.0.4/ eclipse/1.0.4/features/ eclipse/1.0.4/plugins/ eclips
Author: rombert Date: Fri Oct 17 21:15:54 2014 New Revision: 6789 Log: IDE Tooling 1.0.4 Added: release/sling/eclipse/1.0.2/compositeArtifacts.xml (with props) release/sling/eclipse/1.0.2/compositeContent.xml (with props) release/sling/eclipse/1.0.4/ release/sling/eclipse/1.0.4/artifacts.jar (with props) release/sling/eclipse/1.0.4/artifacts.jar.asc (with props) release/sling/eclipse/1.0.4/artifacts.jar.md5 release/sling/eclipse/1.0.4/artifacts.jar.sha1 release/sling/eclipse/1.0.4/content.jar (with props) release/sling/eclipse/1.0.4/content.jar.asc (with props) release/sling/eclipse/1.0.4/content.jar.md5 release/sling/eclipse/1.0.4/content.jar.sha1 release/sling/eclipse/1.0.4/features/ release/sling/eclipse/1.0.4/features/org.apache.sling.ide.feature_1.0.4.jar (with props) release/sling/eclipse/1.0.4/features/org.apache.sling.ide.feature_1.0.4.jar.asc (with props) release/sling/eclipse/1.0.4/features/org.apache.sling.ide.feature_1.0.4.jar.md5 release/sling/eclipse/1.0.4/features/org.apache.sling.ide.feature_1.0.4.jar.sha1 release/sling/eclipse/1.0.4/features/org.apache.sling.ide.m2e-feature_1.0.4.jar (with props) release/sling/eclipse/1.0.4/features/org.apache.sling.ide.m2e-feature_1.0.4.jar.asc (with props) release/sling/eclipse/1.0.4/features/org.apache.sling.ide.m2e-feature_1.0.4.jar.md5 release/sling/eclipse/1.0.4/features/org.apache.sling.ide.m2e-feature_1.0.4.jar.sha1 release/sling/eclipse/1.0.4/index.html release/sling/eclipse/1.0.4/org.apache.sling.ide.source-bundle-1.0.4.zip (with props) release/sling/eclipse/1.0.4/org.apache.sling.ide.source-bundle-1.0.4.zip.asc (with props) release/sling/eclipse/1.0.4/org.apache.sling.ide.source-bundle-1.0.4.zip.md5 release/sling/eclipse/1.0.4/org.apache.sling.ide.source-bundle-1.0.4.zip.sha1 release/sling/eclipse/1.0.4/plugins/ release/sling/eclipse/1.0.4/plugins/org.apache.commons.collections_3.2.0.v2013030210310.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.collections_3.2.0.v2013030210310.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.collections_3.2.0.v2013030210310.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.commons.collections_3.2.0.v2013030210310.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.commons.httpclient_3.1.0.v201012070820.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.httpclient_3.1.0.v201012070820.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.httpclient_3.1.0.v201012070820.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.commons.httpclient_3.1.0.v201012070820.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.commons.io_2.0.1.v201105210651.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.io_2.0.1.v201105210651.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.io_2.0.1.v201105210651.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.commons.io_2.0.1.v201105210651.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.commons.logging_1.1.1.v201101211721.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.api_1.0.4.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.api_1.0.4.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.api_1.0.4.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.api_1.0.4.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.artifacts_1.0.4.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.artifacts_1.0.4.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.artifacts_1.0.4.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.artifacts_1.0.4.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse-core_1.0.4.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse-core_1.0.4.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse-core_1.0.4.jar.md5 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse-core_1.0.4.jar.sha1 release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse-m2e-ui_1.0.4.jar (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse-m2e-ui_1.0.4.jar.asc (with props) release/sling/eclipse/1.0.4/plugins/org.apache.sling.ide.eclipse
svn commit: r1632670 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: rombert Date: Fri Oct 17 21:21:27 2014 New Revision: 1632670 URL: http://svn.apache.org/r1632670 Log: Sling IDE Tooling 1.0.4 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1632670r1=1632669r2=1632670view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Oct 17 21:21:27 2014 @@ -15,7 +15,7 @@ sling|7 # (2) Sling IDE Tooling Version -sling-ide-tooling|1.0.2 +sling-ide-tooling|1.0.4 # # (3) Sling Bundles and Components Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1632670r1=1632669r2=1632670view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Oct 17 21:21:27 2014 @@ -1,6 +1,7 @@ Title: News -* New Releases: Apache Sling Settings 1.3.4, Apache Sling Discovery API 1.0.2, and Apache Sling Discovery Impl 1.0.12 (October, 10th) +* New Release: Apache Sling IDE Tooling 1.0.4 ( October 18th, 2014) +* New Releases: Apache Sling Settings 1.3.4, Apache Sling Discovery API 1.0.2, and Apache Sling Discovery Impl 1.0.12 (October 10th, 2014) * New Release: Apache Sling Resource Resolver 1.1.6 (October 4th, 2014) * New Release: Apache Sling Superimposing Resource Provider 0.2.0, Apache Sling 7 (October 3th, 2014) * New Release: Apache Sling Scripting Java 2.0.12 (September 30th, 2014)
svn commit: r926138 - /websites/production/sling/content/
Author: rombert Date: Fri Oct 17 21:22:01 2014 New Revision: 926138 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r926137, websites/staging/sling/trunk/content/
svn commit: r1632684 - in /sling/site/trunk/content/documentation/development: ide-tooling.mdtext ide-tooling/new-bundle-project-step-2.png ide-tooling/new-bundle-project-step-4.png ide-tooling/new-co
Author: rombert Date: Fri Oct 17 22:49:39 2014 New Revision: 1632684 URL: http://svn.apache.org/r1632684 Log: Update documentation for Eclipse IDE Tooling 1.0.4 - refresh known issues - refresh screenshots - no longer need to update the publish interval manually - take into account the fact that projects may skip deployment when created - note behaviour change when deploying content projects on a server Modified: sling/site/trunk/content/documentation/development/ide-tooling.mdtext sling/site/trunk/content/documentation/development/ide-tooling/new-bundle-project-step-2.png sling/site/trunk/content/documentation/development/ide-tooling/new-bundle-project-step-4.png sling/site/trunk/content/documentation/development/ide-tooling/new-content-project-step-3.png Modified: sling/site/trunk/content/documentation/development/ide-tooling.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/ide-tooling.mdtext?rev=1632684r1=1632683r2=1632684view=diff == --- sling/site/trunk/content/documentation/development/ide-tooling.mdtext (original) +++ sling/site/trunk/content/documentation/development/ide-tooling.mdtext Fri Oct 17 22:49:39 2014 @@ -49,7 +49,6 @@ The server will appear in the servers vi There are a couple of important settings in the server definition page: * port: used for connecting to the server -* publishing interval: controls how fast the resources will be published after a change. We recommend setting the interval to 0, for fast deploy times * username, password, context path: controls the connection details to the Sling instance. * debug port: used for connecting in debug mode @@ -57,7 +56,7 @@ For working with OSGi bundles, a special  -You can now connect to the server +You can now connect to the server. ## Content sync @@ -78,11 +77,13 @@ You will then be asked to name the proje  -Finally, you can select whether to add the project to an existing server or create a new one. +Finally, you can select whether to add the project to an existing server, create a new one, or leave it undeployed.  -Once you press finish, the project will be created and deployed to the server. +Once you press finish, the project will be created and deployed to the server if needed. + +Note that deploying a project on the server publishes all the resources from the project if the server is started. If the server is stopped, you need to manually publish the changes after startup. ### Converting existing projects @@ -140,11 +141,11 @@ You will be asked to configure the arche  -Finally, you can select whether to add the project to an existing server or create a new one. +Finally, you can select whether to add the project to an existing server, create a new one, or leave it undeployed.  -Once you press finish, the project will be created and deployed to the server. +Once you press finish, the project will be created and deployed to the server if needed. ### Converting existing projects @@ -187,7 +188,6 @@ One often-occuring situation is that a M The content sync implementation tries to mimic the FileVault semantics as closely as possible. However, it is possible that some more exotic content structures will not be handled properly. Some of the problems we're are of are: -* [SLING-3586 - Publishing content fails if intermediate nodes are not present in the repository](https://issues.apache.org/jira/browse/SLING-3586) . The workaround is to manually create the missing nodes in the repository . * [SLING-3591 - Unable to delete all nodes of a full coverage aggregate](https://issues.apache.org/jira/browse/SLING-3591) . The workaround is to manually delete the child nodes . -* [SLING-3573 - Local resources which are no longer present in the repository are not deleted when importing](https://issues.apache.org/jira/browse/SLING-3573) . The workaround is to manually delete the workspace files . -* [SLING-3644 - Improve handling of binary properties outside nt:file file nodes](https://issues.apache.org/jira/browse/SLING-3644) . Currently there is no workaround, but in practice this is not an often-encountered situation. \ No newline at end of file +* [SLING-3644 - Improve handling of binary properties outside nt:file file nodes](https://issues.apache.org/jira/browse/SLING-3644) . Currently there is no workaround, but in practice this is not an often-encountered situation. +* [SLING-4069 - Intermediate resources that do not match the filter are not created when publishing](https
svn commit: r926143 - /websites/production/sling/content/
Author: rombert Date: Fri Oct 17 22:50:12 2014 New Revision: 926143 Log: Publishing svnmucc operation to sling site by rombert Added: websites/production/sling/content/ - copied from r926142, websites/staging/sling/trunk/content/
svn commit: r1633368 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
Author: rombert
Date: Tue Oct 21 13:06:33 2014
New Revision: 1633368
URL: http://svn.apache.org/r1633368
Log:
SLING-4081 - SlingStart Maven Plugin fails if the organization is not
defined in pom.xml
Handle missing organization in JarArchiverHelper
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
Modified:
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java?rev=1633368r1=1633367r2=1633368view=diff
==
---
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
(original)
+++
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/JarArchiverHelper.java
Tue Oct 21 13:06:33 2014
@@ -78,22 +78,27 @@ public class JarArchiverHelper {
}
outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_IMPLEMENTATION_BUILD,
project.getVersion()));
-outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VENDOR,
-project.getOrganization().getName()));
outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VERSION,
project.getVersion()));
-outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_CREATED_BY,
-project.getOrganization().getName()));
-outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_BUILT_BY,
-project.getOrganization().getName()));
+
+String organizationName = project.getOrganization() != null ?
project.getOrganization().getName() : null;
+if ( organizationName != null ) {
+outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VENDOR,
+organizationName));
+outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_CREATED_BY,
+organizationName));
+outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_BUILT_BY,
+organizationName));
+outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_SPECIFICATION_VENDOR,
+organizationName));
+}
+
outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_IMPLEMENTATION_VENDOR_ID,
project.getGroupId()));
outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_IMPLEMENTATION_TITLE,
project.getName()));
outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_SPECIFICATION_TITLE,
project.getName()));
-outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_SPECIFICATION_VENDOR,
-project.getOrganization().getName()));
outManifest.addConfiguredAttribute(new
Attribute(BuildConstants.ATTR_SPECIFICATION_VERSION,
project.getVersion()));
svn commit: r1633371 - /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/resources/META-INF/plexus/components.xml
Author: rombert Date: Tue Oct 21 13:11:16 2014 New Revision: 1633371 URL: http://svn.apache.org/r1633371 Log: Moved invocation of org.apache.sling:slingstart-maven-plugin:prepare-package to prepare-package lifecycle phase Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/resources/META-INF/plexus/components.xml Modified: sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/resources/META-INF/plexus/components.xml?rev=1633371r1=1633370r2=1633371view=diff == --- sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/resources/META-INF/plexus/components.xml (original) +++ sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/resources/META-INF/plexus/components.xml Tue Oct 21 13:11:16 2014 @@ -47,7 +47,6 @@ iddefault/id !-- START SNIPPET: bundle-lifecycle -- phases - process-sourcesorg.apache.sling:slingstart-maven-plugin:prepare-package/process-sources process-resourcesorg.apache.maven.plugins:maven-resources-plugin:resources/process-resources compileorg.apache.maven.plugins:maven-compiler-plugin:compile/compile process-test-resources @@ -55,6 +54,7 @@ /process-test-resources test-compileorg.apache.maven.plugins:maven-compiler-plugin:testCompile/test-compile testorg.apache.maven.plugins:maven-surefire-plugin:test/test + prepare-packageorg.apache.sling:slingstart-maven-plugin:prepare-package/prepare-package package org.apache.sling:slingstart-maven-plugin:attach-slingfeature, org.apache.sling:slingstart-maven-plugin:package
svn commit: r1634147 - in /sling/trunk/tooling/ide: eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerialization
Author: rombert
Date: Fri Oct 24 22:38:23 2014
New Revision: 1634147
URL: http://svn.apache.org/r1634147
Log:
SLING-4098 - Full coverage aggregates nested under a partial coverage
aggregate incorrectly deleted when a sibling resource is published
Unify repository path extraction logic in VltSerializationManager -
getRepositoryPath now hosts the more extensive logic which originally
resided in readSerializationData .
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java?rev=1634147r1=1634146r2=1634147view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentDeploymentTest.java
Fri Oct 24 22:38:23 2014
@@ -268,6 +268,52 @@ public class ContentDeploymentTest {
}, hasFileContent(hello, world));
}
+@Test
+public void
filedDeployedWithFullCoverageSiblingDoesNotCauseSpuriousDeletion() throws
Exception {
+
+wstServer.waitForServerToStart();
+
+// create faceted project
+IProject contentProject = projectRule.getProject();
+
+ProjectAdapter project = new ProjectAdapter(contentProject);
+project.addNatures(JavaCore.NATURE_ID,
org.eclipse.wst.common.project.facet.core.nature);
+
+// install bundle facet
+project.installFacet(sling.content, 1.0);
+
+ServerAdapter server = new ServerAdapter(wstServer.getServer());
+server.installModule(contentProject);
+
+// create sling:Folder at /test/folder
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/folder/.content.xml),
getClass()
+.getResourceAsStream(sling-folder-nodetype.xml));
+
+// create nt:file at /test/folder/hello.esp
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/folder/hello.esp),
new ByteArrayInputStream(
+// not really javascript.getBytes()));
+
+// create sling:OsgiConfig at /test/folder/config.xml
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/folder/config.xml),
getClass()
+.getResourceAsStream(com.example.some.Component.xml));
+
+// verify that config node is created
+final RepositoryAccessor repo = new RepositoryAccessor(config);
+Poller poller = new Poller();
+
+assertThatNode(repo, poller, /test/folder/config,
hasPrimaryType(sling:OsgiConfig));
+
+// update file at /test/folder/hello.esp
+
project.createOrUpdateFile(Path.fromPortableString(jcr_root/test/folder/hello.esp),
new ByteArrayInputStream(
+// maybe javascript.getBytes()));
+
+// wait until the file is updated
+assertThatNode(repo, poller, /test/folder/hello.esp,
hasFileContent(// maybe javascript));
+
+// verify that the sling:OsgiConfig node is still present
+assertThatNode(repo, poller, /test/folder/config,
hasPrimaryType(sling:OsgiConfig));
+}
+
private void assertThatNode(final RepositoryAccessor repo, Poller poller,
final String nodePath, MatcherNode matcher)
throws InterruptedException {
Modified:
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java?rev=1634147r1=1634146r2=1634147view=diff
==
---
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
(original)
+++
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/impl/vlt/serialization/VltSerializationManager.java
Fri Oct 24 22:38:23 2014
@@ -174,8 +174,34 @@ public class VltSerializationManager imp
@Override
public String getRepositoryPath(String osPath) {
-// TODO - this is a bit risky, we might clean legitimate directories
which contain '.dir'
-return PlatformNameFormat.getRepositoryPath(osPath).replace(.dir/,
/);
+
+String repositoryPath;
+String name = Text.getName(osPath);
+if (name.equals(Constants.DOT_CONTENT_XML)) {
+// TODO - this is a bit risky, we might clean legitimate
directories which contain '.dir'
+String parentPath = Text.getRelativeParent(osPath, 1);
+if (parentPath != null
svn commit: r1634154 - in /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model: GenericJcrRootFile.java JcrNode.java
Author: rombert
Date: Fri Oct 24 23:11:54 2014
New Revision: 1634154
URL: http://svn.apache.org/r1634154
Log:
SLING-4092: Eclipse runs out of file descriptors due to vault files
being kept open
Ensure that InputStream instances returned from IFile.getContents() are
closed.
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1634154r1=1634153r2=1634154view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
Fri Oct 24 23:11:54 2014
@@ -24,6 +24,7 @@ import java.util.List;
import javax.xml.parsers.ParserConfigurationException;
+import org.apache.commons.io.IOUtils;
import org.apache.sling.ide.eclipse.core.internal.Activator;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
@@ -54,8 +55,12 @@ public class GenericJcrRootFile extends
this.domElement = null;
InputStream in = file.getContents();
-this.document = TolerantXMLParser.parse(in,
file.getFullPath().toOSString());
- handleJcrRoot(this.document.getRootElement());
+try {
+this.document = TolerantXMLParser.parse(in,
file.getFullPath().toOSString());
+handleJcrRoot(this.document.getRootElement());
+} finally {
+IOUtils.closeQuietly(in);
+}
}
@Override
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1634154r1=1634153r2=1634154view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Fri Oct 24 23:11:54 2014
@@ -37,6 +37,7 @@ import javax.xml.parsers.ParserConfigura
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.util.ISO9075;
import org.apache.sling.ide.eclipse.core.ISlingLaunchpadServer;
import org.apache.sling.ide.eclipse.core.ProjectUtil;
@@ -441,9 +442,13 @@ public class JcrNode implements IAdaptab
SAXParser saxParser = factory.newSAXParser();
JcrRootHandler h = new JcrRootHandler();
- saxParser.parse(new InputSource(file.getContents()), h);
-
- return h.isVaultFile();
+ InputStream contents = file.getContents();
+try {
+saxParser.parse(new InputSource(contents), h);
+return h.isVaultFile();
+} finally {
+IOUtils.closeQuietly(contents);
+}
}
return false;
}
@@ -1436,8 +1441,9 @@ public class JcrNode implements IAdaptab
IFolder contentSyncRoot = ProjectUtil.getSyncDirectory(getProject());
IFile file = (IFile) u.file;
+InputStream contents = null;
try{
-InputStream contents = file.getContents();
+contents = file.getContents();
String resourceLocation =
file.getFullPath().makeRelativeTo(contentSyncRoot.getFullPath())
.toPortableString();
ResourceProxy resourceProxy = Activator.getDefault()
@@ -1449,6 +1455,8 @@ public class JcrNode implements IAdaptab
return PropertyTypeSupport.propertyTypeOfString(rawValue);
} catch(Exception e) {
Activator.getDefault().getPluginLogger().warn(Exception occurred
during analyzing propertyType (+propertyName+) for +this, e);
+} finally {
+IOUtils.closeQuietly(contents);
}
return -1;
}
svn commit: r1634165 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
Author: rombert
Date: Fri Oct 24 23:45:31 2014
New Revision: 1634165
URL: http://svn.apache.org/r1634165
Log:
SLING-4099 - Content Navigator: unable to delete node with a namespace
prefix in its name
Allod deletion of DirNode instances.
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java?rev=1634165r1=1634164r2=1634165view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/DirNode.java
Fri Oct 24 23:45:31 2014
@@ -147,7 +147,7 @@ public class DirNode extends JcrNode {
@Override
public boolean canBeDeleted() {
- return false;
+return true;
}
@Override
svn commit: r1634883 - in /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model: GenericJcrRootFile.java JcrNode.java SyncDir.java
Author: rombert
Date: Tue Oct 28 14:14:43 2014
New Revision: 1634883
URL: http://svn.apache.org/r1634883
Log:
Code cleanup in content navigator
- reduce raw types warnings
- clean up unused imports
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/SyncDir.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java?rev=1634883r1=1634882r2=1634883view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/GenericJcrRootFile.java
Tue Oct 28 14:14:43 2014
@@ -159,18 +159,18 @@ public class GenericJcrRootFile extends
}
}
- public void pickResources(ListObject membersList) {
- for (IteratorObject it = membersList.iterator();
it.hasNext();) {
- final IResource resource = (IResource) it.next();
+public void pickResources(ListIResource membersList) {
+for (IteratorIResource it = membersList.iterator(); it.hasNext();) {
+final IResource resource = it.next();
final String resName = resource.getName();
-Iterator? it2;
+IteratorJcrNode it2;
if (isRootContentXml()) {
it2 = parent.children.iterator();
} else {
it2 = children.iterator();
}
while(it2.hasNext()) {
- JcrNode aChild = (JcrNode) it2.next();
+JcrNode aChild = it2.next();
if (resName.equals(aChild.getName())) {
// then pick this one
it.remove();
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1634883r1=1634882r2=1634883view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Tue Oct 28 14:14:43 2014
@@ -313,8 +313,8 @@ public class JcrNode implements IAdaptab
}
}
}
- for (Iterator it = values.iterator(); it.hasNext();) {
-JcrNode jcrNode = (JcrNode) it.next();
+for (IteratorJcrNode it = values.iterator(); it.hasNext();) {
+JcrNode jcrNode = it.next();
if (jcrNode instanceof DirNode) {
DirNode dirNode = (DirNode)jcrNode;
// DirNodes are candidates for hiding
@@ -361,18 +361,18 @@ public class JcrNode implements IAdaptab
throw new IllegalStateException(Children
already loaded);
}
SetString childrenNames = new HashSetString();
- for (Iterator it = children.iterator(); it.hasNext();) {
- JcrNode node = (JcrNode) it.next();
+for (IteratorJcrNode it = children.iterator(); it.hasNext();) {
+JcrNode node = it.next();
childrenNames.add(node.getName());
}
if (resource!=null resource instanceof IFolder) {
IFolder folder = (IFolder)resource;
IResource[] members = folder.members();
- ListObject membersList = new
LinkedListObject(Arrays.asList(members));
+ListIResource membersList = new
LinkedListIResource(Arrays.asList(members));
outerLoop: while(membersList.size()0) {
- for (Iterator it =
membersList.iterator(); it.hasNext();) {
- IResource iResource =
(IResource) it.next();
+for (IteratorIResource it = membersList.iterator();
it.hasNext();) {
+IResource iResource = it.next
svn commit: r1634903 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Author: rombert
Date: Tue Oct 28 16:12:07 2014
New Revision: 1634903
URL: http://svn.apache.org/r1634903
Log:
SLING-4110 - Content Navigator should not show .vlt files
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java?rev=1634903r1=1634902r2=1634903view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/nav/model/JcrNode.java
Tue Oct 28 16:12:07 2014
@@ -373,6 +373,10 @@ public class JcrNode implements IAdaptab
outerLoop: while(membersList.size()0) {
for (IteratorIResource it = membersList.iterator();
it.hasNext();) {
IResource iResource = it.next();
+if (isDotVltFile(iResource)) {
+it.remove();
+continue;
+}
if (isVaultFile(iResource)) {
GenericJcrRootFile gjrf
= new GenericJcrRootFile(this, (IFile)iResource);
it.remove();
@@ -429,7 +433,11 @@ public class JcrNode implements IAdaptab
}
}
- private boolean isVaultFile(IResource iResource)
+private boolean isDotVltFile(IResource res) {
+return res.getType() == IResource.FILE res.getName().equals(.vlt);
+}
+
+private boolean isVaultFile(IResource iResource)
throws ParserConfigurationException, SAXException,
IOException,
CoreException {
if (iResource.getName().endsWith(.xml)) {
svn commit: r1634904 - /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Author: rombert
Date: Tue Oct 28 16:12:49 2014
New Revision: 1634904
URL: http://svn.apache.org/r1634904
Log:
SLING-4113 - Importing resources triggers spurios publish events when
missing parent folders are created
Ensure that ImportRepositoryContentAction.createParents set the import
modification property so its changes are ignored.
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Modified:
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java?rev=1634904r1=1634903r2=1634904view=diff
==
---
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
(original)
+++
sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/ImportRepositoryContentAction.java
Tue Oct 28 16:12:49 2014
@@ -428,6 +428,15 @@ public class ImportRepositoryContentActi
return destinationFolder;
}
+private void createParents(IContainer container) throws CoreException {
+if (container.exists() || container.getType() != IResource.FOLDER) {
+return;
+}
+
+createParents(container.getParent());
+createFolder(container.getProject(),
container.getProjectRelativePath());
+}
+
private void removeTouchedResource(IResource resource) {
IResource current = resource;
@@ -461,17 +470,4 @@ public class ImportRepositoryContentActi
destinationFile.setSessionProperty(ResourceUtil.QN_IMPORT_MODIFICATION_TIMESTAMP,
destinationFile.getModificationStamp());
}
-
-private void createParents(IContainer container) throws CoreException {
- if (container.exists()) {
- return;
- }
- if (!(container instanceof IFolder)) {
- return;
- }
- createParents(container.getParent());
- IFolder parentFolder = (IFolder)container;
-parentFolder.create(true, true, null);
-}
-
}
\ No newline at end of file
svn commit: r1634905 - /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
Author: rombert
Date: Tue Oct 28 16:13:24 2014
New Revision: 1634905
URL: http://svn.apache.org/r1634905
Log:
SLING-3781 - Fix unstable Eclipse-based tests
Tweak ContentImportTest.importFilesAndFoldersRespectsVltFilters so that
events generated by the initial publish are ignored when looking for
unexpected publishing operations.
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
Modified:
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java?rev=1634905r1=1634904r2=1634905view=diff
==
---
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
(original)
+++
sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ContentImportTest.java
Tue Oct 28 16:13:24 2014
@@ -131,14 +131,14 @@ public class ContentImportTest {
ServerAdapter server = new ServerAdapter(wstServer.getServer());
server.installModule(contentProject);
-deh.clearUnexpectedEventsAfterSettling();
-
// create server-side content
RepositoryAccessor repo = new RepositoryAccessor(config);
repo.createNode(/content/test-root/de, nt:folder);
repo.createNode(/content/test-root/de/files, nt:folder);
repo.createFile(/content/test-root/de/files/first.txt, first
file.getBytes());
+deh.clearUnexpectedEventsAfterSettling();
+
runImport(contentProject);
assertThat(contentProject.findMember(jcr_root/content/test-root/de),
nullValue());
