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/10/18 23:21:33 UTC
[sling-org-apache-sling-jcr-registration] branch master created
(now 5024f2f)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git.
at 5024f2f SLING-7167 Adjust READMEs
This branch includes the following new commits:
new 850ce7d SLING-2352 Skeleton of new project
new 9b764f2 SLING-2352 Finish migration of the Repository Registration Support out of jackrabbit-jcr-server into its own bundle
new 2e1f5e9 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 4c8613d SLING-2494 Require configuration to prevent using unsuitable or even unusable default configuration
new 585508c Remove explicit plugin and dependency version to inherit parent pom managed versions
new 9f90a2e Update to latest parent pom
new f4e503f Use released versions
new a0084c6 Use latest releases and update to new parent pom
new b6fc284 Update to latest parent pom and use latest releases in launchpad
new 49e8cbc Correct reactor pom and update to parent pom 16
new 54ca138 Update to latest parent pom
new c356bfa Update to parent pom 18
new 4a1de1f Revert to old maven bundle plugin if DynamicImport-Package is used
new 3787e14 SLING-3178 : org.apache.sling.jcr.registration embeds ancient JCR-RMI classes. Apply patch from Jukka Zitting
new d22edab SLING-3286 - Remove plugin version overrides from poms
new 560ee61 SLING-3387 Fix potential NPE
new 83f8799 [maven-release-plugin] prepare release org.apache.sling.jcr.registration-1.0.0
new 26d0105 [maven-release-plugin] prepare for next development iteration
new 3f8e4e0 Update to parent pom v19
new 2f98a6e 3800 : Fields for dynamic references must be volatile
new ee68d91 Clean up usage of SCR annotations
new 46a1db4 Updated to parent version 20
new 39278b9 [maven-release-plugin] prepare release org.apache.sling.jcr.registration-1.0.2
new 1afd5c3 [maven-release-plugin] prepare for next development iteration
new a8576ca Update to Sling Parent POM 22 with baselining enabled
new bb030ba SLING-4698 - Set parent.relativePath to empty for all modules
new 005ad44 Update to Sling Parent 23
new 32fd9c7 set parent version to 24 and add empty relativePath where missing
new 604bc5a Update the main reactor to parent 25
new 0697f42 Switch to parent pom 26
new 94e8f3e SLING-7167 Adjust READMEs
new 6e47fe4 SLING-7167 Adjust READMEs
new 5024f2f SLING-7167 Adjust READMEs
The 33 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-jcr-registration] 33/33: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 5024f2f26e2fa0a46531fe29a2355480b8d26178
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Oct 3 09:58:13 2017 +0000
SLING-7167 Adjust READMEs
add uniform header linking to Sling project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810862 13f79535-47bb-0310-9956-ffa450edef68
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 89d00e5..a6a6e61 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-Apache Sling JCR Repository Registration
+# Apache Sling JCR Repository Registration
+
+This module is part of the [Apache Sling](https://sling.apache.org) project.
Bundle providing support to publish JCR repository services via RMI
and/or JNDI
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 16/33: SLING-3387 Fix
potential NPE
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 560ee614c4c5375132b92c65d3e4876b2dff14ab
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Wed Feb 12 11:02:59 2014 +0000
SLING-3387 Fix potential NPE
Applying patch by Michael Dürig (thanks alot)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1567598 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/jcr/registration/AbstractRegistrationSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
index 6d941ed..202002b 100644
--- a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
@@ -214,8 +214,8 @@ public abstract class AbstractRegistrationSupport {
protected String getName(ServiceReference reference) {
String name = (String) reference.getProperty(REPOSITORY_REGISTRATION_NAME);
if (name == null || name.length() == 0) {
- this.log.log(LogService.LOG_DEBUG,
- "registerRepository: Repository not to be registered");
+ log(LogService.LOG_DEBUG,
+ "registerRepository: Repository not to be registered", null);
return null;
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 24/33:
[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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 1afd5c307b9eb5040b3ba554f137f98f7203c18e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Sep 16 14:22:12 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1625308 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index d008c19..2b9581a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.jcr.registration</artifactId>
<packaging>bundle</packaging>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<name>Apache Sling JCR Repository Registration</name>
<description>
@@ -36,9 +36,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.2</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.registration-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration</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-jcr-registration] 06/33: Update to latest
parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 9f90a2ef0de11630782e21971faad8474812cc73
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 5 09:29:47 2012 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1357521 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7100b3e..6321c53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-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-jcr-registration] 07/33: Use released
versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit f4e503fe19a5bdcf9f6ae5ea0924a30e0607667c
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 10 11:07:18 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1359601 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6321c53..82b74e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</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-jcr-registration] 17/33:
[maven-release-plugin] prepare release
org.apache.sling.jcr.registration-1.0.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 83f87992c66948bcc7274186659c261009907fa4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 3 09:30:54 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.jcr.registration-1.0.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1573490 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3222284..c8ccc97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.jcr.registration</artifactId>
<packaging>bundle</packaging>
- <version>0.0.1-SNAPSHOT</version>
+ <version>1.0.0</version>
<name>Apache Sling JCR Repository Registration</name>
<description>
@@ -36,9 +36,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.registration-1.0.0</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-jcr-registration] 21/33: Clean up usage of
SCR annotations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit ee68d91890ad117690fc0aa5287671a26327b262
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 29 12:30:06 2014 +0000
Clean up usage of SCR annotations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1614324 13f79535-47bb-0310-9956-ffa450edef68
---
.../jcr/registration/AbstractRegistrationSupport.java | 18 +++---------------
.../jcr/registration/impl/JndiRegistrationSupport.java | 18 ++++++++++++++++++
.../jcr/registration/impl/RmiRegistrationSupport.java | 18 ++++++++++++++++++
.../apache/sling/jcr/registration/package-info.java | 3 ++-
4 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
index 95803b2..9ab9db4 100644
--- a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
@@ -22,11 +22,6 @@ import java.util.Map;
import javax.jcr.Repository;
-import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Reference;
-import org.apache.felix.scr.annotations.ReferenceCardinality;
-import org.apache.felix.scr.annotations.ReferencePolicy;
-import org.apache.felix.scr.annotations.References;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentConstants;
@@ -45,14 +40,6 @@ import org.osgi.service.log.LogService;
* <p>
* To ensure this thread-safeness, said methods should not be overwritten.
*/
-@Component(componentAbstract = true)
-@References({
- @Reference(
- name = "Repository",
- policy = ReferencePolicy.DYNAMIC,
- cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
- referenceInterface = Repository.class)
-})
public abstract class AbstractRegistrationSupport {
/**
@@ -68,7 +55,6 @@ public abstract class AbstractRegistrationSupport {
* service as a reference or call the {@link #bindLog(LogService)} to enable
* logging correctly.
*/
- @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY, policy = ReferencePolicy.DYNAMIC)
private volatile LogService log;
/**
@@ -363,7 +349,9 @@ public abstract class AbstractRegistrationSupport {
/** Unbinds the LogService */
protected void unbindLog(LogService log) {
- this.log = null;
+ if ( this.log == log ) {
+ this.log = null;
+ }
}
//---------- internal -----------------------------------------------------
diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
index 081473a..9b21241 100644
--- a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
@@ -31,6 +31,10 @@ import javax.naming.NamingException;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.felix.scr.annotations.References;
import org.apache.sling.jcr.registration.AbstractRegistrationSupport;
import org.osgi.service.log.LogService;
@@ -67,12 +71,23 @@ import org.osgi.service.log.LogService;
@Property(name = "service.vendor", value = "The Apache Software Foundation", propertyPrivate = true),
@Property(name = "service.description", value = "JNDI Repository Registration", propertyPrivate = true)
})
+@References({
+ @Reference(
+ name = "Repository",
+ policy = ReferencePolicy.DYNAMIC,
+ cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
+ referenceInterface = Repository.class),
+ @Reference(referenceInterface=LogService.class,
+ bind="bindLog", unbind="unbindLog",
+ cardinality = ReferenceCardinality.OPTIONAL_UNARY, policy = ReferencePolicy.DYNAMIC)
+})
public class JndiRegistrationSupport extends AbstractRegistrationSupport {
private Context jndiContext;
// ---------- SCR intergration ---------------------------------------------
+ @Override
protected boolean doActivate() {
@SuppressWarnings("unchecked")
Dictionary<String, Object> props = this.getComponentContext().getProperties();
@@ -104,6 +119,7 @@ public class JndiRegistrationSupport extends AbstractRegistrationSupport {
return false;
}
+ @Override
protected void doDeactivate() {
if (this.jndiContext != null) {
try {
@@ -136,6 +152,7 @@ public class JndiRegistrationSupport extends AbstractRegistrationSupport {
}
}
+ @Override
protected Object bindRepository(String name, Repository repository) {
if (this.jndiContext != null) {
@@ -153,6 +170,7 @@ public class JndiRegistrationSupport extends AbstractRegistrationSupport {
return null;
}
+ @Override
protected void unbindRepository(String name, Object data) {
if (this.jndiContext != null) {
try {
diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
index faf0583..0894e60 100644
--- a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
@@ -30,6 +30,10 @@ import javax.jcr.Repository;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.felix.scr.annotations.References;
import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
import org.apache.jackrabbit.rmi.server.ServerAdapterFactory;
import org.apache.sling.jcr.registration.AbstractRegistrationSupport;
@@ -54,6 +58,16 @@ import org.osgi.service.log.LogService;
@Property(name = "service.vendor", value = "The Apache Software Foundation", propertyPrivate = true),
@Property(name = "service.description", value = "RMI based Repository Registration", propertyPrivate = true)
})
+@References({
+ @Reference(
+ name = "Repository",
+ policy = ReferencePolicy.DYNAMIC,
+ cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
+ referenceInterface = Repository.class),
+ @Reference(referenceInterface=LogService.class,
+ bind="bindLog", unbind="unbindLog",
+ cardinality = ReferenceCardinality.OPTIONAL_UNARY, policy = ReferencePolicy.DYNAMIC)
+})
public class RmiRegistrationSupport extends AbstractRegistrationSupport {
@Property(intValue = 1099, label = "%rmi.port.name", description = "%rmi.port.description")
@@ -74,6 +88,7 @@ public class RmiRegistrationSupport extends AbstractRegistrationSupport {
* registry is disabled, if the port property is negative. If the port is
* zero or not a number, the default port (1099) is assumed.
*/
+ @Override
protected boolean doActivate() {
Object portProp = this.getComponentContext().getProperties().get(
@@ -112,6 +127,7 @@ public class RmiRegistrationSupport extends AbstractRegistrationSupport {
* If a private registry has been acquired this method unexports the
* registry object to free the RMI registry OID for later use.
*/
+ @Override
protected void doDeactivate() {
// if we have a private RMI registry, unexport it here to free
// the RMI registry OID
@@ -130,10 +146,12 @@ public class RmiRegistrationSupport extends AbstractRegistrationSupport {
this.registry = null;
}
+ @Override
protected Object bindRepository(String name, Repository repository) {
return new RmiRegistration(name, repository);
}
+ @Override
protected void unbindRepository(String name, Object data) {
RmiRegistration rr = (RmiRegistration) data;
rr.unregister();
diff --git a/src/main/java/org/apache/sling/jcr/registration/package-info.java b/src/main/java/org/apache/sling/jcr/registration/package-info.java
index 1a1f77f..86981fd 100644
--- a/src/main/java/org/apache/sling/jcr/registration/package-info.java
+++ b/src/main/java/org/apache/sling/jcr/registration/package-info.java
@@ -23,9 +23,10 @@
* class which may be extended by service exposing JCR Repository services
* in any one non-OSGi registry such as RMI or JNDI.
*/
-@Version("1.0")
+@Version("1.1")
@Export(optional = "provide:=true")
package org.apache.sling.jcr.registration;
import aQute.bnd.annotation.Export;
import aQute.bnd.annotation.Version;
+
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 14/33: SLING-3178 :
org.apache.sling.jcr.registration embeds ancient JCR-RMI classes. Apply
patch from Jukka Zitting
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 3787e140a48150d0948bf6b30aa52e9f605e1b1b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Oct 20 13:09:51 2013 +0000
SLING-3178 : org.apache.sling.jcr.registration embeds ancient JCR-RMI classes. Apply patch from Jukka Zitting
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1533884 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2bdc3e2..fffc8d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,8 +66,7 @@
*
</DynamicImport-Package>
<Embed-Dependency>
- jackrabbit-core;inline=org/apache/jackrabbit/core/jndi/provider/*.class,
- jackrabbit-jcr-rmi;inline=org/apache/jackrabbit/rmi/iterator/**|org/apache/jackrabbit/rmi/observation/**|org/apache/jackrabbit/rmi/remote/**|org/apache/jackrabbit/rmi/server/**|org/apache/jackrabbit/rmi/value/**|org/apache/jackrabbit/rmi/server/**
+ jackrabbit-core;inline=org/apache/jackrabbit/core/jndi/provider/*.class
</Embed-Dependency>
</instructions>
</configuration>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 05/33: Remove explicit
plugin and dependency version to inherit parent pom managed versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 585508cfe36b115bceb1a5276df869af1f52cdbc
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri May 25 10:06:30 2012 +0000
Remove explicit plugin and dependency version to inherit parent pom managed versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1342556 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 01293c4..7100b3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -88,7 +87,6 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bndlib</artifactId>
- <version>1.50.0</version>
<scope>provided</scope>
</dependency>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 30/33: Switch to parent
pom 26
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 0697f42335940f94dabfe90875a46f478f08f297
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Jan 3 14:07:46 2016 +0000
Switch to parent pom 26
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1722720 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 894f4b6..0611f15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 22/33: Updated to parent
version 20
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 46a1db49b4a760b883ae555c52a4e550c5b030ee
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Aug 1 19:16:26 2014 +0000
Updated to parent version 20
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1615208 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 15d9953..ff1824d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>19</version>
+ <version>20</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-jcr-registration] 29/33: Update the main
reactor to parent 25
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 604bc5a1e2b1fd4c654934e75cc80de336ed7190
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Oct 5 10:03:45 2015 +0000
Update the main reactor to parent 25
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1706780 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d575d68..894f4b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 18/33:
[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 branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 26d01053b7e14b7e876592a2b1577b6f5a95aa6d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 3 09:31:13 2014 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1573492 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index c8ccc97..9ae074d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.jcr.registration</artifactId>
<packaging>bundle</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<name>Apache Sling JCR Repository Registration</name>
<description>
@@ -36,9 +36,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.0</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.registration-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration</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-jcr-registration] 31/33: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 94e8f3e89e72795d5a77866d72986b05eb1f1f6d
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 2 14:58:05 2017 +0000
SLING-7167 Adjust READMEs
remove outdated information
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810402 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/README.txt b/README.txt
index 8c77ce6..89d00e5 100644
--- a/README.txt
+++ b/README.txt
@@ -2,27 +2,3 @@ Apache Sling JCR Repository Registration
Bundle providing support to publish JCR repository services via RMI
and/or JNDI
-
-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/sling/trunk/jcr/registration
-
-See the Subversion documentation for other source control features.
-
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 11/33: Update to latest
parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 54ca138214974fb4126e2ce8aeb2c54164201f79
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 19 07:04:15 2013 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1504788 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f85e858..7c6dd7e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>16</version>
+ <version>17</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-jcr-registration] 02/33: SLING-2352 Finish
migration of the Repository Registration Support out of
jackrabbit-jcr-server into its own bundle
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 9b764f225f934763d70134085ebfcc1e1541ded7
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Wed May 2 13:22:32 2012 +0000
SLING-2352 Finish migration of the Repository Registration Support out of jackrabbit-jcr-server into its own bundle
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1333033 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 28 +-
.../registration/AbstractRegistrationSupport.java | 386 +++++++++++++++++++++
.../registration/impl/JndiRegistrationSupport.java | 165 +++++++++
.../registration/impl/RmiRegistrationSupport.java | 294 ++++++++++++++++
.../sling/jcr/registration/package-info.java | 31 ++
.../OSGI-INF/metatype/metatype.properties | 54 +++
6 files changed, 951 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index a7146fa..ec5967b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,23 +51,23 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
<Bundle-Category>
sling,jcr
</Bundle-Category>
- <Private-Package>
- org.apache.sling.jcr.registrar.impl.*
- </Private-Package>
- <Export-Package>
- org.apache.sling.jcr.registrar
- </Export-Package>
+ <Import-Package>
+ javax.transaction.xa;resolution:=optional,
+ *
+ </Import-Package>
<DynamicImport-Package>
*
</DynamicImport-Package>
<Embed-Dependency>
- jackrabbit-core;inline:=org/apache/jackrabbit/core/jndi/provider/*.class
+ jackrabbit-core;inline=org/apache/jackrabbit/core/jndi/provider/*.class,
+ jackrabbit-jcr-rmi;inline=org/apache/jackrabbit/rmi/iterator/**|org/apache/jackrabbit/rmi/observation/**|org/apache/jackrabbit/rmi/remote/**|org/apache/jackrabbit/rmi/server/**|org/apache/jackrabbit/rmi/value/**|org/apache/jackrabbit/rmi/server/**
</Embed-Dependency>
</instructions>
</configuration>
@@ -79,11 +79,19 @@
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bndlib</artifactId>
+ <version>1.50.0</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- OSGi Libraries -->
<dependency>
<groupId>org.osgi</groupId>
@@ -101,6 +109,12 @@
<version>2.2.9</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
new file mode 100644
index 0000000..6d941ed
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
@@ -0,0 +1,386 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.jcr.registration;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.jcr.Repository;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.felix.scr.annotations.References;
+import org.osgi.framework.Constants;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.component.ComponentConstants;
+import org.osgi.service.component.ComponentContext;
+import org.osgi.service.log.LogService;
+
+/**
+ * The <code>AbstractRegistrationSupport</code> class is the base class for
+ * registration purposes of embedded repositories.
+ * <p>
+ * This base class cares for synchronization issues of the
+ * {@link #activate(ComponentContext)}, {@link #deactivate(ComponentContext)},
+ * {@link #bindRepository(ServiceReference)} and
+ * {@link #unbindRepository(ServiceReference)} methods. Implementations of the
+ * abstract API may safely assume to run thread-safe.
+ * <p>
+ * To ensure this thread-safeness, said methods should not be overwritten.
+ */
+@Component(componentAbstract = true)
+@References({
+ @Reference(
+ name = "Repository",
+ policy = ReferencePolicy.DYNAMIC,
+ cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE,
+ referenceInterface = Repository.class)
+})
+public abstract class AbstractRegistrationSupport {
+
+ /**
+ * The JCR Repository service registration property used to create
+ * the registration name. If this service registration property
+ * (assumed to be a single string) does not exist, the repository is
+ * not registered.
+ */
+ public static final String REPOSITORY_REGISTRATION_NAME = "name";
+
+ /**
+ * The LogService for logging. Extensions of this class must declare the log
+ * service as a reference or call the {@link #bindLog(LogService)} to enable
+ * logging correctly.
+ */
+ @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY, policy = ReferencePolicy.DYNAMIC)
+ private LogService log;
+
+ /**
+ * The OSGi ComponentContext.
+ */
+ private ComponentContext componentContext;
+
+ /**
+ * The (possibly empty) map of repositories which have been bound to the
+ * registry before the registry has been activated.
+ */
+ private final Map<String, ServiceReference> repositoryRegistrationBacklog = new HashMap<String, ServiceReference>();
+
+ /**
+ * The map of repositories which have been bound to the registry component
+ * and which are actually registered with the registry.
+ */
+ private final Map<String, Object> registeredRepositories = new HashMap<String, Object>();
+
+ /**
+ * A lock to serialize access to the registry management in this class.
+ */
+ protected final Object registryLock = new Object();
+
+ // ---------- API to be implemented by extensions --------------------------
+
+ /**
+ * Performs additional activation tasks. This method is called by the
+ * {@link #activate(ComponentContext)} method and is intended for internal
+ * setup, such as acquiring the registry.
+ *
+ * @return Whether the activation succeeded or not. If <code>true</code>
+ * is returned, activation succeeded and any repositories which have
+ * been bound before the component was activated are now actually
+ * registered. If <code>false</code> is returned, activation
+ * failed and this component is disabled and receives no further
+ * repository bind and unbound events (apart for unbind events for
+ * repositories which have already been bound).
+ */
+ protected abstract boolean doActivate();
+
+ /**
+ * Performs additional deactivation tasks. This method is called by the
+ * {@link #deactivate(ComponentContext)} method and is intended for internal
+ * cleanup of setup done by the {@link #doActivate()} method.
+ * <p>
+ * This method is always called, regardless of whether {@link #doActivate()}
+ * succeeded or not.
+ */
+ protected abstract void doDeactivate();
+
+ /**
+ * Called to actually register a repository with the registry. This method
+ * is called by {@link #activate(ComponentContext)} for any repositories
+ * bound before the component was activated and by
+ * {@link #bindRepository(ServiceReference)} for any repositories bound
+ * after the component was activated.
+ * <p>
+ * If actual registration fails, this method is expected to return
+ * <code>null</code> to indicate this fact. In this case, the
+ * {@link #unbindRepository(String, Object)} will NOT be called for the
+ * named repository.
+ * <p>
+ * This method may safely assume that it is only called on or after
+ * activation of this component on or before the component deactivation.
+ *
+ * @param name The name under which the repository is to be registered.
+ * @param repository The <code>javax.jcr.Repository</code> to register.
+ * @return Returns an object which is later given as the <code>data</code>
+ * parameter to the {@link #unbindRepository(String, Object)} method
+ * to unregister the repository of the given name. This may be
+ * <code>null</code> if actual registration failed.
+ */
+ protected abstract Object bindRepository(String name, Repository repository);
+
+ /**
+ * Called to actually unregister a repository with the registry. This method
+ * is called by {@link #unbindRepository(ServiceReference)} for any
+ * repositories unbound before the component is deactivated and by
+ * {@link #deactivate(ComponentContext)} for any repositories not unbound
+ * before the component is deactivated.
+ * <p>
+ * If the {@link #bindRepository(String, Repository)} returned
+ * <code>null</code> for when the named repository was registered, this
+ * method is not called.
+ * <p>
+ * This method may safely assume that it is only called on or after
+ * activation of this component on or before the component deactivation.
+ *
+ * @param name The name under which the repository is to be registered.
+ * @param data The data object returned by the
+ * {@link #bindRepositoryInternal(String, ServiceReference)}
+ * method.
+ */
+ protected abstract void unbindRepository(String name, Object data);
+
+ // ---------- Implementation support methods -------------------------------
+
+ /**
+ * Returns the OSGi <code>ComponentContext</code> of this component. This
+ * method returns <code>null</code> before the {@link #doActivate()}
+ * method is called and after the {@link #doDeactivate()} method has been
+ * called. That is, this method does not return <code>null</code> if it is
+ * fully operational.
+ */
+ protected ComponentContext getComponentContext() {
+ return this.componentContext;
+ }
+
+ /**
+ * Logs a message with optional <code>Throwable</code> stack trace to the
+ * log service or <code>stderr</code> if no log service is available.
+ *
+ * @param level The <code>LogService</code> level at which to log the
+ * message.
+ * @param message The message to log, this should of course not be
+ * <code>null</code>.
+ * @param t The <code>Throwable</code> to log along with the message. This
+ * may be <code>null</code>.
+ */
+ protected void log(int level, String message, Throwable t) {
+ LogService log = this.log;
+ if (log != null) {
+ log.log(level, message, t);
+ } else {
+ System.err.print(level + " - " + message);
+ if (t != null) {
+ t.printStackTrace(System.err);
+ }
+ }
+
+ }
+
+ /**
+ * Returns the <code>name</code> property from the service properties or
+ * <code>null</code> if no such property exists or the property is an
+ * empty string.
+ *
+ * @param reference The <code>ServiceReference</code> whose
+ * <code>name</code> property is to be returned.
+ * @return The non-empty name property or <code>null</code>.
+ */
+ protected String getName(ServiceReference reference) {
+ String name = (String) reference.getProperty(REPOSITORY_REGISTRATION_NAME);
+ if (name == null || name.length() == 0) {
+ this.log.log(LogService.LOG_DEBUG,
+ "registerRepository: Repository not to be registered");
+ return null;
+ }
+
+ return name;
+ }
+
+ // ---------- SCR intergration ---------------------------------------------
+
+ /**
+ * Activates this component thread-safely as follows:
+ * <ol>
+ * <li>Set the OSGi ComponentContext field
+ * <li>Call {@link #doActivate()}
+ * <li>Register repositores bound before activation calling
+ * {@link #bindRepository(String, Repository)} for each such repository.
+ * </ol>
+ * <p>
+ * If {@link #doActivate()} returns <code>false</code>, the repositories
+ * already bound are not actually registered, but this component is
+ * disabled.
+ *
+ * @param componentContext The OSGi <code>ComponentContext</code> of this
+ * component.
+ */
+ protected void activate(ComponentContext componentContext) {
+ synchronized (this.registryLock) {
+ this.componentContext = componentContext;
+
+ if (this.doActivate()) {
+ // register all repositories in the tmp map
+ for (Iterator<Map.Entry<String, ServiceReference>> ri = this.repositoryRegistrationBacklog.entrySet().iterator(); ri.hasNext();) {
+ Map.Entry<String, ServiceReference> entry = ri.next();
+
+ this.bindRepositoryInternal(entry.getKey(),
+ entry.getValue());
+
+ ri.remove();
+ }
+ } else {
+ // disable this component
+ String name = (String) componentContext.getProperties().get(
+ ComponentConstants.COMPONENT_NAME);
+ this.getComponentContext().disableComponent(name);
+ }
+ }
+ }
+
+ /**
+ * Deactivates this component thread-safely as follows:
+ * <ol>
+ * <li>Unregister repositores still bound calling
+ * {@link #unbindRepository(String, Object)} for each such repository.
+ * <li>Call {@link #doDeactivate()}
+ * <li>Clear the OSGi ComponentContext field
+ * </ol>
+ *
+ * @param componentContext The OSGi <code>ComponentContext</code> of this
+ * component.
+ */
+ protected void deactivate(ComponentContext context) {
+
+ synchronized (this.registryLock) {
+
+ // unregister all repositories in the tmp map
+ for (Iterator<Map.Entry<String, Object>> ri = this.registeredRepositories.entrySet().iterator(); ri.hasNext();) {
+ Map.Entry<String, Object> entry = ri.next();
+
+ this.unbindRepository(entry.getKey(), entry.getValue());
+
+ ri.remove();
+ }
+
+ this.doDeactivate();
+
+ this.componentContext = null;
+ }
+ }
+
+ /**
+ * Registers the repository identified by the OSGi service reference under
+ * the name set as service property. If the repository service has not
+ * name property, the repository is not registered.
+ *
+ * @param reference The <code>ServiceReference</code> representing the
+ * repository to register.
+ */
+ protected void bindRepository(ServiceReference reference) {
+ String name = this.getName(reference);
+
+ if (name != null) {
+ synchronized (this.registryLock) {
+ if (this.componentContext == null) {
+ // no context to register with, delay ??
+ this.repositoryRegistrationBacklog.put(name, reference);
+ } else {
+ this.bindRepositoryInternal(name, reference);
+ }
+ }
+ } else {
+ this.log(LogService.LOG_INFO, "Service "
+ + reference.getProperty(Constants.SERVICE_ID)
+ + " has no name property, not registering", null);
+ }
+ }
+
+ /**
+ * Unregisters the repository identified by the OSGi service reference under
+ * the name set as service property. If the repository service has no
+ * name property, the repository is assumed not be registered and nothing
+ * needs to be done.
+ *
+ * @param reference The <code>ServiceReference</code> representing the
+ * repository to unregister.
+ */
+ protected void unbindRepository(ServiceReference reference) {
+ String name = this.getName(reference);
+ if (name != null) {
+
+ synchronized (this.registryLock) {
+ // unbind the repository
+ Object data = this.registeredRepositories.remove(name);
+ if (data != null) {
+ this.unbindRepository(name, data);
+ }
+
+ // ensure unregistered from internal and temporary map
+ this.repositoryRegistrationBacklog.remove(name);
+
+ // make sure we have no reference to the service
+ if (this.componentContext != null) {
+ this.componentContext.getBundleContext().ungetService(reference);
+ }
+ }
+ } else {
+ this.log(LogService.LOG_DEBUG, "Service "
+ + reference.getProperty(Constants.SERVICE_ID)
+ + " has no name property, nothing to unregister", null);
+ }
+ }
+
+ /** Binds the LogService */
+ protected void bindLog(LogService log) {
+ this.log = log;
+ }
+
+ /** Unbinds the LogService */
+ protected void unbindLog(LogService log) {
+ this.log = null;
+ }
+
+ //---------- internal -----------------------------------------------------
+
+ /**
+ * Internal bind method called by {@link #activate(ComponentContext)} and
+ * {@link #bindRepository(ServiceReference)} to actually control the
+ * registration process by retrieving the repository and calling the
+ * {@link #bindRepository(String, Repository)} method.
+ */
+ private void bindRepositoryInternal(String name, ServiceReference reference) {
+ Repository repository = (Repository) this.getComponentContext().getBundleContext().getService(
+ reference);
+ Object data = this.bindRepository(name, repository);
+ if (data != null) {
+ this.registeredRepositories.put(name, data);
+ }
+ }
+
+}
diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
new file mode 100644
index 0000000..32c5fb4
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
@@ -0,0 +1,165 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.jcr.registration.impl;
+
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Dictionary;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import javax.jcr.Repository;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.sling.jcr.registration.AbstractRegistrationSupport;
+import org.osgi.service.log.LogService;
+
+
+/**
+ * The <code>JndiRegistrationSupport</code> extends the
+ * {@link AbstractRegistrationSupport} class to register repositories with a
+ * JNDI context whose provider URL and initial factory class name may be
+ * configured.
+ * <p>
+ * Note: Currently, only these two properties are declared to be configurable,
+ * in the future a mechanism should be devised to support declaration of more
+ * properties.
+ */
+@Component(
+ immediate = true,
+ metatype = true,
+ label = "%jndi.name",
+ description = "%jndi.description",
+ name = "org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport")
+@org.apache.felix.scr.annotations.Properties({
+ @Property(
+ name = "java.naming.factory.initial",
+ value = "org.apache.jackrabbit.core.jndi.provider.DummyInitialContextFactory",
+ label = "%jndi.factory.name",
+ description = "%jndi.factory.description"),
+ @Property(
+ name = "java.naming.provider.url",
+ value = "http://sling.apache.org",
+ label = "%jndi.providerurl.name",
+ description = "%jndi.providerurl.description"),
+ @Property(name = "service.vendor", value = "The Apache Software Foundation", propertyPrivate = true),
+ @Property(name = "service.description", value = "JNDI Repository Registration", propertyPrivate = true)
+})
+public class JndiRegistrationSupport extends AbstractRegistrationSupport {
+
+ private Context jndiContext;
+
+ // ---------- SCR intergration ---------------------------------------------
+
+ protected boolean doActivate() {
+ @SuppressWarnings("unchecked")
+ Dictionary<String, Object> props = this.getComponentContext().getProperties();
+ Properties env = new Properties();
+ for (Enumeration<String> pe = props.keys(); pe.hasMoreElements();) {
+ String key = pe.nextElement();
+ if (key.startsWith("java.naming.")) {
+ env.setProperty(key, (String) props.get(key));
+ }
+ }
+
+ try {
+ // create the JNDI context for registration
+ this.jndiContext = this.createInitialContext(env);
+
+ this.log(LogService.LOG_INFO, "Using JNDI context "
+ + this.jndiContext.getEnvironment() + " to register repositories",
+ null);
+
+ return true;
+ } catch (NamingException ne) {
+ this.log(
+ LogService.LOG_ERROR,
+ "Problem setting up JNDI initial context, repositories will not be registered. Reason: "
+ + ne.getMessage(), null);
+ }
+
+ // fallback to false
+ return false;
+ }
+
+ protected void doDeactivate() {
+ if (this.jndiContext != null) {
+ try {
+ this.jndiContext.close();
+ } catch (NamingException ne) {
+ this.log(LogService.LOG_INFO, "Problem closing JNDI context", ne);
+ }
+
+ this.jndiContext = null;
+ }
+ }
+
+ private Context createInitialContext(final Properties env) throws NamingException {
+ try {
+ return AccessController.doPrivileged(new PrivilegedExceptionAction<Context>() {
+ public Context run() throws NamingException {
+ Thread currentThread = Thread.currentThread();
+ ClassLoader old = currentThread.getContextClassLoader();
+ currentThread.setContextClassLoader(JndiRegistrationSupport.this.getClass().getClassLoader());
+ try {
+ return new InitialContext(env);
+ } finally {
+ currentThread.setContextClassLoader(old);
+ }
+ }
+ });
+ } catch (PrivilegedActionException pae) {
+ // we now that this method only throws a NamingException
+ throw (NamingException) pae.getCause();
+ }
+ }
+
+ protected Object bindRepository(String name, Repository repository) {
+
+ if (this.jndiContext != null) {
+ try {
+ this.jndiContext.bind(name, repository);
+ this.log(LogService.LOG_INFO, "Repository bound to JNDI as " + name,
+ null);
+ return repository;
+ } catch (NamingException ne) {
+ this.log(LogService.LOG_ERROR, "Failed to register repository " + name, ne);
+ }
+ }
+
+ // fall back to unregistered in case of failures or no context
+ return null;
+ }
+
+ protected void unbindRepository(String name, Object data) {
+ if (this.jndiContext != null) {
+ try {
+ this.jndiContext.unbind(name);
+ this.log(LogService.LOG_INFO, "Repository " + name
+ + " unbound from JNDI", null);
+ } catch (NamingException ne) {
+ this.log(LogService.LOG_ERROR, "Problem unregistering repository "
+ + name, ne);
+ }
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
new file mode 100644
index 0000000..de0dad7
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
@@ -0,0 +1,294 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sling.jcr.registration.impl;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.UnicastRemoteObject;
+
+import javax.jcr.Repository;
+
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Property;
+import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
+import org.apache.jackrabbit.rmi.server.ServerAdapterFactory;
+import org.apache.sling.jcr.registration.AbstractRegistrationSupport;
+import org.osgi.service.log.LogService;
+
+/**
+ * The <code>RmiRegistrationSupport</code> extends the
+ * {@link AbstractRegistrationSupport} class to register repositories with an
+ * RMI registry whose provider localhost port may be configured.
+ * <p>
+ * Note: Currently only registries in this Java VM are supported. In the future
+ * support for external registries may be added.
+ */
+@Component(
+ immediate = true,
+ metatype = true,
+ label = "%rmi.name",
+ description = "%rmi.description",
+ name = "org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport")
+@org.apache.felix.scr.annotations.Properties({
+ @Property(name = "service.vendor", value = "The Apache Software Foundation", propertyPrivate = true),
+ @Property(name = "service.description", value = "RMI based Repository Registration", propertyPrivate = true)
+})
+public class RmiRegistrationSupport extends AbstractRegistrationSupport {
+
+ @Property(intValue = 1099, label = "%rmi.port.name", description = "%rmi.port.description")
+ public static final String PROP_REGISTRY_PORT = "port";
+
+ private int registryPort;
+
+ /** The private RMI registry, only defined if possible */
+ private Registry registry;
+
+ private boolean registryIsPrivate;
+
+ // ---------- SCR intergration ---------------------------------------------
+
+ /**
+ * Read the registry port from the configuration properties. If the value is
+ * invalid (higher than 65525), the RMI registry is disabled. Likewise the
+ * registry is disabled, if the port property is negative. If the port is
+ * zero or not a number, the default port (1099) is assumed.
+ */
+ protected boolean doActivate() {
+
+ Object portProp = this.getComponentContext().getProperties().get(
+ PROP_REGISTRY_PORT);
+ if (portProp instanceof Number) {
+ this.registryPort = ((Number) portProp).intValue();
+ } else {
+ try {
+ this.registryPort = Integer.parseInt(String.valueOf(portProp));
+ } catch (NumberFormatException nfe) {
+ this.registryPort = 0;
+ }
+ }
+
+ // ensure correct value
+ if (this.registryPort < 0) {
+ this.log(LogService.LOG_WARNING,
+ "RMI registry disabled (no or negative RMI port configured)",
+ null);
+ return false;
+ } else if (this.registryPort == 0) {
+ this.registryPort = Registry.REGISTRY_PORT;
+ } else if (this.registryPort == 0 || this.registryPort > 0xffff) {
+ this.log(LogService.LOG_WARNING,
+ "Illegal RMI registry port number " + this.registryPort
+ + ", disabling RMI registry", null);
+ return false;
+ }
+
+ this.log(LogService.LOG_INFO, "Using RMI Registry port "
+ + this.registryPort, null);
+ return true;
+ }
+
+ /**
+ * If a private registry has been acquired this method unexports the
+ * registry object to free the RMI registry OID for later use.
+ */
+ protected void doDeactivate() {
+ // if we have a private RMI registry, unexport it here to free
+ // the RMI registry OID
+ if (this.registry != null && this.registryIsPrivate) {
+ try {
+ UnicastRemoteObject.unexportObject(this.registry, true);
+ this.log(LogService.LOG_INFO,
+ "Unexported private RMI Registry at " + this.registryPort,
+ null);
+ } catch (NoSuchObjectException nsoe) {
+ // not expected, but don't really care either
+ this.log(LogService.LOG_INFO,
+ "Cannot unexport private RMI Registry reference", nsoe);
+ }
+ }
+ this.registry = null;
+ }
+
+ protected Object bindRepository(String name, Repository repository) {
+ return new RmiRegistration(name, repository);
+ }
+
+ protected void unbindRepository(String name, Object data) {
+ RmiRegistration rr = (RmiRegistration) data;
+ rr.unregister();
+ }
+
+ // ---------- support for private rmi registries ---------------------------
+
+ /**
+ * Tries to create a private registry at the configured port. If this fails
+ * (for example because a registry already exists in the VM, a registry stub
+ * for the port is returned. This latter stub may or may not connect to a
+ * real registry, which may only be found out, when trying to register
+ * repositories.
+ */
+ private Registry getPrivateRegistry() {
+ if (this.registry == null) {
+ try {
+ // no, so try to create first
+ this.registry = LocateRegistry.createRegistry(this.registryPort);
+ this.registryIsPrivate = true;
+ this.log(LogService.LOG_INFO, "Using private RMI Registry at "
+ + this.registryPort, null);
+
+ } catch (RemoteException re) {
+ // creating failed, check whether there is already one
+ this.log(LogService.LOG_INFO,
+ "Cannot create private registry, trying existing registry at "
+ + this.registryPort + ", reason: " + re.toString(),
+ null);
+
+ try {
+ this.registry = LocateRegistry.getRegistry(this.registryPort);
+ this.registryIsPrivate = false;
+ this.log(LogService.LOG_INFO,
+ "Trying existing registry at " + this.registryPort,
+ null);
+
+ } catch (RemoteException pre) {
+ this.log(
+ LogService.LOG_ERROR,
+ "Cannot get existing registry, will not register repositories on RMI",
+ pre);
+ }
+ }
+ }
+
+ return this.registry;
+ }
+
+ /**
+ * Returns a Jackrabbit JCR RMI <code>RemoteAdapterFactory</code> to be
+ * used to publish local (server-side) JCR objects to a remote client.
+ * <p>
+ * This method returns an instance of the
+ * <code>JackrabbitServerAdapterFactory</code> class to enable the use of
+ * the Jackrabbit API over RMI. Extensions of this class may overwrite this
+ * method to return a different implementation to provide different JCR
+ * extension API depending on the server implementation.
+ */
+ protected RemoteAdapterFactory getRemoteAdapterFactory() {
+ return new ServerAdapterFactory();
+ }
+
+ // ---------- Inner Class --------------------------------------------------
+
+ private class RmiRegistration {
+
+ private String rmiName;
+
+ private Remote rmiRepository;
+
+ RmiRegistration(String rmiName, Repository repository) {
+ this.register(rmiName, repository);
+ }
+
+ public String getRmiName() {
+ return this.rmiName;
+ }
+
+ public String getRmiURL() {
+ String host;
+ try {
+ host = InetAddress.getLocalHost().getCanonicalHostName();
+ } catch (IOException ignore) {
+ host = "localhost";
+ }
+ return "//" + host + ":" + RmiRegistrationSupport.this.registryPort
+ + "/" + this.getRmiName();
+ }
+
+ private void register(String rmiName, Repository repository) {
+ System.setProperty("java.rmi.server.useCodebaseOnly", "true");
+
+ // try to create remote repository and keep it to ensure it is
+ // unexported in the unregister() method
+ try {
+ RemoteAdapterFactory raf = getRemoteAdapterFactory();
+ this.rmiRepository = raf.getRemoteRepository(repository);
+ } catch (RemoteException e) {
+ RmiRegistrationSupport.this.log(LogService.LOG_ERROR,
+ "Unable to create remote repository.", e);
+ return;
+ } catch (Exception e) {
+ RmiRegistrationSupport.this.log(
+ LogService.LOG_ERROR,
+ "Unable to create RMI repository. jcr-rmi.jar might be missing.",
+ e);
+ return;
+ }
+
+ try {
+ // check whether we have a private registry already
+ Registry registry = RmiRegistrationSupport.this.getPrivateRegistry();
+ if (registry != null) {
+ registry.bind(rmiName, this.rmiRepository);
+ this.rmiName = rmiName;
+ RmiRegistrationSupport.this.log(LogService.LOG_INFO,
+ "Repository bound to " + this.getRmiURL(), null);
+ }
+
+ } catch (NoSuchObjectException nsoe) {
+ // the registry does not really exist
+ RmiRegistrationSupport.this.log(LogService.LOG_WARNING,
+ "Cannot contact RMI registry at "
+ + RmiRegistrationSupport.this.registryPort
+ + ", repository not registered", null);
+ } catch (Exception e) {
+ RmiRegistrationSupport.this.log(LogService.LOG_ERROR,
+ "Unable to bind repository via RMI.", e);
+ }
+ }
+
+ public void unregister() {
+ // unregister repository
+ if (this.rmiName != null) {
+ try {
+ RmiRegistrationSupport.this.getPrivateRegistry().unbind(
+ this.rmiName);
+ RmiRegistrationSupport.this.log(LogService.LOG_INFO,
+ "Repository unbound from " + this.getRmiURL(), null);
+ } catch (Exception e) {
+ RmiRegistrationSupport.this.log(LogService.LOG_ERROR,
+ "Error while unbinding repository from JNDI: " + e,
+ null);
+ }
+ }
+
+ // drop strong reference to remote repository
+ if (this.rmiRepository != null) {
+ try {
+ UnicastRemoteObject.unexportObject(this.rmiRepository, true);
+ } catch (NoSuchObjectException nsoe) {
+ // not expected, but don't really care either
+ RmiRegistrationSupport.this.log(LogService.LOG_INFO,
+ "Cannot unexport remote Repository reference", nsoe);
+ }
+ }
+ }
+ }
+}
diff --git a/src/main/java/org/apache/sling/jcr/registration/package-info.java b/src/main/java/org/apache/sling/jcr/registration/package-info.java
new file mode 100644
index 0000000..1a1f77f
--- /dev/null
+++ b/src/main/java/org/apache/sling/jcr/registration/package-info.java
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+/**
+ * The <code>org.apache.sling.jcr.registration</code> package exports
+ * the {@link org.apache.sling.jcr.registration.AbstractRegistrationSupport}
+ * class which may be extended by service exposing JCR Repository services
+ * in any one non-OSGi registry such as RMI or JNDI.
+ */
+@Version("1.0")
+@Export(optional = "provide:=true")
+package org.apache.sling.jcr.registration;
+
+import aQute.bnd.annotation.Export;
+import aQute.bnd.annotation.Version;
diff --git a/src/main/resources/OSGI-INF/metatype/metatype.properties b/src/main/resources/OSGI-INF/metatype/metatype.properties
new file mode 100644
index 0000000..cf44eab
--- /dev/null
+++ b/src/main/resources/OSGI-INF/metatype/metatype.properties
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+
+#
+# This file contains localization strings for configuration labels and
+# descriptions as used in the metatype.xml descriptor generated by the
+# the Sling SCR plugin
+
+#
+# JNDI Registration Support
+jndi.name = Apache Sling JCR Repository JNDI Registrar
+jndi.description = The JNDI Registrar listens for embedded repositories \
+ to be registered as services and registers them in the JNDI context under the \
+ name specified in the "name" service property.
+
+jndi.factory.name = Initial Context Factory
+jndi.factory.description = The fully qualified class name of the factory class \
+ that will create an initial context.
+
+jndi.providerurl.name = Provider URL
+jndi.providerurl.description = An URL string for the service provider (e.g. \
+ "ldap://somehost:389").
+
+#
+# RMI Registration Support
+rmi.name = Apache Sling JCR Repository RMI Registrar
+rmi.description = The RMI Registrar listens for embedded repositories \
+ to be registered as services and registers them in an RMI registry under the \
+ name specified in the "name" service property.
+
+rmi.port.name = Port Number
+rmi.port.description = Port number of the RMI registry to use. The RMI Registrar \
+ first tries to create a private RMI registry at this port. If this fails, an \
+ existing registry is tried to connect at this port on local host. If this \
+ number is negative, the RMI Registrar is disabled. If this number is higher \
+ than 65535, an error message is logged and the RMI Registrar is also \
+ disabled. If this number is zero, the system default RMI Registry port 1099 \
+ is used.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 04/33: SLING-2494 Require
configuration to prevent using unsuitable or even unusable default
configuration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 4c8613d8479c278f6326351ec6bc66df1636f875
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Fri May 25 10:05:59 2012 +0000
SLING-2494 Require configuration to prevent using unsuitable or even unusable default configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1342555 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/jcr/registration/impl/JndiRegistrationSupport.java | 5 ++++-
.../apache/sling/jcr/registration/impl/RmiRegistrationSupport.java | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
index 32c5fb4..081473a 100644
--- a/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/impl/JndiRegistrationSupport.java
@@ -29,6 +29,7 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Property;
import org.apache.sling.jcr.registration.AbstractRegistrationSupport;
import org.osgi.service.log.LogService;
@@ -49,7 +50,9 @@ import org.osgi.service.log.LogService;
metatype = true,
label = "%jndi.name",
description = "%jndi.description",
- name = "org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport")
+ name = "org.apache.sling.jcr.jackrabbit.server.JndiRegistrationSupport",
+ policy = ConfigurationPolicy.REQUIRE
+ )
@org.apache.felix.scr.annotations.Properties({
@Property(
name = "java.naming.factory.initial",
diff --git a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
index de0dad7..faf0583 100644
--- a/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/impl/RmiRegistrationSupport.java
@@ -28,6 +28,7 @@ import java.rmi.server.UnicastRemoteObject;
import javax.jcr.Repository;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Property;
import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory;
import org.apache.jackrabbit.rmi.server.ServerAdapterFactory;
@@ -47,7 +48,8 @@ import org.osgi.service.log.LogService;
metatype = true,
label = "%rmi.name",
description = "%rmi.description",
- name = "org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport")
+ name = "org.apache.sling.jcr.jackrabbit.server.RmiRegistrationSupport",
+ policy = ConfigurationPolicy.REQUIRE)
@org.apache.felix.scr.annotations.Properties({
@Property(name = "service.vendor", value = "The Apache Software Foundation", propertyPrivate = true),
@Property(name = "service.description", value = "RMI based Repository Registration", propertyPrivate = true)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 08/33: Use latest
releases and update to new parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit a0084c69781ef1ad9ee90147767de3bf41fad12a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun Dec 23 06:53:35 2012 +0000
Use latest releases and update to new parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1425425 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 82b74e8..af6af0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13</version>
+ <version>14</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-jcr-registration] 19/33: Update to parent
pom v19
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 3f8e4e0061d8d7c654a131b981642ad6fa4c7c97
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Mar 31 14:39:20 2014 +0000
Update to parent pom v19
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1583337 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9ae074d..15d9953 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>18</version>
+ <version>19</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-jcr-registration] 26/33: SLING-4698 - Set
parent.relativePath to empty for all modules
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit bb030ba78e09b48c6f8f7e3f4342e3f5f1dd800a
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu May 7 10:14:40 2015 +0000
SLING-4698 - Set parent.relativePath to empty for all modules
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1678154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d46d4d6..6b4cf35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath/>
</parent>
<artifactId>org.apache.sling.jcr.registration</artifactId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 09/33: Update to latest
parent pom and use latest releases in launchpad
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit b6fc28407eec2a7519d0ed9c3b1006f43f7cce8a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Feb 18 08:38:52 2013 +0000
Update to latest parent pom and use latest releases in launchpad
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1447147 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index af6af0e..11a5bae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14</version>
+ <version>15</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-jcr-registration] 32/33: SLING-7167 Adjust
READMEs
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 6e47fe48209c6dc8ba3ef6a6829cb74695c5b1d9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Oct 2 16:15:44 2017 +0000
SLING-7167 Adjust READMEs
switch from plain text to Markdown
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1810489 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt => README.md | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/README.txt b/README.md
similarity index 100%
rename from README.txt
rename to README.md
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 03/33: SLING-2480 : Add
config for maven-sling-plugin to m2e configuration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 2e1f5e9ff972676bec97ce5d82d18bdd2b910c42
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed May 16 07:39:13 2012 +0000
SLING-2480 : Add config for maven-sling-plugin to m2e configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1339038 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index ec5967b..01293c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</version>
+ <version>13-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-jcr-registration] 01/33: SLING-2352
Skeleton of new project
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 850ce7d40e9e5ad39972a8389d78aa4de4e8ff1f
Author: Felix Meschberger <fm...@apache.org>
AuthorDate: Wed May 2 12:22:48 2012 +0000
SLING-2352 Skeleton of new project
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1333012 13f79535-47bb-0310-9956-ffa450edef68
---
README.txt | 28 ++++++++++++++++
pom.xml | 106 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..8c77ce6
--- /dev/null
+++ b/README.txt
@@ -0,0 +1,28 @@
+Apache Sling JCR Repository Registration
+
+Bundle providing support to publish JCR repository services via RMI
+and/or JNDI
+
+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/sling/trunk/jcr/registration
+
+See the Subversion documentation for other source control features.
+
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..a7146fa
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,106 @@
+<?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>12</version>
+ <relativePath>../../../parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.apache.sling.jcr.registration</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.0.1-SNAPSHOT</version>
+
+ <name>Apache Sling JCR Repository Registration</name>
+ <description>
+ Bundle providing support to publish JCR repository services via RMI and/or JNDI
+ </description>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <!-- generate the SCR descriptors -->
+ <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-Category>
+ sling,jcr
+ </Bundle-Category>
+ <Private-Package>
+ org.apache.sling.jcr.registrar.impl.*
+ </Private-Package>
+ <Export-Package>
+ org.apache.sling.jcr.registrar
+ </Export-Package>
+ <DynamicImport-Package>
+ *
+ </DynamicImport-Package>
+ <Embed-Dependency>
+ jackrabbit-core;inline:=org/apache/jackrabbit/core/jndi/provider/*.class
+ </Embed-Dependency>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <!-- OSGi Libraries -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
+ <!-- Dummy JNDI Initial Context -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>2.2.9</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 13/33: Revert to old
maven bundle plugin if DynamicImport-Package is used
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 4a1de1fc6fa2d7cf5f0002ca528e66cbfb52b76a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 15:22:28 2013 +0000
Revert to old maven bundle plugin if DynamicImport-Package is used
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520595 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index de78ff9..2bdc3e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 10/33: Correct reactor
pom and update to parent pom 16
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 49e8cbcab01f09d72b1da213aeed260bec974a41
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Sun May 5 14:38:24 2013 +0000
Correct reactor pom and update to parent pom 16
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1479333 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 11a5bae..f85e858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>15</version>
+ <version>16</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-jcr-registration] 25/33: Update to Sling
Parent POM 22 with baselining enabled
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit a8576ca2f7b592b39de42034fde9b51e51a37404
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Oct 1 06:57:44 2014 +0000
Update to Sling Parent POM 22 with baselining enabled
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1628622 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 2b9581a..d46d4d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>20</version>
+ <version>22</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-jcr-registration] 27/33: Update to Sling
Parent 23
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 005ad4409696700a03e8f3787dbdd3237eb2b6bc
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Thu Jun 25 13:08:16 2015 +0000
Update to Sling Parent 23
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1687500 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 6b4cf35..176e95e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>22</version>
+ <version>23</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 15/33: SLING-3286 -
Remove plugin version overrides from poms
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit d22edab89912ba4a40d7f516a81edd3f58b1bfaa
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Sun Dec 15 21:28:32 2013 +0000
SLING-3286 - Remove plugin version overrides from poms
Remove most plugin version overrides. Still left in:
- a couple of projects where upgrading to the maven-bundle-plugins
leads to errors (TODOs added)
- a couple of projects where the plugin version is newer than the
one from the parent project ( comments added )
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1551060 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index fffc8d0..3222284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
<extensions>true</extensions>
<configuration>
<instructions>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 23/33:
[maven-release-plugin] prepare release
org.apache.sling.jcr.registration-1.0.2
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 39278b9da801b74ab50e1f26b370683020bd5b10
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Sep 16 14:21:54 2014 +0000
[maven-release-plugin] prepare release org.apache.sling.jcr.registration-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1625306 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ff1824d..d008c19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>org.apache.sling.jcr.registration</artifactId>
<packaging>bundle</packaging>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<name>Apache Sling JCR Repository Registration</name>
<description>
@@ -36,9 +36,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/registration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/registration</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.jcr.registration-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.jcr.registration-1.0.2</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-jcr-registration] 28/33: set parent version
to 24 and add empty relativePath where missing
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 32fd9c73cc3820aa233b9e06698904b05e436332
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Tue Jul 7 08:09:17 2015 +0000
set parent version to 24 and add empty relativePath where missing
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1689593 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 176e95e..d575d68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>23</version>
+ <version>24</version>
<relativePath/>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-jcr-registration] 12/33: Update to parent
pom 18
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit c356bfa1648fdc30dd7bdd8854d1287674e0da9a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Sep 6 12:15:57 2013 +0000
Update to parent pom 18
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1520554 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7c6dd7e..de78ff9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>17</version>
+ <version>18</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-jcr-registration] 20/33: 3800 : Fields for
dynamic references must be volatile
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-registration.git
commit 2f98a6e35f0fc48d11849a37d6902b8b1da3c627
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jul 28 06:54:37 2014 +0000
3800 : Fields for dynamic references must be volatile
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1613891 13f79535-47bb-0310-9956-ffa450edef68
---
.../org/apache/sling/jcr/registration/AbstractRegistrationSupport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
index 202002b..95803b2 100644
--- a/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
+++ b/src/main/java/org/apache/sling/jcr/registration/AbstractRegistrationSupport.java
@@ -69,7 +69,7 @@ public abstract class AbstractRegistrationSupport {
* logging correctly.
*/
@Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY, policy = ReferencePolicy.DYNAMIC)
- private LogService log;
+ private volatile LogService log;
/**
* The OSGi ComponentContext.
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.