svn commit: r1700999 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Thu Sep 3 11:50:41 2015 New Revision: 1700999 URL: http://svn.apache.org/r1700999 Log: releng: updated dependencies post-release Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1700999=1700998=1700999=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Thu Sep 3 11:50:41 2015 @@ -58,7 +58,7 @@ org.apache.sling/org.apache.sling.resourceresolver/1.2.6 org.apache.sling/org.apache.sling.scripting.api/2.1.8 org.apache.sling/org.apache.sling.scripting.core/2.0.34 -org.apache.sling/org.apache.sling.scripting.javascript/2.0.23-SNAPSHOT +org.apache.sling/org.apache.sling.scripting.javascript/2.0.25-SNAPSHOT org.apache.sling/org.apache.sling.scripting.jsp/2.1.7-SNAPSHOT org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.5-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly/1.0.5-SNAPSHOT
svn commit: r1700997 - /sling/tags/org.apache.sling.scripting.javascript-2.0.24/
Author: radu Date: Thu Sep 3 11:43:22 2015 New Revision: 1700997 URL: http://svn.apache.org/r1700997 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.javascript-2.0.24 Added: sling/tags/org.apache.sling.scripting.javascript-2.0.24/ - copied from r1700996, sling/trunk/bundles/scripting/javascript/
svn commit: r1700996 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Thu Sep 3 11:43:08 2015 New Revision: 1700996 URL: http://svn.apache.org/r1700996 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.javascript-2.0.24 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=1700996=1700995=1700996=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Sep 3 11:43:08 2015 @@ -29,16 +29,16 @@ org.apache.sling.scripting.javascript -2.0.23-SNAPSHOT +2.0.24 bundle Apache Sling Scripting JavaScript Support Support for JavaScript scripting - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript - http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.24
svn commit: r1700998 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Thu Sep 3 11:43:24 2015 New Revision: 1700998 URL: http://svn.apache.org/r1700998 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=1700998=1700997=1700998=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Thu Sep 3 11:43:24 2015 @@ -29,16 +29,16 @@ org.apache.sling.scripting.javascript -2.0.24 +2.0.25-SNAPSHOT bundle Apache Sling Scripting JavaScript Support Support for JavaScript scripting - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.24 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.24 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/javascript + http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript
svn commit: r1700813 - /sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
Author: radu
Date: Wed Sep 2 13:33:49 2015
New Revision: 1700813
URL: http://svn.apache.org/r1700813
Log:
SLING-4754 - Improve error message if referenced resource type is not available
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java?rev=1700813=1700812=1700813=diff
==
---
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
(original)
+++
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
Wed Sep 2 13:33:49 2015
@@ -130,6 +130,7 @@ public class UnitLoader {
scriptSource =
IOUtils.toString(scriptResource.adaptTo(InputStream.class), encoding);
return obtainResultSource(scriptSource, identifier, bindings,
renderContext);
}
+throw new SightlyException("Cannot find template " +
identifier.getResource().getPath() + " in the repository.");
} catch (SightlyParsingException e) {
String offendingInput = e.getOffendingInput();
if (StringUtils.isNotEmpty(offendingInput)) {
@@ -141,9 +142,8 @@ public class UnitLoader {
throw e;
}
} catch (IOException e) {
-throw new SightlyException(e);
+throw new SightlyException("Unable to read the contents of " +
identifier.getResource().getPath(), e);
}
-throw new SightlyException("Unable to generate Java class for template
" + identifier.getResource().getPath());
}
private String obtainResultSource(String scriptSource, SourceIdentifier
identifier, Bindings bindings, RenderContextImpl renderContext) {
svn commit: r1700816 - in /sling/trunk/bundles/scripting/sightly: engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/ testing-content/src/main/java/org/apache/sling/scri
Author: radu
Date: Wed Sep 2 13:52:34 2015
New Revision: 1700816
URL: http://svn.apache.org/r1700816
Log:
SLING-4554 - Support for OSGi-services in data-sly-use
* if the resolved class is an OSGi service return the service's instance
Added:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/TestService.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/impl/
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/impl/TestServiceImpl.java
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/use/use.html
sling/trunk/bundles/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java?rev=1700816=1700815=1700816=diff
==
---
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
(original)
+++
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
Wed Sep 2 13:52:34 2015
@@ -89,6 +89,11 @@ public class JavaUseProvider implements
Object result;
try {
Class cls =
classLoaderWriter.getClassLoader().loadClass(identifier);
+// attempt OSGi service load
+result = sling.getService(cls);
+if (result != null) {
+return ProviderOutcome.success(result);
+}
result = resource.adaptTo(cls);
if (result == null) {
result = request.adaptTo(cls);
Added:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/TestService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/TestService.java?rev=1700816=auto
==
---
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/TestService.java
(added)
+++
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/TestService.java
Wed Sep 2 13:52:34 2015
@@ -0,0 +1,23 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
**/
+package org.apache.sling.scripting.sightly.testing.use;
+
+public interface TestService {
+
+String sayHello();
+
+}
Added:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/impl/TestServiceImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/impl/TestServiceImpl.java?rev=1700816=auto
==
---
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/impl/TestServiceImpl.java
(added)
+++
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/impl/TestServiceImpl.java
Wed Sep 2 13:52:3
svn commit: r1700821 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Wed Sep 2 14:01:22 2015 New Revision: 1700821 URL: http://svn.apache.org/r1700821 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.js.provider-1.0.10 Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1700821=1700820=1700821=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Wed Sep 2 14:01:22 2015 @@ -33,7 +33,7 @@ org.apache.sling.scripting.sightly.js.provider -1.0.9-SNAPSHOT +1.0.10 bundle Apache Sling Scripting Sightly JavaScript Use Provider @@ -43,9 +43,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider - http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10 + http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10
svn commit: r1700823 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Wed Sep 2 14:01:39 2015 New Revision: 1700823 URL: http://svn.apache.org/r1700823 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1700823=1700822=1700823=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Wed Sep 2 14:01:39 2015 @@ -33,7 +33,7 @@ org.apache.sling.scripting.sightly.js.provider -1.0.10 +1.0.11-SNAPSHOT bundle Apache Sling Scripting Sightly JavaScript Use Provider @@ -43,9 +43,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10 - http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider + http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider
svn commit: r1700822 - /sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10/
Author: radu Date: Wed Sep 2 14:01:36 2015 New Revision: 1700822 URL: http://svn.apache.org/r1700822 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.js.provider-1.0.10 Added: sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.10/ - copied from r1700821, sling/trunk/bundles/scripting/sightly/js-use-provider/
svn commit: r1700826 - /sling/trunk/bundles/scripting/sightly/engine/pom.xml
Author: radu Date: Wed Sep 2 14:08:32 2015 New Revision: 1700826 URL: http://svn.apache.org/r1700826 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.sightly-1.0.4 Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1700826=1700825=1700826=diff == --- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Wed Sep 2 14:08:32 2015 @@ -26,14 +26,14 @@ org.apache.sling sling 24 - + org.apache.sling.scripting.sightly -1.0.3-SNAPSHOT +1.0.4 bundle Apache Sling Scripting Sightly Engine @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine - http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.4 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.4 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly-1.0.4
svn commit: r1700827 - /sling/tags/org.apache.sling.scripting.sightly-1.0.4/
Author: radu Date: Wed Sep 2 14:08:46 2015 New Revision: 1700827 URL: http://svn.apache.org/r1700827 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly-1.0.4 Added: sling/tags/org.apache.sling.scripting.sightly-1.0.4/ - copied from r1700826, sling/trunk/bundles/scripting/sightly/engine/
svn commit: r1700810 - in /sling/trunk/bundles/scripting/sightly: js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/ testing-content/src/main/resources/SLING-INF/apps/sightly/sc
Author: radu
Date: Wed Sep 2 13:21:42 2015
New Revision: 1700810
URL: http://svn.apache.org/r1700810
Log:
SLING-4989 - The JavaScript Use Provider fails to correctly load script using
inheritance
* made sure that an included script can successfully call an inherited script
Added:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/notoverlaid.html
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/notoverlaid.js
Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java
sling/trunk/bundles/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/SlingSpecificsSightlyIT.java
Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java?rev=1700810=1700809=1700810=diff
==
---
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java
(original)
+++
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java
Wed Sep 2 13:21:42 2015
@@ -61,7 +61,7 @@ public class Utils {
}
}
if (scriptResource == null) {
-throw new SightlyException("Required script resource could not be
located: " + path);
+throw new SightlyException("Required script resource could not be
located: " + path + ". The caller is " + caller.getPath());
}
return scriptResource;
}
@@ -81,6 +81,9 @@ public class Utils {
String parentResourceType = resourceA.getResourceType();
if ("nt:file".equals(parentResourceType)) {
parentResourceType =
ResourceUtil.getParent(resourceA.getPath());
+if (parentResourceType.equals(resourceB.getPath())) {
+return true;
+}
}
Resource parentB = resolver.getResource(resourceBSuperType);
while (parentB != null && !"/".equals(parentB.getPath()) &&
StringUtils.isNotEmpty(resourceBSuperType)) {
Added:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/notoverlaid.html
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/notoverlaid.html?rev=1700810=auto
==
---
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/notoverlaid.html
(added)
+++
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/child/notoverlaid.html
Wed Sep 2 13:21:42 2015
@@ -0,0 +1,17 @@
+
+${notoverlaid.message}
\ No newline at end of file
Added:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/notoverlaid.js
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/notoverlaid.js?rev=1700810=auto
==
---
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/notoverlaid.js
(added)
+++
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightly/scripts/useinheritance/grandparent/notoverlaid.js
Wed Sep 2 13:21:42 2015
@@ -0,0 +1,23 @@
+/***
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either e
svn commit: r1700828 - /sling/trunk/bundles/scripting/sightly/engine/pom.xml
Author: radu Date: Wed Sep 2 14:08:49 2015 New Revision: 1700828 URL: http://svn.apache.org/r1700828 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml Modified: sling/trunk/bundles/scripting/sightly/engine/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/pom.xml?rev=1700828=1700827=1700828=diff == --- sling/trunk/bundles/scripting/sightly/engine/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/engine/pom.xml Wed Sep 2 14:08:49 2015 @@ -33,7 +33,7 @@ org.apache.sling.scripting.sightly -1.0.4 +1.0.5-SNAPSHOT bundle Apache Sling Scripting Sightly Engine @@ -44,9 +44,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.4 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly-1.0.4 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.sightly-1.0.4 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/engine + http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine
svn commit: r1700229 - in /sling/trunk/bundles/scripting/sightly: engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/ engine/src/main/java/org/apache/sling/scripting/sightly/impl/en
Author: radu
Date: Mon Aug 31 10:55:07 2015
New Revision: 1700229
URL: http://svn.apache.org/r1700229
Log:
SLING-4977 - Optimise the SightlyJavaCompilerService to provide objects faster
* changed the implementation of the UnitChangeMonitor so that repository POJOs
are stored by class name instead of path
* delayed repository reads in SightlyJavaCompilerService#getInstance
* added tests for Java POJOs stored in bundles and the repository
Added:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/UnitChangeMonitor.java
- copied, changed from r1700222,
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/Utils.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/
sling/trunk/bundles/scripting/sightly/testing-content/src/main/java/org/apache/sling/scripting/sightly/testing/use/Test.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-java-pojo-bundle.html
- copied, changed from r1700222,
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-java.html
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-java-pojo-repo.html
- copied, changed from r1700222,
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-java.html
Removed:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitChangeMonitor.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-java.html
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyScriptEngineFactory.java
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/extension/use/JavaUseProvider.java
sling/trunk/bundles/scripting/sightly/engine/src/test/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerServiceTest.java
sling/trunk/bundles/scripting/sightly/testing-content/pom.xml
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/Test.java
sling/trunk/bundles/scripting/sightly/testing/pom.xml
sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt
sling/trunk/bundles/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/performance/PerformanceIT.java
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java?rev=1700229=1700228=1700229=diff
==
---
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
(original)
+++
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
Mon Aug 31 10:55:07 2015
@@ -48,7 +48,6 @@ import org.apache.sling.commons.compiler
import org.apache.sling.scripting.sightly.ResourceResolution;
import org.apache.sling.scripting.sightly.SightlyException;
import
org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration;
-import org.apache.sling.scripting.sightly.impl.engine.UnitChangeMonitor;
import org.apache.sling.scripting.sightly.impl.engine.UnitLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,50 +95,48 @@ public class SightlyJavaCompilerService
* @return object instance of the requested class
* @throws CompilerException in case of any runtime exception
*/
-public Object getInstance(ResourceResolver resolver, Resource
callingScript, String className) {
+public Object getInstance(ResourceResolver resolver, Resource
callingScript, String className, boolean pojoHint) {
if (className.contains(".")) {
-String pojoPath = getPathFromJavaName(resolver,
svn commit: r1700251 - in /sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl: compiler/SightlyJavaCompilerService.java engine/UnitLoader.java engine/co
Author: radu
Date: Mon Aug 31 14:02:44 2015
New Revision: 1700251
URL: http://svn.apache.org/r1700251
Log:
SLING-4980 - Improve locking in the SightlyJavaCompilerService
* switched to a lock downgrading implementation in compileSource, since only
compilation was affected
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/UnitLoader.java
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/compiled/SourceIdentifier.java
Modified:
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java?rev=1700251=1700250=1700251=diff
==
---
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
(original)
+++
sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/compiler/SightlyJavaCompilerService.java
Mon Aug 31 14:02:44 2015
@@ -49,6 +49,7 @@ import org.apache.sling.scripting.sightl
import org.apache.sling.scripting.sightly.SightlyException;
import
org.apache.sling.scripting.sightly.impl.engine.SightlyEngineConfiguration;
import org.apache.sling.scripting.sightly.impl.engine.UnitLoader;
+import
org.apache.sling.scripting.sightly.impl.engine.compiled.SourceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -124,19 +125,6 @@ public class SightlyJavaCompilerService
throw new SightlyException("Cannot find class " + className + ".");
}
-private Object compileRepositoryJavaClass(ResourceResolver resolver,
String className) {
-String pojoPath = getPathFromJavaName(resolver, className);
-Resource pojoResource = resolver.getResource(pojoPath);
-if (pojoResource != null) {
-try {
-return
compileSource(IOUtils.toString(pojoResource.adaptTo(InputStream.class),
"UTF-8"), className);
-} catch (IOException e) {
-throw new SightlyException(String.format("Unable to compile
class %s from %s.", className, pojoPath), e);
-}
-}
-throw new SightlyException("Cannot find a a file corresponding to
class " + className + " in the repository.");
-}
-
/**
* Compiles a class using the passed fully qualified class name and its
source code.
*
@@ -145,37 +133,74 @@ public class SightlyJavaCompilerService
* @return object instance of the class to compile
* @throws CompilerException in case of any runtime exception
*/
-public Object compileSource(String sourceCode, String fqcn) {
+public Object compileSource(SourceIdentifier sourceIdentifier, String
sourceCode, String fqcn) {
+boolean downgradedLock = false;
writeLock.lock();
try {
-if (sightlyEngineConfiguration.isDevMode()) {
-String path = "/" + fqcn.replaceAll("\\.", "/") + ".java";
-OutputStream os = classLoaderWriter.getOutputStream(path);
-IOUtils.write(sourceCode, os, "UTF-8");
-IOUtils.closeQuietly(os);
-}
-CompilationUnit compilationUnit = new
SightlyCompilationUnit(sourceCode, fqcn);
-
-long start = System.currentTimeMillis();
-CompilationResult compilationResult = javaCompiler.compile(new
CompilationUnit[]{compilationUnit}, options);
-long end = System.currentTimeMillis();
-List errors = compilationResult.getErrors();
-if (errors != null && errors.size() > 0) {
-throw new
CompilerException(CompilerException.CompilerExceptionCause.COMPILER_ERRORS,
createErrorMsg(errors));
-}
-if (LOG.isDebugEnabled()) {
-LOG.debug("script compiled: {}",
compilationResult.didCompile());
-LOG.debug("compilation took {}ms", end - start);
-}
-/**
- * the class loader might have become dirty, so let the {@link
ClassLoaderWriter} decide which class loader to return
- */
-return
classLoaderWriter.getClassLoader().loadClass(fqcn).newInstance();
+if (sourceIdentifier != null) {
+if (sourceIdentifier.needsUpdate()) {
+return internalCompileSource(sourceCode, fqcn);
+
svn commit: r1697513 - in /sling/trunk/bundles/scripting/sightly: js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/ js-use-provider/src/main/java/org/apache/sling/scripting/sig
Author: radu
Date: Mon Aug 24 22:57:39 2015
New Revision: 1697513
URL: http://svn.apache.org/r1697513
Log:
SLING-4964 - Deprecate the asynchronous JavaScript API provided by the Sightly
JS Use Provider
* proxy objects are used to load the async namespaces on first usage for a Use
script
* created a new JS performance test for purely synchronous code
Added:
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/ProxyAsyncScriptableFactory.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-js-async.html
- copied, changed from r1697427,
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-js.html
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-js-sync.html
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/test-async.js
- copied, changed from r1697427,
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/test.js
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/test-sync.js
Removed:
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/sly-js.html
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/test/test.js
Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/Utils.java
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/use/DependencyResolver.java
sling/trunk/bundles/scripting/sightly/testing-content/src/main/resources/SLING-INF/apps/sightlyperf/loop/loop.jsp
sling/trunk/bundles/scripting/sightly/testing/src/test/java/org/apache/sling/scripting/sightly/it/performance/PerformanceIT.java
Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java?rev=1697513r1=1697512r2=1697513view=diff
==
---
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
(original)
+++
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsEnvironment.java
Mon Aug 24 22:57:39 2015
@@ -30,14 +30,8 @@ import javax.script.SimpleBindings;
import javax.script.SimpleScriptContext;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.sling.api.resource.Resource;
-import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.api.resource.ResourceUtil;
-import org.apache.sling.api.scripting.SlingBindings;
-import org.apache.sling.api.scripting.SlingScriptHelper;
import org.apache.sling.scripting.core.ScriptNameAwareReader;
-import org.apache.sling.scripting.sightly.ResourceResolution;
import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.js.impl.async.AsyncContainer;
import
org.apache.sling.scripting.sightly.js.impl.async.TimingBindingsValuesProvider;
@@ -80,31 +74,6 @@ public class JsEnvironment {
Context.exit();
}
-/**
- * Run a Js script at a given path
- * @param caller the resource of the script that invokes the Js code
- * @param path the path to the JS script
- * @param globalBindings the global bindings for the script
- * @param arguments the arguments from the use-plugin
- * @param callback callback that will receive the result of the script
- */
-public void run(Resource caller, String path, Bindings globalBindings,
Bindings arguments, UnaryCallback callback) {
-Resource scriptResource = caller.getChild(path);
-SlingScriptHelper scriptHelper = (SlingScriptHelper)
globalBindings.get(SlingBindings.SLING);
-Resource componentCaller =
ResourceResolution.getResourceForRequest(caller.getResourceResolver(),
scriptHelper.getRequest());
-if (scriptResource == null
svn commit: r1696258 - in /sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting: ./ javascript/ javascript/wrapper/ wrapper/
Author: radu Date: Mon Aug 17 12:13:59 2015 New Revision: 1696258 URL: http://svn.apache.org/r1696258 Log: trivial: reorganised test packages Added: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java - copied, changed from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java - copied, changed from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableNodeTest.java - copied, changed from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResourceTest.java - copied, changed from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableVersionTest.java - copied, changed from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java Removed: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableNodeTest.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableVersionTest.java Modified: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java Copied: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java (from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java) URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.javap1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.javar1=1696254r2=1696258rev=1696258view=diff == --- sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/RepositoryScriptingTestBase.java (original) +++ sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/RepositoryScriptingTestBase.java Mon Aug 17 12:13:59 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.scripting; +package org.apache.sling.scripting.javascript; import javax.jcr.Node; import javax.jcr.RepositoryException; Copied: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java (from r1696254, sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java) URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java?p2=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.javap1=sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.javar1=1696254r2=1696258rev=1696258view=diff == --- sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/TestSetupTest.java (original) +++ sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/TestSetupTest.java Mon Aug 17 12:13:59 2015 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.sling.scripting; +package org.apache.sling.scripting.javascript; import org.apache.sling.scripting.javascript.internal.ScriptEngineHelper; Modified: sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting
svn commit: r1696259 - /sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java
Author: radu Date: Mon Aug 17 12:20:18 2015 New Revision: 1696259 URL: http://svn.apache.org/r1696259 Log: SLING-4693 - Write Sightly generated classes' source code to disk when the scripting engine is in dev mode * updated description for the OSGi org.apache.sling.scripting.sightly.devmode configuration property Modified: sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java Modified: sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java?rev=1696259r1=1696258r2=1696259view=diff == --- sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java (original) +++ sling/trunk/bundles/scripting/sightly/engine/src/main/java/org/apache/sling/scripting/sightly/impl/engine/SightlyEngineConfiguration.java Mon Aug 17 12:20:18 2015 @@ -46,7 +46,9 @@ import org.osgi.service.component.Compon name = SightlyEngineConfiguration.SCR_PROP_NAME_DEVMODE, boolValue = SightlyEngineConfiguration.SCR_PROP_DEFAULT_DEVMODE, label = Development Mode, -description = If enabled, Sightly components will be recompiled at every request instead of loading objects from memory. Also this will give out the Java classes' source via the ClassLoaderWriter. +description = If enabled, Sightly components will be recompiled at every request instead of loading objects from memory. + + This will also write the generated Java classes' source code for Sightly templates through the ClassLoaderWriter + +service. ), @Property( name = SightlyEngineConfiguration.SCR_PROP_NAME_ENCODING,
svn commit: r1696254 - in /sling/trunk/bundles/scripting/javascript/src: main/java/org/apache/sling/scripting/javascript/internal/ main/java/org/apache/sling/scripting/javascript/wrapper/ test/java/or
Author: radu
Date: Mon Aug 17 12:08:51 2015
New Revision: 1696254
URL: http://svn.apache.org/r1696254
Log:
SLING-4953 - Enhance the JavaScript API provided by the
org.apache.sling.scripting.javascript bundle
* added a wrapper for Map objects so that Map keys are mapped as object
properties for the JavaScript object
representing the map
* added a 'properties' property for Javascript objects representing resources
Added:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMapTest.java
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/wrapper/ScriptableResourceTest.java
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java?rev=1696254r1=1696253r2=1696254view=diff
==
---
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java
Mon Aug 17 12:08:51 2015
@@ -42,6 +42,7 @@ import org.apache.sling.scripting.javasc
import org.apache.sling.scripting.javascript.helper.SlingWrapFactory;
import org.apache.sling.scripting.javascript.wrapper.ScriptableCalendar;
import org.apache.sling.scripting.javascript.wrapper.ScriptableItemMap;
+import org.apache.sling.scripting.javascript.wrapper.ScriptableMap;
import org.apache.sling.scripting.javascript.wrapper.ScriptableNode;
import org.apache.sling.scripting.javascript.wrapper.ScriptablePrintWriter;
import org.apache.sling.scripting.javascript.wrapper.ScriptableProperty;
@@ -99,7 +100,7 @@ public class RhinoJavaScriptEngineFactor
ScriptableResource.class, ScriptableNode.class,
ScriptableProperty.class, ScriptableItemMap.class,
ScriptablePrintWriter.class, ScriptableVersionHistory.class,
-ScriptableVersion.class, ScriptableCalendar.class
+ScriptableVersion.class, ScriptableCalendar.class,
ScriptableMap.class
};
/**
Added:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java?rev=1696254view=auto
==
---
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
(added)
+++
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableMap.java
Mon Aug 17 12:08:51 2015
@@ -0,0 +1,88 @@
+/*
+ * 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.scripting.javascript.wrapper;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.sling.scripting.javascript.SlingWrapper;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.Undefined;
+
+/**
+ * The {@code ScriptableMap} wrapper provides easier access to a map's values
by setting the map's keys as properties to the JavaScript
+ * object representing the {@link Map}.
+ */
+public class ScriptableMap extends ScriptableBase implements SlingWrapper {
+
+public static final
svn commit: r961728 - /websites/production/sling/content/
Author: radu Date: Thu Aug 13 14:36:55 2015 New Revision: 961728 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r961727, websites/staging/sling/trunk/content/
svn commit: r1695718 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml
Author: radu Date: Thu Aug 13 14:35:57 2015 New Revision: 1695718 URL: http://svn.apache.org/r1695718 Log: Added Apache Sling Scripting Core 2.0.34, Apache Sling Scripting JavaScript 2.0.22 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1695718r1=1695717r2=1695718view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Aug 13 14:35:57 2015 @@ -132,9 +132,9 @@ Sample Integration Tests|org.apache.slin Sample Server-Side Tests|org.apache.sling.testing.samples.sampletests|1.0.6 Scripting API|org.apache.sling.scripting.api|2.1.8 Scripting Console|org.apache.sling.scripting.console|1.0.0 -Scripting Core|org.apache.sling.scripting.core|2.0.32 +Scripting Core|org.apache.sling.scripting.core|2.0.34 Scripting Java|org.apache.sling.scripting.java|2.0.12 -Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.20 +Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.22 Scripting JSP|org.apache.sling.scripting.jsp|2.1.6 Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.4 Scripting JST|org.apache.sling.scripting.jst|2.0.6 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1695718r1=1695717r2=1695718view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Aug 13 14:35:57 2015 @@ -1,5 +1,6 @@ Title: News +* New Releases: Apache Sling Scripting Core 2.0.34, Apache Sling Scripting JavaScript 2.0.22 (August 13th, 2015) * New Release: Apache Sling i18n 2.4.4 (August 13th, 2015) * New Releases: Apache Sling Commons Log 4.0.6 (August 11th, 2015) * New Releases: Apache Sling Slingstart Maven Plugin 1.3.0, and Apache Sling Provisioning Model 1.3.0 (August 7th, 2015) Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1695718r1=1695717r2=1695718view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Thu Aug 13 14:35:57 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150803015247.441' +repository name='Apache Sling Release Repository' lastmodified='20150813043528.616' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -6483,6 +6483,50 @@ require name='package' filter='(amp;(package=org.slf4j)(versiongt;=1.5.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.slf4j;version=[1.5,2)/require require name='ee' filter='(|(ee=JavaSE-1.6))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=JavaSE-1.6))/require /resource + resource id='org.apache.sling.scripting.core/2.0.34' symbolicname='org.apache.sling.scripting.core' presentationname='Apache Sling Scripting Core implementation' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.core-2.0.34.jar' version='2.0.34' +descriptionSling Scripting core functionality/description +size82469/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.scripting.core'/ + p n='presentationname' v='Apache Sling Scripting Core implementation'/ + p n='version' t='version' v='2.0.34'/ + p n='manifestversion' v='2'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.core'/ + p n='version' t='version' v='2.1.0'/ + p n='uses:' v='org.apache.sling.api,org.apache.sling.api.request,org.apache.sling.api.resource,org.apache.sling.api.scripting,org.apache.sling.scripting.api,org.osgi.framework'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.core.servlet'/ + p n='version' t='version' v='1.0.0'/ + p n='uses:' v='javax.servlet,javax.servlet.http'/ +/capability
svn commit: r1695726 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml
Author: radu Date: Thu Aug 13 15:32:39 2015 New Revision: 1695726 URL: http://svn.apache.org/r1695726 Log: Added Apache Sling Scripting Sightly JS Use Provider 1.0.8 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1695726r1=1695725r2=1695726view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Thu Aug 13 15:32:39 2015 @@ -140,7 +140,7 @@ Scripting JSP Taglib|org.apache.sling.sc Scripting JST|org.apache.sling.scripting.jst|2.0.6 Scripting Groovy|org.apache.sling.scripting.groovy|1.0.0 Scripting Sightly|org.apache.sling.scripting.sightly|1.0.2 -Scripting Sightly JavaScript Use Provider|org.apache.sling.scripting.sightly.js.provider|1.0.6 +Scripting Sightly JavaScript Use Provider|org.apache.sling.scripting.sightly.js.provider|1.0.8 Scripting Sightly REPL|org.apache.sling.scripting.sightly.repl|1.0.0 Scripting Thymeleaf|org.apache.sling.scripting.thymeleaf|0.0.6 Security|org.apache.sling.security|1.0.10 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1695726r1=1695725r2=1695726view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Thu Aug 13 15:32:39 2015 @@ -1,6 +1,6 @@ Title: News -* New Releases: Apache Sling Scripting Core 2.0.34, Apache Sling Scripting JavaScript 2.0.22 (August 13th, 2015) +* New Releases: Apache Sling Scripting Core 2.0.34, Apache Sling Scripting JavaScript 2.0.22, Apache Sling Scripting Sightly JS Use Provider 1.0.8 (August 13th, 2015) * New Release: Apache Sling i18n 2.4.4 (August 13th, 2015) * New Releases: Apache Sling Commons Log 4.0.6 (August 11th, 2015) * New Releases: Apache Sling Slingstart Maven Plugin 1.3.0, and Apache Sling Provisioning Model 1.3.0 (August 7th, 2015) Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1695726r1=1695725r2=1695726view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Thu Aug 13 15:32:39 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150813043528.616' +repository name='Apache Sling Release Repository' lastmodified='20150813053144.342' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -7689,6 +7689,36 @@ require name='package' filter='(amp;(package=org.osgi.service.component)(versiongt;=1.0.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.osgi.service.component;version=[1.0,2)/require require name='package' filter='(amp;(package=org.slf4j)(versiongt;=1.5.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.slf4j;version=[1.5,2)/require require name='ee' filter='(|(ee=JavaSE-1.6))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=JavaSE-1.6))/require + /resource + resource id='org.apache.sling.scripting.sightly.js.provider/1.0.8' symbolicname='org.apache.sling.scripting.sightly.js.provider' presentationname='Apache Sling Scripting Sightly JavaScript Use Provider' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.sightly.js.provider-1.0.8.jar' version='1.0.8' +descriptionThe Apache Sling Sightly JavaScript Use Provider adds support for accessing JS scripts from Sightlyapos;s Use-API./description +size76518/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.scripting.sightly.js.provider'/ + p n='presentationname' v='Apache Sling Scripting Sightly JavaScript Use Provider'/ + p n='version' t='version' v='1.0.8'/ + p n='manifestversion' v='2'/ +/capability +require name='package' filter='(amp;(package=javax.script))' extend='false' multiple='false' optional='false'Import package
svn commit: r961734 - /websites/production/sling/content/
Author: radu Date: Thu Aug 13 15:33:36 2015 New Revision: 961734 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r961733, websites/staging/sling/trunk/content/
svn commit: r1695096 - in /sling/trunk: bundles/scripting/sightly/testing/src/main/provisioning/model.txt launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Mon Aug 10 14:48:44 2015 New Revision: 1695096 URL: http://svn.apache.org/r1695096 Log: release: updated dependencies Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1695096r1=1695095r2=1695096view=diff == --- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original) +++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Mon Aug 10 14:48:44 2015 @@ -20,7 +20,7 @@ # Dependencies [artifacts] org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart - org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.9-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1695096r1=1695095r2=1695096view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Aug 10 14:48:44 2015 @@ -64,7 +64,7 @@ javax.mail/mail/1.4.7 org.apache.sling/org.apache.sling.xss/1.0.4 org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.9-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT org.apache.geronimo.bundles/jstl/1.2_1 org.apache.sling/org.apache.sling.models.api/1.2.0
svn commit: r1695093 - /sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/
Author: radu Date: Mon Aug 10 14:45:27 2015 New Revision: 1695093 URL: http://svn.apache.org/r1695093 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.js.provider-1.0.8 Added: sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/ - copied from r1695092, sling/trunk/bundles/scripting/sightly/js-use-provider/
svn commit: r1695090 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Mon Aug 10 14:44:23 2015 New Revision: 1695090 URL: http://svn.apache.org/r1695090 Log: SLING-4940 - Add the Sling ScriptCache configuration applied by o.a.s.s.sightly.js.provider to the provisioning model * re-added wrongly removed dependency Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1695090r1=1695089r2=1695090view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Mon Aug 10 14:44:23 2015 @@ -102,6 +102,12 @@ /dependency dependency groupIdorg.apache.sling/groupId +artifactIdorg.apache.sling.scripting.core/artifactId +version2.0.32/version +scopeprovided/scope +/dependency +dependency +groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.commons.osgi/artifactId version2.2.0/version scopeprovided/scope
svn commit: r1695092 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Mon Aug 10 14:45:14 2015 New Revision: 1695092 URL: http://svn.apache.org/r1695092 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.js.provider-1.0.8 Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1695092r1=1695091r2=1695092view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Mon Aug 10 14:45:14 2015 @@ -33,7 +33,7 @@ !-- P R O J E C T -- !-- === -- artifactIdorg.apache.sling.scripting.sightly.js.provider/artifactId -version1.0.7-SNAPSHOT/version +version1.0.8/version packagingbundle/packaging nameApache Sling Scripting Sightly JavaScript Use Provider/name @@ -43,9 +43,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/developerConnection - urlhttp://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/developerConnection + urlhttp://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/url /scm !-- === --
svn commit: r1695094 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Mon Aug 10 14:45:29 2015 New Revision: 1695094 URL: http://svn.apache.org/r1695094 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1695094r1=1695093r2=1695094view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Mon Aug 10 14:45:29 2015 @@ -33,7 +33,7 @@ !-- P R O J E C T -- !-- === -- artifactIdorg.apache.sling.scripting.sightly.js.provider/artifactId -version1.0.8/version +version1.0.9-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Sightly JavaScript Use Provider/name @@ -43,9 +43,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/developerConnection - urlhttp://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.8/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/developerConnection + urlhttp://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/url /scm !-- === --
svn commit: r1695046 - /sling/tags/org.apache.sling.scripting.core-2.0.34/
Author: radu Date: Mon Aug 10 12:32:01 2015 New Revision: 1695046 URL: http://svn.apache.org/r1695046 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.core-2.0.34 Added: sling/tags/org.apache.sling.scripting.core-2.0.34/ - copied from r1695045, sling/trunk/bundles/scripting/core/
svn commit: r1695045 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Mon Aug 10 12:31:48 2015 New Revision: 1695045 URL: http://svn.apache.org/r1695045 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.0.34 Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1695045r1=1695044r2=1695045view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Mon Aug 10 12:31:48 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.33-SNAPSHOT/version +version2.0.34/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.34/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.34/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.34/url /scm build
svn commit: r1695047 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Mon Aug 10 12:32:03 2015 New Revision: 1695047 URL: http://svn.apache.org/r1695047 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1695047r1=1695046r2=1695047view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Mon Aug 10 12:32:03 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.34/version +version2.0.35-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.34/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.34/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.34/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url /scm build
svn commit: r1695052 - in /sling/trunk: bundles/scripting/sightly/testing/src/main/provisioning/model.txt launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Mon Aug 10 12:49:18 2015 New Revision: 1695052 URL: http://svn.apache.org/r1695052 Log: release: updated dependencies Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1695052r1=1695051r2=1695052view=diff == --- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original) +++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Mon Aug 10 12:49:18 2015 @@ -20,12 +20,10 @@ # Dependencies [artifacts] org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart - org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.api/2.1.9-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.core/2.0.33-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.javascript/2.0.21-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT + # additional configuration for testing [configurations] Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1695052r1=1695051r2=1695052view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Aug 10 12:49:18 2015 @@ -56,7 +56,7 @@ org.apache.sling/org.apache.sling.fsresource/1.1.4 org.apache.sling/org.apache.sling.launchpad.content/2.0.8 org.apache.sling/org.apache.sling.scripting.api/2.1.9-SNAPSHOT -org.apache.sling/org.apache.sling.scripting.core/2.0.33-SNAPSHOT +org.apache.sling/org.apache.sling.scripting.core/2.0.35-SNAPSHOT org.apache.sling/org.apache.sling.scripting.javascript/2.0.21-SNAPSHOT org.apache.sling/org.apache.sling.scripting.jsp/2.1.6 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4
svn commit: r1695053 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Mon Aug 10 12:51:13 2015 New Revision: 1695053 URL: http://svn.apache.org/r1695053 Log: release: updated dependencies 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=1695053r1=1695052r2=1695053view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Mon Aug 10 12:51:13 2015 @@ -108,13 +108,13 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.9-SNAPSHOT/version +version2.1.8/version scopeprovided/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.31-SNAPSHOT/version +version2.0.32/version scopeprovided/scope /dependency dependency
svn commit: r1695055 - /sling/tags/org.apache.sling.scripting.javascript-2.0.22/
Author: radu Date: Mon Aug 10 12:52:08 2015 New Revision: 1695055 URL: http://svn.apache.org/r1695055 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.javascript-2.0.22 Added: sling/tags/org.apache.sling.scripting.javascript-2.0.22/ - copied from r1695054, sling/trunk/bundles/scripting/javascript/
svn commit: r1695054 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Mon Aug 10 12:51:54 2015 New Revision: 1695054 URL: http://svn.apache.org/r1695054 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.javascript-2.0.22 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=1695054r1=1695053r2=1695054view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Mon Aug 10 12:51:54 2015 @@ -29,16 +29,16 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.21-SNAPSHOT/version +version2.0.22/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.22/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.22/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.22/url /scm build
svn commit: r1695056 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Mon Aug 10 12:52:10 2015 New Revision: 1695056 URL: http://svn.apache.org/r1695056 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=1695056r1=1695055r2=1695056view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Mon Aug 10 12:52:10 2015 @@ -29,16 +29,16 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.22/version +version2.0.23-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.22/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.22/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.22/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: r1695008 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
Author: radu
Date: Mon Aug 10 10:02:16 2015
New Revision: 1695008
URL: http://svn.apache.org/r1695008
Log:
SLING-4936 - Enhance the Sling Script Cache to only cache scripts from the
search paths
* made ScriptCacheImpl#putScript to only accept scripts from the search paths
Modified:
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
Modified:
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java?rev=1695008r1=1695007r2=1695008view=diff
==
---
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
(original)
+++
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
Mon Aug 10 10:02:16 2015
@@ -109,6 +109,7 @@ public class ScriptCacheImpl implements
private ServiceRegistration eventHandlerServiceRegistration = null;
private SetString extensions = new HashSetString();
private String[] additionalExtensions = new String[]{};
+private String[] searchPaths = {};
// use a static policy so that we can reconfigure the watched script files
if the search paths are changed
@Reference(policy = ReferencePolicy.STATIC)
@@ -141,10 +142,15 @@ public class ScriptCacheImpl implements
@Override
public void putScript(CachedScript script) {
-SoftReferenceCachedScript reference = new
SoftReferenceCachedScript(script);
writeLock.lock();
try {
-internalMap.put(script.getScriptPath(), reference);
+for (String searchPath : searchPaths) {
+if (script.getScriptPath().startsWith(searchPath)) {
+SoftReferenceCachedScript reference = new
SoftReferenceCachedScript(script);
+internalMap.put(script.getScriptPath(), reference);
+break;
+}
+}
} finally {
writeLock.unlock();
}
@@ -222,6 +228,17 @@ public class ScriptCacheImpl implements
newMap.putAll(internalMap);
internalMap = newMap;
}
+ResourceResolver resolver = null;
+try {
+resolver = rrf.getAdministrativeResourceResolver(null);
+searchPaths = resolver.getSearchPath();
+} catch (LoginException e) {
+LOGGER.error(Unable to store search paths., e);
+} finally {
+if (resolver != null) {
+resolver.close();
+}
+}
configureCache();
active = true;
}
svn commit: r1695065 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Mon Aug 10 13:28:01 2015 New Revision: 1695065 URL: http://svn.apache.org/r1695065 Log: release: updated dependency Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1695065r1=1695064r2=1695065view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Aug 10 13:28:01 2015 @@ -57,7 +57,7 @@ org.apache.sling/org.apache.sling.launchpad.content/2.0.8 org.apache.sling/org.apache.sling.scripting.api/2.1.9-SNAPSHOT org.apache.sling/org.apache.sling.scripting.core/2.0.35-SNAPSHOT -org.apache.sling/org.apache.sling.scripting.javascript/2.0.21-SNAPSHOT +org.apache.sling/org.apache.sling.scripting.javascript/2.0.23-SNAPSHOT org.apache.sling/org.apache.sling.scripting.jsp/2.1.6 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4 org.apache.sling/org.apache.sling.i18n/2.4.3-SNAPSHOT
svn commit: r1695020 - /sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
Author: radu
Date: Mon Aug 10 11:23:53 2015
New Revision: 1695020
URL: http://svn.apache.org/r1695020
Log:
SLING-4935 - Rhino scripts not based on a resource will not get cached
correctly by the Sling Script Cache
* avoid caching scripts for which a name cannot be extracted from the bindings
/ script resource
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java?rev=1695020r1=1695019r2=1695020view=diff
==
---
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java
Mon Aug 10 11:23:53 2015
@@ -117,7 +117,10 @@ public class RhinoJavaScriptEngine exten
return slingCompiledScript;
}
};
-scriptCache.putScript(cachedScript);
+// SLING-4935 avoid caching scripts for which we cannot
determine a name
+if (!scriptName.equals(NO_SCRIPT_NAME)) {
+scriptCache.putScript(cachedScript);
+}
LOGGER.debug(Added {} script to Script Cache., scriptName);
return slingCompiledScript;
} catch (IOException e) {
@@ -226,13 +229,6 @@ public class RhinoJavaScriptEngine exten
@Override
public Object eval(ScriptContext scriptContext) throws ScriptException
{
Bindings bindings =
scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
-String scriptName = NO_SCRIPT_NAME;
-{
-SlingScriptHelper helper = (SlingScriptHelper)
bindings.get(SlingBindings.SLING);
-if (helper != null) {
-scriptName =
helper.getScript().getScriptResource().getPath();
-}
-}
// container for replaced properties
MapString, Object replacedProperties = null;
@@ -314,9 +310,8 @@ public class RhinoJavaScriptEngine exten
// prevent variables to be pushed back in case of errors
isTopLevelCall = false;
-
-final ScriptException se = new ScriptException(
-Failure running script + scriptName + : +
t.getMessage());
+String scriptName = getScriptName(scriptContext);
+final ScriptException se = new ScriptException(Failure
running script + scriptName + : + t.getMessage());
se.initCause(t);
throw se;
@@ -362,4 +357,17 @@ public class RhinoJavaScriptEngine exten
}
return NO_SCRIPT_NAME;
}
+
+private String getScriptName(ScriptContext scriptContext) {
+Bindings bindings =
scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
+String scriptName = (String) bindings.get(ScriptEngine.FILENAME);
+if (scriptName != null !.equals(scriptName)) {
+return scriptName;
+}
+SlingScriptHelper sling = (SlingScriptHelper)
bindings.get(SlingBindings.SLING);
+if (sling != null) {
+return sling.getScript().getScriptResource().getPath();
+}
+return NO_SCRIPT_NAME;
+}
}
svn commit: r1695078 - in /sling/trunk: bundles/scripting/sightly/js-use-provider/ bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/ launchpad/builder
Author: radu
Date: Mon Aug 10 14:09:01 2015
New Revision: 1695078
URL: http://svn.apache.org/r1695078
Log:
SLING-4940 - Add the Sling ScriptCache configuration applied by
o.a.s.s.sightly.js.provider to the provisioning model
* moved script cache configuration to provisioning model
* updated dependencies for the Sightly JS Use provider to released versions
Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1695078r1=1695077r2=1695078view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Mon Aug 10
14:09:01 2015
@@ -97,13 +97,7 @@
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.scripting.api/artifactId
-version2.1.9-SNAPSHOT/version
-scopeprovided/scope
-/dependency
-dependency
-groupIdorg.apache.sling/groupId
-artifactIdorg.apache.sling.scripting.core/artifactId
-version2.0.31-SNAPSHOT/version
+version2.1.8/version
scopeprovided/scope
/dependency
dependency
Modified:
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java?rev=1695078r1=1695077r2=1695078view=diff
==
---
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
(original)
+++
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/JsUseProvider.java
Mon Aug 10 14:09:01 2015
@@ -18,12 +18,6 @@
**/
package org.apache.sling.scripting.sightly.js.impl;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
import javax.script.Bindings;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
@@ -32,13 +26,10 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferencePolicy;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.scripting.SlingScriptHelper;
-import org.apache.sling.commons.osgi.PropertiesUtil;
-import org.apache.sling.scripting.api.ScriptCache;
import org.apache.sling.scripting.sightly.SightlyException;
import org.apache.sling.scripting.sightly.js.impl.async.AsyncContainer;
import org.apache.sling.scripting.sightly.js.impl.async.AsyncExtractor;
@@ -48,11 +39,6 @@ import org.apache.sling.scripting.sightl
import org.apache.sling.scripting.sightly.use.ProviderOutcome;
import org.apache.sling.scripting.sightly.use.UseProvider;
import org.osgi.framework.Constants;
-import org.osgi.service.cm.Configuration;
-import org.osgi.service.cm.ConfigurationAdmin;
-import org.osgi.service.component.ComponentContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Use provider for JavaScript Use-API objects.
@@ -76,10 +62,6 @@ import org.slf4j.LoggerFactory;
public class JsUseProvider implements UseProvider {
private static final String JS_ENGINE_NAME = javascript;
-private static final String SCRIPT_CACHE_PID =
org.apache.sling.scripting.core.impl.ScriptCacheImpl;
-private static final String SCRIPT_CACHE_ADDITIONAL_EXTENSIONS =
org.apache.sling.scripting.cache.additional_extensions;
-
-private static final Logger LOGGER =
LoggerFactory.getLogger(JsUseProvider.class);
private static final JsValueAdapter jsValueAdapter = new
JsValueAdapter(new AsyncExtractor());
@Reference
@@ -88,9 +70,6 @@ public class JsUseProvider implements Us
@Reference
private SlyBindingsValuesProvider slyBindingsValuesProvider = null;
-@Reference
-private ConfigurationAdmin configurationAdmin = null;
-
@Override
public ProviderOutcome provide(String identifier, RenderContext
svn commit: r960636 - /websites/production/sling/content/
Author: radu Date: Mon Aug 3 11:55:34 2015 New Revision: 960636 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r960635, websites/staging/sling/trunk/content/
svn commit: r1693882 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml
Author: radu Date: Mon Aug 3 11:55:11 2015 New Revision: 1693882 URL: http://svn.apache.org/r1693882 Log: Added Apache Sling XSS Protection API 1.0.4 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1693882r1=1693881r2=1693882view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Mon Aug 3 11:55:11 2015 @@ -168,7 +168,7 @@ Testing Tools|org.apache.sling.testing.t URL Rewriter|org.apache.sling.urlrewriter|0.0.2 Web Console Branding|org.apache.sling.extensions.webconsolebranding|1.0.0 Web Console Security Provider|org.apache.sling.extensions.webconsolesecurityprovider|1.1.4 -XSS Protection|org.apache.sling.xss|1.0.2 +XSS Protection|org.apache.sling.xss|1.0.4 # (4) Maven Plugins # This list is sorted by the title before writing the table Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1693882r1=1693881r2=1693882view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Mon Aug 3 11:55:11 2015 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling XSS Protection Bundle 1.0.4 (August 3rd, 2015) * New Release: Apache Sling Scripting Core 2.0.32 (July 26th, 2015) * New Releases: Apache Sling Event 3.7.4 and Apache Sling Distributed Event Admin 1.0.2 (July 24th, 2015) * New Releases: Apache Sling Scripting API 2.1.8, Apache Sling Scripting Core 2.0.30, Apache Sling Scripting JavaScript 2.0.20, Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1693882r1=1693881r2=1693882view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Mon Aug 3 11:55:11 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150803023500.227' +repository name='Apache Sling Release Repository' lastmodified='20150803015247.441' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector/1.0.0/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -9296,7 +9296,7 @@ require name='package' filter='(amp;(package=org.xml.sax.helpers))' extend='false' multiple='false' optional='false'Import package org.xml.sax.helpers/require require name='ee' filter='(|(ee=JavaSE-1.6))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=JavaSE-1.6))/require /resource - resource id='org.apache.sling.xss/1.0.4' symbolicname='org.apache.sling.xss' presentationname='Apache Sling XSS Protection Bundle' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.xss/1.0.4/org.apache.sling.xss-1.0.4.jar' version='1.0.4' + resource id='org.apache.sling.xss/1.0.4' symbolicname='org.apache.sling.xss' presentationname='Apache Sling XSS Protection Bundle' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.xss-1.0.4.jar' version='1.0.4' descriptionApache Sling XSS Protection Bundle providing XSS protection based on the OWASP AntiSamy and OWASP Java Encoder libraries./description size2734103/size documentationhttp://sling.apache.org/documentation
svn commit: r1693883 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Mon Aug 3 12:00:27 2015 New Revision: 1693883 URL: http://svn.apache.org/r1693883 Log: release: updated org.apache.sling.xss to 1.0.4 Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1693883r1=1693882r2=1693883view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Mon Aug 3 12:00:27 2015 @@ -62,7 +62,7 @@ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4 org.apache.sling/org.apache.sling.i18n/2.4.3-SNAPSHOT javax.mail/mail/1.4.7 -org.apache.sling/org.apache.sling.xss/1.0.5-SNAPSHOT +org.apache.sling/org.apache.sling.xss/1.0.4 org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT
svn commit: r1693302 - /sling/tags/org.apache.sling.xss-1.0.4/
Author: radu Date: Wed Jul 29 15:46:00 2015 New Revision: 1693302 URL: http://svn.apache.org/r1693302 Log: [maven-release-plugin] copy for tag org.apache.sling.xss-1.0.4 Added: sling/tags/org.apache.sling.xss-1.0.4/ - copied from r1693301, sling/trunk/bundles/extensions/xss/
svn commit: r1693303 - /sling/trunk/bundles/extensions/xss/pom.xml
Author: radu Date: Wed Jul 29 15:46:02 2015 New Revision: 1693303 URL: http://svn.apache.org/r1693303 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/extensions/xss/pom.xml Modified: sling/trunk/bundles/extensions/xss/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/pom.xml?rev=1693303r1=1693302r2=1693303view=diff == --- sling/trunk/bundles/extensions/xss/pom.xml (original) +++ sling/trunk/bundles/extensions/xss/pom.xml Wed Jul 29 15:46:02 2015 @@ -32,7 +32,7 @@ !-- === -- artifactIdorg.apache.sling.xss/artifactId packagingbundle/packaging -version1.0.4/version +version1.0.5-SNAPSHOT/version nameApache Sling XSS Protection Bundle/name description @@ -40,9 +40,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.4/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.4/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.xss-1.0.4/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/url /scm
svn commit: r1693301 - /sling/trunk/bundles/extensions/xss/pom.xml
Author: radu Date: Wed Jul 29 15:45:46 2015 New Revision: 1693301 URL: http://svn.apache.org/r1693301 Log: [maven-release-plugin] prepare release org.apache.sling.xss-1.0.4 Modified: sling/trunk/bundles/extensions/xss/pom.xml Modified: sling/trunk/bundles/extensions/xss/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/pom.xml?rev=1693301r1=1693300r2=1693301view=diff == --- sling/trunk/bundles/extensions/xss/pom.xml (original) +++ sling/trunk/bundles/extensions/xss/pom.xml Wed Jul 29 15:45:46 2015 @@ -24,7 +24,7 @@ groupIdorg.apache.sling/groupId artifactIdsling/artifactId version24/version -relativePath/ +relativePath / /parent !-- === -- @@ -32,7 +32,7 @@ !-- === -- artifactIdorg.apache.sling.xss/artifactId packagingbundle/packaging -version1.0.3-SNAPSHOT/version +version1.0.4/version nameApache Sling XSS Protection Bundle/name description @@ -40,9 +40,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/xss/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.4/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.xss-1.0.4/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.xss-1.0.4/url /scm
svn commit: r1693300 - /sling/trunk/bundles/extensions/xss/README.md
Author: radu Date: Wed Jul 29 15:45:15 2015 New Revision: 1693300 URL: http://svn.apache.org/r1693300 Log: trivial: updated README Modified: sling/trunk/bundles/extensions/xss/README.md Modified: sling/trunk/bundles/extensions/xss/README.md URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/README.md?rev=1693300r1=1693299r2=1693300view=diff == --- sling/trunk/bundles/extensions/xss/README.md (original) +++ sling/trunk/bundles/extensions/xss/README.md Wed Jul 29 15:45:15 2015 @@ -2,7 +2,7 @@ Apache Sling XSS Bundle The Apache Sling XSS Bundle provides two services for escaping and filtering XSS-prone user submitted content: -1. XSSAPI -2. XSSFilter +1. org.apache.sling.xss.XSSAPI +2. org.apache.sling.xss.XSSFilter Please check the JavaDoc of each service to find out what methods they provide.
svn commit: r1693306 - /sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Wed Jul 29 16:01:23 2015 New Revision: 1693306 URL: http://svn.apache.org/r1693306 Log: release: updated dependency Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1693306r1=1693305r2=1693306view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Wed Jul 29 16:01:23 2015 @@ -62,7 +62,7 @@ org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4 org.apache.sling/org.apache.sling.i18n/2.4.3-SNAPSHOT javax.mail/mail/1.4.7 -org.apache.sling/org.apache.sling.xss/1.0.3-SNAPSHOT +org.apache.sling/org.apache.sling.xss/1.0.5-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly/1.0.3-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT
svn commit: r1693299 - in /sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss: JSONUtil.java ProtectionContext.java XSSAPI.java XSSFilter.java impl/HtmlToHtmlContentContext.java imp
Author: radu
Date: Wed Jul 29 15:42:14 2015
New Revision: 1693299
URL: http://svn.apache.org/r1693299
Log:
trivial: corrected JavaDoc for Java 1.8
Modified:
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/JSONUtil.java
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/ProtectionContext.java
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSFilter.java
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/HtmlToHtmlContentContext.java
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/impl/PolicyHandler.java
Modified:
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/JSONUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/JSONUtil.java?rev=1693299r1=1693298r2=1693299view=diff
==
---
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/JSONUtil.java
(original)
+++
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/JSONUtil.java
Wed Jul 29 15:42:14 2015
@@ -22,7 +22,7 @@ import org.apache.sling.commons.json.io.
/**
* JSON utilities
- * p/
+ * p
* Support for handling xss protected values with JSON objects and JSON
writers.
*/
public final class JSONUtil {
Modified:
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/ProtectionContext.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/ProtectionContext.java?rev=1693299r1=1693298r2=1693299view=diff
==
---
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/ProtectionContext.java
(original)
+++
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/ProtectionContext.java
Wed Jul 29 15:42:14 2015
@@ -19,7 +19,7 @@ package org.apache.sling.xss;
/**
* This enumeration defines the context for executing XSS protection.
- * p/
+ * p
* The specified rules refer to
*
http://www.owasp.org/index.php/XSS_%28Cross_Site_Scripting%29_Prevention_Cheat_Sheet
*/
Modified:
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java?rev=1693299r1=1693298r2=1693299view=diff
==
---
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
(original)
+++
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSAPI.java
Wed Jul 29 15:42:14 2015
@@ -30,12 +30,12 @@ import aQute.bnd.annotation.ProviderType
/**
* A service providing validators and encoders for XSS protection during the
composition of HTML
* pages.
- * p/
+ * p
* Note: in general, validators are safer than encoders. Encoding only
ensures that content within
* the encoded context cannot break out of said context. It requires that
there be a context (for
* instance, a string context in Javascript), and that damage cannot be done
from within the context
* (for instance, a javascript: URL within a href attribute.
- * p/
+ * p
* When in doubt, use a validator.
*/
@ProviderType
@@ -122,8 +122,8 @@ public interface XSSAPI {
String getValidCSSColor(@Nullable String color, @Nullable String
defaultColor);
/**
- * Validate multi-line comment to be used inside a script.../script or
style.../style block. Multi-line
- * comment end block is disallowed
+ * Validate multi-line comment to be used inside a
lt;scriptgt;...lt;/scriptgt; or lt;stylegt;...lt;/stylegt; block.
Multi-line
+ * comment end block is disallowed.
*
* @param comment the comment to be used
* @param defaultCommenta default value to use if the comment is
{@code null} or not valid.
Modified:
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSFilter.java?rev=1693299r1=1693298r2=1693299view=diff
==
---
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSFilter.java
(original)
+++
sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/XSSFilter.java
Wed Jul 29 15:42:14 2015
@@ -42,7 +42,7 @@ public interface XSSFilter {
/**
* Prevents the given source string from containing XSS stuff.
- * p/
+ * p
* The default protection context is used for checking.
*
* @param src source string
@@ -62,7 +62,7 @@ public interface
svn commit: r1693280 - /sling/trunk/bundles/extensions/xss/src/main/resources/SLING-INF/content/config.xml
Author: radu Date: Wed Jul 29 14:49:58 2015 New Revision: 1693280 URL: http://svn.apache.org/r1693280 Log: SLING-4403 - XSS Configuration should allow caption tags * updated default AntiSamy configuration (patch provided by Amrit Verma; closes #62) Modified: sling/trunk/bundles/extensions/xss/src/main/resources/SLING-INF/content/config.xml Modified: sling/trunk/bundles/extensions/xss/src/main/resources/SLING-INF/content/config.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/resources/SLING-INF/content/config.xml?rev=1693280r1=1693279r2=1693280view=diff == --- sling/trunk/bundles/extensions/xss/src/main/resources/SLING-INF/content/config.xml (original) +++ sling/trunk/bundles/extensions/xss/src/main/resources/SLING-INF/content/config.xml Wed Jul 29 14:49:58 2015 @@ -926,6 +926,8 @@ http://www.w3.org/TR/html401/struct/glob !-- Table tags (tbody, thead, tfoot)-- +tag name=caption action=validate/ + tag name=thead action=validate attribute name=align/ attribute name=char/
svn commit: r1693281 - /sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/package-info.java
Author: radu Date: Wed Jul 29 14:50:01 2015 New Revision: 1693281 URL: http://svn.apache.org/r1693281 Log: SLING-4584 - Performance: XSSAPI.getValidHref should not be based on HTML filtering * corrected excessive API version increase Modified: sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/package-info.java Modified: sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/package-info.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/package-info.java?rev=1693281r1=1693280r2=1693281view=diff == --- sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/package-info.java (original) +++ sling/trunk/bundles/extensions/xss/src/main/java/org/apache/sling/xss/package-info.java Wed Jul 29 14:50:01 2015 @@ -17,9 +17,9 @@ /** * XSS Protection Service * - * @version 1.2.0 + * @version 1.1.0 */ -@Version(1.2.0) +@Version(1.1.0) package org.apache.sling.xss; import aQute.bnd.annotation.Version;
svn commit: r1692724 - in /sling/site/trunk/content: downloads.list news.mdtext
Author: radu Date: Sun Jul 26 12:36:59 2015 New Revision: 1692724 URL: http://svn.apache.org/r1692724 Log: Added Apache Sling Scripting Core 2.0.32 to News and Downloads Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1692724r1=1692723r2=1692724view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Sun Jul 26 12:36:59 2015 @@ -132,7 +132,7 @@ Sample Integration Tests|org.apache.slin Sample Server-Side Tests|org.apache.sling.testing.samples.sampletests|1.0.6 Scripting API|org.apache.sling.scripting.api|2.1.8 Scripting Console|org.apache.sling.scripting.console|1.0.0 -Scripting Core|org.apache.sling.scripting.core|2.0.30 +Scripting Core|org.apache.sling.scripting.core|2.0.32 Scripting Java|org.apache.sling.scripting.java|2.0.12 Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.20 Scripting JSP|org.apache.sling.scripting.jsp|2.1.6 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1692724r1=1692723r2=1692724view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Sun Jul 26 12:36:59 2015 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Scripting Core 2.0.32 (July 26th, 2015) * New Releases: Apache Sling Event 3.7.4 and Apache Sling Distributed Event Admin 1.0.2 (July 24th, 2015) * New Releases: Apache Sling Scripting API 2.1.8, Apache Sling Scripting Core 2.0.30, Apache Sling Scripting JavaScript 2.0.20, Apache Sling Scripting Sightly JS Use Provider 1.0.6, Apache Sling Resource Merger 1.2.10 (July 21st, 2015)
svn commit: r959642 - /websites/production/sling/content/
Author: radu Date: Sun Jul 26 12:37:20 2015 New Revision: 959642 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r959641, websites/staging/sling/trunk/content/
svn commit: r1692723 - /sling/site/trunk/content/obr/sling.xml
Author: radu Date: Sun Jul 26 12:33:46 2015 New Revision: 1692723 URL: http://svn.apache.org/r1692723 Log: Added Apache Sling Scripting Core 2.0.32 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1692723r1=1692722r2=1692723view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Sun Jul 26 12:33:46 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150721025545.054' +repository name='Apache Sling Release Repository' lastmodified='20150726023303.046' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -5637,6 +5637,50 @@ p n='manifestversion' v='2'/ /capability capability name='package' + p n='package' v='org.apache.sling.scripting.core'/ + p n='version' t='version' v='2.1.0'/ + p n='uses:' v='org.apache.sling.api,org.apache.sling.api.request,org.apache.sling.api.resource,org.apache.sling.api.scripting,org.apache.sling.scripting.api,org.osgi.framework'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.scripting.core.servlet'/ + p n='version' t='version' v='1.0.0'/ + p n='uses:' v='javax.servlet,javax.servlet.http'/ +/capability +require name='package' filter='(amp;(package=javax.script))' extend='false' multiple='false' optional='false'Import package javax.script/require +require name='package' filter='(amp;(package=javax.servlet))' extend='false' multiple='false' optional='false'Import package javax.servlet/require +require name='package' filter='(amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'Import package javax.servlet.http/require +require name='package' filter='(amp;(package=org.apache.commons.io)(versiongt;=1.4.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.commons.io;version=[1.4,2)/require +require name='package' filter='(amp;(package=org.apache.commons.lang)(versiongt;=2.4.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.commons.lang;version=[2.4,3)/require +require name='package' filter='(amp;(package=org.apache.felix.webconsole)(versiongt;=3.1.0)(!(versiongt;=4.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.felix.webconsole;version=[3.1,4)/require +require name='package' filter='(amp;(package=org.apache.sling.api)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.adapter)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.adapter;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.request)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.request;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.resource)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.resource;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.scripting)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.scripting;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.wrappers)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.wrappers;version=[2.1,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.mime)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.mime;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.threads)(versiongt;=3.1.0)(!(versiongt;=4.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.threads;version=[3.1,4)/require +require name='package' filter='(amp;(package
svn commit: r1692141 - /sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
Author: radu
Date: Tue Jul 21 15:05:41 2015
New Revision: 1692141
URL: http://svn.apache.org/r1692141
Log:
SLING-4896 - A race condition can prevent correctly disabling the EventHandler
created by the ScriptCache implementation
* made sure the eventHandlerServiceRegistration is nullified on configuration
change events
Modified:
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
Modified:
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java?rev=1692141r1=1692140r2=1692141view=diff
==
---
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
(original)
+++
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
Tue Jul 21 15:05:41 2015
@@ -233,6 +233,7 @@ public class ScriptCacheImpl implements
try {
if (eventHandlerServiceRegistration != null) {
eventHandlerServiceRegistration.unregister();
+eventHandlerServiceRegistration = null;
}
internalMap.clear();
extensions.addAll(Arrays.asList(additionalExtensions));
svn commit: r1692146 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Tue Jul 21 15:19:16 2015 New Revision: 1692146 URL: http://svn.apache.org/r1692146 Log: release: updated to released dependency Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1692146r1=1692145r2=1692146view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 21 15:19:16 2015 @@ -148,7 +148,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.9-SNAPSHOT/version +version2.1.8/version scopeprovided/scope /dependency dependency
svn commit: r1692147 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Tue Jul 21 15:19:57 2015 New Revision: 1692147 URL: http://svn.apache.org/r1692147 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.0.32 Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1692147r1=1692146r2=1692147view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 21 15:19:57 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.31-SNAPSHOT/version +version2.0.32/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.32/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.32/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.32/url /scm build
svn commit: r1692149 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Tue Jul 21 15:20:14 2015 New Revision: 1692149 URL: http://svn.apache.org/r1692149 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1692149r1=1692148r2=1692149view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 21 15:20:14 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.32/version +version2.0.33-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.32/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.32/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.32/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url /scm build
svn commit: r1692148 - /sling/tags/org.apache.sling.scripting.core-2.0.32/
Author: radu Date: Tue Jul 21 15:20:11 2015 New Revision: 1692148 URL: http://svn.apache.org/r1692148 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.core-2.0.32 Added: sling/tags/org.apache.sling.scripting.core-2.0.32/ - copied from r1692147, sling/trunk/bundles/scripting/core/
svn commit: r1692152 - in /sling/trunk: bundles/scripting/sightly/testing/src/main/provisioning/model.txt launchpad/builder/src/main/provisioning/sling.txt
Author: radu Date: Tue Jul 21 15:28:05 2015 New Revision: 1692152 URL: http://svn.apache.org/r1692152 Log: release: updated dependencies Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1692152r1=1692151r2=1692152view=diff == --- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original) +++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Tue Jul 21 15:28:05 2015 @@ -22,7 +22,7 @@ org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT org.apache.sling/org.apache.sling.scripting.api/2.1.9-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.core/2.0.31-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.core/2.0.33-SNAPSHOT org.apache.sling/org.apache.sling.scripting.javascript/2.0.21-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1692152r1=1692151r2=1692152view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Tue Jul 21 15:28:05 2015 @@ -56,7 +56,7 @@ org.apache.sling/org.apache.sling.fsresource/1.1.4 org.apache.sling/org.apache.sling.launchpad.content/2.0.8 org.apache.sling/org.apache.sling.scripting.api/2.1.9-SNAPSHOT -org.apache.sling/org.apache.sling.scripting.core/2.0.31-SNAPSHOT +org.apache.sling/org.apache.sling.scripting.core/2.0.33-SNAPSHOT org.apache.sling/org.apache.sling.scripting.javascript/2.0.21-SNAPSHOT org.apache.sling/org.apache.sling.scripting.jsp/2.1.6 org.apache.sling/org.apache.sling.scripting.jsp.taglib/2.2.4
svn commit: r959102 - /websites/production/sling/content/
Author: radu Date: Tue Jul 21 10:41:14 2015 New Revision: 959102 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r959101, websites/staging/sling/trunk/content/
svn commit: r1692080 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml
Author: radu Date: Tue Jul 21 10:26:19 2015 New Revision: 1692080 URL: http://svn.apache.org/r1692080 Log: Added Scripting API 2.1.8, Scripting Core 2.0.30, Scripting JavaScript 2.0.20, Scripting Sightly JS Use Provider 1.0.6 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1692080r1=1692079r2=1692080view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Tue Jul 21 10:26:19 2015 @@ -131,17 +131,17 @@ Rewriter|org.apache.sling.rewriter|1.0.4 Failing Server-Side Tests|org.apache.sling.testing.samples.failingtests|1.0.6 Sample Integration Tests|org.apache.sling.testing.samples.integrationtests|1.0.6 Sample Server-Side Tests|org.apache.sling.testing.samples.sampletests|1.0.6 -Scripting API|org.apache.sling.scripting.api|2.1.6 +Scripting API|org.apache.sling.scripting.api|2.1.8 Scripting Console|org.apache.sling.scripting.console|1.0.0 -Scripting Core|org.apache.sling.scripting.core|2.0.28 +Scripting Core|org.apache.sling.scripting.core|2.0.30 Scripting Java|org.apache.sling.scripting.java|2.0.12 -Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.18 +Scripting JavaScript|org.apache.sling.scripting.javascript|2.0.20 Scripting JSP|org.apache.sling.scripting.jsp|2.1.6 Scripting JSP Taglib|org.apache.sling.scripting.jsp.taglib|2.2.4 Scripting JST|org.apache.sling.scripting.jst|2.0.6 Scripting Groovy|org.apache.sling.scripting.groovy|1.0.0 Scripting Sightly|org.apache.sling.scripting.sightly|1.0.2 -Scripting Sightly JavaScript Use Provider|org.apache.sling.scripting.sightly.js.provider|1.0.4 +Scripting Sightly JavaScript Use Provider|org.apache.sling.scripting.sightly.js.provider|1.0.6 Scripting Sightly REPL|org.apache.sling.scripting.sightly.repl|1.0.0 Scripting Thymeleaf|org.apache.sling.scripting.thymeleaf|0.0.6 Security|org.apache.sling.security|1.0.10 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1692080r1=1692079r2=1692080view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Tue Jul 21 10:26:19 2015 @@ -1,5 +1,7 @@ Title: News +* New Releases: Apache Sling Scripting API 2.1.8, Apache Sling Scripting Core 2.0.30, Apache Sling Scripting JavaScript 2.0.20, +Apache Sling Scripting Sightly JS Use Provider 1.0.6 (July 21st, 2015) * New Release: Apache Sling JCR Resource 2.5.4 (July 17th, 2015) * New Release: Apache Sling Servlets GET 2.1.12 (July 17th, 2015) * New Release: Apache Sling Event 3.7.2 (July 13th, 2015) Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1692080r1=1692079r2=1692080view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Tue Jul 21 10:26:19 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150717044933.370' +repository name='Apache Sling Release Repository' lastmodified='20150721011522.967' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -5592,6 +5592,50 @@ require name='package' filter='(amp;(package=org.slf4j)(versiongt;=1.5.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.slf4j;version=[1.5,2)/require require name='ee' filter='(|(ee=JavaSE-1.6))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=JavaSE-1.6))/require /resource + resource id='org.apache.sling.scripting.core/2.0.30' symbolicname='org.apache.sling.scripting.core' presentationname='Apache Sling Scripting Core implementation' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.scripting.core-2.0.30.jar' version='2.0.30' +descriptionSling Scripting core functionality/description +size82169/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.scripting.core'/ + p n
svn commit: r959100 - /websites/production/sling/content/
Author: radu Date: Tue Jul 21 10:36:00 2015 New Revision: 959100 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r959099, websites/staging/sling/trunk/content/
svn commit: r959101 - /websites/production/sling/content/
Author: radu Date: Tue Jul 21 10:38:33 2015 New Revision: 959101 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r959100, websites/staging/sling/trunk/content/
svn commit: r1692082 - /sling/site/trunk/content/downloads.list
Author: radu Date: Tue Jul 21 10:46:32 2015 New Revision: 1692082 URL: http://svn.apache.org/r1692082 Log: CMS commit to sling by radu Modified: sling/site/trunk/content/downloads.list Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1692082r1=1692081r2=1692082view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Tue Jul 21 10:46:32 2015 @@ -1,4 +1,3 @@ -# # List of Sling downloads # This file is processed by the downloads template and view # lines starting with a hash sign and empty lines are ignored
svn commit: r1692092 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml
Author: radu Date: Tue Jul 21 12:00:15 2015 New Revision: 1692092 URL: http://svn.apache.org/r1692092 Log: Added Resource Merger 1.2.10 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1692092r1=1692091r2=1692092view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Tue Jul 21 12:00:15 2015 @@ -124,7 +124,7 @@ Provisioning Model|org.apache.sling.prov Resource Access Security|org.apache.sling.resourceaccesssecurity|1.0.0 Resource Collection|org.apache.sling.resourcecollection|1.0.0 Resource Inventory|org.apache.sling.resource.inventory|1.0.4 -Resource Merger|org.apache.sling.resourcemerger|1.2.8 +Resource Merger|org.apache.sling.resourcemerger|1.2.10 Resource Resolver|org.apache.sling.resourceresolver|1.2.2 Rewriter|org.apache.sling.rewriter|1.0.4 Failing Server-Side Tests|org.apache.sling.testing.samples.failingtests|1.0.6 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1692092r1=1692091r2=1692092view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Tue Jul 21 12:00:15 2015 @@ -1,7 +1,7 @@ Title: News * New Releases: Apache Sling Scripting API 2.1.8, Apache Sling Scripting Core 2.0.30, Apache Sling Scripting JavaScript 2.0.20, -Apache Sling Scripting Sightly JS Use Provider 1.0.6 (July 21st, 2015) +Apache Sling Scripting Sightly JS Use Provider 1.0.6, Apache Sling Resource Merger 1.2.10 (July 21st, 2015) * New Release: Apache Sling JCR Resource 2.5.4 (July 17th, 2015) * New Release: Apache Sling Servlets GET 2.1.12 (July 17th, 2015) * New Release: Apache Sling Event 3.7.2 (July 13th, 2015) Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1692092r1=1692091r2=1692092view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Tue Jul 21 12:00:15 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150721011522.967' +repository name='Apache Sling Release Repository' lastmodified='20150721025545.054' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -5141,6 +5141,38 @@ require name='package' filter='(amp;(package=org.osgi.util.tracker)(versiongt;=1.3.0)(!(versiongt;=2.0.0)))' extend='false' multiple='false' optional='false'Import package org.osgi.util.tracker;version=[1.3,2)/require require name='ee' filter='(|(ee=J2SE-1.5))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=J2SE-1.5))/require /resource + resource id='org.apache.sling.resourcemerger/1.2.10' symbolicname='org.apache.sling.resourcemerger' presentationname='Apache Sling Resource Merger' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.resourcemerger-1.2.10.jar' version='1.2.10' +descriptionThis bundle provides services to merge resources./description +size44863/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.resourcemerger'/ + p n='presentationname' v='Apache Sling Resource Merger'/ + p n='version' t='version' v='1.2.10'/ + p n='manifestversion' v='2'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.resourcemerger.api'/ + p n='version' t='version' v='1.2.0'/ + p n='uses:' v='org.apache.sling.api.resource'/ +/capability +capability name='package' + p n='package' v='org.apache.sling.resourcemerger.spi'/ + p n='version' t='version' v='1.1.0'/ + p n='uses:' v='org.apache.sling.api.resource'/ +/capability +require name='package' filter='(amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'Import package javax.servlet.http/require +require name='package' filter='(amp;(package=org.apache.sling.api.resource)(versiongt;=2.5.0)(!(versiongt;=3.0.0
svn commit: r1691572 - in /sling/trunk: bundles/scripting/core/ bundles/scripting/javascript/ bundles/scripting/sightly/js-use-provider/ bundles/scripting/sightly/testing/src/main/provisioning/ launch
Author: radu Date: Fri Jul 17 14:32:06 2015 New Revision: 1691572 URL: http://svn.apache.org/r1691572 Log: updated dependencies after release Modified: sling/trunk/bundles/scripting/core/pom.xml sling/trunk/bundles/scripting/javascript/pom.xml sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691572r1=1691571r2=1691572view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Fri Jul 17 14:32:06 2015 @@ -148,7 +148,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.8/version +version2.1.9-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/scripting/javascript/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1691572r1=1691571r2=1691572view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Fri Jul 17 14:32:06 2015 @@ -108,13 +108,13 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.8/version +version2.1.9-SNAPSHOT/version scopeprovided/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.30/version +version2.0.31-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1691572r1=1691571r2=1691572view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Fri Jul 17 14:32:06 2015 @@ -97,13 +97,13 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.8/version +version2.1.9-SNAPSHOT/version scopeprovided/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.30/version +version2.0.31-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt?rev=1691572r1=1691571r2=1691572view=diff == --- sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt (original) +++ sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt Fri Jul 17 14:32:06 2015 @@ -21,10 +21,10 @@ [artifacts] org.apache.sling/org.apache.sling.launchpad/8-SNAPSHOT/slingstart org.apache.sling/org.apache.sling.scripting.sightly.testing-content/1.0.5-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.api/2.1.7-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.core/2.0.29-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.javascript/2.0.19-SNAPSHOT - org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.5-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.api/2.1.9-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.core/2.0.31-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.javascript/2.0.21-SNAPSHOT + org.apache.sling/org.apache.sling.scripting.sightly.js.provider/1.0.7-SNAPSHOT org.apache.sling/org.apache.sling.scripting.sightly.repl/1.0.1-SNAPSHOT # additional configuration for testing Modified: sling/trunk/launchpad/builder/src/main/provisioning/sling.txt URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/builder/src/main/provisioning/sling.txt?rev=1691572r1=1691571r2=1691572view=diff == --- sling/trunk/launchpad/builder/src/main/provisioning/sling.txt (original) +++ sling/trunk/launchpad/builder/src/main/provisioning/sling.txt
svn commit: r1691574 - /sling/site/trunk/content/obr/sling.xml
Author: radu Date: Fri Jul 17 14:33:01 2015 New Revision: 1691574 URL: http://svn.apache.org/r1691574 Log: Added Apache Sling Default GET Servlets 2.1.12 Modified: sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1691574r1=1691573r2=1691574view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Fri Jul 17 14:33:01 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150702052037.052' +repository name='Apache Sling Release Repository' lastmodified='20150717042713.034' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -982,6 +982,38 @@ require name='package' filter='(amp;(package=org.xml.sax))' extend='false' multiple='false' optional='false'Import package org.xml.sax/require require name='ee' filter='(|(ee=J2SE-1.5))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=J2SE-1.5))/require /resource + resource id='org.apache.sling.servlets.get/2.1.12' symbolicname='org.apache.sling.servlets.get' presentationname='Apache Sling Default GET Servlets' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.servlets.get-2.1.12.jar' version='2.1.12' +descriptionProvides default GET servlets for HTML, Text and JSON renderingand streaming resources./description +size58216/size +documentationhttp://sling.apache.org/documentation +licensehttp://www.apache.org/licenses/LICENSE-2.0.txt/license +category id='sling'/ +capability name='bundle' + p n='symbolicname' v='org.apache.sling.servlets.get'/ + p n='presentationname' v='Apache Sling Default GET Servlets'/ + p n='version' t='version' v='2.1.12'/ + p n='manifestversion' v='2'/ +/capability +require name='package' filter='(amp;(package=javax.jcr))' extend='false' multiple='false' optional='false'Import package javax.jcr/require +require name='package' filter='(amp;(package=javax.jcr.version))' extend='false' multiple='false' optional='false'Import package javax.jcr.version/require +require name='package' filter='(amp;(package=javax.servlet))' extend='false' multiple='false' optional='false'Import package javax.servlet/require +require name='package' filter='(amp;(package=javax.servlet.http))' extend='false' multiple='false' optional='false'Import package javax.servlet.http/require +require name='package' filter='(amp;(package=org.apache.commons.lang)(versiongt;=2.4.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.commons.lang;version=[2.4,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.request)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.request;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.resource)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.resource;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.servlets)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.servlets;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.api.wrappers)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.api.wrappers;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.json)(versiongt;=2.0.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.json;version=[2.0,3)/require +require name='package' filter='(amp;(package=org.apache.sling.commons.json.io)(versiongt;=2.1.0)(!(versiongt;=3.0.0)))' extend='false' multiple='false' optional='false'Import package org.apache.sling.commons.json.io;version=[2.1,3)/require +require name='package' filter='(amp;(package
svn commit: r1691578 - /sling/site/trunk/content/news.mdtext
Author: radu Date: Fri Jul 17 14:43:33 2015 New Revision: 1691578 URL: http://svn.apache.org/r1691578 Log: CMS commit to sling by radu Modified: sling/site/trunk/content/news.mdtext Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1691578r1=1691577r2=1691578view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Jul 17 14:43:33 2015 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling Servlets GET 2.1.12 (July 17th, 2015) * New Release: Apache Sling Event 3.7.2 (July 13th, 2015) * New Release: Apache Sling Authentication Service 1.3.10 (July 13th, 2015) * New Release: Apache Sling Scripting Thymeleaf 0.0.6 (July 10th, 2015)
svn commit: r958694 - /websites/production/sling/content/
Author: radu Date: Fri Jul 17 14:44:42 2015 New Revision: 958694 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r958693, websites/staging/sling/trunk/content/
svn commit: r1691579 - /sling/site/trunk/content/downloads.list
Author: radu Date: Fri Jul 17 14:44:25 2015 New Revision: 1691579 URL: http://svn.apache.org/r1691579 Log: CMS commit to sling by radu Modified: sling/site/trunk/content/downloads.list Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1691579r1=1691578r2=1691579view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Jul 17 14:44:25 2015 @@ -147,7 +147,7 @@ Scripting Thymeleaf|org.apache.sling.scr Security|org.apache.sling.security|1.0.10 Service User Mapper|org.apache.sling.serviceusermapper|1.2.0 Servlets Compat|org.apache.sling.servlets.compat|1.0.2 -Servlets Get|org.apache.sling.servlets.get|2.1.8 +Servlets Get|org.apache.sling.servlets.get|2.1.12 Servlets Post|org.apache.sling.servlets.post|2.3.8 Servlets Resolver|org.apache.sling.servlets.resolver|2.3.6 Settings|org.apache.sling.settings|1.3.6
svn commit: r1691550 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Fri Jul 17 12:40:21 2015 New Revision: 1691550 URL: http://svn.apache.org/r1691550 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.sightly.js.provider-1.0.6 Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1691550r1=1691549r2=1691550view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Fri Jul 17 12:40:21 2015 @@ -33,7 +33,7 @@ !-- P R O J E C T -- !-- === -- artifactIdorg.apache.sling.scripting.sightly.js.provider/artifactId -version1.0.5-SNAPSHOT/version +version1.0.6/version packagingbundle/packaging nameApache Sling Scripting Sightly JavaScript Use Provider/name @@ -43,9 +43,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/developerConnection - urlhttp://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/developerConnection + urlhttp://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/url /scm !-- === --
svn commit: r1691552 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Fri Jul 17 12:40:37 2015 New Revision: 1691552 URL: http://svn.apache.org/r1691552 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1691552r1=1691551r2=1691552view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Fri Jul 17 12:40:37 2015 @@ -33,7 +33,7 @@ !-- P R O J E C T -- !-- === -- artifactIdorg.apache.sling.scripting.sightly.js.provider/artifactId -version1.0.6/version +version1.0.7-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Sightly JavaScript Use Provider/name @@ -43,9 +43,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/developerConnection - urlhttp://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/developerConnection + urlhttp://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/sightly/js-use-provider/url /scm !-- === --
svn commit: r1691544 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Fri Jul 17 12:29:43 2015 New Revision: 1691544 URL: http://svn.apache.org/r1691544 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691544r1=1691543r2=1691544view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Fri Jul 17 12:29:43 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.30/version +version2.0.31-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.30/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.30/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.30/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url /scm build
svn commit: r1691542 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Fri Jul 17 12:29:28 2015 New Revision: 1691542 URL: http://svn.apache.org/r1691542 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.core-2.0.30 Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691542r1=1691541r2=1691542view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Fri Jul 17 12:29:28 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.29-SNAPSHOT/version +version2.0.30/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -43,9 +43,9 @@ /properties scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.30/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.core-2.0.30/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.core-2.0.30/url /scm build
svn commit: r1691543 - /sling/tags/org.apache.sling.scripting.core-2.0.30/
Author: radu Date: Fri Jul 17 12:29:41 2015 New Revision: 1691543 URL: http://svn.apache.org/r1691543 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.core-2.0.30 Added: sling/tags/org.apache.sling.scripting.core-2.0.30/ - copied from r1691542, sling/trunk/bundles/scripting/core/
svn commit: r1691540 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu Date: Fri Jul 17 12:28:46 2015 New Revision: 1691540 URL: http://svn.apache.org/r1691540 Log: release: update dependency Modified: sling/trunk/bundles/scripting/core/pom.xml Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691540r1=1691539r2=1691540view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Fri Jul 17 12:28:46 2015 @@ -148,7 +148,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.7-SNAPSHOT/version +version2.1.8/version scopeprovided/scope /dependency dependency
svn commit: r1691545 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Fri Jul 17 12:33:06 2015 New Revision: 1691545 URL: http://svn.apache.org/r1691545 Log: release: updated dependencies 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=1691545r1=1691544r2=1691545view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Fri Jul 17 12:33:06 2015 @@ -108,13 +108,13 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.7-SNAPSHOT/version +version2.1.8/version scopeprovided/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.29-SNAPSHOT/version +version2.0.30/version scopeprovided/scope /dependency dependency
svn commit: r1691525 - /sling/tags/org.apache.sling.scripting.api-2.1.8/
Author: radu Date: Fri Jul 17 11:53:00 2015 New Revision: 1691525 URL: http://svn.apache.org/r1691525 Log: rollback release Removed: sling/tags/org.apache.sling.scripting.api-2.1.8/
svn commit: r1691527 - /sling/tags/org.apache.sling.scripting.javascript-2.0.20/
Author: radu Date: Fri Jul 17 11:53:47 2015 New Revision: 1691527 URL: http://svn.apache.org/r1691527 Log: rollback release Removed: sling/tags/org.apache.sling.scripting.javascript-2.0.20/
svn commit: r1691526 - /sling/tags/org.apache.sling.scripting.core-2.0.30/
Author: radu Date: Fri Jul 17 11:53:25 2015 New Revision: 1691526 URL: http://svn.apache.org/r1691526 Log: rollback release Removed: sling/tags/org.apache.sling.scripting.core-2.0.30/
svn commit: r1691528 - /sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/
Author: radu Date: Fri Jul 17 11:54:08 2015 New Revision: 1691528 URL: http://svn.apache.org/r1691528 Log: rollback release Removed: sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/
svn commit: r1691529 - in /sling/trunk: bundles/scripting/api/ bundles/scripting/core/ bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/ bundles/scripting/javascript/ bundles/
Author: radu Date: Fri Jul 17 12:03:03 2015 New Revision: 1691529 URL: http://svn.apache.org/r1691529 Log: revert release for Scripting API 2.1.8, Scripting Core 2.0.30, Scripting JavaScript 2.0.20, Scripting Sightly JS Use Provider 1.0.6 Modified: sling/trunk/bundles/scripting/api/pom.xml sling/trunk/bundles/scripting/core/pom.xml sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java sling/trunk/bundles/scripting/javascript/pom.xml sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml sling/trunk/bundles/scripting/sightly/testing/src/main/provisioning/model.txt sling/trunk/launchpad/builder/src/main/provisioning/sling.txt Modified: sling/trunk/bundles/scripting/api/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1691529r1=1691528r2=1691529view=diff == --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Fri Jul 17 12:03:03 2015 @@ -29,7 +29,7 @@ /parent artifactIdorg.apache.sling.scripting.api/artifactId - version2.1.9-SNAPSHOT/version + version2.1.7-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Implementation API/name Modified: sling/trunk/bundles/scripting/core/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691529r1=1691528r2=1691529view=diff == --- sling/trunk/bundles/scripting/core/pom.xml (original) +++ sling/trunk/bundles/scripting/core/pom.xml Fri Jul 17 12:03:03 2015 @@ -28,7 +28,7 @@ /parent artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.31-SNAPSHOT/version +version2.0.29-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Core implementation/name @@ -136,7 +136,7 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.9-SNAPSHOT/version +version2.1.7-SNAPSHOT/version scopeprovided/scope /dependency dependency Modified: sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java?rev=1691529r1=1691528r2=1691529view=diff == --- sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java (original) +++ sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java Fri Jul 17 12:03:03 2015 @@ -86,7 +86,7 @@ public class BindingsValuesProvidersByCo mavenBundle(org.apache.felix, org.apache.felix.eventadmin, 1.3.2), mavenBundle(org.apache.felix, org.apache.felix.webconsole, 3.1.8), -mavenBundle(org.apache.sling, org.apache.sling.scripting.api, 2.1.9-SNAPSHOT), +mavenBundle(org.apache.sling, org.apache.sling.scripting.api, 2.1.7-SNAPSHOT), mavenBundle(org.apache.sling, org.apache.sling.commons.threads, 3.1.0), mavenBundle(org.apache.sling, org.apache.sling.api, 2.4.2), mavenBundle(org.apache.sling, org.apache.sling.commons.mime, 2.1.4), Modified: sling/trunk/bundles/scripting/javascript/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1691529r1=1691528r2=1691529view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Fri Jul 17 12:03:03 2015 @@ -29,7 +29,7 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.21-SNAPSHOT/version +version2.0.19-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting JavaScript Support/name @@ -108,13 +108,13 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.9-SNAPSHOT/version +version2.1.7-SNAPSHOT/version scopeprovided/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.31-SNAPSHOT/version +version2.0.29-SNAPSHOT/version scopeprovided/scope /dependency
svn commit: r1691537 - /sling/tags/org.apache.sling.scripting.api-2.1.8/
Author: radu Date: Fri Jul 17 12:26:36 2015 New Revision: 1691537 URL: http://svn.apache.org/r1691537 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.api-2.1.8 Added: sling/tags/org.apache.sling.scripting.api-2.1.8/ - copied from r1691536, sling/trunk/bundles/scripting/api/
svn commit: r1691538 - /sling/trunk/bundles/scripting/api/pom.xml
Author: radu Date: Fri Jul 17 12:26:38 2015 New Revision: 1691538 URL: http://svn.apache.org/r1691538 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=1691538r1=1691537r2=1691538view=diff == --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Fri Jul 17 12:26:38 2015 @@ -29,17 +29,17 @@ /parent artifactIdorg.apache.sling.scripting.api/artifactId - version2.1.8/version + version2.1.9-SNAPSHOT/version packagingbundle/packaging nameApache Sling Scripting Implementation API/name descriptionThis bundle provides the internal API to implement scripting./description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.8/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.8 + 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/tags/org.apache.sling.scripting.api-2.1.8/url +urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/url /scm build
svn commit: r1691536 - /sling/trunk/bundles/scripting/api/pom.xml
Author: radu Date: Fri Jul 17 12:26:22 2015 New Revision: 1691536 URL: http://svn.apache.org/r1691536 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.api-2.1.8 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=1691536r1=1691535r2=1691536view=diff == --- sling/trunk/bundles/scripting/api/pom.xml (original) +++ sling/trunk/bundles/scripting/api/pom.xml Fri Jul 17 12:26:22 2015 @@ -29,17 +29,17 @@ /parent artifactIdorg.apache.sling.scripting.api/artifactId - version2.1.7-SNAPSHOT/version + version2.1.8/version packagingbundle/packaging nameApache Sling Scripting Implementation API/name descriptionThis bundle provides the internal API to implement scripting./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 + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.8/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.api-2.1.8 /developerConnection -urlhttp://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/url + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.api-2.1.8/url /scm build
svn commit: r1691548 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Fri Jul 17 12:34:17 2015 New Revision: 1691548 URL: http://svn.apache.org/r1691548 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=1691548r1=1691547r2=1691548view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Fri Jul 17 12:34:17 2015 @@ -29,16 +29,16 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.20/version +version2.0.21-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.20/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.20/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.20/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: r1691546 - /sling/trunk/bundles/scripting/javascript/pom.xml
Author: radu Date: Fri Jul 17 12:34:02 2015 New Revision: 1691546 URL: http://svn.apache.org/r1691546 Log: [maven-release-plugin] prepare release org.apache.sling.scripting.javascript-2.0.20 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=1691546r1=1691545r2=1691546view=diff == --- sling/trunk/bundles/scripting/javascript/pom.xml (original) +++ sling/trunk/bundles/scripting/javascript/pom.xml Fri Jul 17 12:34:02 2015 @@ -29,16 +29,16 @@ /parent artifactIdorg.apache.sling.scripting.javascript/artifactId -version2.0.19-SNAPSHOT/version +version2.0.20/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.20/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.scripting.javascript-2.0.20/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.scripting.javascript-2.0.20/url /scm build
svn commit: r1691547 - /sling/tags/org.apache.sling.scripting.javascript-2.0.20/
Author: radu Date: Fri Jul 17 12:34:15 2015 New Revision: 1691547 URL: http://svn.apache.org/r1691547 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.javascript-2.0.20 Added: sling/tags/org.apache.sling.scripting.javascript-2.0.20/ - copied from r1691546, sling/trunk/bundles/scripting/javascript/
svn commit: r1691549 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml
Author: radu Date: Fri Jul 17 12:39:48 2015 New Revision: 1691549 URL: http://svn.apache.org/r1691549 Log: release: updated dependencies Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Modified: sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml?rev=1691549r1=1691548r2=1691549view=diff == --- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original) +++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Fri Jul 17 12:39:48 2015 @@ -97,13 +97,13 @@ dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.api/artifactId -version2.1.7-SNAPSHOT/version +version2.1.8/version scopeprovided/scope /dependency dependency groupIdorg.apache.sling/groupId artifactIdorg.apache.sling.scripting.core/artifactId -version2.0.29-SNAPSHOT/version +version2.0.30/version scopeprovided/scope /dependency dependency
svn commit: r1691551 - /sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/
Author: radu Date: Fri Jul 17 12:40:35 2015 New Revision: 1691551 URL: http://svn.apache.org/r1691551 Log: [maven-release-plugin] copy for tag org.apache.sling.scripting.sightly.js.provider-1.0.6 Added: sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/ - copied from r1691550, sling/trunk/bundles/scripting/sightly/js-use-provider/
svn commit: r1691584 - in /sling/site/trunk/content: downloads.list news.mdtext obr/sling.xml
Author: radu Date: Fri Jul 17 14:57:24 2015 New Revision: 1691584 URL: http://svn.apache.org/r1691584 Log: Added JCR Resource 2.5.4 Modified: sling/site/trunk/content/downloads.list sling/site/trunk/content/news.mdtext sling/site/trunk/content/obr/sling.xml Modified: sling/site/trunk/content/downloads.list URL: http://svn.apache.org/viewvc/sling/site/trunk/content/downloads.list?rev=1691584r1=1691583r2=1691584view=diff == --- sling/site/trunk/content/downloads.list (original) +++ sling/site/trunk/content/downloads.list Fri Jul 17 14:57:24 2015 @@ -97,7 +97,7 @@ JCR Jackrabbit Server|org.apache.sling.j JCR Jackrabbit UserManager|org.apache.sling.jcr.jackrabbit.usermanager|2.2.2 JCR Prefs|org.apache.sling.jcr.prefs|1.0.0 JCR Registration|org.apache.sling.jcr.registration|1.0.2 -JCR Resource|org.apache.sling.jcr.resource|2.5.2 +JCR Resource|org.apache.sling.jcr.resource|2.5.4 JCR Resource Security|org.apache.sling.jcr.resourcesecurity|1.0.2 JCR Web Console Plugin|org.apache.sling.jcr.webconsole|1.0.2 JXM Resource Provider|org.apache.sling.jmx.provider|1.0.2 Modified: sling/site/trunk/content/news.mdtext URL: http://svn.apache.org/viewvc/sling/site/trunk/content/news.mdtext?rev=1691584r1=1691583r2=1691584view=diff == --- sling/site/trunk/content/news.mdtext (original) +++ sling/site/trunk/content/news.mdtext Fri Jul 17 14:57:24 2015 @@ -1,5 +1,6 @@ Title: News +* New Release: Apache Sling JCR Resource 2.5.4 (July 17th, 2015) * New Release: Apache Sling Servlets GET 2.1.12 (July 17th, 2015) * New Release: Apache Sling Event 3.7.2 (July 13th, 2015) * New Release: Apache Sling Authentication Service 1.3.10 (July 13th, 2015) @@ -167,7 +168,7 @@ Title: News * New Releases: Apache Sling Launchpad Base 2.5.0, and Apache Sling Script Console 1.0.0 (March 4th, 2013) * New Releases: Apache Sling JCR Classloader 3.1.2, Apache Sling Commons Testing 2.0.14, Apache Sling JUnit Core 1.0.8, Apache Sling JUnit Remote 1.0.8, Apache Sling JUnit Scriptable 1.0.8, Apache Sling Testing Tools 1.0.6 (February 18th, 2013) * New Releases: Apache Sling Installer Core 3.4.6, Apache Sling Installer Configuration Factory 1.0.10, Apache Sling JCR Instaler 3.1.6, Apache Sling Parent 15, Apache Sling Fragment Extension XML 1.0.2, Apache Sling Fragment Extension WS 1.0.2, Apache Sling Fragment Extension Activation 1.0.2 (February 18th, 2013) -* New Releases: Apache Sling Resource Resolver 1.0.4, Apache Sling JCR Resource 2.2.4 (February 14, 2013) +* New Releases: Apache Sling Resource Resolver 1.0.4, Apache Sling JCR Resource 2.2.4 (February 14, 2013) * New Releases: Apache Sling Installer Core 3.4.4, Apache Sling JCR Resource 2.2.2, Apache Sling Resource Resolver 1.0.2, Apache Sling Security 1.0.2, Apache Sling Parent POM 14 (December 20th, 2012) * New Release: Apache Sling Servlet Resolver 2.2.2 (December 10th, 2012) * New Releases: Apache Sling Settings 1.2.2, Apache Sling Auth Core 1.1.0, Apache Sling Commons Logservice 1.0.2, Apache Sling Installer Core 3.4.2, Apache Sling Scripting JSP 2.0.26, Apache Sling Commons Compiler 2.1.0, Apache Sling JCR Compiler 2.1.0, Apache Sling I18n 2.2.4, Apache Sling JCR Classloader 3.1.10, Apache Sling JCR Webdav 2.1.2, Apache Sling JCR Davex 1.1.0 (November 30th, 2012) Modified: sling/site/trunk/content/obr/sling.xml URL: http://svn.apache.org/viewvc/sling/site/trunk/content/obr/sling.xml?rev=1691584r1=1691583r2=1691584view=diff == --- sling/site/trunk/content/obr/sling.xml (original) +++ sling/site/trunk/content/obr/sling.xml Fri Jul 17 14:57:24 2015 @@ -1,4 +1,4 @@ -repository name='Apache Sling Release Repository' lastmodified='20150717042713.034' +repository name='Apache Sling Release Repository' lastmodified='20150717044933.370' resource id='org.apache.sling.extensions.classloader-leak-detector/1.0.0' symbolicname='org.apache.sling.extensions.classloader-leak-detector' presentationname='Adobe Sling ClassLoader Leak Detector' uri='http://repo1.maven.org/maven2/org/apache/sling/org.apache.sling.extensions.classloader-leak-detector-1.0.0.jar' version='1.0.0' descriptionProvides a web console configuration printer to provide details around classloader leaks/description size18203/size @@ -3520,6 +3520,53 @@ require name='package' filter='(amp;(package=javax.annotation))' extend='false' multiple='false' optional='true'Import package javax.annotation;resolution:=optional/require require name='ee' filter='(|(ee=J2SE-1.5))' extend='false' multiple='false' optional='false'Execution Environment (|(ee=J2SE-1.5))/require /resource + resource id='org.apache.sling.jcr.resource/2.5.4' symbolicname='org.apache.sling.jcr.resource' presentationname='Apache Sling JCR Resource Resolver' uri='http
svn commit: r958698 - /websites/production/sling/content/
Author: radu Date: Fri Jul 17 15:00:39 2015 New Revision: 958698 Log: Publishing svnmucc operation to sling site by radu Added: websites/production/sling/content/ - copied from r958697, websites/staging/sling/trunk/content/
svn commit: r1691152 - in /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger: api/ResourceMergerService.java impl/MergedValueMap.java
Author: radu
Date: Wed Jul 15 09:49:39 2015
New Revision: 1691152
URL: http://svn.apache.org/r1691152
Log:
trivial: updated JavaDoc to comply with Java 1.8
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java?rev=1691152r1=1691151r2=1691152view=diff
==
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/api/ResourceMergerService.java
Wed Jul 15 09:49:39 2015
@@ -35,7 +35,7 @@ public interface ResourceMergerService {
*
* @param relativePath The relative path
* @return Returns the merged resource path
- * @throw IllegalArgumentException if relativePath is codenull/code or
absolute
+ * @throws IllegalArgumentException if relativePath is codenull/code
or absolute
*/
String getMergedResourcePath(String relativePath);
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java?rev=1691152r1=1691151r2=1691152view=diff
==
---
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
(original)
+++
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedValueMap.java
Wed Jul 15 09:49:39 2015
@@ -47,7 +47,7 @@ public class MergedValueMap extends Valu
/**
* Constructor
*
- * @param resource The merged resource to get properties from
+ * @param valueMaps a list of value maps to be aggregated into ithis/i
value map
*/
public MergedValueMap(final ListValueMap valueMaps) {
super(new HashMapString, Object());
svn commit: r1691157 - /sling/tags/org.apache.sling.resourcemerger-1.2.10/
Author: radu Date: Wed Jul 15 09:51:25 2015 New Revision: 1691157 URL: http://svn.apache.org/r1691157 Log: [maven-release-plugin] copy for tag org.apache.sling.resourcemerger-1.2.10 Added: sling/tags/org.apache.sling.resourcemerger-1.2.10/ - copied from r1691156, sling/trunk/contrib/extensions/resourcemerger/
svn commit: r1691156 - /sling/trunk/contrib/extensions/resourcemerger/pom.xml
Author: radu Date: Wed Jul 15 09:51:12 2015 New Revision: 1691156 URL: http://svn.apache.org/r1691156 Log: [maven-release-plugin] prepare release org.apache.sling.resourcemerger-1.2.10 Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/pom.xml?rev=1691156r1=1691155r2=1691156view=diff == --- sling/trunk/contrib/extensions/resourcemerger/pom.xml (original) +++ sling/trunk/contrib/extensions/resourcemerger/pom.xml Wed Jul 15 09:51:12 2015 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.resourcemerger/artifactId packagingbundle/packaging -version1.2.9-SNAPSHOT/version +version1.2.10/version nameApache Sling Resource Merger/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger/developerConnection - urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.2.10/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.2.10/developerConnection + urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourcemerger-1.2.10/url /scm build
svn commit: r1691158 - /sling/trunk/contrib/extensions/resourcemerger/pom.xml
Author: radu Date: Wed Jul 15 09:51:27 2015 New Revision: 1691158 URL: http://svn.apache.org/r1691158 Log: [maven-release-plugin] prepare for next development iteration Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml Modified: sling/trunk/contrib/extensions/resourcemerger/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/pom.xml?rev=1691158r1=1691157r2=1691158view=diff == --- sling/trunk/contrib/extensions/resourcemerger/pom.xml (original) +++ sling/trunk/contrib/extensions/resourcemerger/pom.xml Wed Jul 15 09:51:27 2015 @@ -29,7 +29,7 @@ artifactIdorg.apache.sling.resourcemerger/artifactId packagingbundle/packaging -version1.2.10/version +version1.2.11-SNAPSHOT/version nameApache Sling Resource Merger/name description @@ -37,9 +37,9 @@ /description scm - connectionscm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.2.10/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.resourcemerger-1.2.10/developerConnection - urlhttp://svn.apache.org/viewvc/sling/tags/org.apache.sling.resourcemerger-1.2.10/url + connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger/developerConnection + urlhttp://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/url /scm build
svn commit: r1690925 - /sling/trunk/bundles/scripting/core/pom.xml
Author: radu
Date: Tue Jul 14 13:20:42 2015
New Revision: 1690925
URL: http://svn.apache.org/r1690925
Log:
trivial: updated dependency after staging release
Modified:
sling/trunk/bundles/scripting/core/pom.xml
Modified: sling/trunk/bundles/scripting/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1690925r1=1690924r2=1690925view=diff
==
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 14 13:20:42 2015
@@ -41,7 +41,7 @@
url.version2.1.0/url.version
bundle.file.name${basedir}/target/${project.build.finalName}.jar/bundle.file.name
/properties
-
+
scm
connectionscm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/connection
developerConnectionscm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/scripting/core/developerConnection
@@ -136,7 +136,7 @@
dependency
groupIdorg.apache.sling/groupId
artifactIdorg.apache.sling.scripting.api/artifactId
-version2.1.7-SNAPSHOT/version
+version2.1.9-SNAPSHOT/version
scopeprovided/scope
/dependency
dependency
@@ -215,28 +215,28 @@
version${exam.version}/version
scopetest/scope
/dependency
-
+
dependency
groupIdorg.ops4j.pax.exam/groupId
artifactIdpax-exam-junit4/artifactId
version${exam.version}/version
scopetest/scope
/dependency
-
+
dependency
groupIdorg.ops4j.pax.exam/groupId
artifactIdpax-exam-link-mvn/artifactId
version${exam.version}/version
scopetest/scope
/dependency
-
+
dependency
groupIdorg.ops4j.pax.url/groupId
artifactIdpax-url-aether/artifactId
version${url.version}/version
scopetest/scope
/dependency
-
+
dependency
groupIdorg.apache.felix/groupId
artifactIdorg.apache.felix.framework/artifactId
svn commit: r1690908 - in /sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript: RhinoHostObjectProvider.java SlingWrapper.java helper/SlingGlobal.java io/EspRe
Author: radu
Date: Tue Jul 14 12:01:52 2015
New Revision: 1690908
URL: http://svn.apache.org/r1690908
Log:
trivial: corrected JavaDoc to comply with Java 1.8
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoHostObjectProvider.java
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/SlingWrapper.java
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingGlobal.java
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/io/EspReader.java
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/wrapper/ScriptableResource.java
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoHostObjectProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoHostObjectProvider.java?rev=1690908r1=1690907r2=1690908view=diff
==
---
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoHostObjectProvider.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/RhinoHostObjectProvider.java
Tue Jul 14 12:01:52 2015
@@ -32,9 +32,9 @@ public interface RhinoHostObjectProvider
* codeScriptable/code interface. These classes will be registered
* with the global scope as host objects and may then be used in any
* server-side ECMAScript scripts.
- * p
- * Implementations may return codenull/code instead of an empty array
- * if they do not provide any host objects.
+ *
+ * @return the host object classes; may return codenull/code instead
of an empty array for implementations that do not provide
+ * any host objects
*/
Class? extends Scriptable[] getHostObjectClasses();
@@ -50,9 +50,9 @@ public interface RhinoHostObjectProvider
* codeorg.slf4j.Log/code as an imported class, it may simply be
* referred to as codeLog/code (provided there is no other object of
* that name, of course).
- * p
- * Implementations may return codenull/code instead of an empty array
- * if they do not provide any imported classes.
+ *
+ * @return the imported classes; may return codenull/code instead of
an empty array for implementations that do not import any
+ * classes
*/
Class?[] getImportedClasses();
@@ -75,6 +75,8 @@ public interface RhinoHostObjectProvider
* p
* Implementations may return codenull/code instead of an empty array
* if they do not provide any package names.
+ *
+ * @return the imported packages; may return codenull/code instead of
an empty array for implementations that do import any packages
*/
String[] getImportedPackages();
}
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/SlingWrapper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/SlingWrapper.java?rev=1690908r1=1690907r2=1690908view=diff
==
---
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/SlingWrapper.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/SlingWrapper.java
Tue Jul 14 12:01:52 2015
@@ -24,12 +24,16 @@ import org.mozilla.javascript.Wrapper;
public interface SlingWrapper extends Wrapper {
/**
- * The name of the JavaScript host object class
+ * The name of the JavaScript host object class.
+ *
+ * @return the class name
*/
String getClassName();
/**
- * The list of Java classes wrapped by this wrapper
+ * The list of Java classes wrapped by this wrapper.
+ *
+ * @return the wrapped classes
*/
Class? [] getWrappedClasses();
Modified:
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingGlobal.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingGlobal.java?rev=1690908r1=1690907r2=1690908view=diff
==
---
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingGlobal.java
(original)
+++
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/helper/SlingGlobal.java
Tue Jul 14 12:01:52 2015
@@ -49,7 +49,6 @@ import org.slf4j.LoggerFactory
svn commit: r1690904 - in /sling/trunk/bundles/scripting: api/ api/src/main/java/javax/script/ api/src/main/java/org/apache/sling/scripting/api/ core/ core/src/main/java/org/apache/sling/scripting/cor
Author: radu
Date: Tue Jul 14 12:01:33 2015
New Revision: 1690904
URL: http://svn.apache.org/r1690904
Log:
SLING-913 - Add a cache for pre-compiled scripts
* implemented a size-bound event-based ScriptCache that can store compilation
results for ScriptEngines that implement Compilable
* provided a Felix web console plugin for the ScriptCache implementation so
that cache entries can be manually removed from the cache, if
needed
* updated JavaDoc to comply with Java 1.8
Added:
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/CachedScript.java
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptCache.java
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/ScriptNameAware.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/ScriptNameAwareReader.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheConsolePlugin.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/ScriptCacheImpl.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/CachedScriptImpl.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/helper/CachingMap.java
sling/trunk/bundles/scripting/core/src/main/resources/
sling/trunk/bundles/scripting/core/src/main/resources/scriptcache/
sling/trunk/bundles/scripting/core/src/main/resources/scriptcache/ui/
sling/trunk/bundles/scripting/core/src/main/resources/scriptcache/ui/scriptcache.js
Modified:
sling/trunk/bundles/scripting/api/pom.xml
sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/BindingsValuesProvider.java
sling/trunk/bundles/scripting/core/pom.xml
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/DefaultSlingScript.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/LogWriter.java
sling/trunk/bundles/scripting/core/src/main/java/org/apache/sling/scripting/core/impl/SlingScriptAdapterFactory.java
sling/trunk/bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/BindingsValuesProvidersByContextIT.java
Modified: sling/trunk/bundles/scripting/api/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/pom.xml?rev=1690904r1=1690903r2=1690904view=diff
==
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Tue Jul 14 12:01:33 2015
@@ -54,7 +54,7 @@
javax.script
/Import-Package
Export-Package
- org.apache.sling.scripting.api;version=2.2.0
+ org.apache.sling.scripting.api;version=2.3.0
/Export-Package
/instructions
/configuration
Modified:
sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java?rev=1690904r1=1690903r2=1690904view=diff
==
---
sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java
(original)
+++
sling/trunk/bundles/scripting/api/src/main/java/javax/script/ScriptEngineManager.java
Tue Jul 14 12:01:33 2015
@@ -73,6 +73,8 @@ public class ScriptEngineManager {
/**
* @deprecated use {@link #getBindings()} instaed. This method is
introduced
* by the Livetribe JSR-223 implementation and is wrong.
+ *
+ * @return the bindings
*/
@Deprecated
public Bindings getGlobalScope() {
Modified:
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/BindingsValuesProvider.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/BindingsValuesProvider.java?rev=1690904r1=1690903r2=1690904view=diff
==
---
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/BindingsValuesProvider.java
(original)
+++
sling/trunk/bundles/scripting/api/src/main/java/org/apache/sling/scripting/api/BindingsValuesProvider.java
Tue Jul 14 12:01:33 2015
@@ -28,7 +28,7 @@ public interface BindingsValuesProvider
/** The name of the multi-value service property that defines the
context(s) to which
* a BindingsValuesProvider applies. This service property is optional,
if not set
- * the default value is {@link @DEFAULT_CONTEXT}
+ * the default value is {@link
