date:20170406

Author: justin
Date: Thu Apr  6 15:46:33 2017
New Revision: 1790424

URL: http://svn.apache.org/viewvc?rev=1790424=rev
Log:
forgot to include this file with r1789734

Added:

sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java

Added: 
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java?rev=1790424=auto
==
--- 
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java
 (added)
+++ 
sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java
 Thu Apr  6 15:46:33 2017
@@ -0,0 +1,30 @@
+/*
+ * 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.models.it.models;
+
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.models.annotations.Model;
+
+@Model(adaptables=Resource.class)
+public class ModelWithOptionalImport {
+
+// this class is not available at runtime. The containing package has an 
optional import so the bundle
+// still resolves
+private BeanUtils beanUtils = new BeanUtils();
+}

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1481

2017-04-06 Thread Apache Jenkins Server

See

svn commit: r1790344 - in /sling/trunk/bundles/extensions/serviceusermapper/src: main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java test/java/org/apache/sling/serviceusermap

2017-04-06 Thread cziegeler

Author: cziegeler
Date: Thu Apr  6 06:03:13 2017
New Revision: 1790344

URL: http://svn.apache.org/viewvc?rev=1790344=rev
Log:
SLING-6772 : Provide default mapping for service users

Modified:

sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java

sling/trunk/bundles/extensions/serviceusermapper/src/test/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImplTest.java

Modified: 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java?rev=1790344=1790343=1790344=diff
==
--- 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
 (original)
+++ 
sling/trunk/bundles/extensions/serviceusermapper/src/main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java
 Thu Apr  6 06:03:13 2017
@@ -72,8 +72,14 @@ public class ServiceUserMapperImpl imple
 
 @AttributeDefinition(name = "Default User",
 description = "The name of the user to use as the default if no 
service mapping"
-+ "applies. If this property is missing or empty no default 
user is defined.")
++ " applies. If this property is missing or empty no default 
user is defined.")
 String user_default();
+
+@AttributeDefinition(name = "Default Mapping",
+description = "If enabled and no mapping for a requested 
service user exists and no " +
+  " default user is defined, a " +
+ "default mapping is applied which uses the service user 
\"serviceuser@\" + {bundleId} + [\":\" + subServiceName]")
+boolean user_default_mapping() default true;
 }
 
 /** default log */
@@ -83,13 +89,15 @@ public class ServiceUserMapperImpl imple
 
 private String defaultUser;
 
-private Map amendments = new HashMap();
+private boolean useDefaultMapping;
+
+private Map amendments = new HashMap<>();
 
 private Mapping[] activeMappings = new Mapping[0];
 
-private final List validators = new 
CopyOnWriteArrayList();
+private final List validators = new 
CopyOnWriteArrayList<>();
 
-private SortedMap activeRegistrations = new 
TreeMap();
+private SortedMap activeRegistrations = new 
TreeMap<>();
 
 private BundleContext bundleContext;
 
@@ -107,7 +115,7 @@ public class ServiceUserMapperImpl imple
 final String[] props = config.user_mapping();
 
 if ( props != null ) {
-final ArrayList mappings = new 
ArrayList(props.length);
+final ArrayList mappings = new ArrayList<>(props.length);
 for (final String prop : props) {
 if (prop != null && prop.trim().length() > 0 ) {
 try {
@@ -124,6 +132,7 @@ public class ServiceUserMapperImpl imple
 this.globalServiceUserMappings = new Mapping[0];
 }
 this.defaultUser = config.user_default();
+this.useDefaultMapping = config.user_default_mapping();
 
 RegistrationSet registrationSet = null;
 this.bundleContext = bundleContext;
@@ -208,13 +217,13 @@ public class ServiceUserMapperImpl imple
 }
 
 protected RegistrationSet updateMappings() {
-final List sortedMappings = new 
ArrayList();
+final List sortedMappings = new ArrayList<>();
 for(final MappingConfigAmendment amendment : this.amendments.values() 
) {
 sortedMappings.add(amendment);
 }
 Collections.sort(sortedMappings);
 
-final List mappings = new ArrayList();
+final List mappings = new ArrayList<>();
 for(final Mapping m : this.globalServiceUserMappings) {
 mappings.add(m);
 }
@@ -242,8 +251,8 @@ public class ServiceUserMapperImpl imple
 return result;
 }
 
-final SortedSet orderedNewMappings = new 
TreeSet(Arrays.asList(newMappings));
-final SortedMap newRegistrations = new 
TreeMap();
+final SortedSet orderedNewMappings = new 
TreeSet<>(Arrays.asList(newMappings));
+final SortedMap newRegistrations = new 
TreeMap<>();
 
 // keep those that are still mapped
 for (Map.Entry registrationEntry: 
activeRegistrations.entrySet()) {
@@ -319,7 +328,7 @@ public class ServiceUserMapperImpl imple
 
 for (final Registration registration : registrationSet.added) {

Jenkins build is still unstable: sling-launchpad-testing-war-1.8 #1412

2017-04-06 Thread Apache Jenkins Server

See

Jenkins build is back to stable : sling-bundles-extensions-caconfig-integration-tests-1.8 #9537

2017-04-06 Thread Apache Jenkins Server

See

svn commit: r1790354 - /sling/tags/org.apache.sling.serviceusermapper-1.3.0/

2017-04-06 Thread cziegeler

Author: cziegeler
Date: Thu Apr  6 07:39:34 2017
New Revision: 1790354

URL: http://svn.apache.org/viewvc?rev=1790354=rev
Log:
[maven-release-plugin] copy for tag org.apache.sling.serviceusermapper-1.3.0

Added:
sling/tags/org.apache.sling.serviceusermapper-1.3.0/
  - copied from r1790353, sling/trunk/bundles/extensions/serviceusermapper/

svn commit: r1790355 - /sling/trunk/bundles/extensions/serviceusermapper/pom.xml

2017-04-06 Thread cziegeler

Author: cziegeler
Date: Thu Apr  6 07:39:36 2017
New Revision: 1790355

URL: http://svn.apache.org/viewvc?rev=1790355=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
sling/trunk/bundles/extensions/serviceusermapper/pom.xml

Modified: sling/trunk/bundles/extensions/serviceusermapper/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper/pom.xml?rev=1790355=1790354=1790355=diff
==
--- sling/trunk/bundles/extensions/serviceusermapper/pom.xml (original)
+++ sling/trunk/bundles/extensions/serviceusermapper/pom.xml Thu Apr  6 
07:39:36 2017
@@ -29,7 +29,7 @@
 
 org.apache.sling.serviceusermapper
 bundle
-1.3.0
+1.3.1-SNAPSHOT
 
 Apache Sling Service User Mapper
 
@@ -40,9 +40,9 @@
 
 
 
-
scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0
-
scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.serviceusermapper-1.3.0
-
http://svn.apache.org/viewvc/sling/tags/org.apache.sling.serviceusermapper-1.3.0
+
scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper
+
scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/serviceusermapper
+
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/serviceusermapper

Jenkins build became unstable: sling-bundles-extensions-caconfig-integration-tests-1.8 #9554

2017-04-06 Thread Apache Jenkins Server

See

svn commit: r1790371 - /sling/site/trunk/content/documentation/development/repository-based-development.mdtext

2017-04-06 Thread kwin

Author: kwin
Date: Thu Apr  6 09:54:43 2017
New Revision: 1790371

URL: http://svn.apache.org/viewvc?rev=1790371=rev
Log:
document davex

Modified:

sling/site/trunk/content/documentation/development/repository-based-development.mdtext

Modified: 
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/repository-based-development.mdtext?rev=1790371=1790370=1790371=diff
==
--- 
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
 Thu Apr  6 09:54:43 2017
@@ -4,7 +4,7 @@ Title: Repository Based Development
 
 # WebDAV Support
 
-WebDAV support in Sling is based on the [Simple 
WebDAV](http://jackrabbit.apache.org/jackrabbit-jcr-server.html#JackrabbitJCRServer-JCRWebdavServer)
 implementation of Apache Jackrabbit which is integrated in the `jcr/webdav` 
project. This bundle provides WebDAV access to Sling's repository in two 
flavours: 
+WebDAV support in Sling is based on the [Simple 
WebDAV](http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#Simple_Webdav_Server)
 implementation of Apache Jackrabbit which is integrated in the `jcr/webdav` 
project. This bundle provides WebDAV access to Sling's repository in two 
flavours: 
 
 1. Access to all workspaces of the repository on a separate URI space -- by 
default rooted at `/dav` in the Sling context -- and 
 2. access to the workspace used by Sling itself at the root of the Sling 
context.
@@ -68,6 +68,10 @@ This implementation uses the standard `o
 
 This implementation only supports listing node types which are considered 
representing non-collection resources. All nodes which are instances of any of 
the configured node types are considered non-collection resources. All other 
nodes are considere collection resources.
 
+# DavEx Support
+
+[DavEx](https://wiki.apache.org/jackrabbit/RemoteAccess) (WebDAV with JCR 
Extensions allows to remotely access a JCR repository. Sling provides support 
based on the [JCR WebDAV 
Server](http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server)
 implementation of Apache Jackrabbit which is integrated in the `jcr/davex` 
project. By default the server listens on request urls starting with `/server`.
+
 
 # Eclipse plugin for JCR

svn commit: r1790372 - /sling/site/trunk/content/documentation/development/repository-based-development.mdtext

2017-04-06 Thread kwin

Author: kwin
Date: Thu Apr  6 09:55:29 2017
New Revision: 1790372

URL: http://svn.apache.org/viewvc?rev=1790372=rev
Log:
fix typo

Modified:

sling/site/trunk/content/documentation/development/repository-based-development.mdtext

Modified: 
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/development/repository-based-development.mdtext?rev=1790372=1790371=1790372=diff
==
--- 
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/development/repository-based-development.mdtext
 Thu Apr  6 09:55:29 2017
@@ -70,7 +70,7 @@ This implementation only supports listin
 
 # DavEx Support
 
-[DavEx](https://wiki.apache.org/jackrabbit/RemoteAccess) (WebDAV with JCR 
Extensions allows to remotely access a JCR repository. Sling provides support 
based on the [JCR WebDAV 
Server](http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server)
 implementation of Apache Jackrabbit which is integrated in the `jcr/davex` 
project. By default the server listens on request urls starting with `/server`.
+[DavEx](https://wiki.apache.org/jackrabbit/RemoteAccess) (WebDAV with JCR 
Extensions) allows to remotely access a JCR repository. Sling provides support 
based on the [JCR WebDAV 
Server](http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server)
 implementation of Apache Jackrabbit which is integrated in the `jcr/davex` 
project. By default the server listens on request urls starting with `/server`.
 
 
 # Eclipse plugin for JCR

svn commit: r1009909 - in /websites/staging/sling/trunk/content: ./ documentation/development/repository-based-development.html

2017-04-06 Thread buildbot

Author: buildbot
Date: Thu Apr  6 09:55:00 2017
New Revision: 1009909

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/development/repository-based-development.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr  6 09:55:00 2017
@@ -1 +1 @@
-1790288
+1790371

Modified: 
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
==
--- 
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
 Thu Apr  6 09:55:00 2017
@@ -129,11 +129,12 @@ h2:hover > .headerlink, h3:hover > .head
 
 
 
+DavEx Support
 Eclipse plugin for JCR
 
 
 WebDAV Support
-WebDAV support in Sling is based on the http://jackrabbit.apache.org/jackrabbit-jcr-server.html#JackrabbitJCRServer-JCRWebdavServer;>Simple
 WebDAV implementation of Apache Jackrabbit which is integrated in the 
jcr/webdav project. This bundle provides WebDAV access to Sling's 
repository in two flavours: 
+WebDAV support in Sling is based on the http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#Simple_Webdav_Server;>Simple
 WebDAV implementation of Apache Jackrabbit which is integrated in the 
jcr/webdav project. This bundle provides WebDAV access to Sling's 
repository in two flavours: 
 
 Access to all workspaces of the repository on a separate URI space -- by 
default rooted at /dav in the Sling context -- and 
 access to the workspace used by Sling itself at the root of the Sling 
context.
@@ -222,10 +223,12 @@ h2:hover > .headerlink, h3:hover > .head
 This implementation uses the standard 
org.apache.jackrabbit.webdav.simple.DefaultItemFilter 
implementation as its item filter and configures the filter with the namespace 
prefixes and URIs as well as the node types configured as parameters.
 Collection Node Types
 This implementation only supports listing node types which are considered 
representing non-collection resources. All nodes which are instances of any of 
the configured node types are considered non-collection resources. All other 
nodes are considere collection resources.
+DavEx Support
+https://wiki.apache.org/jackrabbit/RemoteAccess;>DavEx (WebDAV 
with JCR Extensions allows to remotely access a JCR repository. Sling provides 
support based on the http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server;>JCR
 WebDAV Server implementation of Apache Jackrabbit which is integrated in 
the jcr/davex project. By default the server listens on request 
urls starting with /server.
 Eclipse plugin for JCR
 see Sling IDE 
Tooling
   
-Rev. 1786636 by kwin on Mon, 13 Mar 2017 08:14:54 +
+Rev. 1790371 by kwin on Thu, 6 Apr 2017 09:54:43 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

svn commit: r1009910 - in /websites/staging/sling/trunk/content: ./ documentation/development/repository-based-development.html

2017-04-06 Thread buildbot

Author: buildbot
Date: Thu Apr  6 09:55:38 2017
New Revision: 1009910

Log:
Staging update by buildbot for sling

Modified:
websites/staging/sling/trunk/content/   (props changed)

websites/staging/sling/trunk/content/documentation/development/repository-based-development.html

Propchange: websites/staging/sling/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Apr  6 09:55:38 2017
@@ -1 +1 @@
-1790371
+1790372

Modified: 
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
==
--- 
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
 (original)
+++ 
websites/staging/sling/trunk/content/documentation/development/repository-based-development.html
 Thu Apr  6 09:55:38 2017
@@ -224,11 +224,11 @@ h2:hover > .headerlink, h3:hover > .head
 Collection Node Types
 This implementation only supports listing node types which are considered 
representing non-collection resources. All nodes which are instances of any of 
the configured node types are considered non-collection resources. All other 
nodes are considere collection resources.
 DavEx Support
-https://wiki.apache.org/jackrabbit/RemoteAccess;>DavEx (WebDAV 
with JCR Extensions allows to remotely access a JCR repository. Sling provides 
support based on the http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server;>JCR
 WebDAV Server implementation of Apache Jackrabbit which is integrated in 
the jcr/davex project. By default the server listens on request 
urls starting with /server.
+https://wiki.apache.org/jackrabbit/RemoteAccess;>DavEx (WebDAV 
with JCR Extensions) allows to remotely access a JCR repository. Sling provides 
support based on the http://jackrabbit.apache.org/jcr/components/jackrabbit-jcr-server.html#JCR_Webdav_Server;>JCR
 WebDAV Server implementation of Apache Jackrabbit which is integrated in 
the jcr/davex project. By default the server listens on request 
urls starting with /server.
 Eclipse plugin for JCR
 see Sling IDE 
Tooling
   
-Rev. 1790371 by kwin on Thu, 6 Apr 2017 09:54:43 +
+Rev. 1790372 by kwin on Thu, 6 Apr 2017 09:55:29 +
   

 Apache Sling, Sling, Apache, the Apache feather logo, and the Apache 
Sling project

Build failed in Jenkins: sling-ide #99

2017-04-06 Thread Apache Jenkins Server

See 

Changes:

[kwin] SLING-6618 include filevault 3.1.38 (and transitive dependencies) and 
always explicitly specify the default workspace name

--
[...truncated 347.28 KB...]
[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] 
[INFO] --- build-helper-maven-plugin:1.7:reserve-network-port 
(reserve-network-port) @ org.apache.sling.ide.eclipse-test ---
[INFO] Reserved port 53072 for http.port
[INFO] Reserved port 52081 for jetty.stop.port
[INFO] 
[INFO] --- maven-dependency-plugin:2.8:copy (prepare-launchpad) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] Configured Artifact: org.apache.sling:org.apache.sling.launchpad:7:war
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7.war
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/org/apache/sling/org.apache.sling.launchpad/7/org.apache.sling.launchpad-7.war
 (44558 KB at 3396.6 KB/sec)
[INFO] Copying org.apache.sling.launchpad-7.war to 

[INFO] 
[INFO] >>> jetty-maven-plugin:7.6.15.v20140411:run-war (jetty-run) > package @ 
org.apache.sling.ide.eclipse-test >>>
[INFO] 
[INFO] --- tycho-packaging-plugin:0.22.0:build-qualifier 
(default-build-qualifier) @ org.apache.sling.ide.eclipse-test ---
[INFO] The project's OSGi version is 1.1.1.201704061103
[INFO] 
[INFO] --- tycho-packaging-plugin:0.22.0:validate-id (default-validate-id) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] 
[INFO] --- tycho-packaging-plugin:0.22.0:validate-version 
(default-validate-version) @ org.apache.sling.ide.eclipse-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- tycho-compiler-plugin:0.22.0:compile (default-compile) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- target-platform-configuration:0.22.0:target-platform 
(default-target-platform) @ org.apache.sling.ide.eclipse-test ---
[INFO] 
[INFO] --- tycho-packaging-plugin:0.22.0:package-plugin 
(default-package-plugin) @ org.apache.sling.ide.eclipse-test ---
[INFO] Building jar: 

[INFO] 
[INFO] --- tycho-p2-plugin:0.22.0:p2-metadata-default 
(default-p2-metadata-default) @ org.apache.sling.ide.eclipse-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ 
org.apache.sling.ide.eclipse-test ---
[WARNING] Failed to getClass for org.mortbay.jetty.plugin.JettyRunWarMojo
[INFO] 
[INFO] <<< jetty-maven-plugin:7.6.15.v20140411:run-war (jetty-run) < package @ 
org.apache.sling.ide.eclipse-test <<<
[INFO] 
[INFO] --- jetty-maven-plugin:7.6.15.v20140411:run-war (jetty-run) @ 
org.apache.sling.ide.eclipse-test ---
[INFO] Downloading: 
http://repository.jboss.org/nexus/content/groups/public/org/eclipse/jetty/jetty-util/7.6.15.v20140411/jetty-util-7.6.15.v20140411.pom
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-util/7.6.15.v20140411/jetty-util-7.6.15.v20140411.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-util/7.6.15.v20140411/jetty-util-7.6.15.v20140411.pom
 (4 KB at 175.9 KB/sec)
[INFO] Downloading: 
http://repository.jboss.org/nexus/content/groups/public/org/eclipse/jetty/jetty-project/7.6.15.v20140411/jetty-project-7.6.15.v20140411.pom
[INFO] Downloading: 
https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-project/7.6.15.v20140411/jetty-project-7.6.15.v20140411.pom
[INFO] Downloaded: 
https://repo.maven.apache.org/maven2/org/eclipse/jetty/jetty-project/7.6.15.v20140411/jetty-project-7.6.15.v20140411.pom
 (28 KB at 1610.0 KB/sec)
[INFO] Downloading: 
http://repository.jboss.org/nexus/content/groups/public/org/eclipse/jetty/jetty-webapp/7.6.15.v20140411/jetty-webapp-7.6.15.v20140411.pom
[INFO] Downloading:

svn commit: r1790374 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/ impl-vlt/src/org/apache/sling/ide/jcr/ vlt-wrapper/ vlt-wrapper/META-INF/

2017-04-06 Thread kwin

Author: kwin
Date: Thu Apr  6 10:51:26 2017
New Revision: 1790374

URL: http://svn.apache.org/viewvc?rev=1790374=rev
Log:
SLING-6618 include filevault 3.1.38 (and transitive dependencies) and always 
explicitly specify the default workspace name

Added:

sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/

sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
   (with props)
Modified:

sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
sling/trunk/tooling/ide/vlt-wrapper/META-INF/MANIFEST.MF
sling/trunk/tooling/ide/vlt-wrapper/build.properties
sling/trunk/tooling/ide/vlt-wrapper/pom.xml

Added: 
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java?rev=1790374=auto
==
--- 
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
 (added)
+++ 
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
 Thu Apr  6 10:51:26 2017
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.ide.jcr;
+
+import java.net.URISyntaxException;
+
+import org.apache.jackrabbit.vault.fs.api.RepositoryAddress;
+import org.apache.sling.ide.jcr.RepositoryUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class RepositoryUtilsTest {
+
+@Test
+public void testWebDavUrlLocationForAEM() throws URISyntaxException {
+// make sure AEM url contains workspace name
+String url = "http://localhost:4502/; + 
RepositoryUtils.WEBDAV_URL_LOCATIONS[1];
+RepositoryAddress address = new RepositoryAddress(url);
+// make sure the workspace name is correctly extracted
+Assert.assertEquals("crx.default", address.getWorkspace());
+}
+
+@Test
+public void testWebDavUrlLocationForSling() throws URISyntaxException {
+// make sure AEM url contains workspace name
+String url = "http://localhost:4502/; + 
RepositoryUtils.WEBDAV_URL_LOCATIONS[0];
+RepositoryAddress address = new RepositoryAddress(url);
+// make sure the workspace name is correctly extracted
+Assert.assertEquals("default", address.getWorkspace());
+}
+}

Propchange: 
sling/trunk/tooling/ide/impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/RepositoryUtilsTest.java
--
svn:mime-type = text/plain

Modified: 
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java?rev=1790374=1790373=1790374=diff
==
--- 
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
 (original)
+++ 
sling/trunk/tooling/ide/impl-vlt/src/org/apache/sling/ide/jcr/RepositoryUtils.java
 Thu Apr  6 10:51:26 2017
@@ -36,7 +36,15 @@ import org.apache.sling.ide.transport.Re
 public abstract class RepositoryUtils {
 
 private static final Object SYNC = new Object();
-private static final String[] WEBDAV_URL_LOCATIONS = new String[] { 
"server/-/jcr:root", "crx/-/jcr:root" };
+/** 
+ *  Path of DavEx server (by default listens on {@code /server}, for AEM 
below {@code /crx/server}), followed by workspace name.
+ *  Must not start with a slash.
+ *  Always give explicit workspace name to workaround the faulty fix from  
https://issues.apache.org/jira/browse/JCRVLT-144.
+ *  The original issue is https://issues.apache.org/jira/browse/JCR-4120, 
as soon as that one is fixed, 
+ *  the default workspace name does no longer need to be explicitly listed 
here.
+ *  @see RepositoryAddress
+ */
+static final String[] WEBDAV_URL_LOCATIONS = new String[] { 
"server/default/jcr:root",

svn commit: r1790385 - /sling/trunk/tooling/ide/impl-vlt-test/pom.xml

2017-04-06 Thread kwin

Author: kwin
Date: Thu Apr  6 11:51:12 2017
New Revision: 1790385

URL: http://svn.apache.org/viewvc?rev=1790385=rev
Log:
SLING-6618 update test dependencies to FileVault 3.1.38 as well

Modified:
sling/trunk/tooling/ide/impl-vlt-test/pom.xml

Modified: sling/trunk/tooling/ide/impl-vlt-test/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/tooling/ide/impl-vlt-test/pom.xml?rev=1790385=1790384=1790385=diff
==
--- sling/trunk/tooling/ide/impl-vlt-test/pom.xml (original)
+++ sling/trunk/tooling/ide/impl-vlt-test/pom.xml Thu Apr  6 11:51:12 2017
@@ -108,6 +108,12 @@
   test
   
   
+ org.apache.jackrabbit.vault
+  vault-davex
+  ${vault.version}
+  test
+  
+  
   org.apache.sling.ide
   org.apache.sling.ide.api
   ${project.version}
@@ -117,7 +123,7 @@
 
 
 
-2.11.3
-3.1.30
+2.14.0
+3.1.38

svn commit: r1009914 - in /websites/production/sling/content: ./ components/

2017-04-06 Thread kwin

Author: kwin
Date: Thu Apr  6 11:58:37 2017
New Revision: 1009914

Log:
Publishing svnmucc operation to sling site by kwin

Added:
websites/production/sling/content/
  - copied from r1009913, websites/staging/sling/trunk/content/
websites/production/sling/content/components/
  - copied from r1009913, websites/production/sling/content/components/

Nexus: Staging Repository Dropped

2017-04-06 Thread Nexus Repository Manager

Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.3.9 (Java 1.7.0_80; Mac OS X 10.12.4)""userId" = "cziegeler""ip" = "192.147.117.11"Details:The orgapachesling-1685 staging repository has been dropped.Action performed by Carsten Ziegeler (cziegeler)

Jenkins build is back to stable : sling-bundles-extensions-caconfig-integration-tests-1.8 #9555

Jenkins build is back to stable : sling-launchpad-testing-war-1.8 #1413

Jenkins build is still unstable: sling-launchpad-testing-1.8 #1478

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1479

Jenkins build became unstable: sling-launchpad-testing-1.8 #1477

Jenkins build became unstable: sling-launchpad-testing-1.8 #1480

svn commit: r1790424 - /sling/trunk/bundles/extensions/models/integration-tests/src/main/java/org/apache/sling/models/it/models/ModelWithOptionalImport.java

Jenkins build is back to stable : sling-launchpad-testing-1.8 #1481

svn commit: r1790344 - in /sling/trunk/bundles/extensions/serviceusermapper/src: main/java/org/apache/sling/serviceusermapping/impl/ServiceUserMapperImpl.java test/java/org/apache/sling/serviceusermap

Jenkins build is still unstable: sling-launchpad-testing-war-1.8 #1412

Jenkins build is back to stable : sling-bundles-extensions-caconfig-integration-tests-1.8 #9537

svn commit: r1790354 - /sling/tags/org.apache.sling.serviceusermapper-1.3.0/

svn commit: r1790355 - /sling/trunk/bundles/extensions/serviceusermapper/pom.xml

Jenkins build became unstable: sling-bundles-extensions-caconfig-integration-tests-1.8 #9554

svn commit: r1790371 - /sling/site/trunk/content/documentation/development/repository-based-development.mdtext

svn commit: r1790372 - /sling/site/trunk/content/documentation/development/repository-based-development.mdtext

svn commit: r1009909 - in /websites/staging/sling/trunk/content: ./ documentation/development/repository-based-development.html

svn commit: r1009910 - in /websites/staging/sling/trunk/content: ./ documentation/development/repository-based-development.html

Build failed in Jenkins: sling-ide #99

svn commit: r1790374 - in /sling/trunk/tooling/ide: impl-vlt-test/src/test/java/org/apache/sling/ide/jcr/ impl-vlt/src/org/apache/sling/ide/jcr/ vlt-wrapper/ vlt-wrapper/META-INF/

svn commit: r1790385 - /sling/trunk/tooling/ide/impl-vlt-test/pom.xml

svn commit: r1009914 - in /websites/production/sling/content: ./ components/

Nexus: Staging Repository Dropped

23 matches

Site Navigation

Mail list logo

Footer information