[sling-org-apache-sling-jcr-contentloader] 19/36: Clean up code
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.jcr.contentloader-2.0.6
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-contentloader.git
commit 30e1775dcdc69765818f1caeaf10fbf20033a535
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Nov 3 23:40:11 2009 +
Clean up code
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/contentloader@832609
13f79535-47bb-0310-9956-ffa450edef68
---
.../contentloader/internal/readers/XmlReaderTest.java | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git
a/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
b/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
index 2ef7482..bc40cec 100644
---
a/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
+++
b/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
@@ -18,10 +18,6 @@
*/
package org.apache.sling.jcr.contentloader.internal.readers;
-import junit.framework.TestCase;
-import org.apache.sling.jcr.contentloader.internal.ContentCreator;
-
-import javax.jcr.RepositoryException;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -33,6 +29,12 @@ import java.util.Date;
import java.util.List;
import java.util.Map;
+import javax.jcr.RepositoryException;
+
+import junit.framework.TestCase;
+
+import org.apache.sling.jcr.contentloader.internal.ContentCreator;
+
public class XmlReaderTest extends TestCase {
private XmlReader reader;
@@ -91,14 +93,12 @@ public class XmlReaderTest extends TestCase {
private static class MockContentCreator extends ArrayList
implements ContentCreator {
public static class FileDescription {
-public String name;
public InputStream data;
public String mimeType;
public long lastModified;
public String content;
-public FileDescription(String name, InputStream data, String
mimeType, long lastModified) throws IOException {
-this.name = name;
+public FileDescription(InputStream data, String mimeType, long
lastModified) throws IOException {
this.data = data;
this.mimeType = mimeType;
this.lastModified = lastModified;
@@ -134,7 +134,7 @@ public class XmlReaderTest extends TestCase {
public void createFileAndResourceNode(String name, InputStream data,
String mimeType, long lastModified) throws RepositoryException {
try {
-this.filesCreated.add(new FileDescription(name, data,
mimeType, lastModified));
+this.filesCreated.add(new FileDescription( data, mimeType,
lastModified));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -143,7 +143,7 @@ public class XmlReaderTest extends TestCase {
public boolean switchCurrentNode(String subPath, String newNodeType)
throws RepositoryException {
return true;
}
-
+
public void createAce(String principal,
String[] grantedPrivileges, String[]
deniedPrivileges)
throws RepositoryException {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jms] 07/08: [maven-release-plugin] prepare release org.apache.sling.jms-1.0.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jms-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jms.git commit fc3453a712e5b81ca718cc6e33fbcabf98fcee84 Author: Ian Boston <i...@apache.org> AuthorDate: Wed Oct 5 10:03:14 2016 + [maven-release-plugin] prepare release org.apache.sling.jms-1.0.0 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms@1763383 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 715ae96..a95d1f0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.jms bundle -0.0.1-SNAPSHOT +1.0.0 Apache Sling MoM Implementation using JMS with AMQ @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms - http://svn.apache.org/viewvc/sling/trunk/contrib/commons/mom/jms + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jms-1.0.0 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jms-1.0.0 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jms-1.0.0 @@ -106,7 +106,7 @@ * --> - + @@ -137,7 +137,7 @@ org.apache.sling org.apache.sling.mom -0.0.1-SNAPSHOT +1.0.0 provided -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 04/16: Remove superflous sling.java.version=6 as it's the default now
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 1d0ef5fb3dee494b6554802505e877cdd7d47495 Author: Robert Munteanu <romb...@apache.org> AuthorDate: Thu Jun 25 13:14:53 2015 + Remove superflous sling.java.version=6 as it's the default now git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1687505 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index 53227dc..7783492 100644 --- a/pom.xml +++ b/pom.xml @@ -30,10 +30,6 @@ The provisioning model for Apache Sling - -6 - - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] annotated tag org.apache.sling.jcr.webdav-2.3.0 created (now be8cde1)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jcr.webdav-2.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git. at be8cde1 (tag) tagging 21ed202d6fd5dd04361600cb2c236bd4046372bd (commit) by Carsten Ziegeler on Wed Aug 12 09:14:50 2015 + - Log - org.apache.sling.jcr.webdav-2.3.0 --- This annotated tag includes the following new commits: new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient. new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly. new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle new 6075e5a Use OSGi core and cmpendium jars from Felix project. new 97ce3de SLING-204 - add svn ignore patterns for intellij new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere. new 2f19dc1 Move licence and notice to top level dir. new ea1807f Add incubator disclaimer. new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes. new 5084dea Update notice files. new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin. new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins. new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files new ab2e11f SLING-483: Add excludes for javadocs (WiP) new 443e2a3 SLING-495 - NOTICE files generated using mknotice script new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927 new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes new a5898b0 Use released version of parent pom. new 9613fba Use released versions (or soon to be released versions). new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator new adf1a67 [maven-release-plugin] prepare for next development iteration new 8d649af Set version to next development version. new b60df5a Fix reference to parent pom. new ffb8853 Remove unused imports and fix some javadoc errors. new e037bca SLING-521: Restore more notice files. new c7878f3 SLING-521: Separate between notice files for bin and src dists. new cdee843 SLING-521: Separate between notice files for bin and src dists. new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included new fbdc0e3 Update to released versions. new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator new d081bbe [maven-release-plugin] prepare for next development iteration new 6eee069 Use latest snapshots again to make project buildable. new 4099ee4 Use released versions. new f058c71 Use released parent pom where possible. new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting. new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure comp
[sling-org-apache-sling-provisioning-model] 03/06: SLING-6278 : Provide tooling to create an archive with the provisioning model and all artifacts
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.8.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit ab4c7d8e9caf7cfbf2257f232e5dcba8a7a39b52
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Nov 12 15:09:17 2016 +
SLING-6278 : Provide tooling to create an archive with the provisioning
model and all artifacts
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1769384
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/provisioning/model/ModelUtility.java | 52 ++--
.../provisioning/model/io/ModelArchiveReader.java | 103
.../provisioning/model/io/ModelArchiveWriter.java | 137 +
.../sling/provisioning/model/io/package-info.java | 2 +-
4 files changed, 284 insertions(+), 10 deletions(-)
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
index 0503f97..968bfce 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
@@ -167,14 +167,14 @@ public abstract class ModelUtility {
for(final Feature feature : model.getFeatures() ) {
// validate feature
if ( feature.getName() == null || feature.getName().isEmpty() ) {
-errors.put(feature, "Name is required for a feature.");
+addError(errors, feature, "Name is required for a feature.");
}
// version should be a valid version
if ( feature.getVersion() != null ) {
try {
new Version(feature.getVersion());
} catch ( final IllegalArgumentException iae) {
-errors.put(feature, "Version is not a valid version: " +
feature.getVersion());
+addError(errors, feature, "Version is not a valid version:
" + feature.getVersion());
}
}
for(final RunMode runMode : feature.getRunModes()) {
@@ -193,12 +193,12 @@ public abstract class ModelUtility {
hasSpecial = 2;
} else {
hasSpecial = 2;
-errors.put(runMode, "Invalid modes " +
Arrays.toString(rm));
+addError(errors, runMode, "Invalid
modes " + Arrays.toString(rm));
break;
}
} else {
hasSpecial++;
-errors.put(runMode, "Invalid modes " +
Arrays.toString(rm));
+addError(errors, runMode, "Invalid modes "
+ Arrays.toString(rm));
break;
}
@@ -212,7 +212,7 @@ public abstract class ModelUtility {
for(final ArtifactGroup sl : runMode.getArtifactGroups()) {
if ( sl.getStartLevel() < 0 ) {
-errors.put(sl, "Invalid start level " +
sl.getStartLevel());
+addError(errors, sl, "Invalid start level " +
sl.getStartLevel());
}
for(final Artifact a : sl) {
String error = null;
@@ -229,7 +229,7 @@ public abstract class ModelUtility {
error = (error != null ? error + ", " : "") +
"type missing";
}
if (error != null) {
-errors.put(a, error);
+addError(errors, a, error);
}
}
}
@@ -246,12 +246,12 @@ public abstract class ModelUtility {
error = (error != null ? error + ", " : "") +
"configuration properties missing";
}
if (error != null) {
-errors.put(c, error);
+addError(errors, c, error);
}
}
}
}
-if ( errors.size() == 0 ) {
+if ( errors.isEmpty()) {
return null;
}
return errors;
@@ -260,7 +260,7 @@ public abstract class ModelUtility {
/**
* 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.
[sling-org-apache-sling-jcr-webdav] annotated tag org.apache.sling.jcr.webdav-2.2.2 created (now 9756a2a)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jcr.webdav-2.2.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git. at 9756a2a (tag) tagging 6944d552a1a4b63ee178147236e766e3e3f5084b (commit) by Carsten Ziegeler on Wed Mar 5 11:07:00 2014 + - Log - org.apache.sling.jcr.webdav-2.2.2 --- This annotated tag includes the following new commits: new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient. new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly. new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle new 6075e5a Use OSGi core and cmpendium jars from Felix project. new 97ce3de SLING-204 - add svn ignore patterns for intellij new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere. new 2f19dc1 Move licence and notice to top level dir. new ea1807f Add incubator disclaimer. new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes. new 5084dea Update notice files. new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin. new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins. new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files new ab2e11f SLING-483: Add excludes for javadocs (WiP) new 443e2a3 SLING-495 - NOTICE files generated using mknotice script new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927 new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes new a5898b0 Use released version of parent pom. new 9613fba Use released versions (or soon to be released versions). new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator new adf1a67 [maven-release-plugin] prepare for next development iteration new 8d649af Set version to next development version. new b60df5a Fix reference to parent pom. new ffb8853 Remove unused imports and fix some javadoc errors. new e037bca SLING-521: Restore more notice files. new c7878f3 SLING-521: Separate between notice files for bin and src dists. new cdee843 SLING-521: Separate between notice files for bin and src dists. new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included new fbdc0e3 Update to released versions. new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator new d081bbe [maven-release-plugin] prepare for next development iteration new 6eee069 Use latest snapshots again to make project buildable. new 4099ee4 Use released versions. new f058c71 Use released parent pom where possible. new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting. new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure comp
[sling-org-apache-sling-provisioning-model] 06/16: SLING-4645 Update Tika to 1.9
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 3509c1fa7a36415861a03178ab207d3cc593c549 Author: Oliver Lietz <o...@apache.org> AuthorDate: Mon Jul 13 10:00:16 2015 + SLING-4645 Update Tika to 1.9 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1690617 13f79535-47bb-0310-9956-ffa450edef68 --- src/test/resources/main.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/resources/main.txt b/src/test/resources/main.txt index 24da5e7..d94a57d 100644 --- a/src/test/resources/main.txt +++ b/src/test/resources/main.txt @@ -96,8 +96,8 @@ [artifacts startLevel=10] org.apache.felix/org.apache.felix.scr/1.8.2/jar org.apache.felix/org.apache.felix.metatype/1.0.10/jar -org.apache.tika/tika-core/1.2/jar -org.apache.tika/tika-bundle/1.2/jar +org.apache.tika/tika-core/1.9/jar +org.apache.tika/tika-bundle/1.9/jar [artifacts startLevel=15] org.apache.sling/org.apache.sling.jcr.jcr-wrapper/2.0.0/jar -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 38/38: Move Sling to new TLP location
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 6df68ec5430d7a1322eca4deef29fd9d4a927b2f Merge: 11c2e95 7c47711 Author: Felix Meschberger <fmesc...@apache.org> AuthorDate: Thu Jun 18 09:21:02 2009 + Move Sling to new TLP location git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator@785979 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 07/10: fix some typos
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 42ce287abd2d39eba23de7b2c9c03c36ae8f7251 Author: Konrad Windszus <k...@apache.org> AuthorDate: Wed Feb 24 14:53:32 2016 + fix some typos git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1732165 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/resources/OSGI-INF/metatype/metatype.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties index 2a3cb41..3a4fe61 100644 --- a/src/main/resources/OSGI-INF/metatype/metatype.properties +++ b/src/main/resources/OSGI-INF/metatype/metatype.properties @@ -75,9 +75,9 @@ dav.create-absolute-uri.description = When set to true, create absolute URIs \ collection.types.name = Non Collection Node Types collection.types.description = The JCR Node Types considered being \ - non-collection resouces by WebDAV. Any node replying true to Node.isNodeType() \ + non-collection resources by WebDAV. Any node replying true to Node.isNodeType() \ for one of the listed types is considered a non-collection resource. Otherwise \ - the respective node is considered a colleciton resource. + the respective node is considered a collection resource. filter.prefixes.name = Filter Prefixes filter.prefixes.description = A list of namespace prefixes indicating JCR items \ @@ -104,7 +104,7 @@ type.collections.name = Collection Primary Type type.collections.description = The JCR Primary Node Type to assign to nodes \ created to reflect WebDAV collections. The default value is sling:Folder. \ You may name any primary node type here, provided it allows the creation of \ - nodex of this type and the defined Non-Collection Primary Type below it. + nodes of this type and the defined Non-Collection Primary Type below it. type.noncollections.name = Non-Collection Primary Type type.noncollections.description = The JCR Primary Node Type to assign to \ -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 04/05: [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.5.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.5.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 62c933d7f23393be3525586b2252dd8661dc80af Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Oct 28 05:14:48 2016 + [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.5.0 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1766922 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index c5a3548..f789de8 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.sling.provisioning.model -1.4.5-SNAPSHOT +1.5.0 bundle Apache Sling Provisioning Model @@ -31,9 +31,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model - http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.5.0 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.5.0 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.5.0 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jms] 05/08: SLING-5645 Embedded gson added default exclude all exports to jms and services-it bundles
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jms-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jms.git commit f1a752c7a235179ad990749e76209d7685704ed0 Author: Ian Boston <i...@apache.org> AuthorDate: Mon Oct 3 15:52:05 2016 + SLING-5645 Embedded gson added default exclude all exports to jms and services-it bundles git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms@1763176 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 95a7a87..715ae96 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,8 @@ activemq-protobuf, activemq-kahadb-store, activemq-jms-pool, -hawtbuf +hawtbuf, +gson org.apache.activemq.jaas*;resolution:=optional, org.apache.commons.net.ftp*;resolution:=optional, @@ -83,7 +84,6 @@ javax.jmdns*;resolution:=optional, !org.apache.maven*, * - + -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 37/38: Move Sling to new TLP location
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 11c2e9503b4036b1847df79192f77caa620b6e88 Author: Felix Meschberger <fmesc...@apache.org> AuthorDate: Thu Jun 18 09:21:02 2009 + Move Sling to new TLP location git-svn-id: https://svn.eu.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator@785979 13f79535-47bb-0310-9956-ffa450edef68 --- LICENSE| 202 NOTICE | 9 + README.txt | 38 pom.xml| 169 + .../webdav/impl/helper/SlingLocatorFactory.java| 103 +++ .../webdav/impl/helper/SlingResourceLocator.java | 206 + .../webdav/impl/helper/SlingSessionProvider.java | 76 .../impl/servlets/AbstractSlingWebDavServlet.java | 65 +++ .../webdav/impl/servlets/SimpleWebDavServlet.java | 132 + .../webdav/impl/servlets/SlingWebDavServlet.java | 100 ++ src/main/resources/META-INF/DISCLAIMER | 7 + src/main/resources/META-INF/LICENSE| 202 src/main/resources/META-INF/NOTICE | 16 ++ .../OSGI-INF/metatype/metatype.properties | 41 src/main/resources/webdav-resource-config.xml | 156 15 files changed, 1522 insertions(+) diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..d645695 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue t
[sling-org-apache-sling-jcr-webdav] 33/38: SLING-521: Separate between notice files for bin and src dists.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit cdee843ef38e5e39f18ddd0f2a3448cfa039d35d Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Jun 13 13:43:34 2008 + SLING-521: Separate between notice files for bin and src dists. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@667538 13f79535-47bb-0310-9956-ffa450edef68 --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index ce1c702..7d1bf0d 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,6 @@ Apache Sling WebDAV -WE NEED A LOT MORE HERE!! +Bundle to access JCR repositories over WebDAV Disclaimer -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 02/29: using latest parent
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 6c387004ac7b3bb9a9834734065ad57771cfcf75 Author: Justin Edelson <jus...@apache.org> AuthorDate: Wed Nov 10 14:36:33 2010 + using latest parent git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1033492 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6a83e72..1f9d110 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -9 +10-SNAPSHOT ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 16/45: [maven-release-plugin] prepare release org.apache.sling.testing.tools-1.0.4
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 6f3c873b59263a522e252ed3e647b9d17931f52d Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Thu Apr 14 11:57:28 2011 + [maven-release-plugin] prepare release org.apache.sling.testing.tools-1.0.4 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1092151 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index b799e0f..3ae789e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,16 +27,16 @@ org.apache.sling.junit.remote -1.0.3-SNAPSHOT +1.0.4 bundle Apache Sling JUnit Remote Tests Runners Utilities to run server-side JUnit tests remotely - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote - http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.tools-1.0.4 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.tools-1.0.4 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.tools-1.0.4 @@ -76,7 +76,7 @@ org.apache.sling org.apache.sling.junit.core -1.0.3-SNAPSHOT +1.0.4 org.apache.felix @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.testing.tools -1.0.3-SNAPSHOT +1.0.4 org.apache.sling -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 01/10: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 91555fd47fa46a34af96c36e261d4879ccb344af Author: Robert Munteanu <romb...@apache.org> AuthorDate: Wed Oct 7 11:40:31 2015 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1707267 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 77dd475..df37deb 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.jcr.webdav bundle -2.3.2 +2.3.3-SNAPSHOT Apache Sling Simple WebDAV Access to repositories @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.2 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.2 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.3.2 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav +http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 01/03: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit ffade882ea19920b17484ed22409532c0bd1c78c Author: Robert Munteanu <romb...@apache.org> AuthorDate: Wed Jan 25 16:40:10 2017 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1780234 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1c1be1d..2735f95 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.jcr.webdav bundle -2.3.6 +2.3.7-SNAPSHOT Apache Sling Simple WebDAV Access to repositories @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.6 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.6 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.3.6 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav +http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 05/05: [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.2
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit ebcfa459501496f95d35bdd7af37454832fdbf8a Author: Robert Munteanu <romb...@apache.org> AuthorDate: Wed Oct 7 11:40:28 2015 + [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.2 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.2@1707266 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 03/05: Update the main reactor to parent 25
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 29e04d3ac7e01609c9c20d382680b822d732bd49 Author: Robert Munteanu <romb...@apache.org> AuthorDate: Mon Oct 5 10:03:45 2015 + Update the main reactor to parent 25 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1706780 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 134f1dc..397c76a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -24 +25 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 08/45: SLING-1963 - do not check number of tests if < 0
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.junit.healthcheck-1.0.4
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git
commit 5cdc9281159943f24ee4ff6ccb7ad2d0c305bcad
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Mon Feb 28 15:04:49 2011 +
SLING-1963 - do not check number of tests if < 0
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1075364
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/junit/remote/testrunner/SlingRemoteTestRunner.java | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
index d8e9118..8399d95 100644
---
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
+++
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
@@ -97,9 +97,11 @@ public class SlingRemoteTestRunner extends
ParentRunner {
testParameters.getJunitServletUrl(),
testHttpClient.getTestExecutionPath());
// Check that number of tests is as expected
-assertEquals("Expecting " + testParameters.getExpectedNumberOfTests()
+ " tests",
-testParameters.getExpectedNumberOfTests(),
-children.size());
+if(testParameters.getExpectedNumberOfTests() >= 0) {
+assertEquals("Expecting " +
testParameters.getExpectedNumberOfTests() + " tests",
+testParameters.getExpectedNumberOfTests(),
+children.size());
+}
}
@Override
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] annotated tag org.apache.sling.jcr.webdav-2.3.8 created (now 9449f44)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jcr.webdav-2.3.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git. at 9449f44 (tag) tagging 9c3c2096e35e381e2167362c27b0768042b905ce (commit) by Robert Munteanu on Wed Feb 1 12:33:22 2017 + - Log - org.apache.sling.jcr.webdav-2.3.8 --- This annotated tag includes the following new commits: new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient. new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly. new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle new 6075e5a Use OSGi core and cmpendium jars from Felix project. new 97ce3de SLING-204 - add svn ignore patterns for intellij new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere. new 2f19dc1 Move licence and notice to top level dir. new ea1807f Add incubator disclaimer. new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes. new 5084dea Update notice files. new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin. new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins. new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files new ab2e11f SLING-483: Add excludes for javadocs (WiP) new 443e2a3 SLING-495 - NOTICE files generated using mknotice script new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927 new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes new a5898b0 Use released version of parent pom. new 9613fba Use released versions (or soon to be released versions). new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator new adf1a67 [maven-release-plugin] prepare for next development iteration new 8d649af Set version to next development version. new b60df5a Fix reference to parent pom. new ffb8853 Remove unused imports and fix some javadoc errors. new e037bca SLING-521: Restore more notice files. new c7878f3 SLING-521: Separate between notice files for bin and src dists. new cdee843 SLING-521: Separate between notice files for bin and src dists. new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included new fbdc0e3 Update to released versions. new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator new d081bbe [maven-release-plugin] prepare for next development iteration new 6eee069 Use latest snapshots again to make project buildable. new 4099ee4 Use released versions. new f058c71 Use released parent pom where possible. new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting. new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure comp
[sling-org-apache-sling-jcr-webdav] 04/06: SLING-6459 Upgrade Jackrabbit to 2.14.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 8a17484d2d689fe3b42ad9051d010e1fd2f330af Author: Oliver Lietz <o...@apache.org> AuthorDate: Fri Jan 13 11:50:03 2017 + SLING-6459 Upgrade Jackrabbit to 2.14.0 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1778558 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80476d5..fec9a46 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ -2.13.1 +2.14.0 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 01/06: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 614e765c05c99c4a43dfd1083580e1d49ea93a95 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Mar 4 10:47:13 2016 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1733580 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6f1c673..ded6526 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.jcr.webdav bundle -2.3.4 +2.3.5-SNAPSHOT Apache Sling Simple WebDAV Access to repositories @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.4 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.4 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.webdav-2.3.4 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav +http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 24/45: SLING-2153 - fixing parent path reference
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit e3cea0812f9be32330786d7bb65b9f6aa1dc744c Author: Justin Edelson <jus...@apache.org> AuthorDate: Thu Jul 21 22:36:54 2011 + SLING-2153 - fixing parent path reference git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1149394 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index c66e6cb..4aa3de1 100644 --- a/pom.xml +++ b/pom.xml @@ -24,6 +24,7 @@ org.apache.sling sling 11-SNAPSHOT +../../../parent/pom.xml org.apache.sling.junit.remote -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 11/45: SLING-1981 - do not fail if TestObjectProcessor is missing, happens when running tests with SlingRemoteExecutionRule
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.junit.healthcheck-1.0.4
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git
commit c8e2a556e934874d7270c969d2b6519da56208e2
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Thu Mar 10 15:22:10 2011 +
SLING-1981 - do not fail if TestObjectProcessor is missing, happens when
running tests with SlingRemoteExecutionRule
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1080246
13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/junit/remote/ide/SlingRemoteExecutionRule.java | 5 +
1 file changed, 5 insertions(+)
diff --git
a/src/main/java/org/apache/sling/junit/remote/ide/SlingRemoteExecutionRule.java
b/src/main/java/org/apache/sling/junit/remote/ide/SlingRemoteExecutionRule.java
index 9590ab8..529d785 100644
---
a/src/main/java/org/apache/sling/junit/remote/ide/SlingRemoteExecutionRule.java
+++
b/src/main/java/org/apache/sling/junit/remote/ide/SlingRemoteExecutionRule.java
@@ -27,6 +27,11 @@ import org.junit.runners.model.Statement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/** JUnit MethodRule that executes tests remotely if the
+ * {@link #SLING_REMOTE_TEST_URL} property is set.
+ * Used to execute tests from an IDE and have then run
+ * on a remote Sling instance.
+ */
public class SlingRemoteExecutionRule implements MethodRule {
private static final Logger log =
LoggerFactory.getLogger(SlingRemoteExecutionRule.class);
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 12/12: [maven-scm] copy for tag org.apache.sling.jcr.webdav-2.1.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit b094fea2da9bf4f8299ec70c4fd05f538b11401a Author: Justin Edelson <jus...@apache.org> AuthorDate: Wed Nov 3 18:12:13 2010 + [maven-scm] copy for tag org.apache.sling.jcr.webdav-2.1.0 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.1.0@1030582 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 04/31: Use latest snapshots again to make project buildable.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 6eee069b97eaf6e6a3d8f2f5bf8e4e2dea90c9b2 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Jun 17 08:55:12 2008 + Use latest snapshots again to make project buildable. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@668571 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 356af71..46142c6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -3-incubator +4-incubator-SNAPSHOT ../../parent/pom.xml @@ -123,7 +123,7 @@ org.apache.sling org.apache.sling.jcr.api -2.0.2-incubator +2.0.3-incubator-SNAPSHOT -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jms] 04/08: SLING-5645 Removed my signature from all source code
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jms-1.0.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jms.git
commit d62b783dc0dc30805cf479c464ca79a148875dca
Author: Ian Boston <i...@apache.org>
AuthorDate: Mon Oct 3 15:51:56 2016 +
SLING-5645 Removed my signature from all source code
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms@1763175
13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/jms/ConnectionFactoryService.java | 1 -
src/main/java/org/apache/sling/jms/JMSMessageTypes.java | 1 -
src/main/java/org/apache/sling/jms/JMSQueueManager.java | 1 -
src/main/java/org/apache/sling/jms/JMSTopicManager.java | 1 -
src/main/java/org/apache/sling/jms/Json.java | 1 -
.../java/org/apache/sling/amq/ActiveMQConnectionFactoryServiceTest.java | 1 -
src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java | 1 -
src/test/java/org/apache/sling/jms/JMSTopicManagerTest.java | 1 -
src/test/java/org/apache/sling/jms/JsonTest.java | 1 -
9 files changed, 9 deletions(-)
diff --git a/src/main/java/org/apache/sling/jms/ConnectionFactoryService.java
b/src/main/java/org/apache/sling/jms/ConnectionFactoryService.java
index e14a3f7..396896c 100644
--- a/src/main/java/org/apache/sling/jms/ConnectionFactoryService.java
+++ b/src/main/java/org/apache/sling/jms/ConnectionFactoryService.java
@@ -21,7 +21,6 @@ package org.apache.sling.jms;
import javax.jms.ConnectionFactory;
/**
- * Created by ieb on 30/03/2016.
* Implementations of this service provide JMS Connection factories. In
general implementations should work OOTB with no
* further configuration and provide an efficient JMS Connection Factory that
allows sessions to be created with minimal
* overhead.
diff --git a/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
b/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
index a6fcf29..b560a5a 100644
--- a/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
+++ b/src/main/java/org/apache/sling/jms/JMSMessageTypes.java
@@ -19,7 +19,6 @@
package org.apache.sling.jms;
/**
- * Created by ieb on 04/04/2016.
*/
public enum JMSMessageTypes {
/**
diff --git a/src/main/java/org/apache/sling/jms/JMSQueueManager.java
b/src/main/java/org/apache/sling/jms/JMSQueueManager.java
index 4fcc904..ff9bfbc 100644
--- a/src/main/java/org/apache/sling/jms/JMSQueueManager.java
+++ b/src/main/java/org/apache/sling/jms/JMSQueueManager.java
@@ -34,7 +34,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Created by ieb on 30/03/2016.
* A JMS implementation of a QueueManager. It will allow callers to add
messages to named queues, and consumers to read
* messages from named queues in order. The component uses a single connection
to the JMS broker, but dedicated sessions
* for each send and for each Queue reader.
diff --git a/src/main/java/org/apache/sling/jms/JMSTopicManager.java
b/src/main/java/org/apache/sling/jms/JMSTopicManager.java
index e3b0588..e9b7af8 100644
--- a/src/main/java/org/apache/sling/jms/JMSTopicManager.java
+++ b/src/main/java/org/apache/sling/jms/JMSTopicManager.java
@@ -40,7 +40,6 @@ import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Created by ieb on 30/03/2016.
* This class provides support for sending messages to topics over JMS and
subscribing to topics. It uses the ConnectionFactoryService
* to interact with JMS. There is nothing in
*/
diff --git a/src/main/java/org/apache/sling/jms/Json.java
b/src/main/java/org/apache/sling/jms/Json.java
index b4715d2..c769a89 100644
--- a/src/main/java/org/apache/sling/jms/Json.java
+++ b/src/main/java/org/apache/sling/jms/Json.java
@@ -31,7 +31,6 @@ import java.util.List;
import java.util.Map;
/**
- * Created by ieb on 31/03/2016.
*/
public class Json {
diff --git
a/src/test/java/org/apache/sling/amq/ActiveMQConnectionFactoryServiceTest.java
b/src/test/java/org/apache/sling/amq/ActiveMQConnectionFactoryServiceTest.java
index 0a1da45..479f036 100644
---
a/src/test/java/org/apache/sling/amq/ActiveMQConnectionFactoryServiceTest.java
+++
b/src/test/java/org/apache/sling/amq/ActiveMQConnectionFactoryServiceTest.java
@@ -32,7 +32,6 @@ import java.util.Map;
import static org.junit.Assert.*;
/**
- * Created by ieb on 31/03/2016.
*/
public class ActiveMQConnectionFactoryServiceTest {
diff --git a/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
b/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
index 4c3aa36..c391004 100644
--- a/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
+++ b/src/test/java/org/apache/sling/jms/JMSQueueManagerTest.java
@@ -46,7 +46,6 @@ import java.util.Map;
import
[sling-org-apache-sling-jmx-provider] 04/06: SLING-3176 : ValueMap of jmx resource should contain mbean attributes
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-0.6.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 6f5fc977b7bee0f2d15644cede1fe0b5a2e30c8b
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Oct 15 16:56:48 2013 +
SLING-3176 : ValueMap of jmx resource should contain mbean attributes
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1532428
13f79535-47bb-0310-9956-ffa450edef68
---
src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java | 6 --
1 file changed, 6 deletions(-)
diff --git
a/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
b/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
index d479f45..e062612 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/MBeanResource.java
@@ -24,10 +24,8 @@ import java.util.Map;
import javax.management.Attribute;
import javax.management.AttributeList;
-import javax.management.AttributeNotFoundException;
import javax.management.InstanceNotFoundException;
import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
import javax.management.MBeanInfo;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -150,12 +148,8 @@ public class MBeanResource extends AbstractResource {
}
}
}
-} catch (final AttributeNotFoundException e) {
-// ignore
} catch (final InstanceNotFoundException e) {
// ignore
-} catch (final MBeanException e) {
-// ignore
} catch (final ReflectionException e) {
// ignore
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 07/12: SLING-1660 - upgrading to JR 2.1.1
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 15b619073f3a2ce957fe094bc01d59af2ed4eb84 Author: Justin Edelson <jus...@apache.org> AuthorDate: Fri Aug 20 15:58:35 2010 + SLING-1660 - upgrading to JR 2.1.1 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@987559 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6989c69..3fed099 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ org.apache.jackrabbit jackrabbit-jcr-server -2.1.0 +2.1.1 compile -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 15/34: Remove support for xml
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 252bf2d4c21800342af397f7df75d42472843809
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Sep 30 08:13:47 2014 +
Remove support for xml
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/slingstart-model@1628370
13f79535-47bb-0310-9956-ffa450edef68
---
.../slingstart/model/xml/XMLSSMModelReader.java| 356 -
.../slingstart/model/xml/XMLSSMModelWriter.java| 215 -
.../sling/slingstart/model/xml/package-info.java | 24 --
3 files changed, 595 deletions(-)
diff --git
a/src/main/java/org/apache/sling/slingstart/model/xml/XMLSSMModelReader.java
b/src/main/java/org/apache/sling/slingstart/model/xml/XMLSSMModelReader.java
deleted file mode 100644
index a95665a..000
--- a/src/main/java/org/apache/sling/slingstart/model/xml/XMLSSMModelReader.java
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * 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.slingstart.model.xml;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.LineNumberReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Stack;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.felix.cm.file.ConfigurationHandler;
-import org.apache.sling.slingstart.model.SSMArtifact;
-import org.apache.sling.slingstart.model.SSMConfiguration;
-import org.apache.sling.slingstart.model.SSMDeliverable;
-import org.apache.sling.slingstart.model.SSMFeature;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-
-/**
- * Simple XML parser for the model.
- * It ignores all elements in a different namespace than the root element
- */
-public class XMLSSMModelReader {
-
-public enum MODE {
-INIT(null, null),
-DELIVERABLE(INIT, "deliverable"),
-
-VARIABKES(DELIVERABLE, "variables"),
-
-STARTLEVEL(DELIVERABLE, "startLevel"),
-ARTIFACT(DELIVERABLE, "artifact"),
-
-STARTLEVEL_ARTIFACT(STARTLEVEL, "artifact"),
-
-CONFIGURATION(DELIVERABLE, "configuration"),
-SETTINGS(DELIVERABLE, "settings"),
-
-FEATURE(DELIVERABLE, "feature"),
-FEATURE_STARTLEVEL(FEATURE, "startLevel"),
-FEATURE_ARTIFACT(FEATURE, "artifact"),
-FEATURE_STARTLEVEL_ARTIFACT(FEATURE_STARTLEVEL, "artifact"),
-
-FEATURE_CONFIGURATION(FEATURE, "configuration"),
-FEATURE_SETTINGS(FEATURE, "settings");
-
-public final MODE fromMode;
-public final String elementName;
-
-MODE(final MODE fm, final String en) {
-this.fromMode = fm;
-this.elementName = en;
-}
-}
-
-/**
- * Reads the deliverable file
- * The reader is not closed.
- * @throws IOException
- */
-public static SSMDeliverable read(final Reader reader)
-throws IOException {
-try {
-final SSMDeliverable result = new SSMDeliverable();
-
-final SAXParserFactory spf = SAXParserFactory.newInstance();
-spf.setNamespaceAware(true);
-SAXParser saxParser = spf.newSAXParser();
-XMLReader xmlReader = saxParser.getXMLReader();
-xmlReader.setContentHandler(new ContentHandler() {
-
-private final Stack elementsStack = new
Stack();
-
-/** The current parsing mode. */
-private MODE mode = MODE.INIT;
-
-/** String builder to get text from the document.
[sling-org-apache-sling-jcr-webdav] annotated tag org.apache.sling.jcr.webdav-2.3.2 created (now f299a96)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jcr.webdav-2.3.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git. at f299a96 (tag) tagging ebcfa459501496f95d35bdd7af37454832fdbf8a (commit) by Robert Munteanu on Wed Oct 7 11:40:28 2015 + - Log - org.apache.sling.jcr.webdav-2.3.2 --- This annotated tag includes the following new commits: new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient. new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly. new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle new 6075e5a Use OSGi core and cmpendium jars from Felix project. new 97ce3de SLING-204 - add svn ignore patterns for intellij new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere. new 2f19dc1 Move licence and notice to top level dir. new ea1807f Add incubator disclaimer. new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes. new 5084dea Update notice files. new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin. new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins. new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files new ab2e11f SLING-483: Add excludes for javadocs (WiP) new 443e2a3 SLING-495 - NOTICE files generated using mknotice script new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927 new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes new a5898b0 Use released version of parent pom. new 9613fba Use released versions (or soon to be released versions). new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator new adf1a67 [maven-release-plugin] prepare for next development iteration new 8d649af Set version to next development version. new b60df5a Fix reference to parent pom. new ffb8853 Remove unused imports and fix some javadoc errors. new e037bca SLING-521: Restore more notice files. new c7878f3 SLING-521: Separate between notice files for bin and src dists. new cdee843 SLING-521: Separate between notice files for bin and src dists. new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included new fbdc0e3 Update to released versions. new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator new d081bbe [maven-release-plugin] prepare for next development iteration new 6eee069 Use latest snapshots again to make project buildable. new 4099ee4 Use released versions. new f058c71 Use released parent pom where possible. new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting. new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure comp
[sling-org-apache-sling-provisioning-model] 16/16: [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.3.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit db0f182e592e4759c4ee8339fdbe9ba4125a0f2c Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Jul 28 12:33:49 2015 + [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.3.0 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.3.0@1693079 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 06/11: SLING-3127 - prepare for release
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 1c008714f232d9e13a472e31c7ca8ea4ab6fc756 Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Thu Sep 26 15:11:57 2013 + SLING-3127 - prepare for release git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/healthcheck@1526555 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 600677f..9deb611 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.hc.core -1.0.3-SNAPSHOT +1.0.4 provided -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 16/38: Eclude maven-eclipse.xml generated by the maven eclipse plugin.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit f7b71f5ced35a6de09a8da9df915abf503e13658 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon May 5 07:09:17 2008 + Eclude maven-eclipse.xml generated by the maven eclipse plugin. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@653322 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 05/29: Catch and log uncaught exceptions
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.2
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 827bdb0672d1c42d9b22eca5f0431c013652a138
Author: Felix Meschberger <fmesc...@apache.org>
AuthorDate: Fri Jan 28 11:17:06 2011 +
Catch and log uncaught exceptions
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1064628
13f79535-47bb-0310-9956-ffa450edef68
---
.../webdav/impl/servlets/SlingSimpleWebDavServlet.java | 18 ++
1 file changed, 18 insertions(+)
diff --git
a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
index 30e999e..01ec634 100644
---
a/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
+++
b/src/main/java/org/apache/sling/jcr/webdav/impl/servlets/SlingSimpleWebDavServlet.java
@@ -28,6 +28,8 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.jackrabbit.webdav.simple.SimpleWebdavServlet;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The SlingSimpleWebDavServlet extends the
@@ -36,6 +38,9 @@ import
org.apache.sling.jcr.webdav.impl.helper.SlingResourceConfig;
*/
public class SlingSimpleWebDavServlet extends SimpleWebdavServlet {
+/** default log */
+private final Logger log = LoggerFactory.getLogger(getClass());
+
private final SlingResourceConfig resourceConfig;
private final Repository repository;
@@ -58,6 +63,19 @@ public class SlingSimpleWebDavServlet extends
SimpleWebdavServlet {
@Override
protected void service(HttpServletRequest request,
HttpServletResponse response) throws ServletException, IOException
{
+try {
+doService(request, response);
+} catch (RuntimeException re) {
+log.error("service: Uncaught RuntimeException", re);
+throw new ServletException("Uncaught RuntimeException: " + re);
+} catch (Error e) {
+log.error("service: Uncaught Error", e);
+throw new ServletException("Uncaught Error: " + e);
+}
+}
+
+protected void doService(HttpServletRequest request,
+HttpServletResponse response) throws ServletException, IOException
{
// According to the spec the path info is either null or
// a string starting with a slash. Thus a string of length 1
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 04/11: SLING-5172 : Provide support for custom sections in the provisioning model
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.4.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit d0779ce506dbf28cc2b56539f56243b185fa74b2
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Tue Oct 20 14:00:14 2015 +
SLING-5172 : Provide support for custom sections in the provisioning model
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1709592
13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/provisioning/model/Feature.java | 48 +++-
.../sling/provisioning/model/ModelProcessor.java | 13 ++--
.../sling/provisioning/model/ModelUtility.java | 35 +
.../apache/sling/provisioning/model/Section.java | 87 ++
.../sling/provisioning/model/io/ModelReader.java | 39 +-
.../sling/provisioning/model/io/ModelWriter.java | 18 +
.../apache/sling/provisioning/model/io/IOTest.java | 10 +++
src/test/resources/additional.txt | 35 +
8 files changed, 259 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/apache/sling/provisioning/model/Feature.java
b/src/main/java/org/apache/sling/provisioning/model/Feature.java
index 1d892ec..c78cb3e 100644
--- a/src/main/java/org/apache/sling/provisioning/model/Feature.java
+++ b/src/main/java/org/apache/sling/provisioning/model/Feature.java
@@ -32,6 +32,10 @@ public class Feature
extends Commentable
implements Comparable {
+/**
+ * The feature type
+ * @since 1.4.0
+ */
public enum Type {
PLAIN("plain"),
SUBSYSTEM_FEATURE("osgi.subsystem.feature"),
@@ -72,6 +76,9 @@ public class Feature
/** Feature name. */
private final String name;
+/** Additional sections. */
+private final List additionalSections = new ArrayList();
+
/**
* Construct a new feature.
* @param name The feature name
@@ -144,12 +151,48 @@ public class Feature
return result;
}
+/**
+ * Get the feature type.
+ * @return The feature type.
+ * @since 1.4.0
+ */
public Type getType() {
return type;
}
-public void setType(Type t) {
-type = t;
+/**
+ * Set the feature type.
+ * @param t The new type
+ * @since 1.4.0
+ */
+public void setType(final Type t) {
+type = ( t == null ? Type.PLAIN : t);
+}
+
+/**
+ * Get all additional sections
+ * @return The list of additional sections. It might be empty.
+ * @since 1.4.0
+ */
+public List getAdditionalSections() {
+return this.additionalSections;
+}
+
+/**
+ * Get all sections with the given name.
+ * @param name The section name.
+ * @return The list of sections. The list might be empty.
+ * @since 1.4.0
+ */
+public List getAdditionalSections(final String name) {
+final List result = new ArrayList();
+
+for(final Section s : this.additionalSections) {
+if ( name.equals(s.getName()) ) {
+result.add(s);
+}
+}
+return result;
}
@Override
@@ -171,6 +214,7 @@ public class Feature
return "Feature [runModes=" + runModes + ", variables=" + variables
+ ", name=" + name
+ ( type != Type.PLAIN ? ", type=" + type : "" )
++ ( additionalSections.isEmpty() ? "" : ",
additionalSections=" + this.additionalSections)
+ ( this.getLocation() != null ? ", location=" +
this.getLocation() : "")
+ "]";
}
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
b/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
index ad4fcfc..58cad6d 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelProcessor.java
@@ -23,10 +23,10 @@ import java.util.Enumeration;
/**
* Allows to process a value. A new value is created and for each part in the
model a process
* method is called. Subclasses can overwrite those methods to inject specific
behavior.
- * The processor itself does not change anything in the model.
+ * The processor itself does not change anything in the model.
*/
class ModelProcessor {
-
+
/**
* Creates a copy of the model and calls a process method for each part
found in the model.
* This allows to modify the parts content (e.g. replace variables), but
not to add or remove parts.
@@ -42,6 +42,7 @@ class ModelProcessor {
newFeature.setType(feature.getType());
newFeature.setComment(feature.getC
[sling-org-apache-sling-jmx-provider] 03/09: SLING-3200 : Avoid duplicated requests to mbeans when creating resources
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit caba701b5007414fe4b17343fe9399c852f2e214
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Oct 23 08:01:59 2013 +
SLING-3200 : Avoid duplicated requests to mbeans when creating resources
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1534947
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/jmx/provider/impl/AttributeResource.java | 53 --
.../jmx/provider/impl/JMXResourceProvider.java | 12 +++--
.../sling/jmx/provider/impl/MapResource.java | 12 -
3 files changed, 50 insertions(+), 27 deletions(-)
diff --git
a/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
b/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
index 2967d01..eabf9d2 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
import java.util.Set;
import java.util.TreeMap;
@@ -188,24 +189,22 @@ public class AttributeResource extends AbstractResource {
current = (Map<String, Object>)child;
}
-return new MapResource(this.getResourceResolver(), this.getPath(),
current);
+return new MapResource(this.getResourceResolver(), this.getPath(),
current, this);
}
return null;
}
-private Map<String, Object> convertData() {
-try {
-final Object value = attrValue;
+private volatile Map<String, Object> convertedValue;
-if ( value instanceof TabularData ) {
-return convertObject((TabularData)value);
-} else if ( value instanceof CompositeData ) {
-return convertObject((CompositeData)value);
+private Map<String, Object> convertData() {
+if ( convertedValue == null ) {
+if ( attrValue instanceof TabularData ) {
+convertedValue = convertObject((TabularData)attrValue);
+} else if ( attrValue instanceof CompositeData ) {
+convertedValue = convertObject((CompositeData)attrValue);
}
-} catch (final Exception ignore) {
-// ignore and return null
}
-return null;
+return convertedValue;
}
private Map<String, Object> convertObject(final TabularData td) {
@@ -292,7 +291,7 @@ public class AttributeResource extends AbstractResource {
return result;
}
-public Iterator getChildren(String subPath) {
+public Iterator getChildren(final String parentPath, final
String subPath) {
final Map<String, Object> childStructure = this.convertData();
if ( childStructure != null ) {
Map<String, Object> current = childStructure;
@@ -309,13 +308,6 @@ public class AttributeResource extends AbstractResource {
current = (Map<String, Object>)child;
}
}
-final Iterator<Map.Entry<String, Object>> removeIter =
current.entrySet().iterator();
-while ( removeIter.hasNext() ) {
-final Map.Entry<String, Object> c = removeIter.next();
-if ( !(c.getValue() instanceof Map) ) {
-removeIter.remove();
-}
-}
if ( current.size() == 0 ) {
return null;
}
@@ -323,18 +315,33 @@ public class AttributeResource extends AbstractResource {
return new Iterator() {
+private Map.Entry<String, Object> next = this.seek();
+
+private Map.Entry<String, Object> seek() {
+while ( childIter.hasNext() ) {
+final Map.Entry<String, Object> c = childIter.next();
+if ( c.getValue() instanceof Map ) {
+return c;
+}
+}
+return null;
+}
+
public void remove() {
throw new UnsupportedOperationException("remove");
}
public Resource next() {
-final Map.Entry<String, Object> props = childIter.next();
-
-return new MapResource(getResourceResolver(), getPath() +
'/' + props.getKey(), (Map)props.getValue());
+final Map.Entry<String, Object> pro
[sling-org-apache-sling-jcr-webdav] 23/29: SLING-2503 : Update to new Jackrabbit version to fix JCR-3329
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit b948d6e92d8c113027c17451664f9271cd3a2312 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Jun 11 07:22:15 2012 + SLING-2503 : Update to new Jackrabbit version to fix JCR-3329 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1348728 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c71c33c..5edfb16 100644 --- a/pom.xml +++ b/pom.xml @@ -116,7 +116,7 @@ org.apache.jackrabbit jackrabbit-jcr-server -2.3.4 +2.4.2 compile -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 06/10: straighten dependencies
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit f313ceb10f3a0036d15b55d1787ce7941ba99f72 Author: Oliver Lietz <o...@apache.org> AuthorDate: Sun Feb 14 08:28:05 2016 + straighten dependencies * use non-incubator Sling dependencies * update OSGi dependencies * add missing scopes git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1730295 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0d823f0..d6dc7ca 100644 --- a/pom.xml +++ b/pom.xml @@ -106,13 +106,13 @@ org.apache.sling org.apache.sling.commons.osgi -2.0.4-incubator +2.0.6 provided org.apache.sling org.apache.sling.commons.mime -2.0.2-incubator +2.1.2 provided @@ -127,29 +127,43 @@ javax.jcr jcr 2.0 +provided javax.servlet servlet-api +provided org.slf4j slf4j-api +provided org.apache.felix org.apache.felix.scr.annotations +provided org.osgi -org.osgi.core +osgi.core +6.0.0 +provided org.osgi -org.osgi.compendium +org.osgi.service.component +1.3.0 +provided + + +org.osgi +org.osgi.service.http +1.2.1 +provided org.apache.sling -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 31/34: Allow comments in configurations
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit bbe9bcd89cbfed6a053942039a518e7bb0b886b4
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Oct 9 07:52:42 2014 +
Allow comments in configurations
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1630309
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/provisioning/model/ModelUtility.java | 20 +++-
.../sling/provisioning/model/io/ModelReader.java | 7 ++-
2 files changed, 25 insertions(+), 2 deletions(-)
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
index cb711a9..82c129f 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
@@ -18,6 +18,7 @@ package org.apache.sling.provisioning.model;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.io.LineNumberReader;
import java.io.StringReader;
import java.util.Arrays;
import java.util.Dictionary;
@@ -174,9 +175,26 @@ public abstract class ModelUtility {
}
} else {
// Apache Felix CA format
+// the raw format might have comments, we have
to remove them first
+final StringBuilder sb = new StringBuilder();
+try {
+final LineNumberReader lnr = new
LineNumberReader(new StringReader(rawConfig));
+String line = null;
+while ((line = lnr.readLine()) != null ) {
+line = line.trim();
+if ( line.isEmpty() ||
line.startsWith("#")) {
+continue;
+}
+sb.append(line);
+sb.append('\n');
+}
+} catch ( final IOException ioe) {
+throw new IllegalArgumentException("Unable
to read configuration properties: " + config, ioe);
+}
+
ByteArrayInputStream bais = null;
try {
-bais = new
ByteArrayInputStream(rawConfig.getBytes("UTF-8"));
+bais = new
ByteArrayInputStream(sb.toString().getBytes("UTF-8"));
@SuppressWarnings("unchecked")
final Dictionary<String, Object> props =
ConfigurationHandler.read(bais);
final Enumeration i = props.keys();
diff --git
a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
index 5fa2f7e..8786a13 100644
--- a/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
+++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelReader.java
@@ -110,7 +110,12 @@ public class ModelReader {
// comment?
if ( line.startsWith("#") ) {
-checkConfig();
+if ( config != null ) {
+configBuilder.append(line);
+configBuilder.append('\n');
+
+continue;
+}
final String c = line.substring(1).trim();
if ( comment == null ) {
comment = c;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 10/31: SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 4762d9c10c812add4a2fad0319e40b763b2a226d Author: Felix Meschberger <fmesc...@apache.org> AuthorDate: Mon Dec 22 21:35:21 2008 + SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@728788 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bb75c6c..e539bf6 100644 --- a/pom.xml +++ b/pom.xml @@ -135,19 +135,20 @@ org.apache.jackrabbit jackrabbit-jcr-commons compile +1.5.0 org.apache.jackrabbit jackrabbit-jcr-server -1.4 +1.5.0 compile org.apache.jackrabbit jackrabbit-webdav -1.4 +1.5.0 compile -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 19/19: [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.2.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit a198f785d58755b754aad468e9ce292ea3e14b9c Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Jun 9 11:49:38 2015 + [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.2.0 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.2.0@1684387 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 03/10: Update to Sling Parent POM 22 with baselining enabled
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git commit cc2eb0218c33634a99bd39c1a4d3be3e1670a35a Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Oct 1 06:47:17 2014 + Update to Sling Parent POM 22 with baselining enabled git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1628619 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e3319d2..9938245 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.sling sling -20 +22 ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 23/45: SLING-2150 : Update plugins to use the latest available versions
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 4f3f655478acb520af9118298d1b869c14b70ecf Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Jul 20 12:21:40 2011 + SLING-2150 : Update plugins to use the latest available versions git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1148722 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5c78e48..c66e6cb 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -10 +11-SNAPSHOT org.apache.sling.junit.remote @@ -81,7 +81,6 @@ org.apache.felix org.apache.felix.scr.annotations -1.4.0 provided -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 04/11: [maven-release-plugin] prepare release org.apache.sling.hc.core-1.0.2
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit eaee7eea331159dd0ad508beccce645dc04e56ba Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Thu Sep 26 14:41:41 2013 + [maven-release-plugin] prepare release org.apache.sling.hc.core-1.0.2 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/healthcheck@1526513 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index bda99f8..ae29196 100644 --- a/pom.xml +++ b/pom.xml @@ -28,16 +28,16 @@ org.apache.sling.junit.healthcheck -1.0.1-SNAPSHOT +1.0.2 bundle Apache Sling JUnit Health Checks Sling Health Check services that run JUnit tests - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote - http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.2/testing/junit/remote + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.hc.core-1.0.2/testing/junit/remote + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.hc.core-1.0.2/testing/junit/remote @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.hc.core -1.0.1-SNAPSHOT +1.0.2 provided -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-launchpad-api] 03/07: [maven-release-plugin] prepare release org.apache.sling.launchpad.api-1.0.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.launchpad.api-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-api.git commit d707a208a221f6a3d81e6df9a04e210c2b4242fb Author: Justin Edelson <jus...@apache.org> AuthorDate: Tue Feb 15 01:40:47 2011 + [maven-release-plugin] prepare release org.apache.sling.launchpad.api-1.0.0 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/launchpad/api@1070728 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4ea3d70..6feb02d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,7 @@ either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> +http://maven.apache.org/POM/4.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd;> 4.0.0 @@ -22,7 +21,7 @@ org.apache.sling.launchpad.api -0.0.1-SNAPSHOT +1.0.0 bundle Apache Sling Launchpad API @@ -44,4 +43,10 @@ + + + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.api-1.0.0 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.launchpad.api-1.0.0 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.launchpad.api-1.0.0 + \ No newline at end of file -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 17/45: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 29f2df8dd04856535ea034881ca9cb5ebd2a371c Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Thu Apr 14 11:57:44 2011 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1092153 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 3ae789e..19e4be9 100644 --- a/pom.xml +++ b/pom.xml @@ -27,16 +27,16 @@ org.apache.sling.junit.remote -1.0.4 +1.0.5-SNAPSHOT bundle Apache Sling JUnit Remote Tests Runners Utilities to run server-side JUnit tests remotely - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.tools-1.0.4 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.testing.tools-1.0.4 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.testing.tools-1.0.4 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote + http://svn.apache.org/viewvc/sling/trunk/testing/junit/remote @@ -76,7 +76,7 @@ org.apache.sling org.apache.sling.junit.core -1.0.4 +1.0.5-SNAPSHOT org.apache.felix @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.testing.tools -1.0.4 +1.0.5-SNAPSHOT org.apache.sling -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-repoinit-parser] 04/04: [maven-release-plugin] copy for tag org.apache.sling.repoinit.parser-1.0.2
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.repoinit.parser-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-repoinit-parser.git commit 357cad12acb0b9cda7fbae39fcee31c29b200415 Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Wed Jul 6 09:05:22 2016 + [maven-release-plugin] copy for tag org.apache.sling.repoinit.parser-1.0.2 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.repoinit.parser-1.0.2@1751633 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 02/45: SLING-1981 - better name
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit daa3713152b6901e224d47d788eac2f8aeada13b Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Tue Feb 22 17:01:21 2011 + SLING-1981 - better name git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1073409 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 78a3a3a..d2a6b56 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,8 @@ 0.1.1-SNAPSHOT jar -Apache Sling JUnit Remote Extension -Runs JUnit tests remotely +Apache Sling JUnit Remote Tests Runners +Utilities to run server-side JUnit tests remotely scm:svn:http://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 03/03: [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.8
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 9c3c2096e35e381e2167362c27b0768042b905ce Author: Robert Munteanu <romb...@apache.org> AuthorDate: Wed Feb 1 12:33:22 2017 + [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.8 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.8@1781237 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 09/16: SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 544ced7b3d966f59c0504bb3e93aef13db743ed9 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Jun 18 10:47:55 2009 + SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@786012 13f79535-47bb-0310-9956-ffa450edef68 --- README.txt | 10 -- pom.xml| 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/README.txt b/README.txt index cba9ea0..b3e2dee 100644 --- a/README.txt +++ b/README.txt @@ -3,16 +3,6 @@ Apache Sling WebDAV Bundle to access JCR repositories over WebDAV -Disclaimer -== -Apache Sling is an effort undergoing incubation at The Apache Software Foundation (ASF), -sponsored by the Apache Jackrabbit PMC. Incubation is required of all newly accepted -projects until a further review indicates that the infrastructure, communications, -and decision making process have stabilized in a manner consistent with other -successful ASF projects. While incubation status is not necessarily a reflection of -the completeness or stability of the code, it does indicate that the project has yet -to be fully endorsed by the ASF. - Getting Started === diff --git a/pom.xml b/pom.xml index 40ca9d6..9eadbb3 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.jcr.webdav bundle -2.0.7-incubator-SNAPSHOT +2.0.7-SNAPSHOT Apache Sling Simple WebDAV Access to repositories -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 06/06: [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.7.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.7.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit dcbf6321503eac11136d291cef5ab48ba99e7841 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Nov 10 06:00:42 2016 + [maven-release-plugin] copy for tag org.apache.sling.provisioning.model-1.7.0 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.7.0@1769040 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 06/45: SLING-1981 - support running single tests methods using JUnit servlet paths like /system/sling/junit/TEST_CLASS_NAME.json/TEST_METHOD_NAME
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.junit.healthcheck-1.0.4
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git
commit 1614589e36be2bcf5d3f89bf90672d40b914fcc8
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Thu Feb 24 16:54:59 2011 +
SLING-1981 - support running single tests methods using JUnit servlet paths
like /system/sling/junit/TEST_CLASS_NAME.json/TEST_METHOD_NAME
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1074212
13f79535-47bb-0310-9956-ffa450edef68
---
.../remote/testrunner/SlingRemoteTestParameters.java | 18 --
.../remote/testrunner/SlingRemoteTestRunner.java | 19 ++-
2 files changed, 30 insertions(+), 7 deletions(-)
diff --git
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
index 84e32af..69d83ea 100644
---
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
+++
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
@@ -20,7 +20,21 @@ package org.apache.sling.junit.remote.testrunner;
* run the tests.
*/
public interface SlingRemoteTestParameters {
+/** Return the URL of the JUnit servlet */
+String getJunitServletUrl();
+
+/** Return the optional selector for the test classes to run,
+ * for example "org.apache.sling.testing.samples.sampletests.JUnit4Test"
+ */
+String getTestClassesSelector();
+
+/** Return the optional selector for the test methods to run,
+ * for example "someMethodName"
+ */
+String getTestMethodSelector();
+
+/** Return the expected number of tests - if zero, no check
+ * is done.
+ */
int getExpectedNumberOfTests();
-String getServerBaseUrl();
-String getJunitServletPath();
}
diff --git
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
index ba3428e..428f090 100644
---
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
+++
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
@@ -78,13 +78,22 @@ public class SlingRemoteTestRunner extends
ParentRunner {
// Setup request execution
executor = new RequestExecutor(new DefaultHttpClient());
-if(testParameters.getServerBaseUrl() == null) {
+if(testParameters.getJunitServletUrl() == null) {
throw new IllegalStateException("Server base URL is null, cannot
run tests");
}
-builder = new RequestBuilder(testParameters.getServerBaseUrl());
+builder = new RequestBuilder(testParameters.getJunitServletUrl());
// POST request executes the tests
-final Request r =
builder.buildPostRequest(testParameters.getJunitServletPath() + ".json");
+final StringBuilder subpath = new StringBuilder();
+subpath.append("/");
+subpath.append(testParameters.getTestClassesSelector());
+subpath.append(".json");
+final String testMethodSelector =
testParameters.getTestMethodSelector();
+if(testMethodSelector != null && testMethodSelector.length() > 0) {
+subpath.append("/");
+subpath.append(testMethodSelector);
+}
+final Request r = builder.buildPostRequest(subpath.toString());
executor.execute(r)
.assertStatus(200)
.assertContentType("application/json");
@@ -101,8 +110,8 @@ public class SlingRemoteTestRunner extends
ParentRunner {
}
}
-log.info("{} server-side tests executed at {}",
-children.size(), testParameters.getJunitServletPath());
+log.info("Server-side tests executed at {} with path {}",
+testParameters.getJunitServletUrl(), subpath);
// Check that number of tests is as expected
assertEquals("Expecting " + testParameters.getExpectedNumberOfTests()
+ " tests",
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 02/12: SLING-1212 - upgrading to Jackrabbit 2. Also includes re-revert of SLING-1363 and implementation of SLING-1330. Thanks to Felix for getting this started.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit c5338ab4151ac521774f18a8b3257b5c6351a07d
Author: Justin Edelson <jus...@apache.org>
AuthorDate: Thu Feb 18 15:08:43 2010 +
SLING-1212 - upgrading to Jackrabbit 2. Also includes re-revert of
SLING-1363 and implementation of SLING-1330. Thanks to Felix for getting this
started.
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@911430
13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml| 8 +-
.../jcr/webdav/impl/helper/SlingMimeResolver.java | 41 --
.../webdav/impl/helper/SlingResourceConfig.java| 14 +---
.../jcr/webdav/impl/helper/SlingTikaDetector.java | 88 ++
4 files changed, 98 insertions(+), 53 deletions(-)
diff --git a/pom.xml b/pom.xml
index 584335c..b2a4d81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,9 +115,15 @@
+javax.jcr
+jcr
+2.0
+provided
+
+
org.apache.jackrabbit
jackrabbit-jcr-server
-1.5.0
+2.0.0
compile
diff --git
a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java
b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java
deleted file mode 100644
index a01ee22..000
---
a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingMimeResolver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.jcr.webdav.impl.helper;
-
-import org.apache.jackrabbit.server.io.MimeResolver;
-import org.apache.sling.commons.mime.MimeTypeService;
-
-public class SlingMimeResolver extends MimeResolver {
-
-private final MimeTypeService mimeTypeService;
-
-public SlingMimeResolver(MimeTypeService mimeTypeService) {
-this.mimeTypeService = mimeTypeService;
-}
-
-@Override
-public String getMimeType(String filename) {
-String type = mimeTypeService.getMimeType(filename);
-if (type == null) {
-type = getDefaultMimeType();
-}
-return type;
-}
-
-}
diff --git
a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
index 270c416..0612a7f 100644
---
a/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
+++
b/src/main/java/org/apache/sling/jcr/webdav/impl/helper/SlingResourceConfig.java
@@ -30,7 +30,6 @@ import org.apache.jackrabbit.server.io.DefaultHandler;
import org.apache.jackrabbit.server.io.DirListingExportHandler;
import org.apache.jackrabbit.server.io.IOManager;
import org.apache.jackrabbit.server.io.IOManagerImpl;
-import org.apache.jackrabbit.server.io.MimeResolver;
import org.apache.jackrabbit.server.io.PropertyManager;
import org.apache.jackrabbit.server.io.PropertyManagerImpl;
import org.apache.jackrabbit.webdav.simple.DefaultItemFilter;
@@ -43,8 +42,6 @@ import
org.apache.sling.jcr.webdav.impl.servlets.SlingWebDavServlet;
public class SlingResourceConfig extends ResourceConfig {
-private final MimeResolver mimeResolver;
-
private final String[] collectionTypes;
private final ItemFilter itemFilter;
@@ -57,9 +54,9 @@ public class SlingResourceConfig extends ResourceConfig {
private final Dictionary<String, String> servletInitParams;
-public SlingResourceConfig(MimeTypeService mimetypService,
+public SlingResourceConfig(MimeTypeService mimeTypeService,
Dictionary config) {
-mimeResolver = new SlingMimeResolver(mimetypService);
+super(new SlingTikaDetector(mimeTypeService));
collectionTypes = OsgiUtil.toStringArray(
config.get(SlingWebDavServlet.COLLECTION_TYPES),
SlingWebDavServlet.COLLECTION_TYPES_DEFAULT);
@@ -93,7 +90,7 @@ public class SlingResou
[sling-org-apache-sling-jcr-webdav] 10/10: [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.0
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 21ed202d6fd5dd04361600cb2c236bd4046372bd Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Aug 12 09:14:50 2015 + [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.0 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.0@1695452 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 04/10: Switch to parent pom 26
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit ce42a9f86e05ece20a3d97e2fe160700a449884d Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Sun Jan 3 14:07:46 2016 + Switch to parent pom 26 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1722720 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df37deb..1dfc282 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -25 +26 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 16/29: SLING-2233 Apply patch providing support for CopyMoveManager supplied by Sameer Charles (Thanks)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.2
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git
commit 36a21a232ee0e6d8cba0d4abdb8b9e6c75ef3db9
Author: Felix Meschberger <fmesc...@apache.org>
AuthorDate: Wed Sep 28 06:15:26 2011 +
SLING-2233 Apply patch providing support for CopyMoveManager supplied by
Sameer Charles (Thanks)
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1176743
13f79535-47bb-0310-9956-ffa450edef68
---
.../webdav/impl/handler/DefaultHandlerService.java | 21 +++-
.../webdav/impl/handler/SlingCopyMoveManager.java | 62 ++
.../webdav/impl/helper/SlingResourceConfig.java| 12 -
.../webdav/impl/servlets/SlingWebDavServlet.java | 23 +++-
4 files changed, 114 insertions(+), 4 deletions(-)
diff --git
a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
index f25d050..4575ba5 100644
---
a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
+++
b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/DefaultHandlerService.java
@@ -33,6 +33,9 @@ import org.apache.jackrabbit.server.io.ImportContext;
import org.apache.jackrabbit.server.io.PropertyExportContext;
import org.apache.jackrabbit.server.io.PropertyHandler;
import org.apache.jackrabbit.server.io.PropertyImportContext;
+import org.apache.jackrabbit.server.io.CopyMoveHandler;
+import org.apache.jackrabbit.server.io.CopyMoveContext;
+import org.apache.jackrabbit.webdav.DavException;
import org.apache.jackrabbit.webdav.DavResource;
import org.apache.jackrabbit.webdav.property.PropEntry;
import org.apache.sling.commons.osgi.OsgiUtil;
@@ -55,7 +58,7 @@ import javax.jcr.RepositoryException;
@Property(name = SlingWebDavServlet.TYPE_NONCOLLECTIONS, value =
SlingWebDavServlet.TYPE_NONCOLLECTIONS_DEFAULT, propertyPrivate = false),
@Property(name = SlingWebDavServlet.TYPE_CONTENT, value =
SlingWebDavServlet.TYPE_CONTENT_DEFAULT, propertyPrivate = false) })
@Service
-public class DefaultHandlerService implements IOHandler, PropertyHandler {
+public class DefaultHandlerService implements IOHandler, PropertyHandler,
CopyMoveHandler {
private DefaultHandler delegatee;
@@ -149,4 +152,20 @@ public class DefaultHandlerService implements IOHandler,
PropertyHandler {
throws RepositoryException {
return delegatee.importProperties(importContext, isCollection);
}
+
+public boolean canCopy(CopyMoveContext context, DavResource source,
DavResource destination) {
+return delegatee.canCopy(context, source, destination);
+}
+
+public boolean copy(CopyMoveContext context, DavResource source,
DavResource destination) throws DavException {
+return delegatee.copy(context, source, destination);
+}
+
+public boolean canMove(CopyMoveContext context, DavResource source,
DavResource destination) {
+return delegatee.canMove(context, source, destination);
+}
+
+public boolean move(CopyMoveContext context, DavResource source,
DavResource destination) throws DavException {
+ return delegatee.move(context, source, destination);
+}
}
diff --git
a/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingCopyMoveManager.java
b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingCopyMoveManager.java
new file mode 100644
index 000..312e031
--- /dev/null
+++
b/src/main/java/org/apache/sling/jcr/webdav/impl/handler/SlingCopyMoveManager.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.jcr.webdav.impl.handler;
+
+import org.apache.jackrabbit.server.io.CopyMoveHandler;
+import org.apache.jackrabbit.server.io.CopyMoveManagerImpl;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * CopyMoveManager service that uses a ServiceTracker to find available
+ * CopyMoveHandler.
+ */
+public class Sl
[sling-org-apache-sling-jcr-webdav] 05/16: Set parent pom to released version.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit b913dcbf9839fecde7e861208b296fe6da786885 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu May 14 14:49:51 2009 + Set parent pom to released version. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav@774798 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 956f4aa..70526f6 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -6-incubator-SNAPSHOT +5-incubator ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 07/10: set parent version to 24 and add empty relativePath where missing
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 01aa708e06e2ae414c28840c411b6569ddac0497 Author: Oliver Lietz <o...@apache.org> AuthorDate: Tue Jul 7 08:09:17 2015 + set parent version to 24 and add empty relativePath where missing git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1689593 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c1ab75..5f87b44 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -23 +24 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 01/06: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git commit dbefd4478c65197a6582cd45c4a3f1945133a76c Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Mar 5 11:21:19 2014 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1574440 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 7aa6ac0..09fe8c0 100644 --- a/pom.xml +++ b/pom.xml @@ -28,15 +28,15 @@ org.apache.sling org.apache.sling.jmx.provider -1.0.0 +1.0.1-SNAPSHOT bundle Apache Sling JMX Resource Provider - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.0 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jmx.provider-1.0.0 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jmx.provider-1.0.0 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider + http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/jmxprovider -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 02/31: [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 6dc472156b0a7fbc1c0e6986434a026ffd0239b7 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Jun 17 07:35:16 2008 + [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@668490 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3988c2f..505c9b4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.sling.jcr.webdav bundle -2.0.1-incubator-SNAPSHOT +2.0.2-incubator Sling - Simple WebDAV Access to repositories @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav - scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav - http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav + scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator + scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator + http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 01/07: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.6.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 35022106bdb036e75275cffd6732e91681f9e3f1 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Oct 28 05:15:03 2016 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1766924 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index f789de8..e4607fb 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.sling.provisioning.model -1.5.0 +1.5.1-SNAPSHOT bundle Apache Sling Provisioning Model @@ -31,9 +31,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.5.0 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.5.0 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.5.0 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model + http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 22/34: Refactor model and add basic read/write test
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 4b98c32d19fc98161211fa6c411d12ee929c9acb
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Oct 1 16:03:47 2014 +
Refactor model and add basic read/write test
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/slingstart-model@1628749
13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml| 4 +
.../apache/sling/provisioning/model/Artifact.java | 2 +-
.../sling/provisioning/model/ArtifactGroup.java| 17 +--
.../model/{Traceable.java => Commentable.java} | 26 +---
.../sling/provisioning/model/Configuration.java| 2 +-
.../apache/sling/provisioning/model/Feature.java | 16 +-
.../apache/sling/provisioning/model/ItemList.java | 50 +++
.../sling/provisioning/model/KeyValueMap.java | 55 +++
.../org/apache/sling/provisioning/model/Model.java | 4 +-
.../sling/provisioning/model/ModelUtility.java | 20 +--
.../apache/sling/provisioning/model/RunMode.java | 18 ++-
.../apache/sling/provisioning/model/Traceable.java | 25 +---
.../sling/provisioning/model/io/ModelReader.java | 166 +
.../sling/provisioning/model/io/ModelWriter.java | 86 +--
.../apache/sling/provisioning/model/io/IOTest.java | 75 ++
src/test/resources/boot.txt| 40 +
src/test/resources/example.txt | 64
src/test/resources/main.txt| 104 +
src/test/resources/oak.txt | 19 +++
19 files changed, 560 insertions(+), 233 deletions(-)
diff --git a/pom.xml b/pom.xml
index 46f9477..8d212a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,5 +64,9 @@
1.2.8
provided
+
+ junit
+ junit
+
diff --git a/src/main/java/org/apache/sling/provisioning/model/Artifact.java
b/src/main/java/org/apache/sling/provisioning/model/Artifact.java
index bb5d844..432c4bf 100644
--- a/src/main/java/org/apache/sling/provisioning/model/Artifact.java
+++ b/src/main/java/org/apache/sling/provisioning/model/Artifact.java
@@ -25,7 +25,7 @@ import java.util.Map;
* In addition, the classifier and type can be specified as well.
* An artifact can have any metadata.
*/
-public class Artifact extends Traceable {
+public class Artifact extends Commentable {
private final String groupId;
private final String artifactId;
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
b/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
index 0d0ccf9..8cb3550 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ArtifactGroup.java
@@ -16,20 +16,16 @@
*/
package org.apache.sling.provisioning.model;
-import java.util.ArrayList;
-import java.util.List;
/**
* A artifact group holds a set of artifacts.
* A valid start level is positive, start level 0 means the default OSGi start
level.
*/
-public class ArtifactGroup extends Traceable
+public class ArtifactGroup extends ItemList
implements Comparable {
private final int level;
-private final List artifacts = new ArrayList();
-
public ArtifactGroup(final int level) {
this.level = level;
}
@@ -38,20 +34,17 @@ public class ArtifactGroup extends Traceable
return this.level;
}
-public List getArtifacts() {
-return this.artifacts;
-}
-
/**
* Search an artifact with the same groupId, artifactId, version, type and
classifier.
* Version is not considered.
*/
public Artifact search(final Artifact template) {
Artifact found = null;
-for(final Artifact current : this.artifacts) {
+for(final Artifact current : this) {
if ( current.getGroupId().equals(template.getGroupId())
&& current.getArtifactId().equals(template.getArtifactId())
- && current.getClassifier().equals(template.getClassifier())
+ && ((current.getClassifier() == null && template.getClassifier()
== null)
+ || (current.getClassifier().equals(template.getClassifier())
))
&& current.getType().equals(template.getType()) ) {
found = current;
break;
@@ -73,7 +66,7 @@ public class ArtifactGroup extends Traceable
@Override
public String toString() {
return "ArtifactGroup [level=" + level
-+ ", artifacts=" + artifacts
++ ", artifacts=" + this.items
[sling-org-apache-sling-provisioning-model] 04/06: SLING-4473 : Provide a way to remove settings, artifacts and features through a model SLING-4475 : Artifact is twice in feature after merge
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.1.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 523138f61b3f6a23110a7560de88084c3a79a6c8
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Thu Mar 5 12:20:27 2015 +
SLING-4473 : Provide a way to remove settings, artifacts and features
through a model
SLING-4475 : Artifact is twice in feature after merge
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1664323
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/provisioning/model/KeyValueMap.java | 19 ++
.../sling/provisioning/model/ModelConstants.java | 6 ++
.../sling/provisioning/model/ModelUtility.java | 59 +-
.../sling/provisioning/model/io/ModelReader.java | 1 -
.../sling/provisioning/model/package-info.java | 2 +-
.../sling/provisioning/model/ModelUtilityTest.java | 66
.../org/apache/sling/provisioning/model/U.java | 70 ++
src/test/resources/merge/artifact-base.txt | 4 ++
src/test/resources/merge/artifact-merge.txt| 4 ++
src/test/resources/merge/remove-base.txt | 25
src/test/resources/merge/remove-merge.txt | 12
11 files changed, 252 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/sling/provisioning/model/KeyValueMap.java
b/src/main/java/org/apache/sling/provisioning/model/KeyValueMap.java
index 7e64732..010d684 100644
--- a/src/main/java/org/apache/sling/provisioning/model/KeyValueMap.java
+++ b/src/main/java/org/apache/sling/provisioning/model/KeyValueMap.java
@@ -50,6 +50,16 @@ public class KeyValueMap
}
/**
+ * Remove an item from the map
+ * @param key The key of the item.
+ * @return The previously stored value for the key or {@code null}.
+ * @since 1.1
+ */
+public T remove(final String key) {
+return this.properties.remove(key);
+}
+
+/**
* Put all items from the other map in this map
* @param map The other map
*/
@@ -74,4 +84,13 @@ public class KeyValueMap
public String toString() {
return properties.toString();
}
+
+/**
+ * Get the size of the map.
+ * @return The size of the map.
+ * @since 1.1
+ */
+public int size() {
+return this.properties.size();
+}
}
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
b/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
index d3020f9..e5e74dd 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelConstants.java
@@ -62,4 +62,10 @@ public abstract class ModelConstants {
/** Default start level value */
public static final int DEFAULT_START_LEVEL = 0;
+
+/**
+ * Name of the run mode to remove things from the base model.
+ * @since 1.1
+ */
+public static final String RUN_MODE_REMOVE = ":remove";
}
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
index 82c129f..4b4ce7b 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
@@ -50,7 +50,62 @@ public abstract class ModelUtility {
// run modes
for(final RunMode runMode : feature.getRunModes()) {
-final RunMode baseRunMode =
baseFeature.getOrCreateRunMode(runMode.getNames());
+// check for special remove run mode
+String names[] = runMode.getNames();
+if ( names != null ) {
+int removeIndex = -1;
+int index = 0;
+for(final String name : names) {
+if ( name.equals(ModelConstants.RUN_MODE_REMOVE) ) {
+removeIndex = index;
+break;
+}
+index++;
+}
+if ( removeIndex != -1 ) {
+String[] newNames = null;
+if ( names.length > 1 ) {
+newNames = new String[names.length - 1];
+index = 0;
+for(final String name : names) {
+if (
!name.equals(ModelConstants.RUN_MODE_REMOVE) ) {
+newNames[index++] = name;
+}
+}
+}
+names = newNames;
+final RunMode baseRunMode =
bas
[sling-org-apache-sling-jcr-webdav] 02/06: SLING-5832 Update Jackrabbit to 2.12.2
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit fad7286f521ea43d075cce10e8fb600757ffe4e8 Author: Oliver Lietz <o...@apache.org> AuthorDate: Fri Jul 8 20:19:19 2016 + SLING-5832 Update Jackrabbit to 2.12.2 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1751960 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ded6526..449aee9 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ -2.12.1 +2.12.2 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 40/45: Use released versions of testing modules and jcr classloader.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 8a84b7e2daa5334e3dbd386db7f8ef8ce3b6f82c Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Feb 19 07:22:24 2013 + Use released versions of testing modules and jcr classloader. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1447604 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9a75ee7..c9b41fc 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.apache.sling org.apache.sling.junit.core -1.0.9-SNAPSHOT +1.0.8 org.apache.felix @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.testing.tools -1.0.7-SNAPSHOT +1.0.6 org.apache.sling -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 08/10: Use latest installer core
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git commit d2dc4320118b42ae38e7edacb6cbcd1980201a1d Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Jan 8 08:28:37 2015 + Use latest installer core git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1650222 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5bde25..b2e0b94 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.apache.sling org.apache.sling.installer.core -3.5.5-SNAPSHOT +3.6.0 provided -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 02/08: Update to latest parent pom and use latest releases in launchpad
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.12 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git commit 2f43193fabeacb2f6acd5617ae9a5cce5621 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Feb 18 08:38:52 2013 + Update to latest parent pom and use latest releases in launchpad git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1447147 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ecdc91..487d6f3 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ org.apache.sling sling -14 +15 ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 02/07: Switch to current core snapshot for the release phase
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git commit edbb3828456d68c7f6f1208e06ab9d9d19ded7e8 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Jan 8 08:30:31 2015 + Switch to current core snapshot for the release phase git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1650226 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e64b9cb..8fb12ae 100644 --- a/pom.xml +++ b/pom.xml @@ -73,7 +73,7 @@ org.apache.sling org.apache.sling.installer.core -3.6.0 +3.6.1-SNAPSHOT provided -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 08/08: [maven-release-plugin] copy for tag org.apache.sling.installer.factory.configuration-1.0.12
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.12 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git commit e8f3b7e4b9e69df1e10a7e17e7524a2ddc234191 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Sun Mar 23 10:52:16 2014 + [maven-release-plugin] copy for tag org.apache.sling.installer.factory.configuration-1.0.12 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.12@1580486 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webconsole] 07/29: Update to recent snapshot
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webconsole-1.0.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webconsole.git commit 3ac1e52ba4a576e0a881c45e8a6ab9428d4f5792 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Aug 3 09:01:37 2011 + Update to recent snapshot git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webconsole@1153397 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e2922bf..ff1f521 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -11-SNAPSHOT +12-SNAPSHOT ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 14/16: Update notice files.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 45464ff7b40770c09247aff95a2f7d3ba2a7a534 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Feb 12 15:05:46 2010 + Update notice files. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@909446 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE | 2 +- src/main/resources/META-INF/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index d9d3bda..72b2446 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Sling WebDAV -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE index d410975..1b92d4c 100644 --- a/src/main/resources/META-INF/NOTICE +++ b/src/main/resources/META-INF/NOTICE @@ -1,5 +1,5 @@ Apache Sling WebDAV -Copyright 2008-2009 The Apache Software Foundation +Copyright 2008-2010 The Apache Software Foundation Apache Sling is based on source code originally developed by Day Software (http://www.day.com/). -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 03/12: SLING-1405 - fixing duplicate dependencies
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 1d688a637ec5c69441b8823d5f7746dab493ab9b Author: Justin Edelson <jus...@apache.org> AuthorDate: Tue Feb 23 15:11:23 2010 + SLING-1405 - fixing duplicate dependencies SLING-1405 - fixing duplicate depencencies removing dupe jcr dependency SLING-1405 - fixing jcr.webdav pom remove provided scope git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@915371 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b2a4d81..46c05ee 100644 --- a/pom.xml +++ b/pom.xml @@ -113,13 +113,7 @@ org.apache.sling.commons.mime 2.0.2-incubator - - -javax.jcr -jcr -2.0 -provided - + org.apache.jackrabbit jackrabbit-jcr-server @@ -130,6 +124,7 @@ javax.jcr jcr +2.0 javax.servlet -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 08/16: SLING-1011 : Adjust svn location
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit c57f60a74a649071614c6e895438551740f99371 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Jun 18 10:26:35 2009 + SLING-1011 : Adjust svn location git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@786008 13f79535-47bb-0310-9956-ffa450edef68 --- README.txt | 2 +- pom.xml| 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.txt b/README.txt index 7d1bf0d..cba9ea0 100644 --- a/README.txt +++ b/README.txt @@ -32,7 +32,7 @@ Subversion (http://subversion.tigris.org/) source repository of the Apache Software Foundation. If you have Subversion installed, you can checkout the latest source using the following command: -svn checkout http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav +svn checkout http://svn.apache.org/repos/asf/sling/trunk/jcr/webdav See the Subversion documentation for other source control features. diff --git a/pom.xml b/pom.xml index 70526f6..40ca9d6 100644 --- a/pom.xml +++ b/pom.xml @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav - scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav - http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/jcr/webdav + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav +http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/webdav -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 06/06: [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.6
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 7bc7aaa72210fa40efe7aef5e07d4656e058a4df Author: Robert Munteanu <romb...@apache.org> AuthorDate: Wed Jan 25 16:40:08 2017 + [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.3.6 git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.webdav-2.3.6@1780233 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jms] 01/08: SLING-5646 MoM API and JMS implementation with example usage by Jobs implementation. Squashes 27 commits from https://github.com/ieb/sling/tree/jobs_28 as follows.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jms-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jms.git commit 0d2ab666035ea47563339bfce27ed914ae8c2a16 Author: Ian Boston <i...@apache.org> AuthorDate: Wed Jul 27 12:10:12 2016 + SLING-5646 MoM API and JMS implementation with example usage by Jobs implementation. Squashes 27 commits from https://github.com/ieb/sling/tree/jobs_28 as follows. Added first stab at a message oriented job subsystem Added basic implementation for the manager keeping queue implementation details abstracted Added ActiveMQ implementation for queues and topics, and fixed a number of the the SPI interfaces in the process Basic Test coverate for OOT JMS Broker Extracted a MOM API with no Jobs or JMS references, test coverage for ActiveMQ impl is 100% class, 93% method, 75% line Added missing license headers, documentation and cleaned out unused interfaces Fixed JMS Transaction issue found by @tmaret Coverage for the majority of the jobs code is complete Basic unit test coverage complete, core has 94% by lines, AMQ 74%, 100% classes and methods Added testing environment for a runnign server, Not working yet Added ability for detect when the OSGi container has completed bundle startup without having to perform http requests Start at IT testing with Crankstart Fixed issues with shutdown inside a Crankstart container Working Crankstart IT framework Version that uses Q->Jobs->JobConsumer pattern Added a Queue Factory to allow configuration of multiple queues between the MOM API and Job Subsystem and move JobConsumers to register with a Job type Migrated Subscribers and QueueReaders to a OSGi whiteboard pattern after discussion on Sling Dev Changes the JobConsumer to use a Callback rather than return a job. This was suggested offlist by others in Adobe as a way of improving resource consumption Added Types to improve type safety in certain areas after suggestions offlist Fixed issue with OSGi startup in IntelliJ caused by version 4 of the Felix framework bundle being present inside the maven pom. Strangely a command line build was not impacted. Added integration test bundle to test service. Adjusted some of the APIs to make using the Job Sub System easier Integration tests now starting jobs from messages Fixed Startup to work in real Sling/AEM container. The Active MQ OSGi bundle contains additional dependencies that cause all sorts of problems, AMQ is now being embedded into the AMQ MOM Impl bundle. Fixed Queue expriy bug and added AEM Fiddle to run jobs Added Documentation for configuration and default sample configuration Added Explicit requeue mechanims rather than relying on AMQ's requeue capabilities Moved MoM to new Home git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/mom/jms@1754255 13f79535-47bb-0310-9956-ffa450edef68 --- .gitignore | 1 + README.md | 79 ++ pom.xml| 237 .../amq/ActiveMQConnectionFactoryService.java | 106 .../apache/sling/jms/ConnectionFactoryService.java | 36 +++ .../java/org/apache/sling/jms/JMSMessageTypes.java | 29 ++ .../java/org/apache/sling/jms/JMSQueueManager.java | 289 .../java/org/apache/sling/jms/JMSTopicManager.java | 248 + src/main/java/org/apache/sling/jms/Json.java | 92 +++ .../resources/org/apache/sling/amq/activemq.xml| 170 .../org/apache/sling/amq/credentials.properties| 22 ++ src/main/resources/org/apache/sling/amq/jetty.xml | 144 ++ .../amq/ActiveMQConnectionFactoryServiceTest.java | 81 ++ .../org/apache/sling/jms/JMSQueueManagerTest.java | 301 + .../org/apache/sling/jms/JMSTopicManagerTest.java | 235 src/test/java/org/apache/sling/jms/JsonTest.java | 118 16 files changed, 2188 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..0d18955 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +activemq-data diff --git a/README.md b/README.md new file mode 100644 index 000..d95f6d2 --- /dev/null +++ b/README.md @@ -0,0 +1,79 @@ +# Message Oriented Middleware API implementation using Active MQ. + +This bundle implements the MoM API using Active MQ. It supports both Pub/Sub and Queue patterns and will run out of the +box, embedded or connected to a dedicated cluster. + +## Out of the Box. + +As the name suggests, no configuration is required, the components will start, create an ActiveMQ instance embedded inside +the OSGi container and run. On restart, normal or after a crash, provided the worki
[sling-org-apache-sling-jmx-provider] 02/11: SLING-2999 : JMX Resource Provider
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-0.5.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 0a6ebb347d0789aadbfd42e128361089daf6f893
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Fri Aug 9 15:43:41 2013 +
SLING-2999 : JMX Resource Provider
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1512349
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/jmx/provider/impl/AttributeResource.java | 52 +++---
1 file changed, 36 insertions(+), 16 deletions(-)
diff --git
a/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
b/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
index 5e303a3..f715d3b 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/AttributeResource.java
@@ -18,17 +18,15 @@
*/
package org.apache.sling.jmx.provider.impl;
+import java.lang.reflect.Array;
import java.util.HashMap;
import java.util.Map;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
import javax.management.MBeanAttributeInfo;
-import javax.management.MBeanException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import javax.management.ReflectionException;
-import javax.management.RuntimeMBeanException;
+import javax.management.openmbean.CompositeData;
+import javax.management.openmbean.TabularData;
import org.apache.sling.api.SlingConstants;
import org.apache.sling.api.resource.AbstractResource;
@@ -120,19 +118,41 @@ public class AttributeResource extends AbstractResource {
try {
final Object value = server.getAttribute(this.on, info.getName());
if ( value != null ) {
-result.put("value", value.toString());
+if ( value.getClass().isArray() ) {
+final int length = Array.getLength(value);
+final Object[] values = new Object[length];
+for (int i = 0; i < length; i ++) {
+final Object o = Array.get(value, i);
+values[i] = convert(o);
+}
+result.put("value", values);
+} else if (value instanceof TabularData) {
+// TODO
+} else if (value instanceof CompositeData) {
+// TODO
+} else {
+result.put("value", convert(value));
+}
}
-} catch (final RuntimeMBeanException uoe) {
-// ignore
-} catch (final AttributeNotFoundException e) {
-// ignore
-} catch (final InstanceNotFoundException e) {
-// ignore
-} catch (final MBeanException e) {
-// ignore
-} catch (final ReflectionException e) {
-// ignore
+} catch (final Exception ignore) {
+// ignore, but put this as info
+result.put("exception", ignore.getMessage());
}
return result;
}
+
+private Object convert(final Object value) {
+if ( value == null ) {
+return "";
+} else if ( value instanceof String ) {
+return value;
+} else if ( value instanceof Number ) {
+return value;
+} else if ( value instanceof Boolean ) {
+return value;
+} else if ( value instanceof Character ) {
+return value;
+}
+return value.toString();
+}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 15/38: Update notice files.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 5084deaaf554dcd66b17b09a18d206f090ce6a97 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Apr 14 15:52:14 2008 + Update notice files. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@647863 13f79535-47bb-0310-9956-ffa450edef68 --- NOTICE | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index d6312a6..ef2b66a 100644 --- a/NOTICE +++ b/NOTICE @@ -1,8 +1,9 @@ Apache Sling WebDAV Copyright 2008 The Apache Software Foundation -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - Based on source code originally developed by Day Software (http://www.day.com/). + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +Licensed under the Apache License 2.0. -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] annotated tag org.apache.sling.jcr.webdav-2.2.0 created (now 9500ce8)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jcr.webdav-2.2.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git. at 9500ce8 (tag) tagging 66b6b506613068b6cd0490462b9ef77b830b4ef3 (commit) by Felix Meschberger on Tue May 28 12:25:38 2013 + - Log - org.apache.sling.jcr.webdav-2.2.0 --- This annotated tag includes the following new commits: new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient. new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly. new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle new 6075e5a Use OSGi core and cmpendium jars from Felix project. new 97ce3de SLING-204 - add svn ignore patterns for intellij new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere. new 2f19dc1 Move licence and notice to top level dir. new ea1807f Add incubator disclaimer. new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes. new 5084dea Update notice files. new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin. new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins. new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files new ab2e11f SLING-483: Add excludes for javadocs (WiP) new 443e2a3 SLING-495 - NOTICE files generated using mknotice script new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927 new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes new a5898b0 Use released version of parent pom. new 9613fba Use released versions (or soon to be released versions). new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator new adf1a67 [maven-release-plugin] prepare for next development iteration new 8d649af Set version to next development version. new b60df5a Fix reference to parent pom. new ffb8853 Remove unused imports and fix some javadoc errors. new e037bca SLING-521: Restore more notice files. new c7878f3 SLING-521: Separate between notice files for bin and src dists. new cdee843 SLING-521: Separate between notice files for bin and src dists. new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included new fbdc0e3 Update to released versions. new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator new d081bbe [maven-release-plugin] prepare for next development iteration new 6eee069 Use latest snapshots again to make project buildable. new 4099ee4 Use released versions. new f058c71 Use released parent pom where possible. new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting. new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure comp
[sling-org-apache-sling-provisioning-model] 15/19: SLING-4126 : Provide a mechanism to merge configurations
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.provisioning.model-1.2.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 5f9f27cb82310da276e0a2b492bc0298883df4c9
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Mon Jun 8 14:07:56 2015 +
SLING-4126 : Provide a mechanism to merge configurations
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1684190
13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/provisioning/model/ModelUtility.java| 8
src/test/java/org/apache/sling/provisioning/model/U.java | 8 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
index aa64ed9..cfeea1f 100644
--- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
+++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
@@ -147,6 +147,14 @@ public abstract class ModelUtility {
*/
private static void mergeConfiguration(final Configuration baseConfig,
final Configuration mergeConfig) {
// check for merge mode
+final boolean isNew = baseConfig.getProperties().isEmpty();
+if ( isNew ) {
+copyConfigurationProperties(baseConfig, mergeConfig);
+final Object mode =
mergeConfig.getProperties().get(ModelConstants.CFG_UNPROCESSED_MODE);
+if ( mode != null ) {
+
baseConfig.getProperties().put(ModelConstants.CFG_UNPROCESSED_MODE, mode);
+}
+}
final boolean baseIsRaw =
baseConfig.getProperties().get(ModelConstants.CFG_UNPROCESSED) != null;
final boolean mergeIsRaw =
mergeConfig.getProperties().get(ModelConstants.CFG_UNPROCESSED) != null;
// simplest case, both are raw
diff --git a/src/test/java/org/apache/sling/provisioning/model/U.java
b/src/test/java/org/apache/sling/provisioning/model/U.java
index a7924ad..65576de 100644
--- a/src/test/java/org/apache/sling/provisioning/model/U.java
+++ b/src/test/java/org/apache/sling/provisioning/model/U.java
@@ -52,7 +52,7 @@ public class U {
/** Read the complete model from that names */
public static Model readCompleteTestModel(final String[] names) throws
Exception {
-Model result = null;
+final Model result = new Model();
for(final String name : names) {
final Reader reader = new
InputStreamReader(U.class.getResourceAsStream("/" + name), "UTF-8");
@@ -62,11 +62,7 @@ public class U {
if (errors != null ) {
throw new Exception("Invalid model at " + name + " : " +
errors);
}
-if ( result == null ) {
-result = current;
-} else {
-ModelUtility.merge(result, current);
-}
+ModelUtility.merge(result, current);
} finally {
reader.close();
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 25/45: Update to recent snapshot
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 6645e7e44ba6c4109363fcdcd8b0a3febc8ab952 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Aug 3 09:01:37 2011 + Update to recent snapshot git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1153397 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4aa3de1..df3fff0 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -11-SNAPSHOT +12-SNAPSHOT ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 05/06: [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.4
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.4.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 609d205c07e88f1e2b803c51a3b3aa82739035ba Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Jun 6 13:56:20 2016 + [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.4.4 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1747001 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index a86f9ed..8646c3b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.sling.provisioning.model -1.4.3-SNAPSHOT +1.4.4 bundle Apache Sling Provisioning Model @@ -31,9 +31,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model - http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.4.4 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.4.4 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.4.4 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 35/45: Prepare for release: use released version
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit c7bde6874f558b143926c98085a9020713c4f4aa Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Feb 15 11:36:33 2013 + Prepare for release: use released version git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1446526 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b35cf7a..a68ba96 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.apache.sling org.apache.sling.junit.core -1.0.7-SNAPSHOT +1.0.8 org.apache.felix @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.testing.tools -1.0.5-SNAPSHOT +1.0.6 org.apache.sling -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] 04/09: SLING-3200 : Avoid duplicated requests to mbeans when creating resources
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.jmx.provider-1.0.0
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git
commit 269ee17f7c2f1c3a3b43a4b26aeaf94fbe18a793
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Wed Oct 23 08:21:09 2013 +
SLING-3200 : Avoid duplicated requests to mbeans when creating resources
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/jmxprovider@1534954
13f79535-47bb-0310-9956-ffa450edef68
---
.../sling/jmx/provider/impl/JMXResourceProvider.java | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
b/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
index 2eb7b46..5d32811 100644
--- a/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
+++ b/src/main/java/org/apache/sling/jmx/provider/impl/JMXResourceProvider.java
@@ -152,8 +152,22 @@ public class JMXResourceProvider implements
ResourceProvider {
return new AttributesResource(resourceResolver, path,
parent);
}
if ( info.pathInfo.startsWith("mbean:attributes/") ) {
-final AttributesResource parent =
(AttributesResource)resourceResolver.getResource(ResourceUtil.getParent(path));
-final MBeanResource parentMBeanResource = (MBeanResource)
parent.getParent();
+final Resource parentRsrc =
resourceResolver.getResource(ResourceUtil.getParent(path));
+final AttributesResource parentAttributesResource;
+final MBeanResource parentMBeanResource;
+if ( parentRsrc instanceof AttributesResource ) {
+parentAttributesResource = (AttributesResource)
parentRsrc;
+parentMBeanResource =
(MBeanResource)parentRsrc.getParent();
+} else {
+final AttributeResource parent;
+if ( parentRsrc instanceof AttributeResource) {
+parent = (AttributeResource)parentRsrc;
+} else {
+parent =
((MapResource)parentRsrc).getAttributeResource();
+}
+parentAttributesResource = (AttributesResource)
parent.getParent();
+parentMBeanResource = (MBeanResource)
parentAttributesResource.getParent();
+}
final AttributeList result =
parentMBeanResource.getAttributes();
final String attrPath =
info.pathInfo.substring("mbean:attributes/".length());
@@ -177,7 +191,7 @@ public class JMXResourceProvider implements
ResourceProvider {
value = a.getValue();
}
}
-final AttributeResource rsrc = new
AttributeResource(resourceResolver, path, mai, value, parent);
+final AttributeResource rsrc = new
AttributeResource(resourceResolver, path, mai, value, parentAttributesResource);
if ( subPath != null ) {
return rsrc.getChildResource(subPath);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 08/10: SLING-5572 Update Jackrabbit to 2.12.1
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.3.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit bdb81065aafe718a8a52469f5a5e59c8df6b6984 Author: Oliver Lietz <o...@apache.org> AuthorDate: Mon Feb 29 18:03:13 2016 + SLING-5572 Update Jackrabbit to 2.12.1 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1732922 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d6dc7ca..1ae111f 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ -2.12.0 +2.12.1 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 38/45: Use snapshot version after release
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit ef7a70c68ab09bdcbbe851aa4a66b683880ee7ed Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Feb 15 11:46:27 2013 + Use snapshot version after release git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1446540 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 43b82e7..295b9e3 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.apache.sling org.apache.sling.junit.core -1.0.8 +1.0.9-SNAPSHOT org.apache.felix @@ -104,7 +104,7 @@ org.apache.sling org.apache.sling.testing.tools -1.0.6 +1.0.7-SNAPSHOT org.apache.sling -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 19/31: SLING-865 : Adjust reactor pom and svn information in each module.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit a61946c9a7dee80fa8f49322356d24b966142ef7 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Sun Feb 22 14:22:36 2009 + SLING-865 : Adjust reactor pom and svn information in each module. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav@746707 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8857a21..8979efb 100644 --- a/pom.xml +++ b/pom.xml @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav - scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav - http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav + scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav + scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav + http://svn.apache.org/viewvc/incubator/sling/trunk/bundles/jcr/webdav -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-junit-healthcheck] 10/45: Export remote.ide package as well
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.junit.healthcheck-1.0.4 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git commit 53b7072fd6b8951656e0aa6000db54a93f262c7f Author: Bertrand Delacretaz <bdelacre...@apache.org> AuthorDate: Wed Mar 9 16:00:36 2011 + Export remote.ide package as well git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1079862 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 81102e1..a1f6487 100644 --- a/pom.xml +++ b/pom.xml @@ -51,7 +51,10 @@ true - org.apache.sling.junit.remote.exported.* + +org.apache.sling.junit.remote.exported.*, +org.apache.sling.junit.remote.ide.* + org.apache.http.*; resolution:=optional, org.apache.sling.testing.tools.http; resolution:=optional, -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jmx-provider] annotated tag org.apache.sling.jmx.provider-0.5.0 created (now 2a4a74f)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jmx.provider-0.5.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jmx-provider.git. at 2a4a74f (tag) tagging a3d18b554a5c5424e5d5085fece8cc51c360cd9b (commit) by Carsten Ziegeler on Tue Oct 1 09:43:44 2013 + - Log - org.apache.sling.jmx.provider-0.5.0 --- This annotated tag includes the following new commits: new 961d545 SLING-2999 : JMX Resource Provider new 0a6ebb3 SLING-2999 : JMX Resource Provider new 8b1df92 SLING-2999 : JMX Resource Provider new 0ad522b SLING-2999 : JMX Resource Provider new 32d3a34 SLING-2999 : JMX Resource Provider new 94e5196 SLING-2999 : JMX Resource Provider new 7cb48f0 SLING-2999 : JMX Resource Provider - initial support for tabular and composite data new ecc0c20 SLING-2999 : JMX Resource Provider - add sorting of tabular data new 99a4f03 Update to parent pom 18 new 4ea28ab [maven-release-plugin] prepare release org.apache.sling.jmx.provider-0.5.0 new a3d18b5 [maven-release-plugin] copy for tag org.apache.sling.jmx.provider-0.5.0 The 11 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@sling.apache.org" <commits@sling.apache.org>'].
[sling-org-apache-sling-junit-healthcheck] 12/45: SLING-2027 - SlingRemoteTestParameters: make tests count check optional
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag
org.apache.sling.junit.healthcheck-1.0.4
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-healthcheck.git
commit 9c9239ba61b3a0be1ab65ded040c56ec3659e699
Author: Bertrand Delacretaz <bdelacre...@apache.org>
AuthorDate: Fri Mar 11 16:28:09 2011 +
SLING-2027 - SlingRemoteTestParameters: make tests count check optional
git-svn-id:
https://svn.apache.org/repos/asf/sling/trunk/testing/junit/remote@1080639
13f79535-47bb-0310-9956-ffa450edef68
---
.../testrunner/SlingRemoteTestParameters.java | 5
.../remote/testrunner/SlingRemoteTestRunner.java | 10 +++-
...Parameters.java => SlingTestsCountChecker.java} | 27 ++
3 files changed, 10 insertions(+), 32 deletions(-)
diff --git
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
index 69d83ea..7dd7944 100644
---
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
+++
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
@@ -32,9 +32,4 @@ public interface SlingRemoteTestParameters {
* for example "someMethodName"
*/
String getTestMethodSelector();
-
-/** Return the expected number of tests - if zero, no check
- * is done.
- */
-int getExpectedNumberOfTests();
}
diff --git
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
index 8399d95..175b774 100644
---
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
+++
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestRunner.java
@@ -16,8 +16,6 @@
*/
package org.apache.sling.junit.remote.testrunner;
-import static org.junit.Assert.assertEquals;
-
import java.util.LinkedList;
import java.util.List;
@@ -96,11 +94,9 @@ public class SlingRemoteTestRunner extends
ParentRunner {
log.info("Server-side tests executed at {} with path {}",
testParameters.getJunitServletUrl(),
testHttpClient.getTestExecutionPath());
-// Check that number of tests is as expected
-if(testParameters.getExpectedNumberOfTests() >= 0) {
-assertEquals("Expecting " +
testParameters.getExpectedNumberOfTests() + " tests",
-testParameters.getExpectedNumberOfTests(),
-children.size());
+// Optionally check that number of tests is as expected
+if(testParameters instanceof SlingTestsCountChecker) {
+
((SlingTestsCountChecker)testParameters).checkNumberOfTests(children.size());
}
}
diff --git
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java
similarity index 55%
copy from
src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
copy to
src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java
index 69d83ea..31bdb37 100644
---
a/src/main/java/org/apache/sling/junit/remote/testrunner/SlingRemoteTestParameters.java
+++
b/src/main/java/org/apache/sling/junit/remote/testrunner/SlingTestsCountChecker.java
@@ -16,25 +16,12 @@
*/
package org.apache.sling.junit.remote.testrunner;
-/** Test class "proxies" implement this to indicate where to
- * run the tests.
+/** Tests classes can implement this interface to check the
+ * number of tests that are executed remotely. This is useful
+ * when tests are loaded dynamically, to check that all the required
+ * tests have indeed been executed, for example in continuous
+ * integration.
*/
-public interface SlingRemoteTestParameters {
-/** Return the URL of the JUnit servlet */
-String getJunitServletUrl();
-
-/** Return the optional selector for the test classes to run,
- * for example "org.apache.sling.testing.samples.sampletests.JUnit4Test"
- */
-String getTestClassesSelector();
-
-/** Return the optional selector for the test methods to run,
- * for example "someMethodName"
- */
-String getTestMethodSelector();
-
-/** Return the expected number of tests - if zero, no check
- * is done.
- */
-int getExpectedNumberOfTests();
+public interface SlingTestsCountChecker {
+void checkNumberOfTests(int numberOfTestsExecuted);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 18/31: SLING-865 : Move to bundles
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit d8ee9258dd11533a1b8894eb40f497d0798012b0 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Sun Feb 22 13:43:19 2009 + SLING-865 : Move to bundles git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav@746677 13f79535-47bb-0310-9956-ffa450edef68 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 04/29: Use latest releases.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.1.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit dfa2d0a4b86294a332e0f993c5d933fbd1ffc211 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Dec 13 08:55:35 2010 + Use latest releases. git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/webdav@1045037 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c646c7f..ed1a801 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -11-SNAPSHOT +10 ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 01/16: Prepare new release.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit a56f19ae9947e3731526be28203eae48695ce622 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed May 6 12:55:51 2009 + Prepare new release. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav@772191 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 95f26ec..c18c44a 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -6-incubator-SNAPSHOT +5-incubator ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 04/16: Use next parent pom for development.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.8 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit ce85ab92e2a0af7b83b0a6a3a6cd099041421fad Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu May 7 12:04:44 2009 + Use next parent pom for development. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/bundles/jcr/webdav@772627 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 70526f6..956f4aa 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -5-incubator +6-incubator-SNAPSHOT ../../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 01/05: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.5.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 3bd74093fe6d2101cb77d50beb304808e4a48e63 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Jun 6 13:56:35 2016 + [maven-release-plugin] prepare for next development iteration git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1747003 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8646c3b..4205d2e 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.sling.provisioning.model -1.4.4 +1.4.5-SNAPSHOT bundle Apache Sling Provisioning Model @@ -31,9 +31,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.4.4 - scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.4.4 - http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.4.4 + scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model + scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model + http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-provisioning-model] 04/05: [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.2
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.8.2 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git commit 34e6187a6aaa31047bc1f0582cdf55e3836ab2cd Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue May 2 14:44:20 2017 + [maven-release-plugin] prepare release org.apache.sling.provisioning.model-1.8.2 git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1793506 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9dccaf2..1ce3993 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.sling.provisioning.model -1.8.1-SNAPSHOT +1.8.2 bundle Apache Sling Provisioning Model @@ -31,9 +31,9 @@ - scm:svn:http://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model - scm:svn:https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model - http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model + scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.2 + scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.provisioning.model-1.8.2 + http://svn.apache.org/viewvc/sling/tags/org.apache.sling.provisioning.model-1.8.2 -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] annotated tag org.apache.sling.jcr.webdav-2.3.6 created (now d372261)
This is an automated email from the ASF dual-hosted git repository. rombert pushed a change to annotated tag org.apache.sling.jcr.webdav-2.3.6 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git. at d372261 (tag) tagging 7bc7aaa72210fa40efe7aef5e07d4656e058a4df (commit) by Robert Munteanu on Wed Jan 25 16:40:08 2017 + - Log - org.apache.sling.jcr.webdav-2.3.6 --- This annotated tag includes the following new commits: new cf5d7e6 SLING-150 Add support for Jackrabbit Simple WebDAV new e73a751 SLING-150 LICENSE and NOTICE file for the new bundle new ed9ac9c SLING-150 webdav module should be in trunk not whiteboard new 98a70e6 SLING-150 Exclude the WebDAV client code from the bundle and thus remove the dependency on HttpClient. new 840140e SLING-170 Redirect to the default workspace when accessing the servlet directly. new 276d804 Added webdav-resource-config.xml to map nt:file and related nodetypes in the usual way new 0d2bc66 SLING-176 Include jcr-commons packages in the bundle new 6075e5a Use OSGi core and cmpendium jars from Felix project. new 97ce3de SLING-204 - add svn ignore patterns for intellij new 82e5c38 SLING-256 - Use null for the workspace name in JCR calls if configured name is empty new 602518d SLING-342 Register SLingWebDavServlet as a global default servlet. This allows supporting WebDAV requests inside Sling requests. For normal request processing this should not interfere. new 2f19dc1 Move licence and notice to top level dir. new ea1807f Add incubator disclaimer. new 32aee69 Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes. new 5084dea Update notice files. new f7b71f5 Eclude maven-eclipse.xml generated by the maven eclipse plugin. new 694868d SLING-430 Handle empty/missing sling.servlet.methods property as if it would be set to [ "GET", "HEAD" ] and support "*" to mean "all methods". Add sling.servlet.methods="*" setting to SlingWebDavServlet new 5aa0b54 SLING-442: Clean up exports, imports, dependencies and used plugins. new 6d6a706 SLING-479 Fix @scr.tags: - normalize metadata attribute settings to "no" - ensure proper metadata and ds attributes are set - create metatype.properties files where required - fix metatype.properties files new ab2e11f SLING-483: Add excludes for javadocs (WiP) new 443e2a3 SLING-495 - NOTICE files generated using mknotice script new ef70d6c SLING-495 - NOTICE files updated according to changes in revision 662927 new 2a112d7 SLING-495 - NOTICE files regenerated with revision 663097 changes new a5898b0 Use released version of parent pom. new 9613fba Use released versions (or soon to be released versions). new ac9a4d3 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.0-incubator new adf1a67 [maven-release-plugin] prepare for next development iteration new 8d649af Set version to next development version. new b60df5a Fix reference to parent pom. new ffb8853 Remove unused imports and fix some javadoc errors. new e037bca SLING-521: Restore more notice files. new c7878f3 SLING-521: Separate between notice files for bin and src dists. new cdee843 SLING-521: Separate between notice files for bin and src dists. new ea26b87 SLING-537 - disable WebDAV iohandlers for zip and XML files new 25b287a SLING-539: Merge LICENSE.* information to LICENSE files - Xerces notices should be included new fbdc0e3 Update to released versions. new 6dc4721 [maven-release-plugin] prepare release org.apache.sling.jcr.webdav-2.0.2-incubator new d081bbe [maven-release-plugin] prepare for next development iteration new 6eee069 Use latest snapshots again to make project buildable. new 4099ee4 Use released versions. new f058c71 Use released parent pom where possible. new de6d75e SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. new e401896 SLING-639 Don't call the base class service method if a redirect or error has already been sent. Thanks Marc Speck for reporting. new a0ed9b8 SLING-767 Integrate MIME Type resolution with Sling functionliaty and provide better configurability of the WebDAV servlets new 4762d9c SLING-769 Explicit Jackrabbit Dependency Versions, adapt to new OCM data and new commons/testing new c3d766d SLING-769 WebDAV 1.5 has a new package, which must be included new 9d1edc6 SLING-800 Simplify bundle manifest declaration and ensure comp
[sling-org-apache-sling-jcr-webdav] 36/38: [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.0.2-incubator
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.2-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit 7c477115adbcafd7a7caa1eaa6d9d748fad999ec Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Tue Jun 17 07:35:23 2008 + [maven-release-plugin] copy for tag org.apache.sling.jcr.webdav-2.0.2-incubator git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator@668491 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2b6e9d2..505c9b4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ org.apache.sling sling -2-incubator-SNAPSHOT +3-incubator ../../parent/pom.xml org.apache.sling.jcr.webdav bundle -2.0.1-incubator-SNAPSHOT +2.0.2-incubator Sling - Simple WebDAV Access to repositories @@ -37,9 +37,9 @@ - scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav - scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav - http://svn.apache.org/viewvc/incubator/sling/trunk/jcr/webdav + scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator + scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator + http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.jcr.webdav-2.0.2-incubator @@ -123,7 +123,7 @@ org.apache.sling org.apache.sling.jcr.api -2.0.1-incubator-SNAPSHOT +2.0.2-incubator -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
[sling-org-apache-sling-jcr-webdav] 07/31: SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins.
This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.jcr.webdav-2.0.6-incubator in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-webdav.git commit de6d75e655f3cfeae3118c5133058770031c3a38 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Mon Jul 21 14:24:25 2008 + SLING-555 : Update all poms to use the latest parent pom; update parent pom to include the incubator repo for plugins and use latest plugins. git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/jcr/webdav@678436 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 356af71..696b6fa 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.sling sling -3-incubator +4-incubator-SNAPSHOT ../../parent/pom.xml -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.
