svn commit: r1049612 - /sling/trunk/bundles/auth/openid/pom.xml
Author: cziegeler Date: Wed Dec 15 15:55:13 2010 New Revision: 1049612 URL: http://svn.apache.org/viewvc?rev=1049612view=rev Log: [maven-release-plugin] prepare release org.apache.sling.auth.openid-1.0.2 Modified: sling/trunk/bundles/auth/openid/pom.xml Modified: sling/trunk/bundles/auth/openid/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/pom.xml?rev=1049612r1=1049611r2=1049612view=diff == --- sling/trunk/bundles/auth/openid/pom.xml (original) +++ sling/trunk/bundles/auth/openid/pom.xml Wed Dec 15 15:55:13 2010 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.auth.openid/artifactId packagingbundle/packaging -version1.0.1-SNAPSHOT/version +version1.0.2/version nameApache Sling OpenID Authentication/name description @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/openid/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/auth/openid/developerConnection -urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.auth.openid-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.auth.openid-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.auth.openid-1.0.2/url /scm build
svn commit: r1049613 - /sling/tags/org.apache.sling.auth.openid-1.0.2/
Author: cziegeler Date: Wed Dec 15 15:55:26 2010 New Revision: 1049613 URL: http://svn.apache.org/viewvc?rev=1049613view=rev Log: [maven-scm] copy for tag org.apache.sling.auth.openid-1.0.2 Added: sling/tags/org.apache.sling.auth.openid-1.0.2/ - copied from r1049612, sling/trunk/bundles/auth/openid/
svn commit: r1049616 - /sling/trunk/bundles/auth/selector/pom.xml
Author: cziegeler Date: Wed Dec 15 15:57:39 2010 New Revision: 1049616 URL: http://svn.apache.org/viewvc?rev=1049616view=rev Log: [maven-release-plugin] prepare release org.apache.sling.auth.selector-1.0.2 Modified: sling/trunk/bundles/auth/selector/pom.xml Modified: sling/trunk/bundles/auth/selector/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/pom.xml?rev=1049616r1=1049615r2=1049616view=diff == --- sling/trunk/bundles/auth/selector/pom.xml (original) +++ sling/trunk/bundles/auth/selector/pom.xml Wed Dec 15 15:57:39 2010 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.auth.selector/artifactId packagingbundle/packaging -version1.0.1-SNAPSHOT/version +version1.0.2/version nameApache Sling Authentication Selector/name description @@ -48,9 +48,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/auth/selector/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/auth/selector/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.auth.selector-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.auth.selector-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.auth.selector-1.0.2/url /scm build
svn commit: r1049620 - /sling/tags/org.apache.sling.jcr.contentloader-2.1.2/
Author: cziegeler Date: Wed Dec 15 15:59:59 2010 New Revision: 1049620 URL: http://svn.apache.org/viewvc?rev=1049620view=rev Log: [maven-scm] copy for tag org.apache.sling.jcr.contentloader-2.1.2 Added: sling/tags/org.apache.sling.jcr.contentloader-2.1.2/ - copied from r1049619, sling/trunk/bundles/jcr/contentloader/
svn commit: r1049617 - /sling/tags/org.apache.sling.auth.selector-1.0.2/
Author: cziegeler Date: Wed Dec 15 15:57:53 2010 New Revision: 1049617 URL: http://svn.apache.org/viewvc?rev=1049617view=rev Log: [maven-scm] copy for tag org.apache.sling.auth.selector-1.0.2 Added: sling/tags/org.apache.sling.auth.selector-1.0.2/ - copied from r1049616, sling/trunk/bundles/auth/selector/
svn commit: r1049623 - in /sling/trunk: bundles/auth/form/pom.xml bundles/auth/openid/pom.xml bundles/auth/selector/pom.xml launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Wed Dec 15 16:06:34 2010 New Revision: 1049623 URL: http://svn.apache.org/viewvc?rev=1049623view=rev Log: Update to current snapshots Modified: sling/trunk/bundles/auth/form/pom.xml sling/trunk/bundles/auth/openid/pom.xml sling/trunk/bundles/auth/selector/pom.xml sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/bundles/auth/form/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/form/pom.xml?rev=1049623r1=1049622r2=1049623view=diff == --- sling/trunk/bundles/auth/form/pom.xml (original) +++ sling/trunk/bundles/auth/form/pom.xml Wed Dec 15 16:06:34 2010 @@ -98,7 +98,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.core/artifactId -version1.0.4/version +version1.0.5-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/auth/openid/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/openid/pom.xml?rev=1049623r1=1049622r2=1049623view=diff == --- sling/trunk/bundles/auth/openid/pom.xml (original) +++ sling/trunk/bundles/auth/openid/pom.xml Wed Dec 15 16:06:34 2010 @@ -107,7 +107,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.core/artifactId -version1.0.4/version +version1.0.5-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/auth/selector/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/auth/selector/pom.xml?rev=1049623r1=1049622r2=1049623view=diff == --- sling/trunk/bundles/auth/selector/pom.xml (original) +++ sling/trunk/bundles/auth/selector/pom.xml Wed Dec 15 16:06:34 2010 @@ -100,7 +100,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.core/artifactId -version1.0.4/version +version1.0.5-SNAPSHOT/version scopeprovided/scope /dependency dependency 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=1049623r1=1049622r2=1049623view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Wed Dec 15 16:06:34 2010 @@ -61,7 +61,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.core/artifactId -version1.0.3-SNAPSHOT/version +version1.0.5-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -71,17 +71,17 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.openid/artifactId -version1.0.0/version +version1.0.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.form/artifactId -version1.0.1-SNAPSHOT/version +version1.0.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.auth.selector/artifactId -version1.0.0/version +version1.0.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -106,7 +106,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.contentloader/artifactId -version2.1.1-SNAPSHOT/version +version2.1.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1049801 - in /sling/trunk/contrib/scripting/jst: LICENSE NOTICE src/main/resources/META-INF/LICENSE src/main/resources/META-INF/NOTICE
Author: cziegeler Date: Thu Dec 16 07:38:54 2010 New Revision: 1049801 URL: http://svn.apache.org/viewvc?rev=1049801view=rev Log: Remove obsolete notice/licence files. Removed: sling/trunk/contrib/scripting/jst/LICENSE sling/trunk/contrib/scripting/jst/NOTICE sling/trunk/contrib/scripting/jst/src/main/resources/META-INF/LICENSE sling/trunk/contrib/scripting/jst/src/main/resources/META-INF/NOTICE
svn commit: r1049804 - in /sling/trunk/bundles/commons/json: LICENSE NOTICE src/main/resources/
Author: cziegeler Date: Thu Dec 16 07:39:51 2010 New Revision: 1049804 URL: http://svn.apache.org/viewvc?rev=1049804view=rev Log: Remove obsolete notice/licence files. Removed: sling/trunk/bundles/commons/json/LICENSE sling/trunk/bundles/commons/json/NOTICE sling/trunk/bundles/commons/json/src/main/resources/
svn commit: r1049820 - in /sling/trunk/contrib/jcr/compiler: LICENSE NOTICE src/main/resources/
Author: cziegeler Date: Thu Dec 16 08:47:13 2010 New Revision: 1049820 URL: http://svn.apache.org/viewvc?rev=1049820view=rev Log: Remove obsolete notice/licence files. Removed: sling/trunk/contrib/jcr/compiler/LICENSE sling/trunk/contrib/jcr/compiler/NOTICE sling/trunk/contrib/jcr/compiler/src/main/resources/
svn commit: r1049850 - /sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Author: cziegeler
Date: Thu Dec 16 09:39:27 2010
New Revision: 1049850
URL: http://svn.apache.org/viewvc?rev=1049850view=rev
Log:
SLING-1809 : Eclipse compiler used in commons.compiler causes Illegal type in
constant pool with
Modified:
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Modified:
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java?rev=1049850r1=1049849r2=1049850view=diff
==
---
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
(original)
+++
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Thu Dec 16 09:39:27 2010
@@ -236,8 +236,7 @@ public class EclipseJavaCompiler impleme
}
if (options.getSourceVersion() != null) {
props.put(org.eclipse.jdt.core.compiler.source,
options.getSourceVersion());
-//props.put(org.eclipse.jdt.core.compiler.compliance,
options.getSourceVersion());
-
//props.put(org.eclipse.jdt.core.compiler.codegen.targetPlatform,
options.getSourceVersion());
+props.put(org.eclipse.jdt.core.compiler.compliance,
options.getSourceVersion());
}
if (options.getTargetVersion() != null) {
props.put(org.eclipse.jdt.core.compiler.codegen.targetPlatform,
options.getTargetVersion());
svn commit: r1049851 - /sling/trunk/bundles/commons/json/pom.xml
Author: cziegeler
Date: Thu Dec 16 09:47:24 2010
New Revision: 1049851
URL: http://svn.apache.org/viewvc?rev=1049851view=rev
Log:
Set export fixed to 2.0.4 - no api changes in this release
Modified:
sling/trunk/bundles/commons/json/pom.xml
Modified: sling/trunk/bundles/commons/json/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/pom.xml?rev=1049851r1=1049850r2=1049851view=diff
==
--- sling/trunk/bundles/commons/json/pom.xml (original)
+++ sling/trunk/bundles/commons/json/pom.xml Thu Dec 16 09:47:24 2010
@@ -49,7 +49,7 @@
configuration
instructions
Export-Package
-
org.apache.sling.commons.json.*;version=${project.version}
+org.apache.sling.commons.json.*;version=2.0.4
/Export-Package
/instructions
/configuration
svn commit: r1049860 - in /sling/trunk/bundles/commons/log: LICENSE NOTICE src/main/resources/META-INF/
Author: cziegeler Date: Thu Dec 16 10:10:12 2010 New Revision: 1049860 URL: http://svn.apache.org/viewvc?rev=1049860view=rev Log: Remove obsolete licence and notice files Removed: sling/trunk/bundles/commons/log/LICENSE sling/trunk/bundles/commons/log/NOTICE sling/trunk/bundles/commons/log/src/main/resources/META-INF/
svn commit: r1049862 - /sling/tags/org.apache.sling.commons.compiler-2.0.0/
Author: cziegeler Date: Thu Dec 16 10:11:39 2010 New Revision: 1049862 URL: http://svn.apache.org/viewvc?rev=1049862view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.compiler-2.0.0 Added: sling/tags/org.apache.sling.commons.compiler-2.0.0/ - copied from r1049861, sling/trunk/contrib/commons/compiler/
svn commit: r1049863 - /sling/trunk/contrib/commons/compiler/pom.xml
Author: cziegeler Date: Thu Dec 16 10:11:43 2010 New Revision: 1049863 URL: http://svn.apache.org/viewvc?rev=1049863view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/commons/compiler/pom.xml Modified: sling/trunk/contrib/commons/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/pom.xml?rev=1049863r1=1049862r2=1049863view=diff == --- sling/trunk/contrib/commons/compiler/pom.xml (original) +++ sling/trunk/contrib/commons/compiler/pom.xml Thu Dec 16 10:11:43 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.commons.compiler/artifactId -version2.0.0/version +version2.0.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Commons Java Compiler/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.0.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.compiler-2.0.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/url /scm build
svn commit: r1049869 - /sling/tags/org.apache.sling.i18n-2.0.4/
Author: cziegeler Date: Thu Dec 16 10:18:14 2010 New Revision: 1049869 URL: http://svn.apache.org/viewvc?rev=1049869view=rev Log: [maven-scm] copy for tag org.apache.sling.i18n-2.0.4 Added: sling/tags/org.apache.sling.i18n-2.0.4/ - copied from r1049868, sling/trunk/contrib/extensions/i18n/
svn commit: r1049872 - /sling/trunk/contrib/extensions/i18n/pom.xml
Author: cziegeler Date: Thu Dec 16 10:18:19 2010 New Revision: 1049872 URL: http://svn.apache.org/viewvc?rev=1049872view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/i18n/pom.xml Modified: sling/trunk/contrib/extensions/i18n/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/pom.xml?rev=1049872r1=1049871r2=1049872view=diff == --- sling/trunk/contrib/extensions/i18n/pom.xml (original) +++ sling/trunk/contrib/extensions/i18n/pom.xml Thu Dec 16 10:18:19 2010 @@ -28,7 +28,7 @@ artifactIdorg.apache.sling.i18n/artifactId packagingbundle/packaging -version2.0.4/version +version2.0.5-SNAPSHOT/version nameApache Sling Internationalization Support/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.i18n-2.0.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.i18n-2.0.4/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.i18n-2.0.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/url /scm build
svn commit: r1049875 - /sling/trunk/bundles/commons/json/pom.xml
Author: cziegeler Date: Thu Dec 16 10:25:03 2010 New Revision: 1049875 URL: http://svn.apache.org/viewvc?rev=1049875view=rev Log: [maven-release-plugin] prepare release org.apache.sling.commons.json-2.0.6 Modified: sling/trunk/bundles/commons/json/pom.xml Modified: sling/trunk/bundles/commons/json/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/pom.xml?rev=1049875r1=1049874r2=1049875view=diff == --- sling/trunk/bundles/commons/json/pom.xml (original) +++ sling/trunk/bundles/commons/json/pom.xml Thu Dec 16 10:25:03 2010 @@ -29,15 +29,15 @@ artifactIdorg.apache.sling.commons.json/artifactId packagingbundle/packaging -version2.0.5-SNAPSHOT/version +version2.0.6/version nameApache Sling JSON Library/name descriptionApache Sling JSON Library/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/json/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/json/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.json-2.0.6/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.json-2.0.6/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.json-2.0.6/url /scm build
svn commit: r1049876 - /sling/tags/org.apache.sling.commons.json-2.0.6/
Author: cziegeler Date: Thu Dec 16 10:25:16 2010 New Revision: 1049876 URL: http://svn.apache.org/viewvc?rev=1049876view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.json-2.0.6 Added: sling/tags/org.apache.sling.commons.json-2.0.6/ - copied from r1049875, sling/trunk/bundles/commons/json/
svn commit: r1049877 - /sling/trunk/bundles/commons/json/pom.xml
Author: cziegeler Date: Thu Dec 16 10:25:20 2010 New Revision: 1049877 URL: http://svn.apache.org/viewvc?rev=1049877view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/commons/json/pom.xml Modified: sling/trunk/bundles/commons/json/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/pom.xml?rev=1049877r1=1049876r2=1049877view=diff == --- sling/trunk/bundles/commons/json/pom.xml (original) +++ sling/trunk/bundles/commons/json/pom.xml Thu Dec 16 10:25:20 2010 @@ -29,15 +29,15 @@ artifactIdorg.apache.sling.commons.json/artifactId packagingbundle/packaging -version2.0.6/version +version2.0.7-SNAPSHOT/version nameApache Sling JSON Library/name descriptionApache Sling JSON Library/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.json-2.0.6/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.json-2.0.6/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.json-2.0.6/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/json/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/json/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/url /scm build
svn commit: r1049884 - /sling/trunk/bundles/commons/log/pom.xml
Author: cziegeler Date: Thu Dec 16 10:29:49 2010 New Revision: 1049884 URL: http://svn.apache.org/viewvc?rev=1049884view=rev Log: [maven-release-plugin] prepare release org.apache.sling.commons.log-2.1.0 Modified: sling/trunk/bundles/commons/log/pom.xml Modified: sling/trunk/bundles/commons/log/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1049884r1=1049883r2=1049884view=diff == --- sling/trunk/bundles/commons/log/pom.xml (original) +++ sling/trunk/bundles/commons/log/pom.xml Thu Dec 16 10:29:49 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.commons.log/artifactId -version2.0.7-SNAPSHOT/version +version2.1.0/version packagingbundle/packaging nameApache Sling OSGi LogService Implementation/name @@ -40,9 +40,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/log/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/log/developerConnection -urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.log-2.1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.log-2.1.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.log-2.1.0/url /scm properties
svn commit: r1049885 - /sling/tags/org.apache.sling.commons.log-2.1.0/
Author: cziegeler Date: Thu Dec 16 10:30:03 2010 New Revision: 1049885 URL: http://svn.apache.org/viewvc?rev=1049885view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.log-2.1.0 Added: sling/tags/org.apache.sling.commons.log-2.1.0/ - copied from r1049884, sling/trunk/bundles/commons/log/
svn commit: r1049890 - /sling/trunk/contrib/scripting/java/pom.xml
Author: cziegeler Date: Thu Dec 16 10:33:08 2010 New Revision: 1049890 URL: http://svn.apache.org/viewvc?rev=1049890view=rev Log: [maven-release-plugin] prepare release org.apache.sling.scripting.java-2.0.0 Modified: sling/trunk/contrib/scripting/java/pom.xml Modified: sling/trunk/contrib/scripting/java/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/pom.xml?rev=1049890r1=1049889r2=1049890view=diff == --- sling/trunk/contrib/scripting/java/pom.xml (original) +++ sling/trunk/contrib/scripting/java/pom.xml Thu Dec 16 10:33:08 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.scripting.java/artifactId -version1.0.1-SNAPSHOT/version +version2.0.0/version packagingbundle/packaging nameApache Sling Scripting Java Support/name descriptionSupport for scripting Java/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/java/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/java/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.java-2.0.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.java-2.0.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.java-2.0.0/url /scm build
svn commit: r1049892 - /sling/tags/org.apache.sling.scripting.java-2.0.0/
Author: cziegeler Date: Thu Dec 16 10:33:29 2010 New Revision: 1049892 URL: http://svn.apache.org/viewvc?rev=1049892view=rev Log: [maven-scm] copy for tag org.apache.sling.scripting.java-2.0.0 Added: sling/tags/org.apache.sling.scripting.java-2.0.0/ - copied from r1049890, sling/trunk/contrib/scripting/java/
svn commit: r1049893 - /sling/trunk/contrib/scripting/java/pom.xml
Author: cziegeler Date: Thu Dec 16 10:33:36 2010 New Revision: 1049893 URL: http://svn.apache.org/viewvc?rev=1049893view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/scripting/java/pom.xml Modified: sling/trunk/contrib/scripting/java/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/pom.xml?rev=1049893r1=1049892r2=1049893view=diff == --- sling/trunk/contrib/scripting/java/pom.xml (original) +++ sling/trunk/contrib/scripting/java/pom.xml Thu Dec 16 10:33:36 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.scripting.java/artifactId -version2.0.0/version +version2.0.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Java Support/name descriptionSupport for scripting Java/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.java-2.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.java-2.0.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.java-2.0.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/java/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/java/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/url /scm build
svn commit: r1049897 - /sling/tags/org.apache.sling.scripting.jst-2.0.4/
Author: cziegeler Date: Thu Dec 16 10:36:08 2010 New Revision: 1049897 URL: http://svn.apache.org/viewvc?rev=1049897view=rev Log: [maven-scm] copy for tag org.apache.sling.scripting.jst-2.0.4 Added: sling/tags/org.apache.sling.scripting.jst-2.0.4/ - copied from r1049896, sling/trunk/contrib/scripting/jst/
svn commit: r1049898 - /sling/trunk/contrib/scripting/jst/pom.xml
Author: cziegeler Date: Thu Dec 16 10:36:12 2010 New Revision: 1049898 URL: http://svn.apache.org/viewvc?rev=1049898view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/scripting/jst/pom.xml Modified: sling/trunk/contrib/scripting/jst/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/jst/pom.xml?rev=1049898r1=1049897r2=1049898view=diff == --- sling/trunk/contrib/scripting/jst/pom.xml (original) +++ sling/trunk/contrib/scripting/jst/pom.xml Thu Dec 16 10:36:12 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.jst/artifactId -version2.0.4/version +version2.0.5-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting JST Support/name @@ -36,13 +36,13 @@ scm connection - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jst-2.0.4 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/jst /connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jst-2.0.4 + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/scripting/jst /developerConnection url - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jst-2.0.4 +http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/jst /url /scm
svn commit: r1049902 - /sling/trunk/bundles/scripting/api/pom.xml
Author: cziegeler Date: Thu Dec 16 10:39:41 2010 New Revision: 1049902 URL: http://svn.apache.org/viewvc?rev=1049902view=rev Log: [maven-release-plugin] prepare release org.apache.sling.scripting.api-2.1.2 Modified: sling/trunk/bundles/scripting/api/pom.xml Modified: sling/trunk/bundles/scripting/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1049902r1=1049901r2=1049902view=diff == --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Thu Dec 16 10:39:41 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.1-SNAPSHOT/version +version2.1.2/version packagingbundle/packaging nameApache Sling Scripting Implementation API/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/api/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/api/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.api-2.1.2/url /scm build
svn commit: r1049903 - /sling/tags/org.apache.sling.scripting.api-2.1.2/
Author: cziegeler Date: Thu Dec 16 10:39:58 2010 New Revision: 1049903 URL: http://svn.apache.org/viewvc?rev=1049903view=rev Log: [maven-scm] copy for tag org.apache.sling.scripting.api-2.1.2 Added: sling/tags/org.apache.sling.scripting.api-2.1.2/ - copied from r1049902, sling/trunk/bundles/scripting/api/
svn commit: r1049904 - /sling/trunk/bundles/scripting/api/pom.xml
Author: cziegeler Date: Thu Dec 16 10:40:10 2010 New Revision: 1049904 URL: http://svn.apache.org/viewvc?rev=1049904view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/api/pom.xml Modified: sling/trunk/bundles/scripting/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1049904r1=1049903r2=1049904view=diff == --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Thu Dec 16 10:40:10 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.2/version +version2.1.3-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Implementation API/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.api-2.1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/api/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/api/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/url /scm build
svn commit: r1049905 - /sling/trunk/bundles/scripting/jsp/pom.xml
Author: cziegeler Date: Thu Dec 16 10:43:34 2010 New Revision: 1049905 URL: http://svn.apache.org/viewvc?rev=1049905view=rev Log: [maven-release-plugin] prepare release org.apache.sling.scripting.jsp-2.0.12 Modified: sling/trunk/bundles/scripting/jsp/pom.xml Modified: sling/trunk/bundles/scripting/jsp/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1049905r1=1049904r2=1049905view=diff == --- sling/trunk/bundles/scripting/jsp/pom.xml (original) +++ sling/trunk/bundles/scripting/jsp/pom.xml Thu Dec 16 10:43:34 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.scripting.jsp/artifactId -version2.0.11-SNAPSHOT/version +version2.0.12/version packagingbundle/packaging nameApache Sling Scripting JSP Support/name descriptionSupport for JSP scripting/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.0.12/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.0.12/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jsp-2.0.12/url /scm build
svn commit: r1049906 - /sling/tags/org.apache.sling.scripting.jsp-2.0.12/
Author: cziegeler Date: Thu Dec 16 10:43:50 2010 New Revision: 1049906 URL: http://svn.apache.org/viewvc?rev=1049906view=rev Log: [maven-scm] copy for tag org.apache.sling.scripting.jsp-2.0.12 Added: sling/tags/org.apache.sling.scripting.jsp-2.0.12/ - copied from r1049905, sling/trunk/bundles/scripting/jsp/
svn commit: r1049907 - /sling/trunk/bundles/scripting/jsp/pom.xml
Author: cziegeler Date: Thu Dec 16 10:43:56 2010 New Revision: 1049907 URL: http://svn.apache.org/viewvc?rev=1049907view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/jsp/pom.xml Modified: sling/trunk/bundles/scripting/jsp/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/pom.xml?rev=1049907r1=1049906r2=1049907view=diff == --- sling/trunk/bundles/scripting/jsp/pom.xml (original) +++ sling/trunk/bundles/scripting/jsp/pom.xml Thu Dec 16 10:43:56 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.scripting.jsp/artifactId -version2.0.12/version +version2.0.13-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting JSP Support/name descriptionSupport for JSP scripting/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.0.12/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.jsp-2.0.12/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.jsp-2.0.12/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/jsp/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/url /scm build
svn commit: r1049920 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: cziegeler Date: Thu Dec 16 11:03:19 2010 New Revision: 1049920 URL: http://svn.apache.org/viewvc?rev=1049920view=rev Log: [maven-release-plugin] prepare release org.apache.sling.scripting.javascript-2.0.10 Modified: sling/trunk/bundles/scripting/javascript/pom.xml Modified: sling/trunk/bundles/scripting/javascript/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1049920r1=1049919r2=1049920view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Dec 16 11:03:19 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.9-SNAPSHOT/version +version2.0.10/version packagingbundle/packaging nameApache Sling Scripting JavaScript Support/name descriptionSupport for JavaScript scripting/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.10/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.10/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.10/url /scm build
svn commit: r1049921 - /sling/tags/org.apache.sling.scripting.javascript-2.0.10/
Author: cziegeler Date: Thu Dec 16 11:03:35 2010 New Revision: 1049921 URL: http://svn.apache.org/viewvc?rev=1049921view=rev Log: [maven-scm] copy for tag org.apache.sling.scripting.javascript-2.0.10 Added: sling/tags/org.apache.sling.scripting.javascript-2.0.10/ - copied from r1049920, sling/trunk/bundles/scripting/javascript/
svn commit: r1049922 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: cziegeler Date: Thu Dec 16 11:03:41 2010 New Revision: 1049922 URL: http://svn.apache.org/viewvc?rev=1049922view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/javascript/pom.xml Modified: sling/trunk/bundles/scripting/javascript/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1049922r1=1049921r2=1049922view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Dec 16 11:03:41 2010 @@ -28,16 +28,16 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.10/version +version2.0.11-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting JavaScript Support/name descriptionSupport for JavaScript scripting/description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.10/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.10/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.10/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/url /scm build
svn commit: r1049926 - /sling/trunk/contrib/jcr/compiler/pom.xml
Author: cziegeler Date: Thu Dec 16 11:12:21 2010 New Revision: 1049926 URL: http://svn.apache.org/viewvc?rev=1049926view=rev Log: [maven-release-plugin] prepare release org.apache.sling.jcr.compiler-2.0.0 Modified: sling/trunk/contrib/jcr/compiler/pom.xml Modified: sling/trunk/contrib/jcr/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/pom.xml?rev=1049926r1=1049925r2=1049926view=diff == --- sling/trunk/contrib/jcr/compiler/pom.xml (original) +++ sling/trunk/contrib/jcr/compiler/pom.xml Thu Dec 16 11:12:21 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.jcr.compiler/artifactId -version1.0.1-SNAPSHOT/version +version2.0.0/version packagingbundle/packaging nameApache Sling JCR Java Compiler/name @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/jcr/compiler/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/jcr/compiler/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.compiler-2.0.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.compiler-2.0.0/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.compiler-2.0.0/url /scm build
svn commit: r1049927 - /sling/tags/org.apache.sling.jcr.compiler-2.0.0/
Author: cziegeler Date: Thu Dec 16 11:12:36 2010 New Revision: 1049927 URL: http://svn.apache.org/viewvc?rev=1049927view=rev Log: [maven-scm] copy for tag org.apache.sling.jcr.compiler-2.0.0 Added: sling/tags/org.apache.sling.jcr.compiler-2.0.0/ - copied from r1049926, sling/trunk/contrib/jcr/compiler/
svn commit: r1049928 - /sling/trunk/contrib/jcr/compiler/pom.xml
Author: cziegeler Date: Thu Dec 16 11:12:42 2010 New Revision: 1049928 URL: http://svn.apache.org/viewvc?rev=1049928view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/jcr/compiler/pom.xml Modified: sling/trunk/contrib/jcr/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/pom.xml?rev=1049928r1=1049927r2=1049928view=diff == --- sling/trunk/contrib/jcr/compiler/pom.xml (original) +++ sling/trunk/contrib/jcr/compiler/pom.xml Thu Dec 16 11:12:42 2010 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.jcr.compiler/artifactId -version2.0.0/version +version2.0.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling JCR Java Compiler/name @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.compiler-2.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.compiler-2.0.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.compiler-2.0.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/jcr/compiler/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/jcr/compiler/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/url /scm build
svn commit: r1049932 - in /sling/trunk: contrib/jcr/compiler/pom.xml contrib/scripting/java/pom.xml launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Thu Dec 16 11:15:29 2010 New Revision: 1049932 URL: http://svn.apache.org/viewvc?rev=1049932view=rev Log: Switch to latest snapshots Modified: sling/trunk/contrib/jcr/compiler/pom.xml sling/trunk/contrib/scripting/java/pom.xml sling/trunk/launchpad/builder/src/main/bundles/list.xml Modified: sling/trunk/contrib/jcr/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/pom.xml?rev=1049932r1=1049931r2=1049932view=diff == --- sling/trunk/contrib/jcr/compiler/pom.xml (original) +++ sling/trunk/contrib/jcr/compiler/pom.xml Thu Dec 16 11:15:29 2010 @@ -72,7 +72,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.compiler/artifactId - version2.0.0/version + version2.0.1-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/contrib/scripting/java/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/java/pom.xml?rev=1049932r1=1049931r2=1049932view=diff == --- sling/trunk/contrib/scripting/java/pom.xml (original) +++ sling/trunk/contrib/scripting/java/pom.xml Thu Dec 16 11:15:29 2010 @@ -94,7 +94,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.compiler/artifactId -version2.0.0/version +version2.0.1-SNAPSHOT/version scopeprovided/scope /dependency 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=1049932r1=1049931r2=1049932view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Thu Dec 16 11:15:29 2010 @@ -145,7 +145,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.0/version +version2.1.3-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -155,12 +155,12 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.8/version +version2.0.11-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.jsp/artifactId -version2.0.10/version +version2.0.13-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -195,7 +195,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.log/artifactId -version2.0.7-SNAPSHOT/version +version2.1.1-SNAPSHOT/version /bundle /startLevel startLevel level=5 @@ -227,7 +227,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.json/artifactId -version2.0.5-SNAPSHOT/version +version2.0.7-SNAPSHOT/version /bundle bundle groupIdorg.apache.felix/groupId
svn commit: r1051387 - in /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues: OrderedJobQueue.java ParallelJobQueue.java
Author: cziegeler
Date: Tue Dec 21 06:48:42 2010
New Revision: 1051387
URL: http://svn.apache.org/viewvc?rev=1051387view=rev
Log:
Fix remove all jobs from queue and wake up queue if clearing
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/ParallelJobQueue.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java?rev=1051387r1=1051386r2=1051387view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/OrderedJobQueue.java
Tue Dec 21 06:48:42 2010
@@ -96,14 +96,18 @@ public final class OrderedJobQueue exten
this.isSleepingUntil = System.currentTimeMillis() + delay;
}
-@Override
-public void resume() {
+private void wakeUp() {
if ( this.isSleepingUntil != -1 ) {
final Thread thread = this.sleepingThread;
if ( thread != null ) {
thread.interrupt();
}
}
+}
+
+@Override
+public void resume() {
+this.wakeUp();
super.resume();
}
@@ -176,13 +180,14 @@ public final class OrderedJobQueue exten
@Override
public synchronized void removeAll() {
this.jobEvent = null;
+this.wakeUp();
super.removeAll();
}
@Override
protected CollectionJobEvent removeAllJobs() {
-final ListJobEvent events = new ArrayListJobEvent(this.queue);
-this.queue.clear();
+final ListJobEvent events = new ArrayListJobEvent();
+this.queue.drainTo(events);
return events;
}
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/ParallelJobQueue.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/ParallelJobQueue.java?rev=1051387r1=1051386r2=1051387view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/ParallelJobQueue.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/queues/ParallelJobQueue.java
Tue Dec 21 06:48:42 2010
@@ -81,8 +81,8 @@ public final class ParallelJobQueue exte
@Override
protected CollectionJobEvent removeAllJobs() {
-final ListJobEvent events = new ArrayListJobEvent(this.queue);
-this.queue.clear();
+final ListJobEvent events = new ArrayListJobEvent();
+this.queue.drainTo(events);
return events;
}
}
svn commit: r1051472 - /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/JobEventHandlerTest.java
Author: cziegeler
Date: Tue Dec 21 12:36:23 2010
New Revision: 1051472
URL: http://svn.apache.org/viewvc?rev=1051472view=rev
Log:
Set timeout for test
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/JobEventHandlerTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/JobEventHandlerTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/JobEventHandlerTest.java?rev=1051472r1=1051471r2=1051472view=diff
==
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/JobEventHandlerTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/JobEventHandlerTest.java
Tue Dec 21 12:36:23 2010
@@ -639,7 +639,7 @@ public class JobEventHandlerTest extends
/**
* Test sending of jobs with and without a processor
*/
-@org.junit.Test public void testNoJobProcessor() throws Exception {
+@org.junit.Test(timeout=1000*60*4) public void testNoJobProcessor() throws
Exception {
final PersistenceHandler jeh = this.handler;
final AtomicInteger count = new AtomicInteger(0);
final AtomicInteger unprocessedCount = new AtomicInteger(0);
svn commit: r1053874 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
Author: cziegeler
Date: Thu Dec 30 12:41:19 2010
New Revision: 1053874
URL: http://svn.apache.org/viewvc?rev=1053874view=rev
Log:
SLING-1906 : Allow scheme/host/port mapping in the vanityUrls
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java?rev=1053874r1=1053873r2=1053874view=diff
==
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/MapEntries.java
Thu Dec 30 12:41:19 2010
@@ -18,6 +18,8 @@
*/
package org.apache.sling.jcr.resource.internal.helper;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -25,10 +27,10 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
import java.util.TreeSet;
-import java.util.Map.Entry;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@@ -311,10 +313,8 @@ public class MapEntries implements Event
// what is stored in the sling:vanityPath property
String[] pVanityPaths = row.get(sling:vanityPath, new String[0]);
for (String pVanityPath : pVanityPaths) {
-// check for empty values
-if ( pVanityPath != null pVanityPath.trim().length() 0 ) {
-String url = ^ + ANY_SCHEME_HOST + pVanityPath.trim();
-
+final String url = getVanityPath(pVanityPath);
+if ( url != null ) {
// redirect target is the node providing the
sling:vanityPath
// property (or its parent if the node is called
jcr:content)
String redirect = resource.getPath();
@@ -340,6 +340,42 @@ public class MapEntries implements Event
}
}
+private String getVanityPath(final String pVanityPath) {
+String result = null;
+if ( pVanityPath != null ) {
+String path = pVanityPath.trim();
+if ( path.length() 0 ) {
+// check for url
+if ( path.indexOf(:/) - 1 ) {
+try {
+final URL u = new URL(path);
+path = u.getProtocol() + '/' + u.getHost() + '.' +
u.getPort() + u.getPath();
+} catch (MalformedURLException e) {
+log.warn(Ignoring malformed vanity path {},
pVanityPath);
+path = null;
+}
+} else {
+if ( !path.startsWith(/) ) {
+path = / + path;
+}
+path = ^ + ANY_SCHEME_HOST + path;
+}
+
+// remove extension
+if ( path != null ) {
+final int lastSlash = path.lastIndexOf('/');
+final int firstDot = path.indexOf('.', lastSlash + 1);
+if ( firstDot != -1 ) {
+path = path.substring(0, firstDot);
+log.warn(Removing extension from vanity path {},
pVanityPath);
+}
+result = path;
+}
+}
+}
+return result;
+}
+
private void loadConfiguration(JcrResourceResolverFactoryImpl factory,
ListMapEntry entries) {
// virtual uris
svn commit: r1053879 - in /sling/trunk/bundles/jcr/resource/src: main/java/org/apache/sling/jcr/resource/internal/helper/jcr/ test/java/org/apache/sling/jcr/resource/internal/helper/jcr/
Author: cziegeler
Date: Thu Dec 30 12:50:20 2010
New Revision: 1053879
URL: http://svn.apache.org/viewvc?rev=1053879view=rev
Log:
SLING-1761 : JcrPropertyResource sets incorrect content length for strings
containing non-ascii character
Applied slightly modified patch from Julian Sedding
Added:
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResourceTest.java
(with props)
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrPropertyResource.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResourceTestBase.java
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResourceTest.java
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java?rev=1053879r1=1053878r2=1053879view=diff
==
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrItemResource.java
Thu Dec 30 12:50:20 2010
@@ -18,9 +18,12 @@
*/
package org.apache.sling.jcr.resource.internal.helper.jcr;
+import java.io.UnsupportedEncodingException;
import java.util.Iterator;
import javax.jcr.Node;
+import javax.jcr.Property;
+import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
import org.apache.sling.api.resource.AbstractResource;
@@ -28,9 +31,16 @@ import org.apache.sling.api.resource.Res
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.jcr.resource.JcrResourceConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
abstract class JcrItemResource extends AbstractResource implements Resource {
+/**
+ * default log
+ */
+private static final Logger LOGGER =
LoggerFactory.getLogger(JcrItemResource.class);
+
private final ResourceResolver resourceResolver;
private final String path;
@@ -79,6 +89,27 @@ abstract class JcrItemResource extends A
return result;
}
+protected void setContentLength(final Property property) throws
RepositoryException {
+if (property.isMultiple()) {
+return;
+}
+
+try {
+final long length;
+if (property.getType() == PropertyType.BINARY ) {
+// we're interested in the number of bytes, not the
+// number of characters
+length = property.getLength();
+} else {
+length = property.getString().getBytes(UTF-8).length;
+}
+getResourceMetadata().setContentLength(length);
+} catch (UnsupportedEncodingException uee) {
+LOGGER.warn(getPropertyContentLength: Cannot determine length of
non-binary property {}: {},
+toString(), uee);
+}
+}
+
/**
* Returns an iterator over the child resources or codenull/code if
* there are none.
Modified:
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java?rev=1053879r1=1053878r2=1053879view=diff
==
---
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
(original)
+++
sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/helper/jcr/JcrNodeResource.java
Thu Dec 30 12:50:20 2010
@@ -176,9 +176,7 @@ class JcrNodeResource extends JcrItemRes
// if the node has a jcr:data property, use that property
if (content.hasProperty(JCR_DATA)) {
data = content.getProperty(JCR_DATA);
-
} else {
-
// otherwise try to follow default item trail
try {
Item item = content.getPrimaryItem();
@@ -187,16 +185,15 @@ class JcrNodeResource extends JcrItemRes
}
data = ((Property) item
svn commit: r1054159 - /sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
Author: cziegeler
Date: Fri Dec 31 18:42:19 2010
New Revision: 1054159
URL: http://svn.apache.org/viewvc?rev=1054159view=rev
Log:
SLING-1910 : Endless recursion if bundle can't be started
SLING-1911 : If the same resource is at different locations they should be
treated as the same resource
Modified:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
Modified:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java?rev=1054159r1=1054158r2=1054159view=diff
==
---
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
(original)
+++
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
Fri Dec 31 18:42:19 2010
@@ -25,8 +25,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.sling.installer.api.InstallableResource;
-import org.apache.sling.installer.core.impl.RegisteredResource;
-import org.apache.sling.installer.core.impl.RegisteredResourceImpl;
import org.osgi.framework.Constants;
/** Mock RegisteredResource that simulates a bundle */
@@ -34,6 +32,7 @@ public class MockBundleResource implemen
private static final long serialVersionUID = 1L;
private final MapString, Object attributes = new HashMapString,
Object();
+private final MapString, Object tempAttributes = new HashMapString,
Object();
private State state = State.INSTALL;
private final String digest;
private final int priority;
@@ -157,4 +156,21 @@ public class MockBundleResource implemen
this.state = s;
}
+/**
+ * @see
org.apache.sling.installer.core.impl.RegisteredResource#getTemporaryAttribute(java.lang.String)
+ */
+public Object getTemporaryAttribute(String key) {
+return this.tempAttributes.get(key);
+}
+
+/**
+ * @see
org.apache.sling.installer.core.impl.RegisteredResource#setTemporaryAttributee(java.lang.String,
java.lang.Object)
+ */
+public void setTemporaryAttributee(String key, Object value) {
+if ( value == null ) {
+this.tempAttributes.remove(key);
+} else {
+this.tempAttributes.put(key, value);
+}
+}
}
svn commit: r1054571 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: EntityResourceList.java PersistentResourceList.java RegisteredResourceImpl.java Util.java
Author: cziegeler
Date: Mon Jan 3 10:14:32 2011
New Revision: 1054571
URL: http://svn.apache.org/viewvc?rev=1054571view=rev
Log:
SLING-1913 : Implement own serialization/deserilization
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java
(with props)
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java?rev=1054571r1=1054570r2=1054571view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
Mon Jan 3 10:14:32 2011
@@ -18,10 +18,10 @@
*/
package org.apache.sling.installer.core.impl;
+import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.SortedSet;
@@ -36,24 +36,52 @@ import org.slf4j.LoggerFactory;
*/
public class EntityResourceList implements Serializable {
-private static final long serialVersionUID = -1733426192525500065L;
+/** Use own serial version ID as we control serialization. */
+private static final long serialVersionUID = 6L;
+/** Serialization version. */
+private static final int VERSION = 1;
+
+/** Logger. */
private static final Logger LOGGER =
LoggerFactory.getLogger(EntityResourceList.class);
-private static final class ResourceComparator implements
ComparatorRegisteredResource, Serializable {
-private static final long serialVersionUID = 3573107717574356088L;
+/** The set of registered resources for this entity. */
+private final SortedSetRegisteredResource resources = new
TreeSetRegisteredResource();
-public int compare(RegisteredResource o1, RegisteredResource o2) {
-int result = o1.compareTo(o2);
-if ( result == 0 ) {
-result = o1.getURL().compareTo(o2.getURL());
-}
-return result;
+/**
+ * Serialize the object
+ * - write version id
+ * - serialize each entry in the resources list
+ * @param out Object output stream
+ * @throws IOException
+ */
+private void writeObject(final java.io.ObjectOutputStream out)
+throws IOException {
+out.writeInt(VERSION);
+out.writeInt(resources.size());
+for(final RegisteredResource rr : this.resources) {
+out.writeObject(rr);
}
}
-private final SortedSetRegisteredResource resources = new
TreeSetRegisteredResource(
-new ResourceComparator());
+/**
+ * Deserialize the object
+ * - read version id
+ * - deserialize each entry in the resources list
+ */
+private void readObject(final java.io.ObjectInputStream in)
+throws IOException, ClassNotFoundException {
+final int version = in.readInt();
+if ( version != VERSION ) {
+throw new ClassNotFoundException(this.getClass().getName());
+}
+Util.setField(this, resources, new TreeSetRegisteredResource());
+final int size = in.readInt();
+for(int i=0; i size; i++) {
+final RegisteredResource rr = (RegisteredResource)in.readObject();
+this.resources.add(rr);
+}
+}
/** The resource list is empty if it contains no resources. */
public boolean isEmpty() {
@@ -114,7 +142,7 @@ public class EntityResourceList implemen
public void addOrUpdate(final RegisteredResource r) {
LOGGER.debug(Adding new resource: {}, r);
-// If an object with same sort key is already present, replace with the
+// If an object with same url is already present, replace with the
// new one which might have different attributes
boolean first = true;
for(final RegisteredResource rr : resources) {
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java?rev=1054571r1=1054570r2=1054571view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache
svn commit: r1054934 - in /sling/trunk: installer/core/src/main/java/org/apache/sling/installer/core/impl/ installer/core/src/test/java/org/apache/sling/installer/core/impl/ launchpad/base/src/main/re
Author: cziegeler
Date: Tue Jan 4 09:07:05 2011
New Revision: 1054934
URL: http://svn.apache.org/viewvc?rev=1054934view=rev
Log:
SLING-1915 : Status information should be stored outside the bundle data
directory
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
(with props)
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleContext.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java
sling/trunk/launchpad/base/src/main/resources/sling.properties
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java?rev=1054934view=auto
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
(added)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
Tue Jan 4 09:07:05 2011
@@ -0,0 +1,120 @@
+/*
+ * 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.installer.core.impl;
+
+import java.io.File;
+
+import org.osgi.framework.BundleContext;
+
+/**
+ * Utility class for all file handling.
+ */
+public class FileUtil {
+
+/**
+ * The name of the bundle context property defining the location for the
+ * installer files (value is sling.installer.dir).
+ */
+private static final String CONFIG_DIR = sling.installer.dir;
+
+/**
+ * The default configuration data directory if no location is configured
+ * (value is installer).
+ */
+private static final String DEFAULT_DIR = installer;
+
+private final File directory;
+
+/**
+ * Create a file util instance and detect the installer directory.
+ */
+public FileUtil( final BundleContext bundleContext ) {
+String location = bundleContext.getProperty(CONFIG_DIR);
+
+// no configured location, use the config dir in the bundle persistent
+// area
+if ( location == null ) {
+final File locationFile = bundleContext.getDataFile( DEFAULT_DIR );
+if ( locationFile != null ) {
+location = locationFile.getAbsolutePath();
+}
+}
+
+// fall back to the current working directory if the platform does
+// not support filesystem based data area
+if ( location == null ) {
+location = System.getProperty( user.dir ) + File.separatorChar +
DEFAULT_DIR;
+}
+
+// ensure the file is absolute
+File locationFile = new File( location );
+if ( !locationFile.isAbsolute() ) {
+final File bundleLocationFile = bundleContext.getDataFile(
locationFile.getPath() );
+if ( bundleLocationFile != null ) {
+locationFile = bundleLocationFile;
+}
+
+// ensure the file object is an absolute file object
+locationFile = locationFile.getAbsoluteFile();
+}
+
+// check the location
+if ( !locationFile.isDirectory() ) {
+if ( locationFile.exists() ) {
+throw new IllegalArgumentException( location + is not a
directory );
+}
+
+if ( !locationFile.mkdirs() ) {
+throw new IllegalArgumentException( Cannot create directory
+ location );
+}
+}
+
+this.directory = locationFile
svn commit: r1054965 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
Author: cziegeler
Date: Tue Jan 4 10:46:04 2011
New Revision: 1054965
URL: http://svn.apache.org/viewvc?rev=1054965view=rev
Log:
Fix test cases.
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=1054965r1=1054964r2=1054965view=diff
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
Tue Jan 4 10:46:04 2011
@@ -17,8 +17,6 @@
package org.apache.sling.launchpad.webapp.integrationtest;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import org.apache.sling.commons.testing.integration.NameValuePairList;
import org.apache.sling.servlets.post.SlingPostConstants;
@@ -29,7 +27,7 @@ import org.apache.sling.servlets.post.Sl
public class PropertyRenderingTest extends RenderingTestBase {
private String slingResourceType;
-
+
private String testMultiText1;
private String testMultiText2;
@@ -41,12 +39,12 @@ public class PropertyRenderingTest exten
testText = This is a test + System.currentTimeMillis();
testMultiText1 = This is a multivalued test +
System.currentTimeMillis();
testMultiText2 = This is another multivalued test +
System.currentTimeMillis();
-
+
slingResourceType = getClass().getName();
// create the test node, under a path that's specific to this class to
allow collisions
final String url = HTTP_BASE_URL + / + getClass().getSimpleName() +
/ + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX;
-
+
NameValuePairList list = new NameValuePairList();
list.add(sling:resourceType, slingResourceType);
list.add(text, testText);
@@ -78,7 +76,7 @@ public class PropertyRenderingTest exten
}
public void testTextNoExt() throws IOException {
-final String data = getContent(displayUrl + /text, null);
+final String data = getContent(displayUrl + /text,
CONTENT_TYPE_PLAIN);
assertEquals(testText, data);
}
@@ -105,7 +103,7 @@ public class PropertyRenderingTest exten
}
public void testResourceTypeNoExt() throws IOException {
-final String data = getContent(displayUrl + /sling:resourceType,
null);
+final String data = getContent(displayUrl + /sling:resourceType,
CONTENT_TYPE_PLAIN);
assertEquals(slingResourceType, data);
}
}
\ No newline at end of file
svn commit: r1055369 - in /sling/trunk/bundles/extensions/event/src: main/java/org/apache/sling/event/impl/jobs/jcr/ main/resources/OSGI-INF/metatype/ test/java/org/apache/sling/event/impl/jobs/
Author: cziegeler
Date: Wed Jan 5 09:25:28 2011
New Revision: 1055369
URL: http://svn.apache.org/viewvc?rev=1055369view=rev
Log:
SLING-1917 : Make Locking Strategy Configurable (for Cluster Usage)
Added:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/LockManager.java
(with props)
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java
sling/trunk/bundles/extensions/event/src/main/resources/OSGI-INF/metatype/metatype.properties
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/AbstractJobEventHandlerTest.java
Added:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/LockManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/LockManager.java?rev=1055369view=auto
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/LockManager.java
(added)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/LockManager.java
Wed Jan 5 09:25:28 2011
@@ -0,0 +1,388 @@
+/*
+ * 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.event.impl.jobs.jcr;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.observation.Event;
+import javax.jcr.observation.EventIterator;
+import javax.jcr.observation.EventListener;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.QueryResult;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Modified;
+import org.apache.felix.scr.annotations.Properties;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.PropertyOption;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.felix.scr.annotations.Services;
+import org.apache.sling.commons.osgi.OsgiUtil;
+import org.apache.sling.event.impl.EnvironmentComponent;
+import org.apache.sling.event.impl.support.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+...@component(metatype=true,label=%lm.name,description=%jlm.description)
+...@services({
+@Service(value=Runnable.class),
+@Service(value=LockManager.class)
+})
+...@properties({
+@Property(name=scheduler.period, longValue=60, propertyPrivate=true),
+@Property(name=scheduler.concurrent, boolValue=false,
propertyPrivate=true)
+})
+/**
+ * The lock manager handles locking and unlocking nodes.
+ * It can be configured to handle locks in different ways:
+ */
+public class LockManager implements Runnable, EventListener {
+
+/** Default repository path. */
+private static final String DEFAULT_REPOSITORY_PATH =
/var/eventing/cluster;
+
+/** Modes */
+private static final String MODE_SESSION = session;
+private static final String MODE_OPEN = open;
+private static final String MODE_NONE = none;
+
+/** Default lock mode. */
+private static final String DEFAULT_MODE = MODE_SESSION;
+
+/** Property to be updated by the heartbeat. */
+private static final String LAST_MODIFIED_PROP = lastModified;
+
+/** Nodetype for heartbeat nodes. */
+private static final String NODE_TYPE = nt:unstructured;
+
+/** Lock info prefix. */
+private static final String OWNER_PREFIX = SlingVersioningManager:;
+
+/** The path where all beats are stored. */
+@Property(value=DEFAULT_REPOSITORY_PATH, propertyPrivate=true)
+private static final String CONFIG_PROPERTY_REPOSITORY_PATH =
repository.path;
+
+/** Lock mode. */
+@Property(value=DEFAULT_MODE,
+option...@propertyoption(name=MODE_SESSION,value=Session Scoped
svn commit: r1055500 - /sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java
Author: cziegeler
Date: Wed Jan 5 16:05:33 2011
New Revision: 1055500
URL: http://svn.apache.org/viewvc?rev=1055500view=rev
Log:
SLING-1918 : Use time based folder structure for jobs without an id
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java
Modified:
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java?rev=1055500r1=1055499r2=1055500view=diff
==
---
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java
(original)
+++
sling/trunk/bundles/extensions/event/src/main/java/org/apache/sling/event/impl/jobs/jcr/PersistenceHandler.java
Wed Jan 5 16:05:33 2011
@@ -416,10 +416,12 @@ public class PersistenceHandler implemen
// check hour folder
if ( path.endsWith(59) ) {
final String hourPath = path.substring(0, path.length() -
3);
-final Node hourNode = s.getNode(hourPath);
-if ( !hourNode.hasNodes() ) {
-hourNode.remove();
-s.save();
+if ( s.nodeExists(hourPath) ) {
+final Node hourNode = s.getNode(hourPath);
+if ( !hourNode.hasNodes() ) {
+hourNode.remove();
+s.save();
+}
}
}
}
svn commit: r1055853 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: ./ config/ tasks/
Author: cziegeler
Date: Thu Jan 6 12:39:54 2011
New Revision: 1055853
URL: http://svn.apache.org/viewvc?rev=1055853view=rev
Log:
SLING-1920 : Make installers pluggable
Introduce new interface RegisteredResourceGroup to avoid making the whole
EntityResourceList public
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceGroup.java
(with props)
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java?rev=1055853r1=1055852r2=1055853view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
Thu Jan 6 12:39:54 2011
@@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory;
* Persistent list of RegisteredResource, used by installer to
* keep track of all registered resources
*/
-public class EntityResourceList implements Serializable {
+public class EntityResourceList implements Serializable,
RegisteredResourceGroup {
/** Use own serial version ID as we control serialization. */
private static final long serialVersionUID = 6L;
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java?rev=1055853r1=1055852r2=1055853view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerTask.java
Thu Jan 6 12:39:54 2011
@@ -27,20 +27,20 @@ import org.slf4j.LoggerFactory;
*/
public abstract class OsgiInstallerTask implements
ComparableOsgiInstallerTask {
-private final EntityResourceList entityResourceList;
+private final RegisteredResourceGroup resourceGroup;
private final Logger logger = LoggerFactory.getLogger(this.getClass());
-public OsgiInstallerTask(final EntityResourceList erl) {
-this.entityResourceList = erl;
+public OsgiInstallerTask(final RegisteredResourceGroup erl) {
+this.resourceGroup = erl;
}
/**
* Return the corresponding resource - depending on the task this might be
null.
*/
public RegisteredResource getResource() {
-if ( this.entityResourceList != null ) {
-return this.entityResourceList.getActiveResource();
+if ( this.resourceGroup != null ) {
+return this.resourceGroup.getActiveResource();
}
return null;
}
@@ -48,8 +48,8 @@ public abstract class OsgiInstallerTask
/**
* Return the corresponding resource - depending on the task this might be
null.
*/
-public EntityResourceList getEntityResourceList() {
-return this.entityResourceList;
+public RegisteredResourceGroup getResourceGroup() {
+return this.resourceGroup;
}
public Logger getLogger() {
@@ -67,7 +67,7 @@ public abstract class OsgiInstallerTask
}
public void
svn commit: r1055884 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: Activator.java OsgiInstallerImpl.java RegisteredResourceImpl.java config/ConfigTaskCreator.jav
Author: cziegeler
Date: Thu Jan 6 14:11:29 2011
New Revision: 1055884
URL: http://svn.apache.org/viewvc?rev=1055884view=rev
Log:
SLING-1920 : Make installers pluggable
Convert existing factories to the new service interface and use them as
services.
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java?rev=1055884r1=1055883r2=1055884view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
Thu Jan 6 14:11:29 2011
@@ -21,6 +21,9 @@ package org.apache.sling.installer.core.
import java.util.Hashtable;
import org.apache.sling.installer.api.OsgiInstaller;
+import org.apache.sling.installer.api.tasks.InstallTaskFactory;
+import org.apache.sling.installer.core.impl.config.ConfigTaskCreator;
+import org.apache.sling.installer.core.impl.tasks.BundleTaskCreator;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -38,10 +41,19 @@ public class Activator implements Bundle
private OsgiInstallerImpl osgiControllerService;
private ServiceRegistration osgiControllerServiceReg;
+private BundleTaskCreator bundleTaskFactory;
+private ServiceRegistration bundleTaskFactoryReg;
+
+private ConfigTaskCreator configTaskFactory;
+private ServiceRegistration configTaskFactoryReg;
+
/**
* @see
org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
*/
public void start(final BundleContext context) throws Exception {
+// register install task factories
+this.registerFactories(context);
+
// register osgi installer service
final HashtableString, String props = new HashtableString,
String();
props.put(Constants.SERVICE_DESCRIPTION, Apache Sling Install
Controller Service);
@@ -59,7 +71,7 @@ public class Activator implements Bundle
/**
* @see
org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
*/
-public void stop(BundleContext context) {
+public void stop(final BundleContext context) {
// stop osgi installer service
if ( this.osgiControllerService != null ) {
this.osgiControllerService.deactivate();
@@ -70,5 +82,43 @@ public class Activator implements Bundle
this.osgiControllerServiceReg.unregister();
this.osgiControllerServiceReg = null;
}
+if ( this.bundleTaskFactoryReg != null ) {
+this.bundleTaskFactoryReg.unregister();
+this.bundleTaskFactoryReg = null;
+}
+if ( this.bundleTaskFactory != null ) {
+this.bundleTaskFactory.deactivate();
+this.bundleTaskFactory = null;
+}
+if ( this.configTaskFactoryReg != null ) {
+this.configTaskFactoryReg.unregister();
+this.configTaskFactoryReg = null;
+}
+if ( this.configTaskFactory != null ) {
+this.configTaskFactory.deactivate();
+this.configTaskFactory = null;
+}
+}
+
+private void registerFactories(final BundleContext context) {
+final String [] serviceInterfaces = {
+InstallTaskFactory.class.getName()
+};
+
+HashtableString, String props = new HashtableString, String();
+props.put(Constants.SERVICE_DESCRIPTION, Apache Sling Bundle Install
Task Factory);
+props.put(Constants.SERVICE_VENDOR, VENDOR);
+
+this.bundleTaskFactory = new BundleTaskCreator(context);
+this.bundleTaskFactoryReg = context.registerService(serviceInterfaces,
+bundleTaskFactory, props);
+
+props = new HashtableString, String();
+props.put(Constants.SERVICE_DESCRIPTION, Apache Sling Configuration
Install Task Factory);
+props.put(Constants.SERVICE_VENDOR, VENDOR);
+
+this.configTaskFactory = new ConfigTaskCreator(context);
+this.configTaskFactoryReg = context.registerService(serviceInterfaces,
+configTaskFactory, props);
}
}
Modified:
sling/trunk
svn commit: r1056306 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer: api/tasks/ core/impl/
Author: cziegeler
Date: Fri Jan 7 13:17:10 2011
New Revision: 1056306
URL: http://svn.apache.org/viewvc?rev=1056306view=rev
Log:
SLING-1922 : Allow resource transformer for processing installable resources
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
(with props)
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
(with props)
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java?rev=1056306r1=1056305r2=1056306view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
Fri Jan 7 13:17:10 2011
@@ -89,7 +89,9 @@ public interface RegisteredResource exte
*/
int getPriority();
- /** Attributes include the bundle symbolic name, bundle version, etc. */
+ /**
+* Attributes include the bundle symbolic name, bundle version, etc.
+*/
MapString, Object getAttributes();
/** Return the identifier of the OSGi entity that this resource
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java?rev=1056306view=auto
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
(added)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
Fri Jan 7 13:17:10 2011
@@ -0,0 +1,36 @@
+/*
+ * 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.installer.api.tasks;
+
+/**
+ * A resource transformer might transform a registered resource
+ * before it is installed.
+ */
+public interface ResourceTransformer {
+
+/**
+ * Try to transform the registered resource.
+ * If the transformer is not responsible for transforming the
+ * resource, it should return codenull/code
+ *
+ * @param resource The resource
+ * @return A transformation result or codenull/code
+ */
+TransformationResult transform(RegisteredResource resource);
+}
Propchange:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
--
svn:eol-style = native
Propchange:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
--
svn:keywords = author date id revision rev url
Propchange:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
--
svn:mime-type = text/plain
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java?rev=1056306view=auto
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TransformationResult.java
(added)
+++
sling/trunk/installer
svn commit: r1057642 - in /sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp: JspScriptEngineFactory.java jasper/compiler/JspRuntimeContext.java
Author: cziegeler
Date: Tue Jan 11 14:09:56 2011
New Revision: 1057642
URL: http://svn.apache.org/viewvc?rev=1057642view=rev
Log:
SLING-1928 : JSP API classes from the environment can't be used.
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java?rev=1057642r1=1057641r2=1057642view=diff
==
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/JspScriptEngineFactory.java
Tue Jan 11 14:09:56 2011
@@ -115,6 +115,9 @@ public class JspScriptEngineFactory
private ServiceRegistration eventHandlerRegistration;
+/** The handler for the jsp factories. */
+private JspRuntimeContext.JspFactoryHandler jspFactoryHandler;
+
public static final String[] SCRIPT_TYPE = { jsp, jspf, jspx };
public static final String[] NAMES = { jsp, JSP };
@@ -161,6 +164,7 @@ public class JspScriptEngineFactory
}
final SlingIOProvider io = this.ioProvider;
io.setRequestResourceResolver(resolver);
+jspFactoryHandler.incUsage();
try {
final JspServletWrapperAdapter jsp =
getJspWrapperAdapter(scriptHelper);
// create a SlingBindings object
@@ -168,6 +172,7 @@ public class JspScriptEngineFactory
slingBindings.putAll(bindings);
jsp.service(slingBindings);
} finally {
+jspFactoryHandler.decUsage();
io.resetRequestResourceResolver();
}
}
@@ -217,6 +222,8 @@ public class JspScriptEngineFactory
Thread.currentThread().setContextClassLoader(jspClassLoader);
try {
+this.jspFactoryHandler = JspRuntimeContext.initFactoryHandler();
+
this.tldLocationsCache = new
SlingTldLocationsCache(componentContext.getBundleContext());
// prepare some classes
@@ -283,6 +290,8 @@ public class JspScriptEngineFactory
}
ioProvider = null;
+this.jspFactoryHandler.destroy();
+this.jspFactoryHandler = null;
}
/**
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java?rev=1057642r1=1057641r2=1057642view=diff
==
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/jasper/compiler/JspRuntimeContext.java
Tue Jan 11 14:09:56 2011
@@ -33,8 +33,14 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import javax.servlet.Servlet;
import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.jsp.JspApplicationContext;
+import javax.servlet.jsp.JspEngineInfo;
import javax.servlet.jsp.JspFactory;
+import javax.servlet.jsp.PageContext;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
@@ -71,11 +77,86 @@ public final class JspRuntimeContext {
/** The {...@link IOProvider} used to get access to output */
private IOProvider ioProvider = IOProvider.DEFAULT;
+/** This is a delegate forwarding either to our own factory
+ * or the original one.
+ * Depending on the USE_OWN_FACTORY flag.
+ */
+public static final class JspFactoryHandler extends JspFactory {
+
+private final JspFactory original;
+
+private final JspFactory own;
+
+public JspFactoryHandler(final JspFactory orig, final JspFactory own) {
+this.original = (orig instanceof JspFactoryHandler ?
((JspFactoryHandler)orig).original : orig);
+this.own = own;
+}
+
+private JspFactory getFactory() {
+final Integer useOwnFactory = USE_OWN_FACTORY.get();
+if ( useOwnFactory == null || useOwnFactory.intValue() == 0 ) {
+return this.original;
+}
+return this.own;
+}
+
+@Override
+public PageContext getPageContext(Servlet paramServlet,
+ServletRequest paramServletRequest
svn commit: r1058067 - in /sling/trunk/installer/core/src: main/java/org/apache/sling/installer/core/impl/ test/java/org/apache/sling/installer/core/impl/
Author: cziegeler
Date: Wed Jan 12 11:00:27 2011
New Revision: 1058067
URL: http://svn.apache.org/viewvc?rev=1058067view=rev
Log:
SLING-1923 : Improve the (internal) resource handling
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileDataStore.java
(contents, props changed)
- copied, changed from r1057284,
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
Removed:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/DictionaryDigestTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java?rev=1058067r1=1058066r2=1058067view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
Wed Jan 12 11:00:27 2011
@@ -135,6 +135,9 @@ public class EntityResourceList implemen
}
}
toActivate.setState(state);
+if ( state == RegisteredResource.State.UNINSTALLED ) {
+this.cleanup(toActivate);
+}
}
}
@@ -195,6 +198,9 @@ public class EntityResourceList implemen
}
}
+/**
+ * Compact the resource group by removing uninstalled entries
+ */
public boolean compact() {
boolean changed = false;
final ListRegisteredResource toDelete = new
ArrayListRegisteredResource();
Copied:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileDataStore.java
(from r1057284,
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java)
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileDataStore.java?p2=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileDataStore.javap1=sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.javar1=1057284r2=1058067rev=1058067view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileUtil.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/FileDataStore.java
Wed Jan 12 11:00:27 2011
@@ -24,13 +24,16 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.HashMap;
+import java.util.Map;
import org.osgi.framework.BundleContext;
+import org.slf4j.LoggerFactory;
/**
* Utility class for all file handling.
*/
-public class FileUtil {
+public class FileDataStore {
/**
* The name of the bundle context property defining the location for the
@@ -46,12 +49,16 @@ public class FileUtil {
private final File directory;
-public static FileUtil SHARED;
+/** Public instance - to avoid passing a reference to this service to each
data object. */
+public static FileDataStore SHARED;
+
+/** Cache for url to digest mapping. */
+private final MapString, String digestCache = new HashMapString,
String();
/**
* Create a file util instance and detect the installer directory.
*/
-public FileUtil( final BundleContext bundleContext ) {
+public FileDataStore( final BundleContext bundleContext ) {
String location = bundleContext.getProperty(CONFIG_DIR);
// no configured location, use the config dir in the bundle persistent
@@ -97,13 +104,6 @@ public class FileUtil {
}
/**
- * Return the installer directory
svn commit: r1058119 - in /sling/trunk/installer/core/src: main/java/org/apache/sling/installer/api/tasks/ main/java/org/apache/sling/installer/core/impl/ test/java/org/apache/sling/installer/core/imp
Author: cziegeler
Date: Wed Jan 12 13:06:38 2011
New Revision: 1058119
URL: http://svn.apache.org/viewvc?rev=1058119view=rev
Log:
SLING-1922 : Allow resource transformer for processing installable resources
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceComparatorTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/TaskOrderingTest.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java?rev=1058119r1=1058118r2=1058119view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/ResourceTransformer.java
Wed Jan 12 13:06:38 2011
@@ -30,7 +30,7 @@ public interface ResourceTransformer {
* resource, it should return codenull/code
*
* @param resource The resource
- * @return A transformation result or codenull/code
+ * @return An array of transformation results or codenull/code
*/
-TransformationResult transform(RegisteredResource resource);
+TransformationResult[] transform(RegisteredResource resource);
}
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java?rev=1058119r1=1058118r2=1058119view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
Wed Jan 12 13:06:38 2011
@@ -64,7 +64,7 @@ public class DefaultTransformer
/**
* @see
org.apache.sling.installer.api.tasks.ResourceTransformer#transform(org.apache.sling.installer.api.tasks.RegisteredResource)
*/
-public TransformationResult transform(final RegisteredResource resource) {
+public TransformationResult[] transform(final RegisteredResource resource)
{
if ( resource.getType().equals(InstallableResource.TYPE_FILE) ) {
return checkBundle(resource);
} else if (
resource.getType().equals(InstallableResource.TYPE_PROPERTIES) ) {
@@ -77,7 +77,7 @@ public class DefaultTransformer
* Check if the registered resource is a bundle.
* @return
*/
-private TransformationResult checkBundle(final RegisteredResource
resource) {
+private TransformationResult[] checkBundle(final RegisteredResource
resource) {
try {
final Manifest m = getManifest(resource.getInputStream());
if (m != null) {
@@ -92,7 +92,7 @@ public class DefaultTransformer
tr.setId(sn);
tr.setResourceType(InstallableResource.TYPE_BUNDLE);
-return tr;
+return new TransformationResult[] {tr};
}
}
}
@@ -106,7 +106,7 @@ public class DefaultTransformer
* Check if the registered resource is a configuration
* @param resource The resource
*/
-private TransformationResult checkConfiguration(final RegisteredResource
resource) {
+private TransformationResult[] checkConfiguration(final RegisteredResource
resource) {
final String url = resource.getURL();
String lastIdPart = url;
final int pos = lastIdPart.lastIndexOf('/');
@@ -150,7 +150,7 @@ public class DefaultTransformer
tr.setId(id);
tr.setResourceType(InstallableResource.TYPE_CONFIG);
-return tr;
+return new TransformationResult[] {tr};
}
/**
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1058119r1=1058118r2=1058119view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache
svn commit: r1058233 - in /sling/trunk/installer/core/src: main/java/org/apache/sling/installer/api/tasks/ main/java/org/apache/sling/installer/core/impl/ main/java/org/apache/sling/installer/core/imp
Author: cziegeler
Date: Wed Jan 12 17:00:57 2011
New Revision: 1058233
URL: http://svn.apache.org/viewvc?rev=1058233view=rev
Log:
SLING-1922 : Allow resource transformer for processing installable resources
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResourceGroup.java
(contents, props changed)
- copied, changed from r1058196,
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java
Removed:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResourceGroup.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/RegisteredResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/TaskResource.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/EntityResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/AbstractConfigTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigInstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigRemoveTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/config/ConfigTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleInstallTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleRemoveTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleTaskCreator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/ChangeStateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SystemBundleUpdateTask.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/MockBundleResource.java
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/RegisteredResourceTest.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java?rev=1058233r1=1058232r2=1058233view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTask.java
Wed Jan 12 17:00:57 2011
@@ -28,11 +28,11 @@ import org.slf4j.LoggerFactory;
*/
public abstract class InstallTask implements ComparableInstallTask {
-private final RegisteredResourceGroup resourceGroup;
+private final TaskResourceGroup resourceGroup;
private final Logger logger = LoggerFactory.getLogger(this.getClass());
-public InstallTask(final RegisteredResourceGroup erl) {
+public InstallTask(final TaskResourceGroup erl) {
this.resourceGroup = erl;
}
@@ -49,7 +49,7 @@ public abstract class InstallTask implem
/**
* Return the corresponding resource - depending on the task this might be
null.
*/
-public RegisteredResourceGroup getResourceGroup() {
+public TaskResourceGroup getResourceGroup() {
return this.resourceGroup;
}
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java?rev=1058233r1=1058232r2=1058233view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/api/tasks/InstallTaskFactory.java
Wed Jan 12 17:00:57 2011
@@ -24,5 +24,5 @@ public interface InstallTaskFactory
svn commit: r1058472 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: Activator.java console/OsgiInstallerWebConsolePlugin.java
Author: cziegeler
Date: Thu Jan 13 09:25:14 2011
New Revision: 1058472
URL: http://svn.apache.org/viewvc?rev=1058472view=rev
Log:
SLING-755 : Web Console Plugin for the OSGi Installer
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java?rev=1058472r1=1058471r2=1058472view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Activator.java
Thu Jan 13 09:25:14 2011
@@ -40,7 +40,7 @@ import org.osgi.framework.ServiceRegistr
public class Activator implements BundleActivator {
/** Vendor of all registered services. */
-private static final String VENDOR = The Apache Software Foundation;
+public static final String VENDOR = The Apache Software Foundation;
private ListInternalService services = new ArrayListInternalService();
private ListServiceRegistration registrations = new
ArrayListServiceRegistration();
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java?rev=1058472r1=1058471r2=1058472view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/console/OsgiInstallerWebConsolePlugin.java
Thu Jan 13 09:25:14 2011
@@ -20,6 +20,7 @@ package org.apache.sling.installer.core.
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Hashtable;
import java.util.List;
@@ -30,6 +31,7 @@ import javax.servlet.ServletResponse;
import org.apache.sling.installer.api.tasks.RegisteredResource;
import org.apache.sling.installer.api.tasks.TaskResource;
+import org.apache.sling.installer.core.impl.Activator;
import org.apache.sling.installer.core.impl.EntityResourceList;
import org.apache.sling.installer.core.impl.OsgiInstallerImpl;
import org.osgi.framework.BundleContext;
@@ -49,7 +51,7 @@ public class OsgiInstallerWebConsolePlug
props.put(felix.webconsole.label, osgi-installer);
props.put(felix.webconsole.title, OSGi Installer);
props.put(felix.webconsole.configprinter.modes, new String[] {zip,
txt});
-props.put(Constants.SERVICE_VENDOR, The Apache Software Foundation);
+props.put(Constants.SERVICE_VENDOR, Activator.VENDOR);
props.put(Constants.SERVICE_DESCRIPTION,
OSGi Installer Web Console Plugin);
return bundleContext.registerService(javax.servlet.Servlet, plugin,
@@ -61,27 +63,60 @@ public class OsgiInstallerWebConsolePlug
this.installer = installer;
}
+/**
+ * Internal class to collect the current state.
+ */
+private static final class State {
+public final ListEntityResourceList activeResources = new
ArrayListEntityResourceList();
+public final ListEntityResourceList installedResources = new
ArrayListEntityResourceList();
+public final ListRegisteredResource untransformedResources = new
ArrayListRegisteredResource();
+}
+
+/**
+ * Get the current installer state.
+ * This method should be called from within a synchronized block for the
resources!
+ */
+private State getCurrentState() {
+final State state = new State();
+
+for(final String entityId :
this.installer.getPersistentResourceList().getEntityIds()) {
+final EntityResourceList group =
this.installer.getPersistentResourceList().getEntityResourceList(entityId);
+if ( group.getActiveResource() != null ) {
+state.activeResources.add(group);
+} else {
+state.installedResources.add(group);
+}
+}
+
state.untransformedResources.addAll(this.installer.getPersistentResourceList().getUntransformedResources());
+
+return state;
+}
+
@Override
public void service(ServletRequest req, ServletResponse res)
throws IOException {
final PrintWriter pw = res.getWriter();
-pw.println(h1Entities/h1);
-pw.println(ul);
synchronized
svn commit: r1058549 - /sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Author: cziegeler
Date: Thu Jan 13 13:42:10 2011
New Revision: 1058549
URL: http://svn.apache.org/viewvc?rev=1058549view=rev
Log:
SLING-1930 : Compilation message contains only class name without package
information
Modified:
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Modified:
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java?rev=1058549r1=1058548r2=1058549view=diff
==
---
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
(original)
+++
sling/trunk/contrib/commons/compiler/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
Thu Jan 13 13:42:10 2011
@@ -497,7 +497,7 @@ public class EclipseJavaCompiler impleme
* @see org.eclipse.jdt.internal.compiler.env.IDependent#getFileName()
*/
public char[] getFileName() {
-return (this.mainTypeName + .java).toCharArray();
+return (this.packageName + '.' + this.mainTypeName +
.java).toCharArray();
}
}
}
svn commit: r1058553 - /sling/trunk/contrib/jcr/compiler/src/main/java/org/apache/sling/jcr/compiler/impl/JcrJavaCompilerImpl.java
Author: cziegeler
Date: Thu Jan 13 13:44:06 2011
New Revision: 1058553
URL: http://svn.apache.org/viewvc?rev=1058553view=rev
Log:
SLING-1931 : Compiler message contain only class name but not resource path
Modified:
sling/trunk/contrib/jcr/compiler/src/main/java/org/apache/sling/jcr/compiler/impl/JcrJavaCompilerImpl.java
Modified:
sling/trunk/contrib/jcr/compiler/src/main/java/org/apache/sling/jcr/compiler/impl/JcrJavaCompilerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/src/main/java/org/apache/sling/jcr/compiler/impl/JcrJavaCompilerImpl.java?rev=1058553r1=1058552r2=1058553view=diff
==
---
sling/trunk/contrib/jcr/compiler/src/main/java/org/apache/sling/jcr/compiler/impl/JcrJavaCompilerImpl.java
(original)
+++
sling/trunk/contrib/jcr/compiler/src/main/java/org/apache/sling/jcr/compiler/impl/JcrJavaCompilerImpl.java
Thu Jan 13 13:44:06 2011
@@ -24,6 +24,10 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.jcr.Item;
import javax.jcr.Node;
@@ -37,6 +41,7 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.commons.classloader.ClassLoaderWriter;
import org.apache.sling.commons.compiler.CompilationResult;
import org.apache.sling.commons.compiler.CompilationUnit;
+import org.apache.sling.commons.compiler.CompilerMessage;
import org.apache.sling.commons.compiler.JavaCompiler;
import org.apache.sling.commons.compiler.Options;
import org.apache.sling.jcr.api.SlingRepository;
@@ -117,7 +122,7 @@ public class JcrJavaCompilerImpl impleme
}
// and compile
-return compiler.compile(units, options);
+return mapResult(compiler.compile(units, options), srcFiles,
units);
} finally {
if ( session != null ) {
session.logout();
@@ -125,6 +130,56 @@ public class JcrJavaCompilerImpl impleme
}
}
+/**
+ * Map the source information of the errors
+ */
+private CompilationResult mapResult(final CompilationResult result,
+final String[] srcFiles,
+final CompilationUnit[] units) {
+if ( result == null || (result.getErrors() == null
result.getWarnings() == null ) ) {
+return result;
+}
+
+final MapString, String mapping = new HashMapString, String();
+for(int i=0;isrcFiles.length;i++) {
+mapping.put(units[i].getMainClassName() + .java, srcFiles[i]);
+}
+return new CompilationResult() {
+
+private ListCompilerMessage mapMessages(final
ListCompilerMessage msgs) {
+if ( msgs == null || msgs.size() == 0 ) {
+return msgs;
+}
+final ListCompilerMessage newMsgs = new
ArrayListCompilerMessage();
+for(final CompilerMessage msg : msgs) {
+final String mapped = mapping.get(msg.getFile());
+
+newMsgs.add(new CompilerMessage(
+mapped == null ? msg.getFile() : mapped,
+msg.getLine(), msg.getColumn(), msg.getMessage()));
+}
+return newMsgs;
+}
+
+public Class? loadCompiledClass(String className)
+throws ClassNotFoundException {
+return result.loadCompiledClass(className);
+}
+
+public ListCompilerMessage getWarnings() {
+return mapMessages(result.getWarnings());
+}
+
+public ListCompilerMessage getErrors() {
+return mapMessages(result.getErrors());
+}
+
+public boolean didCompile() {
+return result.didCompile();
+}
+};
+}
+
// misc. helpers
private CompilationUnit createCompileUnit(final String sourceFile, final
Session session)
svn commit: r1058673 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: DefaultTransformer.java tasks/BundleStartTask.java tasks/BundleUpdateTask.java tasks/Synchrono
Author: cziegeler
Date: Thu Jan 13 17:18:57 2011
New Revision: 1058673
URL: http://svn.apache.org/viewvc?rev=1058673view=rev
Log:
SLING-1810 : Support for lazy activated bundles
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/SynchronousRefreshPackagesTask.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java?rev=1058673r1=1058672r2=1058673view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/DefaultTransformer.java
Thu Jan 13 17:18:57 2011
@@ -90,6 +90,12 @@ public class DefaultTransformer
attr.put(Constants.BUNDLE_SYMBOLICNAME, sn);
attr.put(Constants.BUNDLE_VERSION, v.toString());
+// check for activation policy
+final String actPolicy =
m.getMainAttributes().getValue(Constants.BUNDLE_ACTIVATIONPOLICY);
+if ( Constants.ACTIVATION_LAZY.equals(actPolicy) ) {
+attr.put(Constants.BUNDLE_ACTIVATIONPOLICY,
actPolicy);
+}
+
final TransformationResult tr = new
TransformationResult();
tr.setId(sn);
tr.setResourceType(InstallableResource.TYPE_BUNDLE);
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java?rev=1058673r1=1058672r2=1058673view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
Thu Jan 13 17:18:57 2011
@@ -28,6 +28,7 @@ import org.apache.sling.installer.api.ta
import org.apache.sling.installer.core.impl.OsgiInstallerImpl;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
/** Start a bundle given its bundle ID
* Restarts if the bundle does not start on the first try,
@@ -71,6 +72,27 @@ public class BundleStartTask extends Ins
}
/**
+* Check if the bundle is active.
+* This is true if the bundle has the active state or of the bundle
+* is in the starting state and has the lazy activation policy.
+*/
+ public static boolean isBundleActive(final Bundle b) {
+ if ( b.getState() == Bundle.ACTIVE ) {
+ return true;
+ }
+ if ( b.getState() == Bundle.STARTING isLazyActivatian(b) ) {
+ return true;
+ }
+return false;
+ }
+ /**
+* Check if the bundle has the lazy activation policy
+*/
+ private static boolean isLazyActivatian(final Bundle b) {
+return
Constants.ACTIVATION_LAZY.equals(b.getHeaders().get(Constants.BUNDLE_ACTIVATIONPOLICY));
+ }
+
+ /**
* @see
org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext)
*/
public void execute(final InstallationContext ctx) {
@@ -100,7 +122,7 @@ public class BundleStartTask extends Ins
return;
}
-if (b.getState() == Bundle.ACTIVE) {
+if (isBundleActive(b) ) {
this.getLogger().debug(Bundle already started, no action taken:
{}/{}, bundleId, b.getSymbolicName());
if ( this.getResource() != null ) {
this.setFinishedState(ResourceState.INSTALLED);
@@ -115,7 +137,7 @@ public class BundleStartTask extends Ins
}
this.getLogger().info(Bundle started (retry count={}, bundle
ID={}) : {},
new Object[] {retryCount, bundleId, b.getSymbolicName()});
-} catch(BundleException e) {
+} catch (final BundleException e) {
this.getLogger().info(Could not start bundle (retry count={},
bundle ID={}) : {}. Reason: {}. Will retry.,
new Object
svn commit: r1059064 - in /sling/trunk/installer/core/src/test/java/org/apache/sling/installer: api/ api/InstallableResourceTest.java core/impl/InternalResourceTest.java core/impl/mocks/ core/impl/moc
Author: cziegeler
Date: Fri Jan 14 16:40:16 2011
New Revision: 1059064
URL: http://svn.apache.org/viewvc?rev=1059064view=rev
Log:
Start adding simple junit tests.
Added:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
(with props)
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
(with props)
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/mocks/
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/mocks/MockFileDataStore.java
(with props)
Added:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java?rev=1059064view=auto
==
---
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
(added)
+++
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
Fri Jan 14 16:40:16 2011
@@ -0,0 +1,62 @@
+/*
+ * 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.installer.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.util.Hashtable;
+
+import org.junit.Test;
+
+/**
+ * Test for the installable resource.
+ */
+public class InstallableResourceTest {
+
+@Test public void testConstructor() {
+// no id
+try {
+new InstallableResource(null, null, new HashtableString,
Object(), null, null, null);
+fail(IAE expected : no id);
+} catch (IllegalArgumentException iae) {
+// expected
+}
+// no input stream, no dict
+try {
+new InstallableResource(1, null, null, null, null, null);
+fail(IAE expected : no is no dict);
+} catch (IllegalArgumentException iae) {
+// expected
+}
+new InstallableResource(1, new ByteArrayInputStream(a.getBytes()),
null, null, null, null);
+new InstallableResource(1, null, new HashtableString, Object(),
null, null, null);
+new InstallableResource(1, new
ByteArrayInputStream(a.getBytes()), new HashtableString, Object(), null,
null, null);
+}
+
+@Test public void testPriority() {
+final InstallableResource defaultPrio =
+new InstallableResource(1, null, new HashtableString,
Object(), null, null, null);
+assertEquals(InstallableResource.DEFAULT_PRIORITY,
defaultPrio.getPriority());
+final InstallableResource ownPrio =
+new InstallableResource(1, null, new HashtableString,
Object(), null, null, 47);
+assertEquals(47, ownPrio.getPriority());
+}
+}
Propchange:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
--
svn:eol-style = native
Propchange:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
--
svn:keywords = author date id revision rev url
Propchange:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/api/InstallableResourceTest.java
--
svn:mime-type = text/plain
Added:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java?rev=1059064view=auto
==
---
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
(added
svn commit: r1059068 - /sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
Author: cziegeler
Date: Fri Jan 14 16:48:34 2011
New Revision: 1059068
URL: http://svn.apache.org/viewvc?rev=1059068view=rev
Log:
Start adding simple junit tests.
Modified:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
Modified:
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java?rev=1059068r1=1059067r2=1059068view=diff
==
---
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
(original)
+++
sling/trunk/installer/core/src/test/java/org/apache/sling/installer/core/impl/InternalResourceTest.java
Fri Jan 14 16:48:34 2011
@@ -21,9 +21,9 @@ package org.apache.sling.installer.core.
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.util.Dictionary;
import java.util.Hashtable;
import org.apache.sling.installer.api.InstallableResource;
@@ -46,19 +46,46 @@ public class InternalResourceTest {
MockFileDataStore.unset();
}
-private InstallableResource getInstallableResource() {
-return new InstallableResource(1,
-null, new HashtableString, Object(), null, null, null);
+private DictionaryString, Object getSimpleDict() {
+final HashtableString, Object dict = new HashtableString, Object();
+dict.put(a, a);
+dict.put(b, 2);
+
+return dict;
+}
+
+private void assertIsSimpleDict(final DictionaryString, Object dict) {
+assertEquals(2, dict.size());
+assertEquals(a, dict.get(a));
+assertEquals(2, dict.get(b));
}
-@Test public void testConstructor() throws IOException {
-final InternalResource ir = InternalResource.create(SCHEME,
-getInstallableResource());
-assertTrue(ir.getURL().startsWith(SCHEME + ':'));
-assertNotNull(ir.getDictionary());
-assertNotNull(ir.getPrivateCopyOfDictionary());
-assertNull(ir.getInputStream());
-assertNull(ir.getPrivateCopyOfFile());
-assertEquals(InstallableResource.TYPE_PROPERTIES, ir.getType());
+@Test public void testSimpleProps() throws IOException {
+final String[] types = new String[] {InstallableResource.TYPE_CONFIG,
+InstallableResource.TYPE_PROPERTIES,
+null, zip};
+
+for(int i=0;itypes.length; i++) {
+final InstallableResource instRes = new InstallableResource(1,
+null, getSimpleDict(), null, types[i], null);
+
+final InternalResource ir = InternalResource.create(SCHEME,
+instRes);
+assertEquals(SCHEME + :1, ir.getURL());
+assertEquals(1, ir.getId());
+assertNotNull(ir.getDictionary());
+assertIsSimpleDict(ir.getDictionary());
+assertNotNull(ir.getPrivateCopyOfDictionary());
+assertIsSimpleDict(ir.getPrivateCopyOfDictionary());
+assertNull(ir.getInputStream());
+assertNull(ir.getPrivateCopyOfFile());
+if ( zip.equals(types[i]) ) {
+assertEquals(zip, ir.getType());
+} else {
+assertEquals(InstallableResource.TYPE_PROPERTIES,
ir.getType());
+}
+assertNotNull(ir.getDigest());
+assertEquals(InstallableResource.DEFAULT_PRIORITY,
ir.getPriority());
+}
}
}
svn commit: r1060230 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Author: cziegeler
Date: Tue Jan 18 08:01:08 2011
New Revision: 1060230
URL: http://svn.apache.org/viewvc?rev=1060230view=rev
Log:
Add log statement for each cycle.
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1060230r1=1060229r2=1060230view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Tue Jan 18 08:01:08 2011
@@ -162,6 +162,8 @@ public class OsgiInstallerImpl
public void run() {
this.init();
while (active) {
+logger.debug(Starting new cycle);
+
boolean sleep = true;
this.mergeNewlyRegisteredResources();
svn commit: r1060233 - /sling/trunk/pom.xml
Author: cziegeler Date: Tue Jan 18 08:05:06 2011 New Revision: 1060233 URL: http://svn.apache.org/viewvc?rev=1060233view=rev Log: First version of deployment package support for the installer. Modified: sling/trunk/pom.xml Modified: sling/trunk/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=1060233r1=1060232r2=1060233view=diff == --- sling/trunk/pom.xml (original) +++ sling/trunk/pom.xml Tue Jan 18 08:05:06 2011 @@ -139,6 +139,7 @@ moduleinstaller/core/module moduleinstaller/providers/file/module moduleinstaller/providers/jcr/module +moduleinstaller/factories/deploymentpck/module moduleinstaller/it/module !-- Launchpad --
svn commit: r1060238 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
Author: cziegeler
Date: Tue Jan 18 08:41:32 2011
New Revision: 1060238
URL: http://svn.apache.org/viewvc?rev=1060238view=rev
Log:
Readd missing behaviour for properties and config files.
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java?rev=1060238r1=1060237r2=1060238view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/InternalResource.java
Tue Jan 18 08:41:32 2011
@@ -69,7 +69,9 @@ public class InternalResource extends In
type = InstallableResource.TYPE_PROPERTIES;
}
-if ( is != null InstallableResource.TYPE_PROPERTIES.equals(type) ) {
+if ( is != null
+ (InstallableResource.TYPE_PROPERTIES.equals(type) ||
+ type == null isConfigExtension(resource.getId( {
dict = readDictionary(is, getExtension(resource.getId()));
if ( dict == null ) {
throw new IOException(Unable to read dictionary from input
stream: + resource.getId());
@@ -240,6 +242,11 @@ public class InternalResource extends In
return ht;
}
+private static boolean isConfigExtension(final String url) {
+final String ext = getExtension(url);
+return config.equals(ext) || properties.equals(ext) ||
cfg.equals(ext);
+}
+
/** Digest is needed to detect changes in data */
private static String computeDigest(final File data) throws IOException {
try {
svn commit: r1060248 - /sling/tags/org.apache.sling.commons.log-2.1.2/
Author: cziegeler Date: Tue Jan 18 09:04:55 2011 New Revision: 1060248 URL: http://svn.apache.org/viewvc?rev=1060248view=rev Log: [maven-scm] copy for tag org.apache.sling.commons.log-2.1.2 Added: sling/tags/org.apache.sling.commons.log-2.1.2/ - copied from r1060247, sling/trunk/bundles/commons/log/
svn commit: r1060249 - /sling/trunk/bundles/commons/log/pom.xml
Author: cziegeler Date: Tue Jan 18 09:05:05 2011 New Revision: 1060249 URL: http://svn.apache.org/viewvc?rev=1060249view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/commons/log/pom.xml Modified: sling/trunk/bundles/commons/log/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/pom.xml?rev=1060249r1=1060248r2=1060249view=diff == --- sling/trunk/bundles/commons/log/pom.xml (original) +++ sling/trunk/bundles/commons/log/pom.xml Tue Jan 18 09:05:05 2011 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.commons.log/artifactId -version2.1.2/version +version2.1.3-SNAPSHOT/version packagingbundle/packaging nameApache Sling OSGi LogService Implementation/name @@ -40,9 +40,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.log-2.1.2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.log-2.1.2/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.log-2.1.2/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/commons/log/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/commons/log/developerConnection +urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/commons/log/url /scm properties
svn commit: r1060251 - /sling/trunk/contrib/commons/compiler/pom.xml
Author: cziegeler Date: Tue Jan 18 09:07:59 2011 New Revision: 1060251 URL: http://svn.apache.org/viewvc?rev=1060251view=rev Log: [maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.0.2 Modified: sling/trunk/contrib/commons/compiler/pom.xml Modified: sling/trunk/contrib/commons/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/pom.xml?rev=1060251r1=1060250r2=1060251view=diff == --- sling/trunk/contrib/commons/compiler/pom.xml (original) +++ sling/trunk/contrib/commons/compiler/pom.xml Tue Jan 18 09:07:59 2011 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.commons.compiler/artifactId -version2.0.1-SNAPSHOT/version +version2.0.2/version packagingbundle/packaging nameApache Sling Commons Java Compiler/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.compiler-2.0.2/url /scm build
svn commit: r1060254 - /sling/trunk/contrib/jcr/compiler/pom.xml
Author: cziegeler Date: Tue Jan 18 09:11:36 2011 New Revision: 1060254 URL: http://svn.apache.org/viewvc?rev=1060254view=rev Log: [maven-release-plugin] prepare release org.apache.sling.jcr.compiler-2.0.2 Modified: sling/trunk/contrib/jcr/compiler/pom.xml Modified: sling/trunk/contrib/jcr/compiler/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/pom.xml?rev=1060254r1=1060253r2=1060254view=diff == --- sling/trunk/contrib/jcr/compiler/pom.xml (original) +++ sling/trunk/contrib/jcr/compiler/pom.xml Tue Jan 18 09:11:36 2011 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.jcr.compiler/artifactId -version2.0.1-SNAPSHOT/version +version2.0.2/version packagingbundle/packaging nameApache Sling JCR Java Compiler/name @@ -39,9 +39,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/jcr/compiler/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/jcr/compiler/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/jcr/compiler/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.compiler-2.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.compiler-2.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.compiler-2.0.2/url /scm build
svn commit: r1060262 - /sling/tags/org.apache.sling.event-3.0.0/
Author: cziegeler Date: Tue Jan 18 09:18:43 2011 New Revision: 1060262 URL: http://svn.apache.org/viewvc?rev=1060262view=rev Log: [maven-scm] copy for tag org.apache.sling.event-3.0.0 Added: sling/tags/org.apache.sling.event-3.0.0/ - copied from r1060261, sling/trunk/bundles/extensions/event/
svn commit: r1060263 - /sling/trunk/bundles/extensions/event/pom.xml
Author: cziegeler Date: Tue Jan 18 09:18:52 2011 New Revision: 1060263 URL: http://svn.apache.org/viewvc?rev=1060263view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/event/pom.xml Modified: sling/trunk/bundles/extensions/event/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1060263r1=1060262r2=1060263view=diff == --- sling/trunk/bundles/extensions/event/pom.xml (original) +++ sling/trunk/bundles/extensions/event/pom.xml Tue Jan 18 09:18:52 2011 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.event/artifactId packagingbundle/packaging -version3.0.0/version +version3.0.1-SNAPSHOT/version nameApache Sling Event Support/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-3.0.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.event-3.0.0/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.event-3.0.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/event/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/url /scm properties
svn commit: r1060275 - /sling/trunk/installer/core/pom.xml
Author: cziegeler Date: Tue Jan 18 09:50:55 2011 New Revision: 1060275 URL: http://svn.apache.org/viewvc?rev=1060275view=rev Log: [maven-release-plugin] prepare release org.apache.sling.installer.core-3.1.0 Modified: sling/trunk/installer/core/pom.xml Modified: sling/trunk/installer/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=1060275r1=1060274r2=1060275view=diff == --- sling/trunk/installer/core/pom.xml (original) +++ sling/trunk/installer/core/pom.xml Tue Jan 18 09:50:55 2011 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.installer.core/artifactId -version3.0.1-SNAPSHOT/version +version3.1.0/version packagingbundle/packaging nameApache Sling Installer/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/core/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/core/developerConnection -urlhttp://svn.apache.org/viewvc/sling/installer/core/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.core-3.1.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.core-3.1.0/developerConnection + urlscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.core-3.1.0/url /scm build
svn commit: r1060278 - /sling/trunk/installer/core/pom.xml
Author: cziegeler Date: Tue Jan 18 09:51:36 2011 New Revision: 1060278 URL: http://svn.apache.org/viewvc?rev=1060278view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/installer/core/pom.xml Modified: sling/trunk/installer/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/pom.xml?rev=1060278r1=1060277r2=1060278view=diff == --- sling/trunk/installer/core/pom.xml (original) +++ sling/trunk/installer/core/pom.xml Tue Jan 18 09:51:36 2011 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.installer.core/artifactId -version3.1.0/version +version3.1.1-SNAPSHOT/version packagingbundle/packaging nameApache Sling Installer/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.core-3.1.0/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.core-3.1.0/developerConnection - urlscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.core-3.1.0/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/core/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/core/developerConnection +urlhttp://svn.apache.org/viewvc/sling/installer/core/url /scm build
svn commit: r1060280 - /sling/trunk/installer/providers/jcr/pom.xml
Author: cziegeler Date: Tue Jan 18 09:55:31 2011 New Revision: 1060280 URL: http://svn.apache.org/viewvc?rev=1060280view=rev Log: [maven-release-plugin] prepare release org.apache.sling.installer.provider.jcr-3.0.2 Modified: sling/trunk/installer/providers/jcr/pom.xml Modified: sling/trunk/installer/providers/jcr/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/pom.xml?rev=1060280r1=1060279r2=1060280view=diff == --- sling/trunk/installer/providers/jcr/pom.xml (original) +++ sling/trunk/installer/providers/jcr/pom.xml Tue Jan 18 09:55:31 2011 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.installer.provider.jcr/artifactId -version3.0.1-SNAPSHOT/version +version3.0.2/version packagingbundle/packaging nameApache Sling JCR Installer/name @@ -38,9 +38,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr/connection -developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr//url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.provider.jcr-3.0.2/connection +developerConnection scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.provider.jcr-3.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.provider.jcr-3.0.2/url /scm build
svn commit: r1060281 - /sling/tags/org.apache.sling.installer.provider.jcr-3.0.2/
Author: cziegeler Date: Tue Jan 18 09:55:58 2011 New Revision: 1060281 URL: http://svn.apache.org/viewvc?rev=1060281view=rev Log: [maven-scm] copy for tag org.apache.sling.installer.provider.jcr-3.0.2 Added: sling/tags/org.apache.sling.installer.provider.jcr-3.0.2/ - copied from r1060280, sling/trunk/installer/providers/jcr/
svn commit: r1060336 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Tue Jan 18 11:49:16 2011 New Revision: 1060336 URL: http://svn.apache.org/viewvc?rev=1060336view=rev Log: Use latest snapshots 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=1060336r1=1060335r2=1060336view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Tue Jan 18 11:49:16 2011 @@ -160,7 +160,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.jsp/artifactId -version2.0.12/version +version2.0.15-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -200,14 +200,14 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.installer.core/artifactId - version3.0.1-SNAPSHOT/version + version3.1.1-SNAPSHOT/version /bundle /startLevel startLevel level=1 bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.log/artifactId -version2.1.1-SNAPSHOT/version +version2.1.3-SNAPSHOT/version /bundle /startLevel startLevel level=5
svn commit: r1060338 - /sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java
Author: cziegeler Date: Tue Jan 18 11:57:31 2011 New Revision: 1060338 URL: http://svn.apache.org/viewvc?rev=1060338view=rev Log: Remove obsolete scr reference tag Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java?rev=1060338r1=1060337r2=1060338view=diff == --- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java (original) +++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/SlingRequestProcessorImpl.java Tue Jan 18 11:57:31 2011 @@ -66,8 +66,6 @@ public class SlingRequestProcessorImpl i /** default log */ private final Logger log = LoggerFactory.getLogger(SlingRequestProcessorImpl.class); -/** @scr.reference cardinality=0..1 policy=dynamic */ - // used fields private final DefaultErrorHandler defaultErrorHandler = new DefaultErrorHandler();
svn commit: r1060490 - in /sling/trunk/bundles/extensions/bundleresource: ./ src/main/java/org/apache/sling/bundleresource/impl/
Author: cziegeler
Date: Tue Jan 18 18:02:03 2011
New Revision: 1060490
URL: http://svn.apache.org/viewvc?rev=1060490view=rev
Log:
SLING-1935 : Remove dependency to web console
Modified:
sling/trunk/bundles/extensions/bundleresource/pom.xml
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceCache.java
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceWebConsolePlugin.java
Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=1060490r1=1060489r2=1060490view=diff
==
--- sling/trunk/bundles/extensions/bundleresource/pom.xml (original)
+++ sling/trunk/bundles/extensions/bundleresource/pom.xml Tue Jan 18 18:02:03
2011
@@ -67,9 +67,6 @@
org.apache.sling.api.resource;version=[$(version;==;$(@)),$(version;=+;$(@))),
*
/Import-Package
-DynamicImport-Package
-org.apache.felix.webconsole
-/DynamicImport-Package
/instructions
/configuration
/plugin
@@ -101,15 +98,18 @@
/dependency
dependency
groupIdorg.apache.sling/groupId
-artifactIdorg.apache.sling.jcr.resource/artifactId
+artifactIdorg.apache.sling.commons.osgi/artifactId
version2.0.6/version
scopeprovided/scope
/dependency
dependency
-groupIdorg.apache.felix/groupId
-artifactIdorg.apache.felix.webconsole/artifactId
-version1.2.0/version
-scopeprovided/scope
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.core/artifactId
+/dependency
+dependency
+groupIdorg.osgi/groupId
+artifactIdorg.osgi.compendium/artifactId
+scopecompile/scope
/dependency
dependency
groupIdorg.apache.jackrabbit/groupId
@@ -118,13 +118,8 @@
scopeprovided/scope
/dependency
dependency
-groupIdorg.osgi/groupId
-artifactIdorg.osgi.core/artifactId
-/dependency
-dependency
-groupIdorg.osgi/groupId
-artifactIdorg.osgi.compendium/artifactId
-scopecompile/scope
+groupIdjavax.jcr/groupId
+artifactIdjcr/artifactId
/dependency
dependency
groupIdorg.slf4j/groupId
Modified:
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/Activator.java?rev=1060490r1=1060489r2=1060490view=diff
==
---
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
(original)
+++
sling/trunk/bundles/extensions/bundleresource/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
Tue Jan 18 18:02:03 2011
@@ -18,7 +18,6 @@
*/
package org.apache.sling.bundleresource.impl;
-import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
@@ -38,26 +37,6 @@ public class Activator implements Bundle
*/
public static final String BUNDLE_RESOURCE_ROOTS =
Sling-Bundle-Resources;
-/**
- * Fully qualified name of the Web Console Plugin class. This class will be
- * loaded dynamically to prevent issues if the Felix Web Console is not
- * installed in the system (value is
- * org.apache.sling.bundleresource.impl.BundleResourceWebConsolePlugin).
- */
-private static final String CONSOLE_PLUGIN_CLASS =
org.apache.sling.bundleresource.impl.BundleResourceWebConsolePlugin;
-
-/**
- * Name of the initialization method to call on the Web Console Plugin
class
- * (value is initPlugin).
- */
-private static final String METHOD_INIT = initPlugin;
-
-/**
- * Name of the shutdown method to call on the Web Console Plugin class
- * (value is destroyPlugin).
- */
-private static final String METHOD_DESTROY = destroyPlugin;
-
/** default log */
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -65,7 +44,10 @@ public class Activator implements Bundle
private BundleContext bundleContext;
-public void start(BundleContext context) throws Exception {
+/**
+ * @see
org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext
svn commit: r1060492 - in /sling/trunk/bundles/extensions/bundleresource: LICENSE NOTICE src/main/resources/
Author: cziegeler Date: Tue Jan 18 18:03:08 2011 New Revision: 1060492 URL: http://svn.apache.org/viewvc?rev=1060492view=rev Log: Remove obsolete licence and notice Removed: sling/trunk/bundles/extensions/bundleresource/LICENSE sling/trunk/bundles/extensions/bundleresource/NOTICE sling/trunk/bundles/extensions/bundleresource/src/main/resources/
svn commit: r1060500 - in /sling/trunk/bundles/extensions/fsresource: LICENSE NOTICE src/main/resources/META-INF/
Author: cziegeler Date: Tue Jan 18 18:15:52 2011 New Revision: 1060500 URL: http://svn.apache.org/viewvc?rev=1060500view=rev Log: Remove obsolete licence and notice Removed: sling/trunk/bundles/extensions/fsresource/LICENSE sling/trunk/bundles/extensions/fsresource/NOTICE sling/trunk/bundles/extensions/fsresource/src/main/resources/META-INF/
svn commit: r1060513 - in /sling/trunk/bundles/jcr/base: LICENSE NOTICE src/main/resources/
Author: cziegeler Date: Tue Jan 18 18:26:36 2011 New Revision: 1060513 URL: http://svn.apache.org/viewvc?rev=1060513view=rev Log: Remove obsolete licence and notice Removed: sling/trunk/bundles/jcr/base/LICENSE sling/trunk/bundles/jcr/base/NOTICE sling/trunk/bundles/jcr/base/src/main/resources/
svn commit: r1060865 - in /sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices: exported/ filters/ scripting/ servlets/
Author: cziegeler
Date: Wed Jan 19 17:00:24 2011
New Revision: 1060865
URL: http://svn.apache.org/viewvc?rev=1060865view=rev
Log:
Fix test case and correct all licence headers to be before the package statement
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/NoPropertyFilter.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/SlingFilter.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/TestFilter.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/GroovyBindingsValuesProvider.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/JSPBindingsValuesProvider.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/scripting/StringBindingsValuesProvider.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/ExtensionServlet.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/HtmlDefaultServlet.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletMinusOne.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PrefixServletZero.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/PutMethodServlet.java
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/servlets/SelectorServlet.java
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java?rev=1060865r1=1060864r2=1060865view=diff
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java
(original)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/exported/TestEnum.java
Wed Jan 19 17:00:24 2011
@@ -1,9 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.sling.launchpad.testservices.exported;
public enum TestEnum {
FOO,
BAR;
-
+
public static TestEnum parse(String str) {
if(str.contains(foo)) {
return FOO;
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java?rev=1060865r1=1060864r2=1060865view=diff
==
---
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java
(original)
+++
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/filters/HttpServiceExtFilter.java
Wed Jan 19 17:00:24 2011
@@ -1,5 +1,3 @@
-package org.apache.sling.launchpad.testservices.filters;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -16,6 +14,7 @@ package org.apache.sling.launchpad.tests
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package org.apache.sling.launchpad.testservices.filters;
/** Example/test Filter.
*
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache
svn commit: r1061707 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: PersistentResourceList.java RegisteredResourceImpl.java
Author: cziegeler
Date: Fri Jan 21 09:41:42 2011
New Revision: 1061707
URL: http://svn.apache.org/viewvc?rev=1061707view=rev
Log:
SLING-1945 : Remove resource from untransformed resources if resource is
removed by provider
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java?rev=1061707r1=1061706r2=1061707view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/PersistentResourceList.java
Fri Jan 21 09:41:42 2011
@@ -191,6 +191,10 @@ public class PersistentResourceList {
t.addOrUpdate(input);
} else {
+// check if there is an old resource and remove it first
+if ( this.untransformedResources.contains(input) ) {
+this.untransformedResources.remove(input);
+}
this.untransformedResources.add(input);
}
}
@@ -203,13 +207,25 @@ public class PersistentResourceList {
}
/**
- * Remove a resource by url
+ * Remove a resource by url.
+ * Check all resource groups and the list of untransformed resources.
* @param url The url to remove
*/
public void remove(final String url) {
+// iterate over all resource groups and remove resources
+// with the given url
for(final EntityResourceList group : this.data.values()) {
group.remove(url);
}
+// iterate over untransformed resources and remove
+// the resource with that url
+for(final RegisteredResource rr : this.untransformedResources) {
+if ( rr.getURL().equals(url) ) {
+((RegisteredResourceImpl)rr).cleanup();
+this.untransformedResources.remove(rr);
+break;
+}
+}
}
/**
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java?rev=1061707r1=1061706r2=1061707view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
Fri Jan 21 09:41:42 2011
@@ -293,7 +293,7 @@ public class RegisteredResourceImpl
return false;
}
if ( this.entity == null ) {
-return super.equals(obj);
+return
this.getURL().equals(((RegisteredResourceImpl)obj).getURL());
}
return compareTo((RegisteredResourceImpl)obj) == 0;
}
svn commit: r1061742 - /sling/trunk/bundles/extensions/bundleresource/pom.xml
Author: cziegeler Date: Fri Jan 21 11:10:04 2011 New Revision: 1061742 URL: http://svn.apache.org/viewvc?rev=1061742view=rev Log: [maven-release-plugin] prepare release org.apache.sling.bundleresource.impl-2.0.6 Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml Modified: sling/trunk/bundles/extensions/bundleresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource/pom.xml?rev=1061742r1=1061741r2=1061742view=diff == --- sling/trunk/bundles/extensions/bundleresource/pom.xml (original) +++ sling/trunk/bundles/extensions/bundleresource/pom.xml Fri Jan 21 11:10:04 2011 @@ -28,7 +28,7 @@ artifactIdorg.apache.sling.bundleresource.impl/artifactId packagingbundle/packaging -version2.0.5-SNAPSHOT/version +version2.0.6/version nameApache Sling Bundle Resource Provider/name description @@ -38,13 +38,13 @@ scm connection - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/bundleresource + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bundleresource.impl-2.0.6 /connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/bundleresource + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bundleresource.impl-2.0.6 /developerConnection url - http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/bundleresource + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.bundleresource.impl-2.0.6 /url /scm
svn commit: r1061743 - /sling/tags/org.apache.sling.bundleresource.impl-2.0.6/
Author: cziegeler Date: Fri Jan 21 11:10:18 2011 New Revision: 1061743 URL: http://svn.apache.org/viewvc?rev=1061743view=rev Log: [maven-scm] copy for tag org.apache.sling.bundleresource.impl-2.0.6 Added: sling/tags/org.apache.sling.bundleresource.impl-2.0.6/ - copied from r1061742, sling/trunk/bundles/extensions/bundleresource/
svn commit: r1061747 - /sling/trunk/bundles/extensions/fsresource/pom.xml
Author: cziegeler Date: Fri Jan 21 11:13:41 2011 New Revision: 1061747 URL: http://svn.apache.org/viewvc?rev=1061747view=rev Log: [maven-release-plugin] prepare release org.apache.sling.fsresource-1.0.2 Modified: sling/trunk/bundles/extensions/fsresource/pom.xml Modified: sling/trunk/bundles/extensions/fsresource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/pom.xml?rev=1061747r1=1061746r2=1061747view=diff == --- sling/trunk/bundles/extensions/fsresource/pom.xml (original) +++ sling/trunk/bundles/extensions/fsresource/pom.xml Fri Jan 21 11:13:41 2011 @@ -28,7 +28,7 @@ artifactIdorg.apache.sling.fsresource/artifactId packagingbundle/packaging -version1.0.1-SNAPSHOT/version +version1.0.2/version nameApache Sling Filesystem Resource Provider/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/fsresource/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/fsresource/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.fsresource-1.0.2/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.fsresource-1.0.2/url /scm build
svn commit: r1061751 - /sling/trunk/bundles/jcr/resource/pom.xml
Author: cziegeler Date: Fri Jan 21 11:16:48 2011 New Revision: 1061751 URL: http://svn.apache.org/viewvc?rev=1061751view=rev Log: [maven-release-plugin] prepare release org.apache.sling.jcr.resource-2.0.8 Modified: sling/trunk/bundles/jcr/resource/pom.xml Modified: sling/trunk/bundles/jcr/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1061751r1=1061750r2=1061751view=diff == --- sling/trunk/bundles/jcr/resource/pom.xml (original) +++ sling/trunk/bundles/jcr/resource/pom.xml Fri Jan 21 11:16:48 2011 @@ -27,7 +27,7 @@ /parent artifactIdorg.apache.sling.jcr.resource/artifactId -version2.0.7-SNAPSHOT/version +version2.0.8/version packagingbundle/packaging nameApache Sling JCR Resource Resolver/name @@ -37,13 +37,13 @@ scm connection - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.0.8 /connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.0.8 /developerConnection url -http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.resource-2.0.8 /url /scm
svn commit: r1061752 - /sling/tags/org.apache.sling.jcr.resource-2.0.8/
Author: cziegeler Date: Fri Jan 21 11:17:02 2011 New Revision: 1061752 URL: http://svn.apache.org/viewvc?rev=1061752view=rev Log: [maven-scm] copy for tag org.apache.sling.jcr.resource-2.0.8 Added: sling/tags/org.apache.sling.jcr.resource-2.0.8/ - copied from r1061751, sling/trunk/bundles/jcr/resource/
svn commit: r1061753 - /sling/trunk/bundles/jcr/resource/pom.xml
Author: cziegeler Date: Fri Jan 21 11:17:06 2011 New Revision: 1061753 URL: http://svn.apache.org/viewvc?rev=1061753view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/jcr/resource/pom.xml Modified: sling/trunk/bundles/jcr/resource/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/pom.xml?rev=1061753r1=1061752r2=1061753view=diff == --- sling/trunk/bundles/jcr/resource/pom.xml (original) +++ sling/trunk/bundles/jcr/resource/pom.xml Fri Jan 21 11:17:06 2011 @@ -27,7 +27,7 @@ /parent artifactIdorg.apache.sling.jcr.resource/artifactId -version2.0.8/version +version2.0.9-SNAPSHOT/version packagingbundle/packaging nameApache Sling JCR Resource Resolver/name @@ -37,13 +37,13 @@ scm connection - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.0.8 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource /connection developerConnection - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.resource-2.0.8 + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/resource /developerConnection url - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.resource-2.0.8 +http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource /url /scm
svn commit: r1061777 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Fri Jan 21 12:08:16 2011 New Revision: 1061777 URL: http://svn.apache.org/viewvc?rev=1061777view=rev Log: Use recent snapshots and remove groovy support which we will not ship with sling6 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=1061777r1=1061776r2=1061777view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Fri Jan 21 12:08:16 2011 @@ -111,7 +111,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.jcr.resource/artifactId -version2.0.7-SNAPSHOT/version +version2.0.9-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId @@ -126,12 +126,12 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.bundleresource.impl/artifactId -version2.0.5-SNAPSHOT/version +version2.0.7-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.fsresource/artifactId -version1.0.1-SNAPSHOT/version +version1.0.3-SNAPSHOT/version /bundle !-- Launchpad initial content -- @@ -258,11 +258,6 @@ /bundle bundle groupIdorg.apache.sling/groupId -artifactIdorg.apache.sling.extensions.groovy/artifactId -version1.0.0-SNAPSHOT/version -/bundle -bundle -groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.extensions.explorer/artifactId version1.0.0/version /bundle
svn commit: r1061795 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: OsgiInstallerImpl.java SortingServiceTracker.java
Author: cziegeler
Date: Fri Jan 21 12:57:17 2011
New Revision: 1061795
URL: http://svn.apache.org/viewvc?rev=1061795view=rev
Log:
SLING-1943 : Sort services (transformer and factories) by service ranking
before invoking
Added:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
(with props)
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1061795r1=1061794r2=1061795view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Fri Jan 21 12:57:17 2011
@@ -48,9 +48,6 @@ import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
-import org.osgi.framework.ServiceReference;
-import org.osgi.util.tracker.ServiceTracker;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +62,7 @@ import org.slf4j.LoggerFactory;
*/
public class OsgiInstallerImpl
extends Thread
-implements BundleListener, FrameworkListener, OsgiInstaller,
ServiceTrackerCustomizer {
+implements BundleListener, FrameworkListener, OsgiInstaller {
/** The logger */
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -95,10 +92,10 @@ public class OsgiInstallerImpl
private PersistentResourceList persistentList;
/** A tracker for the factories. */
-private ServiceTracker factoryTracker;
+private SortingServiceTrackerInstallTaskFactory factoryTracker;
/** A tracker for the transformers. */
-private ServiceTracker transformerTracker;
+private SortingServiceTrackerResourceTransformer transformerTracker;
/** New resources lock. */
private final Object resourcesLock = new Object();
@@ -146,9 +143,9 @@ public class OsgiInstallerImpl
*/
private void init() {
// start service trackers
-this.factoryTracker = new ServiceTracker(ctx,
InstallTaskFactory.class.getName(), this);
+this.factoryTracker = new
SortingServiceTrackerInstallTaskFactory(ctx,
InstallTaskFactory.class.getName(), this);
this.factoryTracker.open();
-this.transformerTracker = new ServiceTracker(ctx,
ResourceTransformer.class.getName(), this);
+this.transformerTracker = new
SortingServiceTrackerResourceTransformer(ctx,
ResourceTransformer.class.getName(), this);
this.transformerTracker.open();
// listen to framework and bundle events
@@ -449,7 +446,7 @@ public class OsgiInstallerImpl
}
// Walk the list of entities, and create appropriate OSGi tasks for
each group
-final Object[] services = this.factoryTracker.getServices();
+final InstallTaskFactory[] services =
this.factoryTracker.getSortedServices();
if ( services != null services.length 0 ) {
for(final String entityId : this.persistentList.getEntityIds()) {
final EntityResourceList group =
this.persistentList.getEntityResourceList(entityId);
@@ -470,13 +467,13 @@ public class OsgiInstallerImpl
/**
* Get the task for the resource.
*/
-private InstallTask getTask(final Object[] services,
+private InstallTask getTask(final InstallTaskFactory[] services,
final TaskResourceGroup rrg) {
InstallTask result = null;
for(int i=0; iservices.length; i++) {
-if ( services[i] instanceof InstallTaskFactory ) {
-final InstallTaskFactory factory =
(InstallTaskFactory)services[i];
+final InstallTaskFactory factory = services[i];
+if ( factory != null ) {
result = factory.createTask(rrg);
if ( result != null ) {
break;
@@ -545,7 +542,7 @@ public class OsgiInstallerImpl
private void transformResources() {
boolean changed = false;
-final Object[] services = this.transformerTracker.getServices();
+final ResourceTransformer[] services =
this.transformerTracker.getSortedServices();
if ( services != null services.length 0 ) {
// Walk the list of unknown resources and invoke all transformers
@@ -555,8 +552,8 @@ public class OsgiInstallerImpl
while ( index unknownList.size() ) {
final RegisteredResource resource = unknownList.get(index
svn commit: r1062151 - /sling/trunk/installer/it/pom.xml
Author: cziegeler Date: Sat Jan 22 13:11:58 2011 New Revision: 1062151 URL: http://svn.apache.org/viewvc?rev=1062151view=rev Log: Correct dependency to latest core snapshot Modified: sling/trunk/installer/it/pom.xml Modified: sling/trunk/installer/it/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/pom.xml?rev=1062151r1=1062150r2=1062151view=diff == --- sling/trunk/installer/it/pom.xml (original) +++ sling/trunk/installer/it/pom.xml Sat Jan 22 13:11:58 2011 @@ -404,7 +404,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.installer.core/artifactId -version3.0.1-SNAPSHOT/version +version3.1.1-SNAPSHOT/version scopeprovided/scope /dependency dependency
svn commit: r1062156 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks: BundleStartTask.java BundleUpdateTask.java
Author: cziegeler
Date: Sat Jan 22 13:55:57 2011
New Revision: 1062156
URL: http://svn.apache.org/viewvc?rev=1062156view=rev
Log:
SLING-1948 : Improve support for fragment bundles
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java?rev=1062156r1=1062155r2=1062156view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleStartTask.java
Sat Jan 22 13:55:57 2011
@@ -84,10 +84,9 @@ public class BundleStartTask extends Abs
if ( b.getState() == Bundle.STARTING isLazyActivatian(b) ) {
return true;
}
- /*
if ( b.getHeaders().get(Constants.FRAGMENT_HOST) != null ) {
return true;
- }*/
+ }
return false;
}
/**
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java?rev=1062156r1=1062155r2=1062156view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java
Sat Jan 22 13:55:57 2011
@@ -79,13 +79,13 @@ public class BundleUpdateTask extends Ab
ctx.log(Updated bundle {} from resource {}, b, getResource());
if (reactivate) {
- // if ( isSystemBundleFragment(b) ) {
- // this.setFinishedState(ResourceState.INSTALLED);
- // ctx.addTaskToCurrentCycle(new
SystemBundleUpdateTask(null, creator));
- // } else {
+if ( isSystemBundleFragment(b) ) {
+this.setFinishedState(ResourceState.INSTALLED);
+ctx.addTaskToCurrentCycle(new SystemBundleUpdateTask(null,
creator));
+} else {
this.getResource().setAttribute(BundleTaskCreator.ATTR_START, true);
ctx.addTaskToCurrentCycle(new
BundleStartTask(this.getResourceGroup(), b.getBundleId(), this.creator));
- // }
+}
} else {
this.setFinishedState(ResourceState.INSTALLED);
}
svn commit: r1062193 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java
Author: cziegeler
Date: Sat Jan 22 16:48:27 2011
New Revision: 1062193
URL: http://svn.apache.org/viewvc?rev=1062193view=rev
Log:
SLING-1950 : Parameters are not removed from symbolic name
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java?rev=1062193r1=1062192r2=1062193view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/Util.java
Sat Jan 22 16:48:27 2011
@@ -105,8 +105,10 @@ public class Util {
if (sn != null) {
final String v =
m.getMainAttributes().getValue(Constants.BUNDLE_VERSION);
if (v != null) {
+final int paramPos = sn.indexOf(';');
+final String symbolicName = (paramPos == -1 ? sn :
sn.substring(0, paramPos));
final BundleHeaders headers = new BundleHeaders();
-headers.symbolicName = sn;
+headers.symbolicName = symbolicName;
headers.version = v.toString();
// check for activation policy
svn commit: r1062205 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: OsgiInstallerImpl.java RegisteredResourceImpl.java SortingServiceTracker.java
Author: cziegeler
Date: Sat Jan 22 17:12:36 2011
New Revision: 1062205
URL: http://svn.apache.org/viewvc?rev=1062205view=rev
Log:
SLING-1946 : Transformer should only be invoked once on an untransformed
resource
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1062205r1=1062204r2=1062205view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Sat Jan 22 17:12:36 2011
@@ -47,8 +47,10 @@ import org.apache.sling.installer.api.ta
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
+import org.osgi.framework.Constants;
import org.osgi.framework.FrameworkEvent;
import org.osgi.framework.FrameworkListener;
+import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -542,30 +544,42 @@ public class OsgiInstallerImpl
private void transformResources() {
boolean changed = false;
-final ListResourceTransformer services =
this.transformerTracker.getSortedServices();
+final ListServiceReference serviceRefs =
this.transformerTracker.getSortedServiceReferences();
-if ( services.size() 0 ) {
+if ( serviceRefs.size() 0 ) {
// Walk the list of unknown resources and invoke all transformers
int index = 0;
final ListRegisteredResource unknownList =
this.persistentList.getUntransformedResources();
while ( index unknownList.size() ) {
final RegisteredResource resource = unknownList.get(index);
-for(final ResourceTransformer transformer : services) {
-try {
-final TransformationResult[] result =
transformer.transform(resource);
-if ( logger.isDebugEnabled() ) {
-logger.debug(Invoked transformer {} on {} : {},
-new Object[] {transformer, resource,
Arrays.toString(result)});
-}
-if ( result != null result.length 0 ) {
-this.persistentList.transform(resource, result);
-changed = true;
-index--;
-break;
+for(final ServiceReference reference : serviceRefs) {
+final Long id =
(Long)reference.getProperty(Constants.SERVICE_ID);
+// check if this transformer has already been invoked for
the resource
+final String transformers =
(String)((RegisteredResourceImpl)resource).getAttribute(ResourceTransformer.class.getName());
+if ( id == null ||
+ (transformers != null transformers.contains(: +
id + ':'))) {
+continue;
+}
+final ResourceTransformer transformer =
(ResourceTransformer) this.transformerTracker.getService(reference);
+if ( transformer != null ) {
+try {
+final TransformationResult[] result =
transformer.transform(resource);
+final String newTransformers = (transformers ==
null ? : + id + ':' : transformers + id + ':');
+
((RegisteredResourceImpl)resource).setAttribute(ResourceTransformer.class.getName(),
newTransformers);
+if ( logger.isDebugEnabled() ) {
+logger.debug(Invoked transformer {} on {} :
{},
+new Object[] {transformer, resource,
Arrays.toString(result)});
+}
+if ( result != null result.length 0 ) {
+this.persistentList.transform(resource,
result);
+changed = true;
+index--;
+break;
+}
+} catch (final Throwable t) {
+logger.error(Uncaught exception during resource
transformation!, t
svn commit: r1062666 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: OsgiInstallerImpl.java SortingServiceTracker.java
Author: cziegeler
Date: Mon Jan 24 07:35:45 2011
New Revision: 1062666
URL: http://svn.apache.org/viewvc?rev=1062666view=rev
Log:
SLING-1943 : Sort services (transformer and factories) by service ranking
before invoking
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1062666r1=1062665r2=1062666view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java
Mon Jan 24 07:35:45 2011
@@ -543,7 +543,6 @@ public class OsgiInstallerImpl
*/
private void transformResources() {
boolean changed = false;
-
final ListServiceReference serviceRefs =
this.transformerTracker.getSortedServiceReferences();
if ( serviceRefs.size() 0 ) {
Modified:
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java?rev=1062666r1=1062665r2=1062666view=diff
==
---
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
(original)
+++
sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/SortingServiceTracker.java
Mon Jan 24 07:35:45 2011
@@ -122,7 +122,7 @@ public class SortingServiceTrackerT
Arrays.sort(references);
this.sortedReferences = new ArrayListServiceReference();
for(int i=0;ireferences.length;i++) {
-this.sortedReferences.add(references[i]);
+this.sortedReferences.add(references[references.length - 1
- i]);
}
}
}
svn commit: r1062737 - /sling/trunk/bundles/engine/pom.xml
Author: cziegeler Date: Mon Jan 24 11:38:59 2011 New Revision: 1062737 URL: http://svn.apache.org/viewvc?rev=1062737view=rev Log: [maven-release-plugin] prepare release org.apache.sling.engine-2.2.0 Modified: sling/trunk/bundles/engine/pom.xml Modified: sling/trunk/bundles/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/pom.xml?rev=1062737r1=1062736r2=1062737view=diff == --- sling/trunk/bundles/engine/pom.xml (original) +++ sling/trunk/bundles/engine/pom.xml Mon Jan 24 11:38:59 2011 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.engine/artifactId packagingbundle/packaging -version2.1.1-SNAPSHOT/version +version2.2.0/version nameApache Sling Engine Implementation/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/engine/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/engine/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/sling/engine/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.engine-2.2.0/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.engine-2.2.0/developerConnection + urlscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.engine-2.2.0/url /scm properties
svn commit: r1062738 - /sling/tags/org.apache.sling.engine-2.2.0/
Author: cziegeler Date: Mon Jan 24 11:39:12 2011 New Revision: 1062738 URL: http://svn.apache.org/viewvc?rev=1062738view=rev Log: [maven-scm] copy for tag org.apache.sling.engine-2.2.0 Added: sling/tags/org.apache.sling.engine-2.2.0/ - copied from r1062737, sling/trunk/bundles/engine/
svn commit: r1062749 - /sling/trunk/launchpad/builder/src/main/bundles/list.xml
Author: cziegeler Date: Mon Jan 24 12:28:13 2011 New Revision: 1062749 URL: http://svn.apache.org/viewvc?rev=1062749view=rev Log: Use latest snapshot 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=1062749r1=1062748r2=1062749view=diff == --- sling/trunk/launchpad/builder/src/main/bundles/list.xml (original) +++ sling/trunk/launchpad/builder/src/main/bundles/list.xml Mon Jan 24 12:28:13 2011 @@ -66,7 +66,7 @@ bundle groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.engine/artifactId -version2.1.1-SNAPSHOT/version +version2.2.1-SNAPSHOT/version /bundle bundle groupIdorg.apache.sling/groupId
svn commit: r1062752 - in /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl: BootstrapInstaller.java DeploymentPackageInstaller.java
Author: cziegeler
Date: Mon Jan 24 12:31:49 2011
New Revision: 1062752
URL: http://svn.apache.org/viewvc?rev=1062752view=rev
Log:
SLING-1952 : Remove support for deployment packages
Removed:
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/DeploymentPackageInstaller.java
Modified:
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
Modified:
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java?rev=1062752r1=1062751r2=1062752view=diff
==
---
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
(original)
+++
sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
Mon Jan 24 12:31:49 2011
@@ -216,21 +216,7 @@ class BootstrapInstaller implements Bund
}
if (shouldInstall) {
-// only run the deployment package stuff and war/jar copies when
this war/jar is new/changed
-
-// register deployment package support
-try {
-final DeploymentPackageInstaller dpi = new
DeploymentPackageInstaller(
-context, logger, resourceProvider);
-context.addFrameworkListener(dpi);
-context.addServiceListener(dpi, ( + Constants.OBJECTCLASS
-+ = + DeploymentPackageInstaller.DEPLOYMENT_ADMIN + ));
-} catch (Throwable t) {
-logger.log(
-Logger.LOG_WARNING,
-Cannot register Deployment Admin support, continuing
without,
-t);
-}
+// only run the war/jar copies when this war/jar is new/changed
// see if the loading of bundles from the package is disabled
String dpblString =
context.getProperty(SharedConstants.DISABLE_PACKAGE_BUNDLE_LOADING);
