svn commit: r1690868 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java

[olli]

Author: olli
Date: Tue Jul 14 06:54:46 2015
New Revision: 1690868

URL: http://svn.apache.org/r1690868
Log:
SLING-4411 SLING-4412 workaround OAK-3083

Modified:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1690868r1=1690867r2=1690868view=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
 Tue Jul 14 06:54:46 2015
@@ -137,6 +137,7 @@ public abstract class KarafTestSupport {
 .unpackDirectory(new File(target/paxexam/ + 
getClass().getSimpleName())),
 keepRuntimeFolder(),
 logLevel(LogLevelOption.LogLevel.INFO),
+editConfigurationFilePut(etc/org.apache.karaf.features.cfg, 
serviceRequirements, disable), // TODO OAK-3083
 editConfigurationFilePut(etc/org.apache.karaf.features.cfg, 
featuresBoot, (aries-blueprint, bundle, config, deployer, diagnostic, 
feature, instance, jaas, kar, log, management, package, service, shell, 
shell-compat, ssh, system, wrap, eventadmin, webconsole, http, 
http-whiteboard)),
 editConfigurationFilePut(etc/org.apache.karaf.management.cfg, 
rmiRegistryPort, Integer.toString(rmiRegistryPort)),
 editConfigurationFilePut(etc/org.apache.karaf.management.cfg, 
rmiServerPort, Integer.toString(rmiServerPort)),

svn commit: r1690878 - in /sling/trunk/tooling: maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ support/provisioning-model/src/main/java/org/apache/sling/provisioning/mo

[sseifert]

Author: sseifert
Date: Tue Jul 14 09:04:19 2015
New Revision: 1690878

URL: http://svn.apache.org/r1690878
Log:
SLING-4879 refactor model processing logic from ModelUtility#getEffectiveModel 
into separate class to make it reusable

Added:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
   (with props)

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
   (with props)

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelProcessorTest.java
   (with props)
Modified:

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java?rev=1690878r1=1690877r2=1690878view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
 Tue Jul 14 09:04:19 2015
@@ -148,10 +148,10 @@ public class DependencyLifecycleParticip
 
 // prepare resolver options
 ResolverOptions resolverOptions = new ResolverOptions();
-if (nodeBooleanValue(info.plugin, usePomVariables, false)  
info.project != null) {
+if (nodeBooleanValue(info.plugin, usePomVariables, false)) {
 resolverOptions.variableResolver(new 
PomVariableResolver(info.project));
 }
-if (nodeBooleanValue(info.plugin, usePomDependencies, false)  
info.project != null) {
+if (nodeBooleanValue(info.plugin, usePomDependencies, false)) {
 resolverOptions.artifactVersionResolver(new 
PomArtifactVersionResolver(info.project));
 }
 

Added: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java?rev=1690878view=auto
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 (added)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 Tue Jul 14 09:04:19 2015
@@ -0,0 +1,77 @@
+/*
+ * 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.provisioning.model;
+
+import java.util.Map.Entry;
+
+import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
+import org.apache.sling.provisioning.model.ModelUtility.VariableResolver;
+
+class EffectiveModelProcessor extends ModelProcessor {
+
+private final ResolverOptions options;
+
+public EffectiveModelProcessor(ResolverOptions options) {
+if (options == null) {
+throw new IllegalArgumentException(Resolver options is null);
+}
+this.options = options;
+}
+
+@Override
+protected Artifact processArtifact(Artifact artifact, Feature newFeature, 
RunMode newRunMode) {
+final String groupId = ModelUtility.replace(newFeature, 
artifact.getGroupId(), options.getVariableResolver());
+final String artifactId = ModelUtility.replace(newFeature, 
artifact.getArtifactId(), options.getVariableResolver());
+final String version = ModelUtility.replace(newFeature, 
artifact.getVersion(), options.getVariableResolver());
+

svn commit: r1690881 - in /sling/trunk/tooling/support/provisioning-model/src: main/java/org/apache/sling/provisioning/model/ test/java/org/apache/sling/provisioning/model/

[sseifert]

Author: sseifert
Date: Tue Jul 14 09:10:39 2015
New Revision: 1690881

URL: http://svn.apache.org/r1690881
Log:
SLING-4879 move resolver/replace logic to separate class ModelResolverUtility

Added:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
   (with props)

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelResolveUtilityReplaceTest.java
  - copied, changed from r1690877, 
sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelUtilityReplaceTest.java
Removed:

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelUtilityReplaceTest.java
Modified:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java?rev=1690881r1=1690880r2=1690881view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 Tue Jul 14 09:10:39 2015
@@ -18,11 +18,16 @@
  */
 package org.apache.sling.provisioning.model;
 
+import static 
org.apache.sling.provisioning.model.ModelResolveUtility.getProcessedConfiguration;
+import static org.apache.sling.provisioning.model.ModelResolveUtility.replace;
+import static 
org.apache.sling.provisioning.model.ModelResolveUtility.resolveArtifactVersion;
+
 import java.util.Map.Entry;
 
 import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
 import org.apache.sling.provisioning.model.ModelUtility.VariableResolver;
 
+
 class EffectiveModelProcessor extends ModelProcessor {
 
 private final ResolverOptions options;
@@ -36,12 +41,12 @@ class EffectiveModelProcessor extends Mo
 
 @Override
 protected Artifact processArtifact(Artifact artifact, Feature newFeature, 
RunMode newRunMode) {
-final String groupId = ModelUtility.replace(newFeature, 
artifact.getGroupId(), options.getVariableResolver());
-final String artifactId = ModelUtility.replace(newFeature, 
artifact.getArtifactId(), options.getVariableResolver());
-final String version = ModelUtility.replace(newFeature, 
artifact.getVersion(), options.getVariableResolver());
-final String classifier = ModelUtility.replace(newFeature, 
artifact.getClassifier(), options.getVariableResolver());
-final String type = ModelUtility.replace(newFeature, 
artifact.getType(), options.getVariableResolver());
-final String resolvedVersion = 
ModelUtility.resolveArtifactVersion(groupId, artifactId, version, classifier, 
type,
+final String groupId = replace(newFeature, artifact.getGroupId(), 
options.getVariableResolver());
+final String artifactId = replace(newFeature, 
artifact.getArtifactId(), options.getVariableResolver());
+final String version = replace(newFeature, artifact.getVersion(), 
options.getVariableResolver());
+final String classifier = replace(newFeature, 
artifact.getClassifier(), options.getVariableResolver());
+final String type = replace(newFeature, artifact.getType(), 
options.getVariableResolver());
+final String resolvedVersion = resolveArtifactVersion(groupId, 
artifactId, version, classifier, type,
 options.getArtifactVersionResolver());
 return new Artifact(groupId, artifactId, resolvedVersion, classifier, 
type);
 }
@@ -49,7 +54,7 @@ class EffectiveModelProcessor extends Mo
 @Override
 protected Configuration processConfiguration(Configuration config, Feature 
newFeature, RunMode newRunMode) {
 Configuration newConfig = new Configuration(config.getPid(), 
config.getFactoryPid());
-ModelUtility.getProcessedConfiguration(newFeature, newConfig, config, 
options.getVariableResolver());
+getProcessedConfiguration(newFeature, newConfig, config, 
options.getVariableResolver());
 return newConfig;
 }
 
@@ -57,7 +62,7 @@ class EffectiveModelProcessor extends Mo
 protected KeyValueMapString processSettings(KeyValueMapString 
settings, final Feature newFeature, final RunMode newRunMode) {
 KeyValueMapString newSettings = new KeyValueMapString();
 for (final EntryString, String entry : settings) {
-

svn commit: r1690898 - in /sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart: AbstractSlingStartMojo.java AttachSlingStartModel.java PreparePackageMojo.

[sseifert]

Author: sseifert
Date: Tue Jul 14 10:17:41 2015
New Revision: 1690898

URL: http://svn.apache.org/r1690898
Log:
SLING-4879 update variables section in feature for attached artifact instead of 
using effective model

Modified:

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?rev=1690898r1=1690897r2=1690898view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
 Tue Jul 14 10:17:41 2015
@@ -24,7 +24,6 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
-import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
 
 /**
  * Base class for all slingstart mojos.
@@ -48,39 +47,21 @@ public abstract class AbstractSlingStart
 
 /**
  * If set to true, properties from the Maven POM can be used as variables 
in the provisioning files.
+ * The resolved variables are added to the generated provisioning file, so 
other tools using this model
+ * do not have to resolve them themselves.
  */
 @Parameter(defaultValue=false)
 protected boolean usePomVariables;
 
 /**
- * If set to true, Artifact dependencies from provisioning file without 
explict version are tried 
+ * If set to true, Artifact dependencies from provisioning file without 
explicit version are tried 
  * to be resolved against the dependency versions from the Maven POM.
  */
 @Parameter(defaultValue=false)
 protected boolean usePomDependencies;
 
-/**
- * If set to true, the effective provisioning models with all variables 
replaced is attached instead of the raw model.
- */
-@Parameter(defaultValue=false)
-protected boolean attachEffectiveModel;
-
 protected File getTmpDir() {
 return new File(this.project.getBuild().getDirectory(), 
slingstart-tmp);
 }
 
-/**
- * @return Variable to be used when building an effective provisioning 
model.
- */
-protected ResolverOptions getResolverOptions() {
-ResolverOptions options = new ResolverOptions();
-if (usePomVariables) {
-options.variableResolver(new PomVariableResolver(project));
-}
-if (usePomDependencies) {
-options.artifactVersionResolver(new 
PomArtifactVersionResolver(project));
-}
-return options;
-}
-
 }

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java?rev=1690898r1=1690897r2=1690898view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
 Tue Jul 14 10:17:41 2015
@@ -28,6 +28,7 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.sling.provisioning.model.Model;
+import org.apache.sling.provisioning.model.ModelUtility;
 import org.apache.sling.provisioning.model.io.ModelWriter;
 
 /**
@@ -43,12 +44,12 @@ public class AttachSlingStartModel exten
 
 @Override
 public void execute() throws MojoExecutionException, MojoFailureException {
-final Model model;
-if (attachEffectiveModel) {
-model = ProjectHelper.getEffectiveModel(this.project, 
getResolverOptions());
+Model model = ProjectHelper.getRawModel(this.project);
+if (usePomVariables) {
+model = ModelUtility.applyVariables(model, new 
PomVariableResolver(project));
 }
-else {
-model = 

svn commit: r1690883 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

[olli]

Author: olli
Date: Tue Jul 14 09:31:11 2015
New Revision: 1690883

URL: http://svn.apache.org/r1690883
Log:
SLING-3027 remove features sling-scripting-javascript and sling-scripting-jsp 
from feature sling-launchpad-jackrabbit-derby

Modified:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml?rev=1690883r1=1690882r2=1690883view=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-features/src/main/feature/feature.xml
 Tue Jul 14 09:31:11 2015
@@ -185,8 +185,6 @@
 feature version=${project.version}sling-jcr-jackrabbit/feature
 !-- ... --
 feature version=${project.version}sling-installer/feature
-feature version=${project.version}sling-scripting-javascript/feature
-feature version=${project.version}sling-scripting-jsp/feature
 feature version=${project.version}sling-extension-adapter/feature
 feature 
version=${project.version}sling-extension-bundleresource/feature
 bundlemvn:org.apache.derby/derby/10.11.1.1/bundle

svn commit: r1690894 - /sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java

[sseifert]

Author: sseifert
Date: Tue Jul 14 10:01:53 2015
New Revision: 1690894

URL: http://svn.apache.org/r1690894
Log:
SLING-4807 make sure variable replacement is applied whether custom resolver 
exists or not

Modified:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java?rev=1690894r1=1690893r2=1690894view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
 Tue Jul 14 10:01:53 2015
@@ -30,6 +30,9 @@ import org.apache.felix.cm.file.Configur
 import 
org.apache.sling.provisioning.model.ModelUtility.ArtifactVersionResolver;
 import org.apache.sling.provisioning.model.ModelUtility.VariableResolver;
 
+/**
+ * Helper methods for resolving variables and artifact versions in models.
+ */
 class ModelResolveUtility {
 
 /**
@@ -114,9 +117,7 @@ class ModelResolveUtility {
 // check for raw configuration
 String rawConfig = 
(String)config.getProperties().get(ModelConstants.CFG_UNPROCESSED);
 if ( rawConfig != null ) {
-if ( resolver != null ) {
-rawConfig = replace(feature, rawConfig, resolver);
-}
+rawConfig = replace(feature, rawConfig, resolver);
 if ( config.isSpecial() ) {
 newConfig.getProperties().put(config.getPid(), rawConfig);
 } else {

Jenkins build is unstable: sling-contrib-1.7 #249

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-contrib-1.7/249/

Jenkins build is back to stable : sling-trunk-1.8 #1312

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.8/1312/changes

svn commit: r1690884 - in /sling/trunk/contrib/launchpad/karaf: org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/ org.apache.sling.launchpad.ka

[olli]

Author: olli
Date: Tue Jul 14 09:37:35 2015
New Revision: 1690884

URL: http://svn.apache.org/r1690884
Log:
SLING-3821 run launchpad integration tests against Sling on Karaf

* add features sling-scripting-javascript and sling-scripting-jsp to 
SlingLaunchpadConfiguration
* add bundles org.apache.sling.jcr.jackrabbit.accessmanager and 
org.apache.sling.jcr.jackrabbit.usermanager to SlingLaunchpadOakTarConfiguration
* style

Modified:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-oak-tar-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadOakTarConfiguration.java

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java?rev=1690884r1=1690883r2=1690884view=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
 Tue Jul 14 09:37:35 2015
@@ -30,7 +30,16 @@ public abstract class SlingLaunchpadConf
 final int httpPort = ; // TODO findFreePort();
 return OptionUtils.combine(baseConfiguration(),
 editConfigurationFilePut(etc/org.ops4j.pax.web.cfg, 
org.osgi.service.http.port, Integer.toString(httpPort)),
-addSlingFeatures(sling-launchpad-content, sling-auth-form, 
sling-auth-openid, sling-auth-selector, sling-scripting-groovy, 
sling-installer-provider-jcr),
+addSlingFeatures(
+sling-launchpad-content,
+sling-auth-form,
+sling-auth-openid,
+sling-auth-selector,
+sling-scripting-groovy,
+sling-scripting-javascript,
+sling-scripting-jsp,
+sling-installer-provider-jcr
+),
 // misc (legacy, snapshots, ...) stuff
 
mavenBundle().groupId(org.apache.sling).artifactId(org.apache.sling.servlets.compat).version(1.0.3-SNAPSHOT),
 // test support

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java?rev=1690884r1=1690883r2=1690884view=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-launchpad-jackrabbit-derby-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/configuration/SlingLaunchpadJackrabbitDerbyConfiguration.java
 Tue Jul 14 09:37:35 2015
@@ -31,7 +31,10 @@ public class SlingLaunchpadJackrabbitDer
 public Option[] configuration() {
 return OptionUtils.combine(launchpadConfiguration(),
 editConfigurationFilePut(etc/custom.properties, 
sling.run.modes, jackrabbit),
-addSlingFeatures(sling-jcr-jackrabbit-security, 
sling-launchpad-jackrabbit-derby),
+addSlingFeatures(
+sling-jcr-jackrabbit-security,
+sling-launchpad-jackrabbit-derby
+),
 // configurations for tests
 editConfigurationFilePut(etc/integrationTestsConfig.cfg, 
message, This test config should be loaded at startup),
 
editConfigurationFilePut(etc/org.apache.sling.servlets.resolver.SlingServletResolver.cfg,
 servletresolver.cacheSize, 0)

Modified: 

svn commit: r1690896 - in /sling/trunk/tooling/support/provisioning-model/src: main/java/org/apache/sling/provisioning/model/ test/java/org/apache/sling/provisioning/model/

[sseifert]

Author: sseifert
Date: Tue Jul 14 10:05:28 2015
New Revision: 1690896

URL: http://svn.apache.org/r1690896
Log:
SLING-4879 add ModelUtility.applyVariables method that allows to inject further 
variables from a custom variable resolver

Added:

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelUtilityApplyVariablesTest.java
   (with props)
Modified:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java?rev=1690896r1=1690895r2=1690896view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
 Tue Jul 14 10:05:28 2015
@@ -86,7 +86,7 @@ class ModelProcessor {
 return result;
 }
 
-protected KeyValueMapString processVariables(KeyValueMapString 
variables, Feature feature) {
+protected KeyValueMapString processVariables(KeyValueMapString 
variables, Feature newFeature) {
 return variables;
 }
 

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java?rev=1690896r1=1690895r2=1690896view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
 Tue Jul 14 10:05:28 2015
@@ -415,5 +415,58 @@ public abstract class ModelUtility {
 }
 return errors;
 }
+
+/**
+ * Applies a set of variables to the given model.
+ * All variables that are referenced anywhere within the model are 
detected and passed to the given variable resolver.
+ * The variable resolver may look up variables on it's own, or fallback to 
the variables already defined for the feature.
+ * All resolved variable values are collected and put to the variables 
section of the resulting model.
+ * @param model Original model
+ * @param variableResolver Variable resolver
+ * @return Model with updated variables section.
+ * @throws IllegalArgumentException If a variable can't be replaced or 
configuration properties can't be parsed
+ * @since 1.3
+ */
+public static Model applyVariables(final Model model, final 
VariableResolver variableResolver) {
+
+// define delegating resolver that collects all variable names and 
value per feature
+final MapString,MapString,String collectedVars = new 
HashMapString, MapString,String();
+VariableResolver variableCollector = new VariableResolver() {
+@Override
+public String resolve(Feature feature, String name) {
+String value = variableResolver.resolve(feature, name);
+if (value != null) {
+MapString,String featureVars = 
collectedVars.get(feature.getName());
+if (featureVars == null) {
+featureVars = new HashMapString, String();
+collectedVars.put(feature.getName(), featureVars);
+}
+featureVars.put(name, value);
+}
+return value;
+}
+};
+
+// use effective model processor to collect variables, but drop the 
resulting model
+new EffectiveModelProcessor(new 
ResolverOptions().variableResolver(variableCollector)).process(model);
+
+// define a processor that updates the variables sections in the 
features
+ModelProcessor variablesUpdater = new ModelProcessor() {
+@Override
+protected KeyValueMapString processVariables(KeyValueMapString 
variables, Feature newFeature) {
+KeyValueMapString newVariables = new KeyValueMapString();
+MapString,String featureVars = 
collectedVars.get(newFeature.getName());
+if (featureVars != null) {
+for (Map.EntryString, String entry : 
featureVars.entrySet()) {
+

Jenkins build is still unstable: sling-contrib-1.7 #250

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-contrib-1.7/changes

Jenkins build became unstable: sling-trunk-1.7 #2025

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/2025/changes

svn commit: r1690903 - in /sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model: EffectiveModelProcessor.java Model.java io/ModelWriter.java

[sseifert]

Author: sseifert
Date: Tue Jul 14 11:45:41 2015
New Revision: 1690903

URL: http://svn.apache.org/r1690903
Log:
fix some javadoc errors java 8 complains about

Modified:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java?rev=1690903r1=1690902r2=1690903view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 Tue Jul 14 11:45:41 2015
@@ -27,7 +27,9 @@ import java.util.Map.Entry;
 import org.apache.sling.provisioning.model.ModelUtility.ResolverOptions;
 import org.apache.sling.provisioning.model.ModelUtility.VariableResolver;
 
-
+/**
+ * Resolves all variables and artifact dependencies for the {@link 
ModelUtility#getEffectiveModel(Model)} method.
+ */
 class EffectiveModelProcessor extends ModelProcessor {
 
 private final ResolverOptions options;

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java?rev=1690903r1=1690902r2=1690903view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/Model.java
 Tue Jul 14 11:45:41 2015
@@ -45,8 +45,8 @@ public class Model extends Traceable {
 
 /**
  * Get or create the feature.
- * @param runModes The run modes.
- * @return The feature for the given run modes.
+ * @param name Feature name
+ * @return The feature for the given name.
  */
 public Feature getOrCreateFeature(final String name) {
 Feature result = getFeature(name);

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java?rev=1690903r1=1690902r2=1690903view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
 Tue Jul 14 11:45:41 2015
@@ -74,8 +74,8 @@ public class ModelWriter {
 /**
  * Writes the model to the writer.
  * The writer is not closed.
- * @param writer
- * @param subystem
+ * @param writer Writer
+ * @param model Model
  * @throws IOException
  */
 public static void write(final Writer writer, final Model model)

svn commit: r1690911 - in /sling/trunk/contrib/extensions/security/src: main/java/org/apache/sling/security/impl/ContentDispositionFilter.java test/java/org/apache/sling/security/impl/ContentDispositi

[asanso]

Author: asanso
Date: Tue Jul 14 12:17:17 2015
New Revision: 1690911

URL: http://svn.apache.org/r1690911
Log:
SLING-4604 - Multiple Content-Disposition headers added

* added patch from Rob Ryan (thanks)

Modified:

sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java

sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java

Modified: 
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java?rev=1690911r1=1690910r2=1690911view=diff
==
--- 
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
 (original)
+++ 
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
 Tue Jul 14 12:17:17 2015
@@ -173,6 +173,9 @@ public class ContentDispositionFilter im
 
 private static final String CONTENT_DISPOSTION_ATTACHMENT = 
attachment;
 
+static final String ATTRIBUTE_NAME =
+
org.apache.sling.security.impl.ContentDispositionFilter.RewriterResponse.contentType;
+
 /** The current request. */
 private final SlingHttpServletRequest request;
 
@@ -185,8 +188,14 @@ public class ContentDispositionFilter im
  * @see 
javax.servlet.ServletResponseWrapper#setContentType(java.lang.String)
  */
 public void setContentType(String type) { 
-String pathInfo = request.getPathInfo();
+String previousContentType = (String) 
request.getAttribute(ATTRIBUTE_NAME);
+
+if (previousContentType != null  
previousContentType.equals(type)) {
+return;
+}
+request.setAttribute(ATTRIBUTE_NAME, type);
 
+String pathInfo = request.getPathInfo();
 if (contentDispositionPaths.contains(pathInfo)) {
 
 if (contentTypesMapping.containsKey(pathInfo)) {
@@ -218,7 +227,9 @@ public class ContentDispositionFilter im
 }
 
 private void setContentDisposition() {
+if (!this.containsHeader(CONTENT_DISPOSTION)) {
 this.addHeader(CONTENT_DISPOSTION, CONTENT_DISPOSTION_ATTACHMENT);
 }
 }
 }
+}

Modified: 
sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java?rev=1690911r1=1690910r2=1690911view=diff
==
--- 
sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java
 (original)
+++ 
sling/trunk/contrib/extensions/security/src/test/java/org/apache/sling/security/impl/ContentDispositionFilterTest.java
 Tue Jul 14 12:17:17 2015
@@ -20,9 +20,12 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
+
 import junitx.util.PrivateAccessor;
+
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
+import 
org.apache.sling.security.impl.ContentDispositionFilter.RewriterResponse;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
@@ -221,6 +224,9 @@ public class ContentDispositionFilterTes
 
 context.checking(new Expectations() {
 {
+
allowing(request).getAttribute(RewriterResponse.ATTRIBUTE_NAME);
+will(returnValue(null));
+
allowing(request).setAttribute(RewriterResponse.ATTRIBUTE_NAME, text/html);
 allowing(request).getPathInfo();
 will(returnValue(/libs));
 allowing(response).setContentType(text/html);
@@ -254,6 +260,9 @@ public class ContentDispositionFilterTes
 
 context.checking(new Expectations() {
 {
+
allowing(request).getAttribute(RewriterResponse.ATTRIBUTE_NAME);
+will(returnValue(null));
+
allowing(request).setAttribute(RewriterResponse.ATTRIBUTE_NAME, text/html);
 allowing(request).getPathInfo();
 will(returnValue(/content/usergenerated/author));
 allowing(response).setContentType(text/html);
@@ -282,10 +291,15 @@ public class ContentDispositionFilterTes
 }
 });
 PrivateAccessor.invoke(contentDispositionFilter,activate,  new 
Class[]{ComponentContext.class},new 

Jenkins build is still unstable: sling-trunk-1.7 #2026

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/changes

svn commit: r1690925 - /sling/trunk/bundles/scripting/core/pom.xml

[radu]

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: r1690902 - in /sling/trunk/tooling: maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/ support/provisioning-model/src/main/java/org/apache/sling/provisioning/mo

[sseifert]

Author: sseifert
Date: Tue Jul 14 11:39:49 2015
New Revision: 1690902

URL: http://svn.apache.org/r1690902
Log:
SLING-4880 apply resolved dependencies to raw model instead of attaching 
effective model
add new optional parameter allowUnresolvedPomDependencies (default: false)

Added:

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelUtilityApplyArtifactVersionsTest.java
   (with props)
Modified:

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PomArtifactVersionResolver.java

sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/PreparePackageMojo.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelProcessorTest.java

sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/ModelUtilityApplyVariablesTest.java

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java?rev=1690902r1=1690901r2=1690902view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AbstractSlingStartMojo.java
 Tue Jul 14 11:39:49 2015
@@ -60,6 +60,13 @@ public abstract class AbstractSlingStart
 @Parameter(defaultValue=false)
 protected boolean usePomDependencies;
 
+/**
+ * If set to true, an exception is throws when usePomDependencies is set 
to true and some
+ * dependency version could not be resolved in the Maven POM.
+ */
+@Parameter(defaultValue=false)
+protected boolean allowUnresolvedPomDependencies;
+
 protected File getTmpDir() {
 return new File(this.project.getBuild().getDirectory(), 
slingstart-tmp);
 }

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java?rev=1690902r1=1690901r2=1690902view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/AttachSlingStartModel.java
 Tue Jul 14 11:39:49 2015
@@ -49,7 +49,7 @@ public class AttachSlingStartModel exten
 model = ModelUtility.applyVariables(model, new 
PomVariableResolver(project));
 }
 if (usePomDependencies) {
-// TODO: implement applyDependencies
+model = ModelUtility.applyArtifactVersions(model, new 
PomArtifactVersionResolver(project, allowUnresolvedPomDependencies));
 }
 
 // write the model

Modified: 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java?rev=1690902r1=1690901r2=1690902view=diff
==
--- 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
 (original)
+++ 
sling/trunk/tooling/maven/slingstart-maven-plugin/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
 Tue Jul 14 11:39:49 2015
@@ -152,7 +152,8 @@ public class DependencyLifecycleParticip
 resolverOptions.variableResolver(new 
PomVariableResolver(info.project));
 }
 if (nodeBooleanValue(info.plugin, 

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Scripting Implementation API 2.1.8Deployer properties:"userAgent" = "Apache-Maven/3.2.5 (Java 1.8.0_45; Mac OS X 10.11), Apache-Maven/3.2.5 (Java 1.8.0_45; Mac OS X 10.11)""userId" = "radu""ip" = "192.147.117.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-javadoc.jar.asc(SHA1: afe139efc3e8555d10c358a79914ae72b6e84ea7)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.pom(SHA1: e53c962ff348411e465b72d3cc83f2f973029b20)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-source-release.zip.asc(SHA1: e4ed289a33358ca30e185596ac5c8629c50a5772)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-source-release.zip(SHA1: 2c6a918a88e86e5afb9eb3257388c8c3a0ad1cb0)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.jar(SHA1: fd42886c26b7ba81226095ea584a06e199fa8f7f)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-sources.jar.asc(SHA1: 0980709a330c34f75a5ce69084c799cdc037bf67)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.pom.asc(SHA1: 3b56d8d8f9e91ef8403f54e4300fe2b4e8db38ba)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-javadoc.jar(SHA1: 32d5218542288be3eb1d2f05a111af3274ac4e8e)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-sources.jar(SHA1: d73a64beb724b11b9e0338a0cc792b0a82f77920)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.jar.asc(SHA1: 7038eff25c08de77952ca5d02ee6bce30d4a9ef3)Action performed by Radu Cotescu (radu)

svn commit: r1690924 - in /sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution: servlet/ transport/impl/

[mpetria]

Author: mpetria
Date: Tue Jul 14 13:15:17 2015
New Revision: 1690924

URL: http://svn.apache.org/r1690924
Log:
SLING-4651: delete remote package only after it is fetched

Added:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/HttpTransportUtils.java
Modified:

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java

sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java

Modified: 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java?rev=1690924r1=1690923r2=1690924view=diff
==
--- 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
 (original)
+++ 
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/servlet/DistributionPackageExporterServlet.java
 Tue Jul 14 13:15:17 2015
@@ -34,6 +34,7 @@ import org.apache.sling.distribution.Dis
 import org.apache.sling.distribution.packaging.DistributionPackage;
 import org.apache.sling.distribution.packaging.DistributionPackageExporter;
 import org.apache.sling.distribution.resources.DistributionResourceTypes;
+import org.apache.sling.distribution.transport.impl.HttpTransportUtils;
 import org.apache.sling.distribution.util.RequestUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,10 +47,40 @@ public class DistributionPackageExporter
 
 private final Logger log = LoggerFactory.getLogger(getClass());
 
+
+
 @Override
 protected void doPost(SlingHttpServletRequest request, 
SlingHttpServletResponse response)
 throws ServletException, IOException {
 
+String operation = request.getParameter(operation);
+
+
+
+try {
+if (delete.equals(operation)) {
+
+deletePackage(request, response);
+
+} if (fetch.equals(operation)) {
+
+exportOnePackage(request, response, false);
+
+} else {
+
+exportOnePackage(request, response, true);
+}
+
+} catch (Throwable t) {
+response.setStatus(503);
+log.error(error while exporting package, t);
+}
+}
+
+
+protected void exportOnePackage(SlingHttpServletRequest request, 
SlingHttpServletResponse response, boolean delete)
+throws ServletException, IOException {
+
 DistributionPackageExporter distributionPackageExporter = request
 .getResource()
 .adaptTo(DistributionPackageExporter.class);
@@ -77,14 +108,20 @@ public class DistributionPackageExporter
 InputStream inputStream = null;
 int bytesCopied = -1;
 try {
+
response.addHeader(HttpTransportUtils.HEADER_DISTRIBUTION_ORIGINAL_ID, 
distributionPackage.getId());
+
 inputStream = 
distributionPackage.createInputStream();
+
 bytesCopied = IOUtils.copy(inputStream, 
response.getOutputStream());
 } finally {
 IOUtils.closeQuietly(inputStream);
 }
 
-// delete the package permanently
-distributionPackage.delete();
+if (delete) {
+// delete the package permanently
+distributionPackage.delete();
+}
+
 
 // everything ok
 response.setStatus(200);
@@ -107,4 +144,30 @@ public class DistributionPackageExporter
 }
 }
 
+
+
+void deletePackage(final SlingHttpServletRequest request, final 
SlingHttpServletResponse response) {
+DistributionPackageExporter distributionPackageExporter = request
+.getResource()
+.adaptTo(DistributionPackageExporter.class);
+
+ResourceResolver resourceResolver = request.getResourceResolver();
+
+
+String id = request.getParameter(id);
+
+DistributionPackage distributionPackage = 
distributionPackageExporter.getPackage(resourceResolver, id);
+
+if (distributionPackage != null) {
+distributionPackage.delete();
+
+response.setStatus(200);
+} else {
+response.setStatus(204);
+log.debug(nothing to delete {}, id);
+}
+
+
+}
+
 }

Added: 

svn commit: r1690900 - /sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java

[olli]

Author: olli
Date: Tue Jul 14 11:18:08 2015
New Revision: 1690900

URL: http://svn.apache.org/r1690900
Log:
SLING-3821 run launchpad integration tests against Sling on Karaf

* add Sling’s default admin credentials used in tests to Karaf’s 
users.properties

Modified:

sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java

Modified: 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java?rev=1690900r1=1690899r2=1690900view=diff
==
--- 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
 (original)
+++ 
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/SlingLaunchpadConfiguration.java
 Tue Jul 14 11:18:08 2015
@@ -29,6 +29,7 @@ public abstract class SlingLaunchpadConf
 public Option[] launchpadConfiguration() {
 final int httpPort = ; // TODO findFreePort();
 return OptionUtils.combine(baseConfiguration(),
+editConfigurationFilePut(etc/users.properties, admin, 
admin,_g_:admingroup), // Sling’s default admin credentials used in tests
 editConfigurationFilePut(etc/org.ops4j.pax.web.cfg, 
org.osgi.service.http.port, Integer.toString(httpPort)),
 addSlingFeatures(
 sling-launchpad-content,

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

[radu]

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;
  * The 

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

[radu]

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 

svn commit: r1690905 - in /sling/trunk/bundles/scripting/javascript: ./ src/main/java/org/apache/sling/scripting/javascript/internal/ src/test/java/org/apache/sling/scripting/javascript/internal/

[radu]

Author: radu
Date: Tue Jul 14 12:01:39 2015
New Revision: 1690905

URL: http://svn.apache.org/r1690905
Log:
SLING-915 - [Rhino] Implement Compilable

* implemented Compilable support
* added support for the ScripCache implemented in SLING-913 for scripts that 
are not executed as part of the normal Sling script resolution

Modified:
sling/trunk/bundles/scripting/javascript/pom.xml

sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java

sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineFactory.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngineTest.java

sling/trunk/bundles/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/internal/ScriptEngineHelper.java

Modified: sling/trunk/bundles/scripting/javascript/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/javascript/pom.xml?rev=1690905r1=1690904r2=1690905view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Tue Jul 14 12:01:39 2015
@@ -103,16 +103,25 @@
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.api/artifactId
 version2.1.0/version
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.scripting.api/artifactId
-version2.1.0/version
+version2.1.7-SNAPSHOT/version
+scopeprovided/scope
+/dependency
+dependency
+groupIdorg.apache.sling/groupId
+artifactIdorg.apache.sling.scripting.core/artifactId
+version2.0.29-SNAPSHOT/version
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.jcr.resource/artifactId
 version2.3.8/version
+scopeprovided/scope
 exclusions
 exclusion
 groupIdorg.apache.jackrabbit/groupId
@@ -128,11 +137,13 @@
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.commons.classloader/artifactId
 version1.3.0/version
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.commons.json/artifactId
 version2.0.6/version
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
@@ -143,10 +154,12 @@
 dependency
 groupIdorg.osgi/groupId
 artifactIdorg.osgi.core/artifactId
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.osgi/groupId
 artifactIdorg.osgi.compendium/artifactId
+scopeprovided/scope
 /dependency
 dependency
 groupIdjavax.jcr/groupId
@@ -157,10 +170,12 @@
 dependency
 groupIdjavax.servlet/groupId
 artifactIdservlet-api/artifactId
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.apache.felix/groupId
 artifactIdorg.apache.felix.scr.annotations/artifactId
+scopeprovided/scope
 /dependency
 dependency
 groupIdorg.mozilla/groupId
@@ -170,6 +185,7 @@
 dependency
 groupIdorg.slf4j/groupId
 artifactIdslf4j-api/artifactId
+scopeprovided/scope
 /dependency
 dependency
 groupIdcommons-collections/groupId
@@ -177,6 +193,12 @@
 version3.2.1/version
 scopeprovided/scope
 /dependency
+dependency
+groupIdcommons-io/groupId
+artifactIdcommons-io/artifactId
+version1.4/version
+scopeprovided/scope
+/dependency
 !-- Testing --
 dependency
 groupIdorg.apache.sling/groupId
@@ -184,5 +206,17 @@
 version2.0.16/version
 scopetest/scope
 /dependency
+dependency
+groupIdorg.powermock/groupId
+artifactIdpowermock-module-junit4/artifactId
+version1.6.2/version
+scopetest/scope
+/dependency
+dependency
+groupIdorg.powermock/groupId
+artifactIdpowermock-api-mockito/artifactId
+version1.6.2/version
+scopetest/scope
+/dependency
 /dependencies
 /project

Modified: 
sling/trunk/bundles/scripting/javascript/src/main/java/org/apache/sling/scripting/javascript/internal/RhinoJavaScriptEngine.java

svn commit: r1690906 - in /sling/trunk/bundles/scripting/sightly: js-use-provider/ js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/ testing/src/main/provisioning/

[radu]

Author: radu
Date: Tue Jul 14 12:01:45 2015
New Revision: 1690906

URL: http://svn.apache.org/r1690906
Log:
SLING-4855 - Add support for Compilable Script Engines in the Sightly JS Use 
Provider

* run Compilable#eval for ScriptEngine implementations that support Compilable
* added JS scripts to the scripts monitored by the ScriptCache implementation 
provided by Sling
* updated the Sightly tests launchpad to use the bundle versions corresponding 
to SLING-913, SLING-915

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/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/testing/src/main/provisioning/model.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=1690906r1=1690905r2=1690906view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Tue Jul 14 
12:01:45 2015
@@ -96,8 +96,14 @@
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
+artifactIdorg.apache.sling.scripting.core/artifactId
+version2.0.29-SNAPSHOT/version
+scopeprovided/scope
+/dependency
+dependency
+groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.scripting.api/artifactId
-version2.1.0/version
+version2.1.7-SNAPSHOT/version
 scopeprovided/scope
 /dependency
 dependency

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=1690906r1=1690905r2=1690906view=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
 Tue Jul 14 12:01:45 2015
@@ -21,8 +21,8 @@ package org.apache.sling.scripting.sight
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-
 import javax.script.Bindings;
+import javax.script.Compilable;
 import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
@@ -36,6 +36,7 @@ import org.apache.sling.api.resource.Res
 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;
@@ -109,6 +110,7 @@ public class JsEnvironment {
 CommonJsModule module = new CommonJsModule();
 Bindings scriptBindings = buildBindings(scriptResource, 
globalBindings, arguments, module);
 scriptContext.setBindings(scriptBindings, ScriptContext.ENGINE_SCOPE);
+scriptContext.setAttribute(ScriptEngine.FILENAME, 
scriptResource.getPath(), ScriptContext.ENGINE_SCOPE);
 runScript(scriptResource, scriptContext, callback, module);
 }
 
@@ -156,8 +158,15 @@ public class JsEnvironment {
 public void run() {
 Reader reader = null;
 try {
-reader = new 
InputStreamReader(scriptResource.adaptTo(InputStream.class));
-Object result = jsEngine.eval(reader, scriptContext);
+Object result;
+if (jsEngine instanceof Compilable) {
+reader = new ScriptNameAwareReader(new 
InputStreamReader(scriptResource.adaptTo(InputStream.class)),
+scriptResource.getPath());
+result = ((Compilable) 
jsEngine).compile(reader).eval(scriptContext);
+} else {
+reader = new 
InputStreamReader(scriptResource.adaptTo(InputStream.class));
+result = jsEngine.eval(reader, scriptContext);
+}
 

svn commit: r1690922 - /sling/tags/org.apache.sling.scripting.api-2.1.8/

[radu]

Author: radu
Date: Tue Jul 14 13:03:59 2015
New Revision: 1690922

URL: http://svn.apache.org/r1690922
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 r1690921, sling/trunk/bundles/scripting/api/

svn commit: r1690923 - /sling/trunk/bundles/scripting/api/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 13:04:01 2015
New Revision: 1690923

URL: http://svn.apache.org/r1690923
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=1690923r1=1690922r2=1690923view=diff
==
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Tue Jul 14 13:04:01 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: r1690921 - /sling/trunk/bundles/scripting/api/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 13:03:45 2015
New Revision: 1690921

URL: http://svn.apache.org/r1690921
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=1690921r1=1690920r2=1690921view=diff
==
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Tue Jul 14 13:03:45 2015
@@ -25,21 +25,21 @@
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
 version24/version
-relativePath/
+relativePath /
   /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: r1690909 - in /sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl: JsEnvironment.java JsUseProvider.java jsapi/SlyBindingsValues

[radu]

Author: radu
Date: Tue Jul 14 12:01:57 2015
New Revision: 1690909

URL: http://svn.apache.org/r1690909
Log:
trivial: corrected JavaDoc to comply with Java 1.8

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/jsapi/SlyBindingsValuesProvider.java

sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/rhino/HybridObject.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=1690909r1=1690908r2=1690909view=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
 Tue Jul 14 12:01:57 2015
@@ -122,9 +122,11 @@ public class JsEnvironment {
 
 /**
  * Run a 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 caller the resource of the script that invokes the Js 
code
+ * @param path   the path to the JS script
  * @param globalBindings bindings for the JS script
+ * @param arguments  the arguments for the JS script
  * @return an asynchronous container for the result
  * @throws UnsupportedOperationException if this method is run when the 
event loop is not empty
  */

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=1690909r1=1690908r2=1690909view=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
 Tue Jul 14 12:01:57 2015
@@ -55,7 +55,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Use provider for JS scripts. Ensures proper integration between Sightly  
JS code-behind.
+ * Use provider for JavaScript Use-API objects.
  */
 @Component(
 metatype = true,

Modified: 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.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/jsapi/SlyBindingsValuesProvider.java?rev=1690909r1=1690908r2=1690909view=diff
==
--- 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java
 (original)
+++ 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/jsapi/SlyBindingsValuesProvider.java
 Tue Jul 14 12:01:57 2015
@@ -64,8 +64,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Provides the {@code sightly} namespace for usage in Sightly  JS scripts
- * called from Sightly
+ * Provides the {@code sightly} namespace for usage in Sightly amp; JS 
scripts called from Sightly
  */
 @Component(metatype = true, label = Apache Sling Scripting Sightly JavaScript 
Bindings Provider,
 description = The Apache Sling Scripting Sightly JavaScript Bindings 
Provider loads the JS Use-API and makes it available in the +

Modified: 
sling/trunk/bundles/scripting/sightly/js-use-provider/src/main/java/org/apache/sling/scripting/sightly/js/impl/rhino/HybridObject.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/rhino/HybridObject.java?rev=1690909r1=1690908r2=1690909view=diff
==
--- 

Jenkins build is still unstable: sling-contrib-1.7 #251

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-contrib-1.7/changes

Jenkins build is still unstable: sling-contrib-1.7 #252

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-contrib-1.7/changes

svn commit: r1690953 - /sling/trunk/bundles/scripting/core/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 14:51:20 2015
New Revision: 1690953

URL: http://svn.apache.org/r1690953
Log:
release: updated dependency for staged release artifact

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=1690953r1=1690952r2=1690953view=diff
==
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 14 14:51:20 2015
@@ -136,7 +136,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

Nexus: Staging Repository Dropped

[Nexus Repository Manager]

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.2.5 (Java 1.8.0_45; Mac OS X 10.11), Apache-Maven/3.2.5 (Java 1.8.0_45; Mac OS X 10.11)""userId" = "radu""ip" = "192.147.117.11"Details:The orgapachesling-1296 staging repository has been dropped.Action performed by Radu Cotescu (radu)

svn commit: r1690947 - /sling/trunk/bundles/scripting/api/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 14:46:38 2015
New Revision: 1690947

URL: http://svn.apache.org/r1690947
Log:
Release rollback

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=1690947r1=1690946r2=1690947view=diff
==
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Tue Jul 14 14:46:38 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

Jenkins build is still unstable: sling-trunk-1.7 #2027

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/changes

svn commit: r1690949 - /sling/trunk/bundles/scripting/api/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 14:47:33 2015
New Revision: 1690949

URL: http://svn.apache.org/r1690949
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=1690949r1=1690948r2=1690949view=diff
==
--- sling/trunk/bundles/scripting/api/pom.xml (original)
+++ sling/trunk/bundles/scripting/api/pom.xml Tue Jul 14 14:47:33 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: r1690950 - /sling/tags/org.apache.sling.scripting.api-2.1.8/

[radu]

Author: radu
Date: Tue Jul 14 14:47:46 2015
New Revision: 1690950

URL: http://svn.apache.org/r1690950
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 r1690949, sling/trunk/bundles/scripting/api/

svn commit: r1690957 - /sling/trunk/bundles/scripting/core/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 14:52:46 2015
New Revision: 1690957

URL: http://svn.apache.org/r1690957
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=1690957r1=1690956r2=1690957view=diff
==
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 14 14:52:46 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: r1690955 - /sling/trunk/bundles/scripting/core/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 14:52:30 2015
New Revision: 1690955

URL: http://svn.apache.org/r1690955
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=1690955r1=1690954r2=1690955view=diff
==
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 14 14:52:30 2015
@@ -24,11 +24,11 @@
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
 version24/version
-relativePath/
+relativePath /
 /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: r1690956 - /sling/tags/org.apache.sling.scripting.core-2.0.30/

[radu]

Author: radu
Date: Tue Jul 14 14:52:44 2015
New Revision: 1690956

URL: http://svn.apache.org/r1690956
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 r1690955, sling/trunk/bundles/scripting/core/

svn commit: r1690960 - /sling/tags/org.apache.sling.scripting.javascript-2.0.20/

[radu]

Author: radu
Date: Tue Jul 14 14:56:36 2015
New Revision: 1690960

URL: http://svn.apache.org/r1690960
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 r1690959, sling/trunk/bundles/scripting/javascript/

svn commit: r1690961 - /sling/trunk/bundles/scripting/javascript/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 14:56:38 2015
New Revision: 1690961

URL: http://svn.apache.org/r1690961
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=1690961r1=1690960r2=1690961view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Tue Jul 14 14:56:38 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: r1690966 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 15:04:39 2015
New Revision: 1690966

URL: http://svn.apache.org/r1690966
Log:
release: updated dependencies to staged release artifacts

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=1690966r1=1690965r2=1690966view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Tue Jul 14 
15:04:39 2015
@@ -96,26 +96,14 @@
 /dependency
 dependency
 groupIdorg.apache.sling/groupId
-artifactIdorg.apache.sling.scripting.core/artifactId
-version2.0.29-SNAPSHOT/version
-scopeprovided/scope
-/dependency
-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.javascript/artifactId
-version2.0.12/version
-exclusions
-exclusion
-groupIdorg.apache.sling/groupId
-artifactIdorg.apache.sling.jcr.resource/artifactId
-/exclusion
-/exclusions
+artifactIdorg.apache.sling.scripting.core/artifactId
+version2.0.30/version
 scopeprovided/scope
 /dependency
 dependency
@@ -129,7 +117,7 @@
 dependency
 groupIdorg.apache.sling/groupId
 artifactIdorg.apache.sling.scripting.sightly/artifactId
-version1.0.3-SNAPSHOT/version
+version1.0.2/version
 scopeprovided/scope
 /dependency
 

svn commit: r1690968 - /sling/tags/org.apache.sling.scripting.sightly.js.provider-1.0.6/

[radu]

Author: radu
Date: Tue Jul 14 15:05:27 2015
New Revision: 1690968

URL: http://svn.apache.org/r1690968
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 r1690967, 
sling/trunk/bundles/scripting/sightly/js-use-provider/

Nexus: Staging Completed

[Nexus Repository Manager]

Message from: https://repository.apache.orgDescription:Apache Sling Scripting API, Core, _javascript_, Sightly JS Use ProviderDeployer properties:"userAgent" = "Apache-Maven/3.2.5 (Java 1.8.0_45; Mac OS X 10.11), Apache-Maven/3.2.5 (Java 1.8.0_45; Mac OS X 10.11)""userId" = "radu""ip" = "192.147.117.11"Details:The following artifacts have been staged/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30-sources.jar.asc(SHA1: c1632f254acd525b6d4c71c7a670dce9fa3c742d)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30.pom(SHA1: 7400b931f801d3d85d7d1edde1813d662013beca)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30.jar.asc(SHA1: 5e2c77cff44cd0c6362bd48007c4af6a5420bdca)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30-sources.jar(SHA1: 8cba847e4cb27df74d3113979c2eaa6d0db46861)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30.jar(SHA1: 069fcbd058d26930f9a1d880f48120b12cfcec0c)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30-javadoc.jar.asc(SHA1: 6b623e25f39b46d9c6389d98c020a8975fd44844)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30.pom.asc(SHA1: 589dedabda1caf8b617aee787524d58cc06df39a)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30-source-release.zip.asc(SHA1: 4316d9b37b0052a985fe886ef337ae4a2f43bba3)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30-javadoc.jar(SHA1: 0de399234bd1edb4d80ce2614ec77c8132882546)/org/apache/sling/org.apache.sling.scripting.core/2.0.30/org.apache.sling.scripting.core-2.0.30-source-release.zip(SHA1: 5a2a637b6a52cc3902ee52c5b4d8c468ccbebb0d)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20-javadoc.jar.asc(SHA1: 58ebd0e585e1d66bc4980147a61a6d48223b2bfa)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20-source-release.zip.asc(SHA1: 0ff989061d0b3743bc37d5c12e81b63e794d81e2)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20-javadoc.jar(SHA1: 4523b19150435b908fcc3d21bb9360e673708efa)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20.pom(SHA1: 698ad3821030d568b95cf185246193404604c1c2)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20-source-release.zip(SHA1: 2f0e10719205cb628d381c9f3a024b145ad6f9bc)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20.jar.asc(SHA1: cfb8c723fd461cc58e853cdfe60400635ff77d6f)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20-sources.jar(SHA1: a911064457fae59dd8424ed6da015f433e702b1c)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20.jar(SHA1: 3d427eac576c58c75cf4149b321fc84f98313bb5)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20.pom.asc(SHA1: 8c3efa73484c0d2386126202ca5a47311b854bd7)/org/apache/sling/org.apache.sling.scripting._javascript_/2.0.20/org.apache.sling.scripting._javascript_-2.0.20-sources.jar.asc(SHA1: f1e8a9c4d24733f0505748a2e0b568ce818e125c)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-javadoc.jar.asc(SHA1: f569a5a4682535db69c782926bfe4f6f5c2003e6)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.pom(SHA1: e53c962ff348411e465b72d3cc83f2f973029b20)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-source-release.zip.asc(SHA1: 171371b7a45784a989e480914956d7d6eb7214e5)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-source-release.zip(SHA1: 9479b7989b795ca4ab626fb960fdf2b67f7c9edc)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.jar(SHA1: 11d6b47b94cf34da626bef3adc3afdd60389a628)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-sources.jar.asc(SHA1: b6441988af01151b4b9f62e2e515d5c47cf40680)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8.pom.asc(SHA1: adc4809b3965958d5893983e609d4ad80696a3f2)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-javadoc.jar(SHA1: 5f0876d60acca8feab2a4825ef6bd28091362549)/org/apache/sling/org.apache.sling.scripting.api/2.1.8/org.apache.sling.scripting.api-2.1.8-sources.jar(SHA1: 

Jenkins build is back to stable : sling-trunk-1.7 #2028

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/2028/changes

Build failed in Jenkins: sling-trunk-1.7 #2029

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/2029/changes

Changes:

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.sightly.js.provider-1.0.6

[radu] release: updated dependencies to staged release artifacts

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.javascript-2.0.20

[radu] release: updated dependencies to staged release artifacts

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.core-2.0.30

[radu] release: updated dependency for staged release artifact

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.api-2.1.8

[radu] Release rollback

--
[...truncated 36324 lines...]
[INFO] Apache Sling JSP Standard Tag Library . SKIPPED
[INFO] Apache Sling Scripting Sightly Engine . SKIPPED
[INFO] Apache Sling Scripting Sightly JavaScript Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Read-Eval-Print Loop Environment  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests Content  SKIPPED
[INFO] Apache Sling Adapter Manager Implementation ... SKIPPED
[INFO] Apache Sling Internationalization Support . SKIPPED
[INFO] Apache Sling XSS Protection Bundle  SKIPPED
[INFO] Apache Sling Launchpad Application Builder  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests .. SKIPPED
[INFO] Apache Sling Scripting Sightly Models Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Reactor  SKIPPED
[INFO] Apache Sling Bundle Resource Provider . SKIPPED
[INFO] Apache Sling Distributed Event Admin .. SKIPPED
[INFO] Apache Sling Discovery API  SKIPPED
[INFO] Apache Sling Discovery Commons Bundle . SKIPPED
[INFO] Apache Sling Resource-Based Discovery Service . SKIPPED
[INFO] Apache Sling Discovery Support Bundle . SKIPPED
[INFO] Apache Sling Discovery Standalone Implementation .. SKIPPED
[INFO] Apache Sling Event Support  SKIPPED
[INFO] Apache Sling Feature Flags  SKIPPED
[INFO] Apache Sling Filesystem Resource Provider . SKIPPED
[INFO] Apache Sling javax.activation bundle .. SKIPPED
[INFO] Apache Sling Service User Mapper .. SKIPPED
[INFO] Apache Sling Settings . SKIPPED
[INFO] Apache Sling Web Console Branding . SKIPPED
[INFO] Apache Sling Web Console Security Provider  SKIPPED
[INFO] Apache Sling Explorer . SKIPPED
[INFO] Apache Sling Health Check Core  SKIPPED
[INFO] Apache Sling Health Check Annotations . SKIPPED
[INFO] Apache Sling Health Check Samples . SKIPPED
[INFO] Apache Sling Health Check Support Components .. SKIPPED
[INFO] Apache Sling Health Check Webconsole Plugin ... SKIPPED
[INFO] Apache Sling Health Check JUnit Bridge  SKIPPED
[INFO] Apache Sling Health Check Integration Tests ... SKIPPED
[INFO] Apache Sling Health Check Reactor POM . SKIPPED
[INFO] Apache Sling Resource Access Security . SKIPPED
[INFO] Apache Sling Test Tools ... SKIPPED
[INFO] Apache Sling Resource Access Security Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework API . SKIPPED
[INFO] Apache Sling Validation Framework Core Implementation  SKIPPED
[INFO] Apache Sling Validation Framework Testing Services  SKIPPED
[INFO] Apache Sling Validation Framework Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework Examples  SKIPPED
[INFO] Apache Sling Validation Framework Builder . SKIPPED
[INFO] Apache Sling Models API ... SKIPPED
[INFO] Apache Sling Models Implementation  SKIPPED
[INFO] Apache Sling Models Validation Implementation . SKIPPED
[INFO] Apache Sling Models Integration Tests . SKIPPED
[INFO] Apache Sling JUnit Core ... SKIPPED
[INFO] Apache Sling JUnit Scriptable Tests Provider .. SKIPPED
[INFO] Apache Sling JUnit Health Checks .. SKIPPED
[INFO] Apache Sling JUnit Remote Tests Runners ... SKIPPED
[INFO] Apache Sling JUnit Performance  SKIPPED
[INFO] Apache Sling Testing Mock Log Configuration ... SKIPPED
[INFO] Apache Sling Testing Resource Resolver Mock ... SKIPPED
[INFO] Apache Sling Testing JCR Mock . SKIPPED
[INFO] Apache Sling Testing OSGi Mock  SKIPPED
[INFO] Apache Sling Testing Sling Mock ... SKIPPED

svn commit: r1691005 - /sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java

[kwin]

Author: kwin
Date: Tue Jul 14 15:54:55 2015
New Revision: 1691005

URL: http://svn.apache.org/r1691005
Log:
add extended logging

Modified:

sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java

Modified: 
sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java?rev=1691005r1=1691004r2=1691005view=diff
==
--- 
sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
 (original)
+++ 
sling/trunk/bundles/extensions/i18n/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
 Tue Jul 14 15:54:55 2015
@@ -143,6 +143,9 @@ public class JcrResourceBundle extends R
 
 @Override
 protected Object handleGetObject(String key) {
+if (log.isDebugEnabled()) {
+log.debug(Requesting key '{}' from resource bundle (baseName 
'{}', locale '{}'), new Object[] {key, baseName, locale});
+}
 return resources.get(key);
 }
 

Build failed in Jenkins: sling-trunk-1.8 #1317

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.8/1317/changes

Changes:

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.sightly.js.provider-1.0.6

[radu] release: updated dependencies to staged release artifacts

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.javascript-2.0.20

[radu] release: updated dependencies to staged release artifacts

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.core-2.0.30

[radu] release: updated dependency for staged release artifact

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.api-2.1.8

[radu] Release rollback

[radu] trivial: updated dependency after staging release

[mpetria] SLING-4651: delete remote package only after it is fetched

[radu] [maven-release-plugin] prepare for next development iteration

[radu] [maven-release-plugin] prepare release 
org.apache.sling.scripting.api-2.1.8

--
[...truncated 53117 lines...]
[INFO] Apache Sling JSP Standard Tag Library . SKIPPED
[INFO] Apache Sling Scripting Sightly Engine . SKIPPED
[INFO] Apache Sling Scripting Sightly JavaScript Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Read-Eval-Print Loop Environment  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests Content  SKIPPED
[INFO] Apache Sling Adapter Manager Implementation ... SKIPPED
[INFO] Apache Sling Internationalization Support . SKIPPED
[INFO] Apache Sling XSS Protection Bundle  SKIPPED
[INFO] Apache Sling Launchpad Application Builder  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests .. SKIPPED
[INFO] Apache Sling Scripting Sightly Models Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Reactor  SKIPPED
[INFO] Apache Sling Bundle Resource Provider . SKIPPED
[INFO] Apache Sling Distributed Event Admin .. SKIPPED
[INFO] Apache Sling Discovery API  SKIPPED
[INFO] Apache Sling Discovery Commons Bundle . SKIPPED
[INFO] Apache Sling Resource-Based Discovery Service . SKIPPED
[INFO] Apache Sling Discovery Support Bundle . SKIPPED
[INFO] Apache Sling Discovery Standalone Implementation .. SKIPPED
[INFO] Apache Sling Event Support  SKIPPED
[INFO] Apache Sling Feature Flags  SKIPPED
[INFO] Apache Sling Filesystem Resource Provider . SKIPPED
[INFO] Apache Sling javax.activation bundle .. SKIPPED
[INFO] Apache Sling Service User Mapper .. SKIPPED
[INFO] Apache Sling Settings . SKIPPED
[INFO] Apache Sling Web Console Branding . SKIPPED
[INFO] Apache Sling Web Console Security Provider  SKIPPED
[INFO] Apache Sling Explorer . SKIPPED
[INFO] Apache Sling Health Check Core  SKIPPED
[INFO] Apache Sling Health Check Annotations . SKIPPED
[INFO] Apache Sling Health Check Samples . SKIPPED
[INFO] Apache Sling Health Check Support Components .. SKIPPED
[INFO] Apache Sling Health Check Webconsole Plugin ... SKIPPED
[INFO] Apache Sling Health Check JUnit Bridge  SKIPPED
[INFO] Apache Sling Health Check Integration Tests ... SKIPPED
[INFO] Apache Sling Health Check Reactor POM . SKIPPED
[INFO] Apache Sling Resource Access Security . SKIPPED
[INFO] Apache Sling Test Tools ... SKIPPED
[INFO] Apache Sling Resource Access Security Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework API . SKIPPED
[INFO] Apache Sling Validation Framework Core Implementation  SKIPPED
[INFO] Apache Sling Validation Framework Testing Services  SKIPPED
[INFO] Apache Sling Validation Framework Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework Examples  SKIPPED
[INFO] Apache Sling Validation Framework Builder . SKIPPED
[INFO] Apache Sling Models API ... SKIPPED
[INFO] Apache Sling Models Implementation  SKIPPED
[INFO] Apache Sling Models Validation Implementation . SKIPPED
[INFO] Apache Sling Models Integration Tests . SKIPPED
[INFO] Apache Sling JUnit Core ... SKIPPED
[INFO] Apache Sling JUnit Scriptable Tests Provider .. SKIPPED
[INFO] Apache Sling JUnit Health Checks .. SKIPPED
[INFO] Apache Sling JUnit Remote Tests Runners ... SKIPPED
[INFO] Apache Sling JUnit Performance  SKIPPED
[INFO] Apache Sling Testing Mock Log Configuration 

svn commit: r1690990 - /sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java

[sseifert]

Author: sseifert
Date: Tue Jul 14 15:35:35 2015
New Revision: 1690990

URL: http://svn.apache.org/r1690990
Log:
SLING-4881 NoSQL Generic Resource Provider: Preserve order of changed resources 
(patch contributed by Levente Santha)

Modified:

sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java

Modified: 
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java?rev=1690990r1=1690989r2=1690990view=diff
==
--- 
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
 (original)
+++ 
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
 Tue Jul 14 15:35:35 2015
@@ -24,6 +24,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
@@ -56,7 +57,7 @@ public class NoSqlResourceProvider imple
 
 private final NoSqlAdapter adapter;
 private final EventAdmin eventAdmin;
-private final MapString, NoSqlData changedResources = new 
HashMapString, NoSqlData();
+private final MapString, NoSqlData changedResources = new 
LinkedHashMapString, NoSqlData();
 private final SetString deletedResources = new HashSetString();
 
 public NoSqlResourceProvider(NoSqlAdapter adapter, EventAdmin eventAdmin) {

svn commit: r1690969 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 15:05:29 2015
New Revision: 1690969

URL: http://svn.apache.org/r1690969
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=1690969r1=1690968r2=1690969view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Tue Jul 14 
15:05:29 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: r1690967 - /sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml

[radu]

Author: radu
Date: Tue Jul 14 15:05:13 2015
New Revision: 1690967

URL: http://svn.apache.org/r1690967
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=1690967r1=1690966r2=1690967view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Tue Jul 14 
15:05:13 2015
@@ -26,14 +26,14 @@
 groupIdorg.apache.sling/groupId
 artifactIdsling/artifactId
 version24/version
-relativePath/
+relativePath /
 /parent
 
 !-- 
=== --
 !-- 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
 
 !-- 
=== --

Build failed in Jenkins: sling-trunk-1.7 #2030

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/2030/changes

Changes:

[kwin] add extended logging

[sseifert] SLING-4881 NoSQL Generic Resource Provider: Preserve order of 
changed resources (patch contributed by Levente Santha)

--
[...truncated 36163 lines...]
[INFO] Apache Sling JSP Standard Tag Library . SKIPPED
[INFO] Apache Sling Scripting Sightly Engine . SKIPPED
[INFO] Apache Sling Scripting Sightly JavaScript Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Read-Eval-Print Loop Environment  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests Content  SKIPPED
[INFO] Apache Sling Adapter Manager Implementation ... SKIPPED
[INFO] Apache Sling Internationalization Support . SKIPPED
[INFO] Apache Sling XSS Protection Bundle  SKIPPED
[INFO] Apache Sling Launchpad Application Builder  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests .. SKIPPED
[INFO] Apache Sling Scripting Sightly Models Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Reactor  SKIPPED
[INFO] Apache Sling Bundle Resource Provider . SKIPPED
[INFO] Apache Sling Distributed Event Admin .. SKIPPED
[INFO] Apache Sling Discovery API  SKIPPED
[INFO] Apache Sling Discovery Commons Bundle . SKIPPED
[INFO] Apache Sling Resource-Based Discovery Service . SKIPPED
[INFO] Apache Sling Discovery Support Bundle . SKIPPED
[INFO] Apache Sling Discovery Standalone Implementation .. SKIPPED
[INFO] Apache Sling Event Support  SKIPPED
[INFO] Apache Sling Feature Flags  SKIPPED
[INFO] Apache Sling Filesystem Resource Provider . SKIPPED
[INFO] Apache Sling javax.activation bundle .. SKIPPED
[INFO] Apache Sling Service User Mapper .. SKIPPED
[INFO] Apache Sling Settings . SKIPPED
[INFO] Apache Sling Web Console Branding . SKIPPED
[INFO] Apache Sling Web Console Security Provider  SKIPPED
[INFO] Apache Sling Explorer . SKIPPED
[INFO] Apache Sling Health Check Core  SKIPPED
[INFO] Apache Sling Health Check Annotations . SKIPPED
[INFO] Apache Sling Health Check Samples . SKIPPED
[INFO] Apache Sling Health Check Support Components .. SKIPPED
[INFO] Apache Sling Health Check Webconsole Plugin ... SKIPPED
[INFO] Apache Sling Health Check JUnit Bridge  SKIPPED
[INFO] Apache Sling Health Check Integration Tests ... SKIPPED
[INFO] Apache Sling Health Check Reactor POM . SKIPPED
[INFO] Apache Sling Resource Access Security . SKIPPED
[INFO] Apache Sling Test Tools ... SKIPPED
[INFO] Apache Sling Resource Access Security Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework API . SKIPPED
[INFO] Apache Sling Validation Framework Core Implementation  SKIPPED
[INFO] Apache Sling Validation Framework Testing Services  SKIPPED
[INFO] Apache Sling Validation Framework Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework Examples  SKIPPED
[INFO] Apache Sling Validation Framework Builder . SKIPPED
[INFO] Apache Sling Models API ... SKIPPED
[INFO] Apache Sling Models Implementation  SKIPPED
[INFO] Apache Sling Models Validation Implementation . SKIPPED
[INFO] Apache Sling Models Integration Tests . SKIPPED
[INFO] Apache Sling JUnit Core ... SKIPPED
[INFO] Apache Sling JUnit Scriptable Tests Provider .. SKIPPED
[INFO] Apache Sling JUnit Health Checks .. SKIPPED
[INFO] Apache Sling JUnit Remote Tests Runners ... SKIPPED
[INFO] Apache Sling JUnit Performance  SKIPPED
[INFO] Apache Sling Testing Mock Log Configuration ... SKIPPED
[INFO] Apache Sling Testing Resource Resolver Mock ... SKIPPED
[INFO] Apache Sling Testing JCR Mock . SKIPPED
[INFO] Apache Sling Testing OSGi Mock  SKIPPED
[INFO] Apache Sling Testing Sling Mock ... SKIPPED
[INFO] Apache Sling Testing Sling Mock Jackrabbit-based Resource Resolver  
SKIPPED
[INFO] Apache Sling Sample Server-Side Tests . SKIPPED
[INFO] Apache Sling Failing Server-Side Tests  SKIPPED
[INFO] Apache Sling Sample Integration Tests . SKIPPED
[INFO] Apache Sling Testing Modules Reactor .. SKIPPED
[INFO] Apache Sling Installer  SKIPPED
[INFO] Apache Sling Installer WebConsole Plugin .. SKIPPED
[INFO] Apache Sling File Installer ... SKIPPED
[INFO] Apache Sling JCR Installer  SKIPPED
[INFO] Apache Sling Installer Configuration Admin Support  SKIPPED
[INFO] Apache Sling 

svn commit: r1691036 - in /sling/trunk: bundles/scripting/core/ bundles/scripting/core/src/test/java/org/apache/sling/scripting/core/impl/ bundles/scripting/javascript/ bundles/scripting/sightly/js-us

[radu]

Author: radu
Date: Tue Jul 14 17:16:52 2015
New Revision: 1691036

URL: http://svn.apache.org/r1691036
Log:
release: updated dependencies after staging artifacts for release

Modified:
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/core/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/core/pom.xml?rev=1691036r1=1691035r2=1691036view=diff
==
--- sling/trunk/bundles/scripting/core/pom.xml (original)
+++ sling/trunk/bundles/scripting/core/pom.xml Tue Jul 14 17:16:52 2015
@@ -136,7 +136,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/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=1691036r1=1691035r2=1691036view=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
 Tue Jul 14 17:16:52 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.7-SNAPSHOT),
+mavenBundle(org.apache.sling, 
org.apache.sling.scripting.api, 2.1.9-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=1691036r1=1691035r2=1691036view=diff
==
--- sling/trunk/bundles/scripting/javascript/pom.xml (original)
+++ sling/trunk/bundles/scripting/javascript/pom.xml Tue Jul 14 17:16:52 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=1691036r1=1691035r2=1691036view=diff
==
--- sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml (original)
+++ sling/trunk/bundles/scripting/sightly/js-use-provider/pom.xml Tue Jul 14 
17:16:52 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: 

Build failed in Jenkins: sling-trunk-1.8 #1318

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.8/1318/changes

Changes:

[kwin] add extended logging

[sseifert] SLING-4881 NoSQL Generic Resource Provider: Preserve order of 
changed resources (patch contributed by Levente Santha)

--
[...truncated 44961 lines...]
[INFO] Apache Sling JSP Standard Tag Library . SKIPPED
[INFO] Apache Sling Scripting Sightly Engine . SKIPPED
[INFO] Apache Sling Scripting Sightly JavaScript Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Read-Eval-Print Loop Environment  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests Content  SKIPPED
[INFO] Apache Sling Adapter Manager Implementation ... SKIPPED
[INFO] Apache Sling Internationalization Support . SKIPPED
[INFO] Apache Sling XSS Protection Bundle  SKIPPED
[INFO] Apache Sling Launchpad Application Builder  SKIPPED
[INFO] Apache Sling Scripting Sightly Integration Tests .. SKIPPED
[INFO] Apache Sling Scripting Sightly Models Use Provider  SKIPPED
[INFO] Apache Sling Scripting Sightly Reactor  SKIPPED
[INFO] Apache Sling Bundle Resource Provider . SKIPPED
[INFO] Apache Sling Distributed Event Admin .. SKIPPED
[INFO] Apache Sling Discovery API  SKIPPED
[INFO] Apache Sling Discovery Commons Bundle . SKIPPED
[INFO] Apache Sling Resource-Based Discovery Service . SKIPPED
[INFO] Apache Sling Discovery Support Bundle . SKIPPED
[INFO] Apache Sling Discovery Standalone Implementation .. SKIPPED
[INFO] Apache Sling Event Support  SKIPPED
[INFO] Apache Sling Feature Flags  SKIPPED
[INFO] Apache Sling Filesystem Resource Provider . SKIPPED
[INFO] Apache Sling javax.activation bundle .. SKIPPED
[INFO] Apache Sling Service User Mapper .. SKIPPED
[INFO] Apache Sling Settings . SKIPPED
[INFO] Apache Sling Web Console Branding . SKIPPED
[INFO] Apache Sling Web Console Security Provider  SKIPPED
[INFO] Apache Sling Explorer . SKIPPED
[INFO] Apache Sling Health Check Core  SKIPPED
[INFO] Apache Sling Health Check Annotations . SKIPPED
[INFO] Apache Sling Health Check Samples . SKIPPED
[INFO] Apache Sling Health Check Support Components .. SKIPPED
[INFO] Apache Sling Health Check Webconsole Plugin ... SKIPPED
[INFO] Apache Sling Health Check JUnit Bridge  SKIPPED
[INFO] Apache Sling Health Check Integration Tests ... SKIPPED
[INFO] Apache Sling Health Check Reactor POM . SKIPPED
[INFO] Apache Sling Resource Access Security . SKIPPED
[INFO] Apache Sling Test Tools ... SKIPPED
[INFO] Apache Sling Resource Access Security Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework API . SKIPPED
[INFO] Apache Sling Validation Framework Core Implementation  SKIPPED
[INFO] Apache Sling Validation Framework Testing Services  SKIPPED
[INFO] Apache Sling Validation Framework Integration Tests  SKIPPED
[INFO] Apache Sling Validation Framework Examples  SKIPPED
[INFO] Apache Sling Validation Framework Builder . SKIPPED
[INFO] Apache Sling Models API ... SKIPPED
[INFO] Apache Sling Models Implementation  SKIPPED
[INFO] Apache Sling Models Validation Implementation . SKIPPED
[INFO] Apache Sling Models Integration Tests . SKIPPED
[INFO] Apache Sling JUnit Core ... SKIPPED
[INFO] Apache Sling JUnit Scriptable Tests Provider .. SKIPPED
[INFO] Apache Sling JUnit Health Checks .. SKIPPED
[INFO] Apache Sling JUnit Remote Tests Runners ... SKIPPED
[INFO] Apache Sling JUnit Performance  SKIPPED
[INFO] Apache Sling Testing Mock Log Configuration ... SKIPPED
[INFO] Apache Sling Testing Resource Resolver Mock ... SKIPPED
[INFO] Apache Sling Testing JCR Mock . SKIPPED
[INFO] Apache Sling Testing OSGi Mock  SKIPPED
[INFO] Apache Sling Testing Sling Mock ... SKIPPED
[INFO] Apache Sling Testing Sling Mock Jackrabbit-based Resource Resolver  
SKIPPED
[INFO] Apache Sling Sample Server-Side Tests . SKIPPED
[INFO] Apache Sling Failing Server-Side Tests  SKIPPED
[INFO] Apache Sling Sample Integration Tests . SKIPPED
[INFO] Apache Sling Testing Modules Reactor .. SKIPPED
[INFO] Apache Sling Installer  SKIPPED
[INFO] Apache Sling Installer WebConsole Plugin .. SKIPPED
[INFO] Apache Sling File Installer ... SKIPPED
[INFO] Apache Sling JCR Installer  SKIPPED
[INFO] Apache Sling Installer Configuration Admin Support  SKIPPED
[INFO] Apache Sling 

Jenkins build is back to normal : sling-trunk-1.7 #2031

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.7/2031/changes

svn commit: r1691105 - in /sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model: EffectiveModelProcessor.java ModelResolveUtility.java ModelUtility.java

[sseifert]

Author: sseifert
Date: Tue Jul 14 23:24:19 2015
New Revision: 1691105

URL: http://svn.apache.org/r1691105
Log:
SLING-4807 introduce explicit boolean flag to make sure variable replacement 
does not take place when merging models

Modified:

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java

sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java?rev=1691105r1=1691104r2=1691105view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/EffectiveModelProcessor.java
 Tue Jul 14 23:24:19 2015
@@ -56,7 +56,7 @@ class EffectiveModelProcessor extends Mo
 @Override
 protected Configuration processConfiguration(Configuration config, Feature 
newFeature, RunMode newRunMode) {
 Configuration newConfig = new Configuration(config.getPid(), 
config.getFactoryPid());
-getProcessedConfiguration(newFeature, newConfig, config, 
options.getVariableResolver());
+getProcessedConfiguration(newFeature, newConfig, config, true, 
options.getVariableResolver());
 return newConfig;
 }
 

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java?rev=1691105r1=1691104r2=1691105view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelResolveUtility.java
 Tue Jul 14 23:24:19 2015
@@ -104,12 +104,14 @@ class ModelResolveUtility {
  * @param feature Feature
  * @param newConfig New configuration with replaced variables
  * @param config Source configuration which may contain variable 
placeholders
- * @param resolver Variable resolver
+ * @param replaceVariables If set to true variables are resolved in the 
config before processing it.
+ * @param resolver Variable resolver Optional variable resolver which is 
used. If not given only the feature's variables are used.
  */
 static void getProcessedConfiguration(
 final Feature feature,
 final Configuration newConfig,
 final Configuration config,
+final boolean replaceVariables,
 final VariableResolver resolver) {
 newConfig.setComment(config.getComment());
 newConfig.setLocation(config.getLocation());
@@ -117,7 +119,9 @@ class ModelResolveUtility {
 // check for raw configuration
 String rawConfig = 
(String)config.getProperties().get(ModelConstants.CFG_UNPROCESSED);
 if ( rawConfig != null ) {
-rawConfig = replace(feature, rawConfig, resolver);
+if ( replaceVariables ) {
+rawConfig = replace(feature, rawConfig, resolver);
+}
 if ( config.isSpecial() ) {
 newConfig.getProperties().put(config.getPid(), rawConfig);
 } else {

Modified: 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java?rev=1691105r1=1691104r2=1691105view=diff
==
--- 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
 (original)
+++ 
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
 Tue Jul 14 23:24:19 2015
@@ -171,12 +171,12 @@ public abstract class ModelUtility {
 copyConfigurationProperties(baseConfig, mergeConfig);
 } else {
 final Configuration newConfig = new 
Configuration(baseConfig.getPid(), baseConfig.getFactoryPid());
-

Jenkins build became unstable: sling-trunk-1.8 #1320

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.8/1320/changes

Jenkins build is still unstable: sling-contrib-1.7 #256

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-contrib-1.7/256/

Jenkins build is back to normal : sling-trunk-1.8 #1319

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-trunk-1.8/1319/changes

Jenkins build is still unstable: sling-contrib-1.7 #254

[Apache Jenkins Server]

See https://builds.apache.org/job/sling-contrib-1.7/changes