You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:18:21 UTC
[sling-org-apache-sling-bundleresource-impl] annotated tag
org.apache.sling.bundleresource.impl-2.0.2-incubator created (now 4dca730)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git.
at 4dca730 (tag)
tagging 80ce29b25a67a66a21aceb4e4d968935bc60d772 (commit)
by Felix Meschberger
on Thu Jun 18 09:21:02 2009 +0000
- Log -----------------------------------------------------------------
org.apache.sling.bundleresource.impl-2.0.2-incubator
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new 8adff11 SLING-256 create project folder for bundle resource provider
new 3bdcb03 SLING-356 Add separate bundle for the BundleResourceProvider SLING-361 First steps towards simple path mapping (currently on the bang separator is supported)
new 5b195a9 SLING-357 Replace the currently used pipe symbol (¦) by the bang (!) as described in the issue
new f0dba22 Move licence and notice to top level dir.
new 856967f Add incubator disclaimer.
new a7bb09a Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes.
new 1a14d57 Update notice files.
new 3e3593e more svn:ignore
new 3f9036b Move constant to bundleresource module.
new 15b9883 Exclude maven-eclipse.xml generated by the maven eclipse plugin.
new 15a6979 SLING-450: Move bundleresource to extensions
new a24d70f Correct svn urls.
new 20bd245 SLING-442: Clean up exports, imports, dependencies and used plugins.
new 563a113 SLING-483: Add excludes for javadocs and fix javadocs (WiP)
new 5febc09 SLING-495 - NOTICE files generated using mknotice script
new 57a64c9 SLING-495 - NOTICE files updated according to changes in revision 662927
new c85cf13 SLING-495 - NOTICE files regenerated with revision 663097 changes
new 59c0fa2 Use released version of parent pom.
new 9ae781f Use released versions (or soon to be released versions).
new 58ddc8d [maven-release-plugin] prepare release org.apache.sling.bundleresource.impl-2.0.0-incubator
new 57bef59 [maven-release-plugin] prepare for next development iteration
new a0dfbaa Set version to next development version.
new 289fa2a Fix reference to parent pom.
new da5a589 SLING-521: Restore more notice files.
new 5f9007c SLING-521: Separate between notice files for bin and src dists.
new 307890b SLING-521: Separate between notice files for bin and src dists.
new 8b16c7f Change copyright year to 2008.
new b7d7353 [maven-release-plugin] copy for tag org.apache.sling.bundleresource.impl-2.0.2-incubator
new 80ce29b Move Sling to new TLP location
The 29 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" <co...@sling.apache.org>'].
[sling-org-apache-sling-bundleresource-impl] 19/29: Use released
versions (or soon to be released versions).
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 9ae781f482812e457f16272a9c72c80c6b7dc807
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jun 4 15:06:54 2008 +0000
Use released versions (or soon to be released versions).
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663157 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index db32e8b..450a31b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,12 +92,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <version>2.0.0-incubator</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <version>2.0.0-incubator</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 29/29: Move Sling to
new TLP location
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 80ce29b25a67a66a21aceb4e4d968935bc60d772
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Thu Jun 18 09:21:02 2009 +0000
Move Sling to new TLP location
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.bundleresource.impl-2.0.2-incubator@785979 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 11/29: SLING-450: Move
bundleresource to extensions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 15a69791563738ff8a0dbfebe1b787c8d3b59dc7
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 14 07:55:51 2008 +0000
SLING-450: Move bundleresource to extensions
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@656134 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 22/29: Set version to
next development version.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit a0dfbaa35537ff6022926b253f6d6c1c52887fda
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jun 4 17:27:58 2008 +0000
Set version to next development version.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663320 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa0851e..1592095 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,12 +86,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.0-incubator</version>
+ <version>2.0.1-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.0.0-incubator</version>
+ <version>2.0.1-incubator-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 08/29: more svn:ignore
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 3e3593eade0ac0471fd4d311ab72b427641ed471
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Apr 16 09:54:31 2008 +0000
more svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@648651 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 28/29:
[maven-release-plugin] copy for tag
org.apache.sling.bundleresource.impl-2.0.2-incubator
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit b7d73537cb91b3b7f083ec194d9ef61740bbabb1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 17 07:37:08 2008 +0000
[maven-release-plugin] copy for tag org.apache.sling.bundleresource.impl-2.0.2-incubator
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.2-incubator@668495 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 43467d7..308abeb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>2-incubator-SNAPSHOT</version>
+ <version>3-incubator</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.bundleresource.impl</artifactId>
<packaging>bundle</packaging>
- <version>2.0.1-incubator-SNAPSHOT</version>
+ <version>2.0.2-incubator</version>
<name>Sling - Bundle Resource Provider</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.2-incubator</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.2-incubator</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.2-incubator</url>
</scm>
<build>
@@ -86,12 +86,12 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.0.1-incubator-SNAPSHOT</version>
+ <version>2.0.2-incubator</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.jcr.resource</artifactId>
- <version>2.0.1-incubator-SNAPSHOT</version>
+ <version>2.0.2-incubator</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 14/29: SLING-483: Add
excludes for javadocs and fix javadocs (WiP)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 563a11399cbcc842d38aa9381c59f47d3dd97d2f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri May 30 09:14:49 2008 +0000
SLING-483: Add excludes for javadocs and fix javadocs (WiP)
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@661608 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/pom.xml b/pom.xml
index e07de5f..bb7647c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,19 @@
</plugin>
</plugins>
</build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <excludePackageNames>
+ org.apache.sling.bundleresource
+ </excludePackageNames>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 15/29: SLING-495 -
NOTICE files generated using mknotice script
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 5febc09c88c39505ff4a6b2c8037bf6f82fd3cd4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Tue Jun 3 12:24:26 2008 +0000
SLING-495 - NOTICE files generated using mknotice script
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@662766 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index d56e84e..39fd80f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Sling Bundle Resource Provider
+Apache Sling - Bundle Resource Provider
Copyright 2007-2008 The Apache Software Foundation
Based on source code originally developed by
@@ -7,3 +7,13 @@ 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.
+
+See http://www.apache.org/legal/3party.html for the ASF policy on
+third-party licenses.
+
+This product includes software developed under the JCP from
+http://www.jcp.org. Copyright 2005 Day Management AG.
+
+This product includes software developed at http://slf4j.org, distributed
+under the slf4j MIT-like license (http://slf4j.org/license.html).
+
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 16/29: SLING-495 -
NOTICE files updated according to changes in revision 662927
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 57a64c914222afe8474e036bbfde968a1710f518
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jun 4 08:05:20 2008 +0000
SLING-495 - NOTICE files updated according to changes in revision 662927
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663025 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/NOTICE b/NOTICE
index 39fd80f..3bc60e8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,19 +1,11 @@
Apache Sling - Bundle Resource Provider
-Copyright 2007-2008 The Apache Software Foundation
-Based on source code originally developed by
-Day Software (http://www.day.com/).
+Apache Sling
+Copyright 2008 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-See http://www.apache.org/legal/3party.html for the ASF policy on
-third-party licenses.
-This product includes software developed under the JCP from
-http://www.jcp.org. Copyright 2005 Day Management AG.
-
-This product includes software developed at http://slf4j.org, distributed
-under the slf4j MIT-like license (http://slf4j.org/license.html).
+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" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 09/29: Move constant
to bundleresource module.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 3f9036b55ad1b4e1135f6203c12c8766f9f1f0fe
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Apr 30 06:19:27 2008 +0000
Move constant to bundleresource module.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@652287 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/bundleresource/impl/Activator.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/Activator.java b/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
index fd7455a..f9a8f85 100644
--- a/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
+++ b/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
@@ -18,8 +18,6 @@
*/
package org.apache.sling.bundleresource.impl;
-import static org.apache.sling.jcr.resource.JcrResourceConstants.BUNDLE_RESOURCE_ROOTS;
-
import java.util.HashMap;
import java.util.Map;
@@ -33,17 +31,23 @@ import org.slf4j.LoggerFactory;
public class Activator implements BundleActivator, BundleListener {
+ /**
+ * The name of the bundle manifest header listing the resource provider root
+ * paths provided by the bundle (value is "Sling-Bundle-Resources").
+ */
+ public static final String BUNDLE_RESOURCE_ROOTS = "Sling-Bundle-Resources";
+
/** default log */
private final Logger log = LoggerFactory.getLogger(getClass());
-
+
private Map<Long, BundleResourceProvider> bundleResourceProviderMap = new HashMap<Long, BundleResourceProvider>();
-
+
private BundleContext bundleContext;
public void start(BundleContext context) throws Exception {
this.bundleContext = context;
-
+
context.addBundleListener(this);
try {
@@ -86,7 +90,7 @@ public class Activator implements BundleActivator, BundleListener {
break;
}
}
-
+
// ---------- Bundle provided resources -----------------------------------
private void addBundleResourceProvider(Bundle bundle) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 18/29: Use released
version of parent pom.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 59c0fa29ae5d2a17fc6a27a353fd8f7886ba41a5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jun 4 14:16:40 2008 +0000
Use released version of parent pom.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663109 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bb7647c..db32e8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>1-incubator-SNAPSHOT</version>
+ <version>1-incubator</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 02/29: SLING-356 Add
separate bundle for the BundleResourceProvider SLING-361 First steps
towards simple path mapping (currently on the bang separator is supported)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 3bdcb03f358eb49a5651f5ea6dc94bf45e7006a7
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri Apr 4 20:27:41 2008 +0000
SLING-356 Add separate bundle for the BundleResourceProvider
SLING-361 First steps towards simple path mapping (currently on the bang separator is supported)
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@644887 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 111 ++++++++++
.../sling/bundleresource/impl/Activator.java | 111 ++++++++++
.../sling/bundleresource/impl/BundleResource.java | 225 +++++++++++++++++++++
.../impl/BundleResourceIterator.java | 161 +++++++++++++++
.../impl/BundleResourceProvider.java | 143 +++++++++++++
.../impl/BundleResourceURLConnection.java | 112 ++++++++++
.../impl/BundleResourceURLStreamHandler.java | 51 +++++
.../sling/bundleresource/impl/MappedPath.java | 100 +++++++++
src/main/resources/META-INF/LICENSE | 202 ++++++++++++++++++
src/main/resources/META-INF/NOTICE | 5 +
10 files changed, 1221 insertions(+)
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..67e366f
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+-->
+<project xmlns="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/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling</artifactId>
+ <version>1-incubator-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.bundleresource.impl</artifactId>
+ <packaging>bundle</packaging>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+
+ <name>Sling Bundle Resource Provider</name>
+ <description>
+ Provides a ResourceProvider implementation supporting bundle
+ based resources.
+ </description>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/incubator/sling/trunk/sling/bundleresource
+ </url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Activator>
+ org.apache.sling.bundleresource.impl.Activator
+ </Bundle-Activator>
+ <Private-Package>
+ org.apache.sling.bundleresource.*
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.api</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.jcr.resource</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>org.apache.sling.commons.json</artifactId>
+ <version>2.0.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/Activator.java b/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
new file mode 100644
index 0000000..fd7455a
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
@@ -0,0 +1,111 @@
+/*
+ * 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.bundleresource.impl;
+
+import static org.apache.sling.jcr.resource.JcrResourceConstants.BUNDLE_RESOURCE_ROOTS;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class Activator implements BundleActivator, BundleListener {
+
+ /** default log */
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private Map<Long, BundleResourceProvider> bundleResourceProviderMap = new HashMap<Long, BundleResourceProvider>();
+
+ private BundleContext bundleContext;
+
+ public void start(BundleContext context) throws Exception {
+
+ this.bundleContext = context;
+
+ context.addBundleListener(this);
+
+ try {
+ Bundle[] bundles = context.getBundles();
+ for (Bundle bundle : bundles) {
+ if (bundle.getState() == Bundle.ACTIVE) {
+ // add bundle resource provider for active bundles
+ addBundleResourceProvider(bundle);
+ }
+ }
+ } catch (Throwable t) {
+ log.error("activate: Problem while loading initial content and"
+ + " registering mappings for existing bundles", t);
+ }
+ }
+
+ public void stop(BundleContext context) throws Exception {
+ context.removeBundleListener(this);
+ this.bundleContext = null;
+ }
+
+ /**
+ * Loads and unloads any components provided by the bundle whose state
+ * changed. If the bundle has been started, the components are loaded. If
+ * the bundle is about to stop, the components are unloaded.
+ *
+ * @param event The <code>BundleEvent</code> representing the bundle state
+ * change.
+ */
+ public void bundleChanged(BundleEvent event) {
+ switch (event.getType()) {
+ case BundleEvent.STARTED:
+ // register resource provider for the started bundle
+ addBundleResourceProvider(event.getBundle());
+ break;
+
+ case BundleEvent.STOPPED:
+ // remove resource provider after the bundle has stopped
+ removeBundleResourceProvider(event.getBundle());
+ break;
+ }
+ }
+
+ // ---------- Bundle provided resources -----------------------------------
+
+ private void addBundleResourceProvider(Bundle bundle) {
+ String prefixes = (String) bundle.getHeaders().get(
+ BUNDLE_RESOURCE_ROOTS);
+ if (prefixes != null) {
+ BundleResourceProvider brp = new BundleResourceProvider(bundle,
+ prefixes);
+ brp.registerService(bundleContext);
+ bundleResourceProviderMap.put(bundle.getBundleId(), brp);
+ }
+ }
+
+ private void removeBundleResourceProvider(Bundle bundle) {
+ BundleResourceProvider brp = bundleResourceProviderMap.remove(bundle.getBundleId());
+ if (brp != null) {
+ brp.unregisterService();
+ }
+ }
+
+
+}
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
new file mode 100644
index 0000000..f9519b1
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResource.java
@@ -0,0 +1,225 @@
+/*
+ * 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.bundleresource.impl;
+
+import static org.apache.jackrabbit.JcrConstants.NT_FILE;
+import static org.apache.jackrabbit.JcrConstants.NT_FOLDER;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.sling.adapter.SlingAdaptable;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceMetadata;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/** A Resource that wraps a Bundle entry */
+public class BundleResource extends SlingAdaptable implements Resource {
+
+ /** default log */
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private final ResourceResolver resourceResolver;
+
+ private final Bundle bundle;
+
+ private final MappedPath mappedPath;
+
+ private final String path;
+
+ private URL url;
+
+ private final String resourceType;
+
+ private final ResourceMetadata metadata;
+
+ public static BundleResource getResource(ResourceResolver resourceResolver,
+ Bundle bundle, MappedPath mappedPath, String resourcePath) {
+
+ String entryPath = mappedPath.getEntryPath(resourcePath);
+
+ // first try, whether the bundle has an entry with a trailing slash
+ // which would be a folder. In this case we check whether the
+ // repository contains an item with the same path. If so, we
+ // don't create a BundleResource but instead return null to be
+ // able to return an item-based resource
+ URL entry = bundle.getEntry(entryPath.concat("/"));
+ if (entry != null) {
+ Session session = resourceResolver.adaptTo(Session.class);
+ if (session != null) {
+ try {
+ if (session.itemExists(resourcePath)) {
+ return null;
+ }
+ } catch (RepositoryException re) {
+ // don't care
+ }
+ }
+
+ // append the slash to path for next steps
+ resourcePath = resourcePath.concat("/");
+ }
+
+ // if there is no entry with a trailing slash, try plain name
+ // which would then of course be a file
+ if (entry == null) {
+ entry = bundle.getEntry(entryPath);
+ }
+
+ // here we either have a folder for which no same-named item exists
+ // or a bundle file
+ if (entry != null) {
+ return new BundleResource(resourceResolver, bundle, mappedPath,
+ resourcePath);
+ }
+
+ // the bundle does not contain the path
+ return null;
+ }
+
+ public BundleResource(ResourceResolver resourceResolver, Bundle bundle,
+ MappedPath mappedPath, String resourcePath) {
+
+ this.resourceResolver = resourceResolver;
+ this.bundle = bundle;
+ this.mappedPath = mappedPath;
+
+ metadata = new ResourceMetadata();
+ metadata.setResolutionPath(resourcePath);
+ metadata.setCreationTime(bundle.getLastModified());
+ metadata.setModificationTime(bundle.getLastModified());
+
+ if (resourcePath.endsWith("/")) {
+
+ this.path = resourcePath.substring(0, resourcePath.length() - 1);
+ this.resourceType = NT_FOLDER;
+
+ } else {
+
+ this.path = resourcePath;
+ this.resourceType = NT_FILE;
+
+ try {
+ URL url = bundle.getEntry(mappedPath.getEntryPath(resourcePath));
+ metadata.setContentLength(url.openConnection().getContentLength());
+ } catch (Exception e) {
+ // don't care, we just have no content length
+ }
+ }
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public String getResourceType() {
+ return resourceType;
+ }
+
+ /** Returns <code>null</code>, bundle resources have no super type */
+ public String getResourceSuperType() {
+ return null;
+ }
+
+ public ResourceMetadata getResourceMetadata() {
+ return metadata;
+ }
+
+ public ResourceResolver getResourceResolver() {
+ return resourceResolver;
+ }
+
+ @SuppressWarnings("unchecked")
+ public <Type> Type adaptTo(Class<Type> type) {
+ if (type == InputStream.class) {
+ return (Type) getInputStream(); // unchecked cast
+ } else if (type == URL.class) {
+ return (Type) getURL(); // unchecked cast
+ }
+
+ // fall back to nothing
+ return super.adaptTo(type);
+ }
+
+ public String toString() {
+ return getClass().getSimpleName() + ", type=" + getResourceType()
+ + ", path=" + getPath();
+ }
+
+ // ---------- internal -----------------------------------------------------
+
+ /**
+ * Returns a stream to the bundle entry if it is a file. Otherwise returns
+ * <code>null</code>.
+ */
+ private InputStream getInputStream() {
+ // implement this for files only
+ if (isFile()) {
+ try {
+ URL url = getURL();
+ if (url != null) {
+ return url.openStream();
+ }
+ } catch (IOException ioe) {
+ log.error(
+ "getInputStream: Cannot get input stream for " + this, ioe);
+ }
+ }
+
+ // otherwise there is no stream
+ return null;
+ }
+
+ private URL getURL() {
+ if (url == null) {
+ try {
+ url = new URL(BundleResourceURLStreamHandler.PROTOCOL, null,
+ -1, path, new BundleResourceURLStreamHandler(bundle,
+ mappedPath.getEntryPath(path)));
+ } catch (MalformedURLException mue) {
+ log.error("getURL: Cannot get URL for " + this, mue);
+ }
+ }
+
+ return url;
+ }
+
+ Iterator<Resource> listChildren() {
+ return new BundleResourceIterator(this);
+ }
+
+ Bundle getBundle() {
+ return bundle;
+ }
+
+ MappedPath getMappedPath() {
+ return mappedPath;
+ }
+
+ boolean isFile() {
+ return NT_FILE.equals(getResourceType());
+ }
+}
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceIterator.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceIterator.java
new file mode 100644
index 0000000..d4f03bd
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceIterator.java
@@ -0,0 +1,161 @@
+/*
+ * 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.bundleresource.impl;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The <code>BundleResourceIterator</code> class is a resource iterator, which
+ * returns resources for each Bundle entry of an underlying enumeration of
+ * Bundle entry paths.
+ */
+class BundleResourceIterator implements Iterator<Resource> {
+
+ /** default log */
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ /** The bundle resource resolver */
+ private final ResourceResolver resourceResolver;
+
+ /** Bundle providing the entry resources */
+ private final Bundle bundle;
+
+ private final MappedPath mappedPath;
+
+ /** Underlying bundle entry path enumeration */
+ private final Enumeration<String> entries;
+
+ /** The length of the parent entry path, see seek() */
+ private final int prefixLength;
+
+ /** The prefetched next iterator entry, null at the end of iterating */
+ private Resource nextResult;
+
+ /**
+ * Creates an instance using the given parent bundle resource.
+ */
+ @SuppressWarnings("unchecked")
+ BundleResourceIterator(BundleResource parent) {
+
+ if (parent.isFile()) {
+
+ // if the parent is a file, the iterator is empty
+ this.resourceResolver = null;
+ this.bundle = null;
+ this.entries = null;
+ this.prefixLength = 0;
+ this.mappedPath = null;
+ this.nextResult = null;
+
+ } else {
+ // trailing slash to enumerate children
+ String parentPath = parent.getPath().concat("/");
+
+ this.resourceResolver = parent.getResourceResolver();
+ this.bundle = parent.getBundle();
+ this.mappedPath = parent.getMappedPath();
+
+ // unchecked cast
+ this.entries = parent.getBundle().getEntryPaths(parentPath);
+ this.prefixLength = parentPath.length();
+
+ this.nextResult = seek();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ BundleResourceIterator(ResourceResolver resourceResolver, Bundle bundle,
+ MappedPath mappedPath, String parentPath) {
+
+ // trailing slash to enumerate children
+ if (!parentPath.endsWith("/")) {
+ parentPath = parentPath.concat("/");
+ }
+
+ this.resourceResolver = resourceResolver;
+ this.bundle = bundle;
+ this.mappedPath = mappedPath;
+
+ // unchecked cast
+ this.entries = bundle.getEntryPaths(parentPath);
+ this.prefixLength = parentPath.length();
+
+ this.nextResult = (entries != null) ? seek() : null;
+ }
+
+ /** Returns true if there is another Resource available */
+ public boolean hasNext() {
+ return nextResult != null;
+ }
+
+ /** Returns the next resource in the iterator */
+ public Resource next() {
+ if (!hasNext()) {
+ throw new NoSuchElementException();
+ }
+
+ Resource result = nextResult;
+ nextResult = seek();
+ return result;
+ }
+
+ /**
+ * Throws <code>UnsupportedOperationException</code> as this method is not
+ * supported by this implementation.
+ */
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Scans the entry path enumeration looking for the next entry being a
+ * direct child of the parent resource.
+ */
+ private Resource seek() {
+ while (entries.hasMoreElements()) {
+ String entry = entries.nextElement();
+
+ // require leading slash
+ if (!entry.startsWith("/")) {
+ entry = "/" + entry;
+ }
+
+ int slash = entry.indexOf('/', prefixLength);
+ if (slash < 0 || slash == entry.length() - 1) {
+ log.debug("seek: Using entry {}", entry);
+ return new BundleResource(resourceResolver, bundle, mappedPath,
+ entry);
+ }
+
+ log.debug("seek: Ignoring entry {}", entry);
+ }
+
+ // no more results
+ log.debug("seek: No more nodes, iterator exhausted");
+ return null;
+ }
+}
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java
new file mode 100644
index 0000000..7347209
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceProvider.java
@@ -0,0 +1,143 @@
+/*
+ * 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.bundleresource.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.sling.api.SlingException;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceProvider;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceRegistration;
+
+public class BundleResourceProvider implements ResourceProvider {
+
+ /** The bundle providing the resources */
+ private final Bundle bundle;
+
+ /** The root paths */
+ private final MappedPath[] roots;
+
+ private ServiceRegistration serviceRegistration;
+
+ /**
+ * Creates Bundle resource provider accessing entries in the given Bundle an
+ * supporting resources below root paths given by the rootList which is a
+ * comma (and whitespace) separated list of absolute paths.
+ */
+ public BundleResourceProvider(Bundle bundle, String rootList) {
+ this.bundle = bundle;
+
+ StringTokenizer pt = new StringTokenizer(rootList, ", \t\n\r\f");
+ List<MappedPath> prefixList = new ArrayList<MappedPath>();
+ while (pt.hasMoreTokens()) {
+ String resourceRoot = pt.nextToken();
+ if (resourceRoot.length() > 0) {
+ prefixList.add(MappedPath.create(resourceRoot));
+ }
+ }
+ this.roots = prefixList.toArray(new MappedPath[prefixList.size()]);
+ }
+
+ void registerService(BundleContext context) {
+ Dictionary<String, Object> props = new Hashtable<String, Object>();
+ props.put(Constants.SERVICE_DESCRIPTION, "Provider of Bundle based Resources");
+ props.put(Constants.SERVICE_VENDOR, "The Apache Software Foundation");
+ props.put(ROOTS, getRoots());
+
+ serviceRegistration = context.registerService(SERVICE_NAME, this, props);
+ }
+
+ void unregisterService() {
+ if (serviceRegistration != null) {
+ serviceRegistration.unregister();
+ }
+ }
+
+ /** Returns the root paths */
+ private String[] getRoots() {
+ String[] rootPaths = new String[roots.length];
+ for (int i=0; i < roots.length; i++) {
+ rootPaths[i] = roots[i].getResourceRoot();
+ }
+ return rootPaths;
+ }
+
+ private MappedPath getMappedPath(String resourcePath) {
+ for (MappedPath mappedPath: roots) {
+ if (mappedPath.isChild(resourcePath)) {
+ return mappedPath;
+ }
+ }
+
+ return null;
+ }
+
+ public Resource getResource(ResourceResolver resourceResolver,
+ HttpServletRequest request, String path) {
+ return getResource(resourceResolver, path);
+ }
+
+ /**
+ * Returns a BundleResource for the path if such an entry exists in the
+ * bundle of this provider. The JcrResourceResolver is ignored by this
+ * implementation.
+ */
+ public Resource getResource(ResourceResolver resourceResolver, String path) {
+ MappedPath mappedPath = getMappedPath(path);
+ if (mappedPath != null) {
+ return BundleResource.getResource(resourceResolver, bundle, mappedPath, path);
+ }
+
+ return null;
+ }
+
+ public Iterator<Resource> listChildren(final Resource parent)
+ throws SlingException {
+
+ // bundle resources can handle this request directly
+ if (parent instanceof BundleResource) {
+ return ((BundleResource) parent).listChildren();
+ }
+
+ // ensure this provider may have children of the parent
+ String parentPath = parent.getPath();
+ MappedPath mappedPath = getMappedPath(parentPath);
+ if (mappedPath != null) {
+ return new BundleResourceIterator(parent.getResourceResolver(),
+ bundle, mappedPath, parentPath);
+ }
+
+ // the parent resource cannot have children in this provider,
+ // though this is basically not expected, we still have to
+ // be prepared for such a situation
+ return Collections.<Resource>emptyList().iterator();
+ }
+}
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceURLConnection.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceURLConnection.java
new file mode 100644
index 0000000..c121be4
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceURLConnection.java
@@ -0,0 +1,112 @@
+/*
+ * 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.bundleresource.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+import org.osgi.framework.Bundle;
+
+/**
+ * A Bundle based <code>UIRLConnection</code> which uses the bundle's last
+ * modification time as the last modification time of the URL in contrast to the
+ * (Apache Felix) URLConnection used for the bundle entry, which always returns
+ * zero.
+ */
+public class BundleResourceURLConnection extends URLConnection {
+
+ /** The bundle owning the resource underlying the URLConnection */
+ private final Bundle bundle;
+
+ private final String bundlePath;
+
+ /** The original URLConnection */
+ private URLConnection delegatee;
+
+ protected BundleResourceURLConnection(Bundle bundle, String bundlePath, URL url) {
+ super(url);
+
+ this.bundle = bundle;
+ this.bundlePath = bundlePath;
+ }
+
+ /**
+ * Connects this URLConnection to access the data and metadata such as the
+ * content length, last modification time and content type.
+ */
+ public synchronized void connect() throws IOException {
+ if (!connected) {
+ URL url = bundle.getEntry(bundlePath);
+ if (url == null) {
+ throw new IOException("Cannot find entry " + bundlePath
+ + " in bundle " + bundle + " for URL " + url);
+ }
+
+ delegatee = url.openConnection();
+
+ connected = true;
+ }
+ }
+
+ /** Returns the input stream of the Bundle provided URLConnection */
+ public InputStream getInputStream() throws IOException {
+ connect();
+
+ return delegatee.getInputStream();
+ }
+
+ /** Returns the content length of the Bundle provided URLConnection */
+ public int getContentLength() {
+ try {
+ connect();
+ } catch (IOException ex) {
+ return -1;
+ }
+
+ return delegatee.getContentLength();
+ }
+
+ /**
+ * Returns the last modification time of the underlying bundle, which is the
+ * last time the bundle was installed or updated
+ */
+ public long getLastModified() {
+ try {
+ connect();
+ } catch (IOException ex) {
+ return 0;
+ }
+
+ return bundle.getLastModified();
+ }
+
+ /** Returns the content type of the Bundle provided URLConnection */
+ public String getContentType() {
+ try {
+ connect();
+ } catch (IOException ex) {
+ return null;
+ }
+
+ return delegatee.getContentType();
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceURLStreamHandler.java b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceURLStreamHandler.java
new file mode 100644
index 0000000..a27585a
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/BundleResourceURLStreamHandler.java
@@ -0,0 +1,51 @@
+/*
+ * 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.bundleresource.impl;
+
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+
+import org.osgi.framework.Bundle;
+
+class BundleResourceURLStreamHandler extends URLStreamHandler {
+
+ static final String PROTOCOL = "bundle";
+
+ private final Bundle bundle;
+
+ private final String bundlePath;
+
+ BundleResourceURLStreamHandler(Bundle bundle, String bundlePath) {
+ this.bundle = bundle;
+ this.bundlePath = bundlePath;
+ }
+
+ @Override
+ protected URLConnection openConnection(URL u) throws IOException {
+ if (!PROTOCOL.equals(u.getProtocol())) {
+ throw new IOException("Cannot open connection to " + u
+ + ", wrong protocol");
+ }
+
+ return new BundleResourceURLConnection(bundle, bundlePath, u);
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java b/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java
new file mode 100644
index 0000000..1cc8276
--- /dev/null
+++ b/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java
@@ -0,0 +1,100 @@
+/*
+ * 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.bundleresource.impl;
+
+class MappedPath {
+
+ private final String resourceRoot;
+ private final String resourceRootPrefix;
+ private final String entryRoot;
+ private final String entryRootPrefix;
+
+ static MappedPath create(String configPath) {
+ String resourceRoot;
+ String entryRoot;
+ int pipe = configPath.indexOf('¦');
+ if (pipe >= 0) {
+ entryRoot = configPath.substring(pipe + 1);
+ resourceRoot = configPath.substring(0, pipe).concat(entryRoot);
+ } else {
+ resourceRoot = configPath;
+ entryRoot = null;
+ }
+ return new MappedPath(resourceRoot, entryRoot);
+ }
+
+ MappedPath(String resourceRoot, String entryRoot) {
+ this.resourceRoot = resourceRoot;
+ this.resourceRootPrefix = ensureTrailingSlash(resourceRoot);
+ this.entryRoot = entryRoot;
+ this.entryRootPrefix = ensureTrailingSlash(entryRoot);
+ }
+
+ boolean isChild(String resourcePath) {
+ return resourcePath.startsWith(resourceRootPrefix)
+ || resourcePath.equals(resourceRoot);
+ }
+
+ String getEntryPath(String resourcePath) {
+ if (entryRootPrefix == null) {
+ return resourcePath;
+ }
+
+ if (resourcePath.startsWith(resourceRootPrefix)) {
+ return entryRootPrefix.concat(resourcePath.substring(resourceRootPrefix.length()));
+ } else if (resourcePath.equals(resourceRoot)) {
+ return entryRoot;
+ }
+
+ return null;
+ }
+
+ String getResourceRoot() {
+ return resourceRoot;
+ }
+
+ String getResourceRootPrefix() {
+ return resourceRootPrefix;
+ }
+
+ String getEntryRoot() {
+ return entryRoot;
+ }
+
+ String getEntryRootPrefix() {
+ return entryRootPrefix;
+ }
+
+ private static String ensureTrailingSlash(String path) {
+ if (path == null || path.length() == 0) {
+ return null;
+ }
+
+ if (!path.endsWith("/")) {
+ return path.concat("/");
+ }
+
+ return path;
+ }
+
+ @Override
+ public String toString() {
+ return "MappedPath: " + getResourceRoot() + " -> " + getEntryRoot();
+ }
+}
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/src/main/resources/META-INF/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 tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/src/main/resources/META-INF/NOTICE b/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..56e77ee
--- /dev/null
+++ b/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,5 @@
+Apache Sling Bundle Resource Provider
+Copyright 2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 17/29: SLING-495 -
NOTICE files regenerated with revision 663097 changes
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit c85cf13aae6bd4f05e6696d08fcf2ea1a789684d
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed Jun 4 13:50:29 2008 +0000
SLING-495 - NOTICE files regenerated with revision 663097 changes
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663098 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/NOTICE b/NOTICE
index 3bc60e8..cc042be 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,6 +6,6 @@ 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/).
+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" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 25/29: SLING-521:
Separate between notice files for bin and src dists.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 5f9007c4cf268b3684ae3d3663c6b9a28520870e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jun 13 10:58:09 2008 +0000
SLING-521: Separate between notice files for bin and src dists.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@667471 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 1 -
README.txt | 38 ++++
.../main/resources/META-INF/DISCLAIMER | 0
src/main/resources/META-INF/LICENSE | 202 +++++++++++++++++++++
NOTICE => src/main/resources/META-INF/NOTICE | 1 -
5 files changed, 240 insertions(+), 2 deletions(-)
diff --git a/NOTICE b/NOTICE
index cbe84fb..acb7361 100644
--- a/NOTICE
+++ b/NOTICE
@@ -6,5 +6,4 @@ 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.
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..bc27ec7
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,38 @@
+Apache Sling Bundle Resource Provider
+
+WE NEED A LOT MORE HERE!!!!!!!!!!!!!!!!!!
+
+
+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
+===============
+
+This component uses a Maven 2 (http://maven.apache.org/) build
+environment. It requires a Java 5 JDK (or higher) and Maven (http://maven.apache.org/)
+2.0.7 or later. We recommend to use the latest Maven version.
+
+If you have Maven 2 installed, you can compile and
+package the jar using the following command:
+
+ mvn package
+
+See the Maven 2 documentation for other build features.
+
+The latest source code for this component is available in the
+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/extensions/bundleresource
+
+See the Subversion documentation for other source control features.
+
diff --git a/DISCLAIMER b/src/main/resources/META-INF/DISCLAIMER
similarity index 100%
rename from DISCLAIMER
rename to src/main/resources/META-INF/DISCLAIMER
diff --git a/src/main/resources/META-INF/LICENSE b/src/main/resources/META-INF/LICENSE
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/src/main/resources/META-INF/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 tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
diff --git a/NOTICE b/src/main/resources/META-INF/NOTICE
similarity index 88%
copy from NOTICE
copy to src/main/resources/META-INF/NOTICE
index cbe84fb..acb7361 100644
--- a/NOTICE
+++ b/src/main/resources/META-INF/NOTICE
@@ -6,5 +6,4 @@ 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" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 20/29:
[maven-release-plugin] prepare release
org.apache.sling.bundleresource.impl-2.0.0-incubator
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 58ddc8de1e23c97f73ef296cf159cf2e6f80de7f
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jun 4 15:48:07 2008 +0000
[maven-release-plugin] prepare release org.apache.sling.bundleresource.impl-2.0.0-incubator
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663247 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 450a31b..61409af 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.bundleresource.impl</artifactId>
<packaging>bundle</packaging>
- <version>2.0.0-incubator-SNAPSHOT</version>
+ <version>2.0.0-incubator</version>
<name>Sling - Bundle Resource Provider</name>
<description>
@@ -37,15 +37,9 @@
</description>
<scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource
- </developerConnection>
- <url>
- http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource
- </url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.0-incubator</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.0-incubator</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.0-incubator</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 05/29: Add incubator
disclaimer.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 856967fc1158d0296e370532c41ce03af26b6554
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 14 12:58:07 2008 +0000
Add incubator disclaimer.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@647780 13f79535-47bb-0310-9956-ffa450edef68
---
DISCLAIMER | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/DISCLAIMER b/DISCLAIMER
new file mode 100644
index 0000000..90850c2
--- /dev/null
+++ b/DISCLAIMER
@@ -0,0 +1,7 @@
+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.
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 04/29: Move licence
and notice to top level dir.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit f0dba2266cdca625b92a5b4474eae7fabd960dad
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Apr 10 15:38:48 2008 +0000
Move licence and notice to top level dir.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@646849 13f79535-47bb-0310-9956-ffa450edef68
---
src/main/resources/META-INF/LICENSE => LICENSE | 0
src/main/resources/META-INF/NOTICE => NOTICE | 0
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/META-INF/LICENSE b/LICENSE
similarity index 100%
rename from src/main/resources/META-INF/LICENSE
rename to LICENSE
diff --git a/src/main/resources/META-INF/NOTICE b/NOTICE
similarity index 100%
rename from src/main/resources/META-INF/NOTICE
rename to NOTICE
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 23/29: Fix reference
to parent pom.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 289fa2af46989db1aff2a4a11df0a2d16a5544e4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jun 5 05:51:38 2008 +0000
Fix reference to parent pom.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663458 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 1592095..43467d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>1-incubator</version>
+ <version>2-incubator-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 06/29: Write first
element in pom in one line (to avoid problems with the maven release
plugin) and minor pom fixes.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit a7bb09ae4b78fb222e789b4eb734b2c836b26285
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 14 13:43:49 2008 +0000
Write first element in pom in one line (to avoid problems with the maven release plugin) and minor pom fixes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@647797 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 67e366f..ab93b01 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<packaging>bundle</packaging>
<version>2.0.0-incubator-SNAPSHOT</version>
- <name>Sling Bundle Resource Provider</name>
+ <name>Sling - Bundle Resource Provider</name>
<description>
Provides a ResourceProvider implementation supporting bundle
based resources.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 24/29: SLING-521:
Restore more notice files.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit da5a5894a314a2b38130fa9faa8bbfcb1921e57e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jun 10 14:28:07 2008 +0000
SLING-521: Restore more notice files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@666121 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/NOTICE b/NOTICE
index cc042be..cbe84fb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,11 +1,10 @@
-Apache Sling - Bundle Resource Provider
+Apache Sling Bundle Resource Provider
+Copyright 2007-2008 The Apache Software Foundation
-Apache Sling
-Copyright 2008 The Apache Software Foundation
+Apache Sling is 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/).
-
-Apache Sling is based on source code originally developed
-by Day Software (http://www.day.com/).
+Licensed under the Apache License 2.0.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 12/29: Correct svn
urls.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit a24d70f22b119c63ed5ca1c4c88d0d22ad7103b9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 14 09:44:23 2008 +0000
Correct svn urls.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@656192 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index ab93b01..12898b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,13 +38,13 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource
+ scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource
+ scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource
</developerConnection>
<url>
- http://svn.apache.org/viewvc/incubator/sling/trunk/sling/bundleresource
+ http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource
</url>
</scm>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 13/29: SLING-442:
Clean up exports, imports, dependencies and used plugins.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 20bd245151d36e59488799eb2e81154e64324f61
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 26 14:43:58 2008 +0000
SLING-442: Clean up exports, imports, dependencies and used plugins.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@660202 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 12898b9..e07de5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,11 +87,6 @@
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.commons.json</artifactId>
- <version>2.0.0-incubator-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
</dependency>
@@ -101,7 +96,7 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 26/29: SLING-521:
Separate between notice files for bin and src dists.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 307890bf87e4ffd214bf3a5b4744ac2b6591929c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jun 13 13:30:32 2008 +0000
SLING-521: Separate between notice files for bin and src dists.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@667529 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.txt b/README.txt
index bc27ec7..480d767 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
Apache Sling Bundle Resource Provider
-WE NEED A LOT MORE HERE!!!!!!!!!!!!!!!!!!
-
+Provides a ResourceProvider implementation supporting bundle
+based resources.
Disclaimer
==========
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 27/29: Change
copyright year to 2008.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 8b16c7f907c27fe076cc2b1c8ca12bf825a30e45
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jun 16 12:08:14 2008 +0000
Change copyright year to 2008.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@668130 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 acb7361..8cb5ef0 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Sling Bundle Resource Provider
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2008 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 acb7361..8cb5ef0 100644
--- a/src/main/resources/META-INF/NOTICE
+++ b/src/main/resources/META-INF/NOTICE
@@ -1,5 +1,5 @@
Apache Sling Bundle Resource Provider
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2008 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" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 03/29: SLING-357 Replace the currently used pipe symbol (¦) by the bang (!) as described in the issue
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 5b195a9560d3f6c396daea5d38d60a4d489fa040
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri Apr 4 22:20:28 2008 +0000
SLING-357 Replace the currently used pipe symbol (¦) by the bang (!) as described in the issue
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@644957 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/bundleresource/impl/MappedPath.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java b/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java
index 1cc8276..98b2fc0 100644
--- a/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java
+++ b/src/main/java/org/apache/sling/bundleresource/impl/MappedPath.java
@@ -20,6 +20,7 @@ package org.apache.sling.bundleresource.impl;
class MappedPath {
+ private static final char prefixSeparatorChar = '!';
private final String resourceRoot;
private final String resourceRootPrefix;
private final String entryRoot;
@@ -28,10 +29,10 @@ class MappedPath {
static MappedPath create(String configPath) {
String resourceRoot;
String entryRoot;
- int pipe = configPath.indexOf('¦');
- if (pipe >= 0) {
- entryRoot = configPath.substring(pipe + 1);
- resourceRoot = configPath.substring(0, pipe).concat(entryRoot);
+ int prefixSep = configPath.indexOf(prefixSeparatorChar);
+ if (prefixSep >= 0) {
+ entryRoot = configPath.substring(prefixSep + 1);
+ resourceRoot = configPath.substring(0, prefixSep).concat(entryRoot);
} else {
resourceRoot = configPath;
entryRoot = null;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 10/29: Exclude
maven-eclipse.xml generated by the maven eclipse plugin.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 15b9883212ae2149eccc45fd6bd25a9806277cce
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 5 07:14:10 2008 +0000
Exclude maven-eclipse.xml generated by the maven eclipse plugin.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@653324 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 07/29: Update notice
files.
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 1a14d5755055971b0b5892d08a6a11807323da69
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Apr 14 15:52:14 2008 +0000
Update notice files.
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@647863 13f79535-47bb-0310-9956-ffa450edef68
---
NOTICE | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/NOTICE b/NOTICE
index 56e77ee..d56e84e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,9 @@
Apache Sling Bundle Resource Provider
-Copyright 2007 The Apache Software Foundation
+Copyright 2007-2008 The Apache Software Foundation
+
+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" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 21/29:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 57bef59256fc45b4a6c2ff626b955452efcf3fb3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jun 4 15:48:17 2008 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource@663249 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 61409af..aa0851e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.bundleresource.impl</artifactId>
<packaging>bundle</packaging>
- <version>2.0.0-incubator</version>
+ <version>2.0.1-incubator-SNAPSHOT</version>
<name>Sling - Bundle Resource Provider</name>
<description>
@@ -37,9 +37,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.0-incubator</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.0-incubator</developerConnection>
- <url>http://svn.apache.org/viewvc/incubator/sling/tags/org.apache.sling.bundleresource.impl-2.0.0-incubator</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/sling/trunk/extensions/bundleresource</developerConnection>
+ <url>http://svn.apache.org/viewvc/incubator/sling/trunk/extensions/bundleresource</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-bundleresource-impl] 01/29: SLING-256
create project folder for bundle resource provider
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.bundleresource.impl-2.0.2-incubator
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git
commit 8adff11a6e92dedcbf2179f2ead0df9079891afd
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri Apr 4 20:20:07 2008 +0000
SLING-256 create project folder for bundle resource provider
git-svn-id: https://svn.apache.org/repos/asf/incubator/sling/trunk/sling/bundleresource@644879 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.