You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:42:36 UTC
[sling-org-apache-sling-installer-factory-configuration] annotated
tag org.apache.sling.installer.factory.configuration-1.0.10 created (now
929931e)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git.
at 929931e (tag)
tagging d4606f0133f4a69e416017ceb2a5ec54be60367d (commit)
by Carsten Ziegeler
on Wed Feb 13 13:54:05 2013 +0000
- Log -----------------------------------------------------------------
org.apache.sling.installer.factory.configuration-1.0.10
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new fc46c46 SLING-1999 : Split Installer Core and Configuration Support
new 51fb4b7 SLING-1999 : Split Installer Core and Configuration Support
new 02525eb SLING-2004 : Don't add org.apache.sling.installer.osgi.path property to configurations
new 18c23bc SLING-2005 : Don't add alias as a property to factory configurations
new 39d3129 SLING-1971 : Persist configuration (and bundle) changes not made through the installer
new 93642dd SLING-2014 : Provide a possibility to not persist configuration changes
new 23bc6be SLING-2014 : Provide a possibility to not persist configuration changes
new df1190c SLING-2031 : Use bundle location to create path for persisting new configurations
new cc753d8 Prepare release
new 54f089c [maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.0
new 524e5af [maven-release-plugin] prepare for next development iteration
new 1df84f2 Use latest snapshot during release
new fd87bcc svn:ignore
new 1861468 Use released versions.
new 8632a71 SLING-2150 : Update plugins to use the latest available versions
new 07a6bfd SLING-2163 : Persisting a new configuration is missing PID and factory PID
new 6f06963 Update to recent snapshot
new c4d51fb Using latest released parent pom
new 87eefa9 [maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.2
new 51d351d [maven-release-plugin] prepare for next development iteration
new 673c0d3 SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
new f856909 temporarily using snapshots during release vote
new c9a8bfc using latest releases
new 537f026 SLING-2252 : If a config is removed and a different config is to be installed perform an update
new 4186ea6 SLING-2342 : Support old factory configurations
new ccfad3a Use new change task instead of own copy
new 31ab899 Prepare release
new a4c8bc5 Prepare release
new e1310c7 [maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.4
new 9710bf4 [maven-release-plugin] prepare for next development iteration
new 9e18ab7 Use latest snapshot
new 9e61c0d Use released versions
new 391053f SLING-2451 : NPE while trying to persist new configuration
new 6a4fc7e SLING-2450 : JcrInstaller generates incorrect node name in /apps/system/config (or else the installer doesn't process the nodename properly)
new 810da2c [maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.6
new 0a8f64b [maven-release-plugin] prepare for next development iteration
new 5b5ddd5 SLING-2450 : JcrInstaller generates incorrect node name in /apps/system/config (or else the installer doesn't process the nodename properly)
new 2efd399 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new f9baad2 Prepare for release
new 6a56a1f [maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.8
new fc9ebc0 [maven-release-plugin] prepare for next development iteration
new b4a83d7 Use latest parent pom
new 37b0bad Update to latest parent pom
new bf04de1 Use released versions
new e94e4d8 Merge branch 'SLING-2527'
new 380293d FELIX-2578 : Filter value should be escaped
new fe306ed Update to released versions or latest snapshot
new cd1c482 Use latest releases and update to new parent pom
new 811a9bc [maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.10
new d4606f0 [maven-release-plugin] copy for tag org.apache.sling.installer.factory.configuration-1.0.10
The 50 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-installer-factory-configuration] 28/40:
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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 2efd39928a8ffa7e8261346df8bbc9294988db3c
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/installer/factories/configuration@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 011b96a..9b0170c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-configuration] 31/40:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit fc9ebc0e88528a847ab34bdbe870d998dc8d98f3
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 17 12:25:05 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1339569 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 59f2cdf..f5cf9d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.8</version>
+ <version>1.0.9-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.8</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.8</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.8</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</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-installer-factory-configuration] 13/40:
using latest releases
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit c9a8bfc6f2b0506ded30afcc52ca985c8f08c384
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Sep 7 14:35:51 2011 +0000
using latest releases
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1166199 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d326732..62a3ed3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>12</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-installer-factory-configuration] 14/40:
SLING-2252 : If a config is removed and a different config is to be
installed perform an update
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 537f026d2e5c204b2f40c68ee7d8ac4a057f1d6b
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Oct 20 09:35:14 2011 +0000
SLING-2252 : If a config is removed and a different config is to be installed perform an update
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1186689 13f79535-47bb-0310-9956-ffa450edef68
---
.../configuration/impl/ChangeStateTask.java | 51 ++++++++++++++++++++++
.../configuration/impl/ConfigTaskCreator.java | 10 ++++-
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ChangeStateTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ChangeStateTask.java
new file mode 100644
index 0000000..d7ba948
--- /dev/null
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ChangeStateTask.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.installer.factories.configuration.impl;
+
+import org.apache.sling.installer.api.tasks.InstallationContext;
+import org.apache.sling.installer.api.tasks.ResourceState;
+import org.apache.sling.installer.api.tasks.TaskResourceGroup;
+
+/**
+ * Simple general task, setting the state of a registered resource.
+ */
+public class ChangeStateTask extends AbstractConfigTask {
+
+ private static final String ORDER = "00-";
+
+ private final ResourceState state;
+
+ public ChangeStateTask(final TaskResourceGroup r,
+ final ResourceState s) {
+ super(r, null);
+ this.state = s;
+ }
+
+ /**
+ * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext)
+ */
+ public void execute(final InstallationContext ctx) {
+ this.setFinishedState(this.state);
+ }
+
+ @Override
+ public String getSortKey() {
+ return ORDER + getResource().getEntityId();
+ }
+}
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index 8554f80..b8f8ea7 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -69,7 +69,15 @@ public class ConfigTaskCreator
final InstallTask result;
if (toActivate.getState() == ResourceState.UNINSTALL) {
- result = new ConfigRemoveTask(group, this.configAdmin);
+ // if this is an uninstall, check if we have to install an older version
+ // in this case we should do an update instead of uninstall/install (!)
+ final TaskResource second = group.getNextActiveResource();
+ if ( second != null &&
+ ( second.getState() == ResourceState.IGNORED || second.getState() == ResourceState.INSTALLED || second.getState() == ResourceState.INSTALL ) ) {
+ result = new ChangeStateTask(group, ResourceState.UNINSTALLED);
+ } else {
+ result = new ConfigRemoveTask(group, this.configAdmin);
+ }
} else {
result = new ConfigInstallTask(group, this.configAdmin);
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 18/40:
Prepare release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit a4c8bc5a58fcfee4b2c7859342e4980ef3a290fe
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 15:15:04 2012 +0000
Prepare release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1226807 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d113576..a56506b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.4</version>
+ <version>3.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 27/40:
SLING-2450 : JcrInstaller generates incorrect node name in
/apps/system/config (or else the installer doesn't process the nodename
properly)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 5b5ddd5c2ed049ba3716fa67c78c4e4ecbf17cf0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 14 16:17:59 2012 +0000
SLING-2450 : JcrInstaller generates incorrect node name in /apps/system/config (or else the installer doesn't process the nodename properly)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1338272 13f79535-47bb-0310-9956-ffa450edef68
---
.../configuration/impl/AbstractConfigTask.java | 7 ++++++-
.../factories/configuration/impl/ConfigTaskCreator.java | 17 ++++++++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
index 84cdfa9..c1d82e5 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
@@ -80,7 +80,12 @@ abstract class AbstractConfigTask extends InstallTask {
if ( this.aliasPid == null || this.factoryPid == null ) {
return null;
}
- return factoryPid + "." + this.aliasPid;
+ final String alias = factoryPid + "." + this.aliasPid;
+ final int pos = this.getResource().getEntityId().indexOf(':');
+ if ( this.getResource().getEntityId().substring(pos + 1).equals(alias) ) {
+ return null;
+ }
+ return alias;
}
protected Dictionary<String, Object> getDictionary() {
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index 3ee9fde..b14dbd3 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -181,7 +181,22 @@ public class ConfigTaskCreator
final String configPid;
int n = pid.indexOf('-');
if (n > 0) {
- configPid = pid.substring(n + 1);
+ // quick check if this is an existing configuration
+ final String fString = pid.substring(0, n);
+ final String cString = pid.substring(n + 1);
+ boolean useExtendedPid = false;
+ try {
+ if ( ConfigUtil.getConfiguration(this.configAdmin, fString, fString + '.' + cString, false) != null ) {
+ useExtendedPid = true;
+ }
+ } catch ( final Exception ignore) {
+ // ignore this
+ }
+ if ( useExtendedPid ) {
+ configPid = fString + '.' + cString;
+ } else {
+ configPid = pid.substring(n + 1);
+ }
factoryPid = pid.substring(0, n);
} else {
factoryPid = null;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 26/40:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 0a8f64bd6cb8d99ec066ecebde791a66bd262438
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 14 08:58:16 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1338082 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index faf8547..011b96a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.6</version>
+ <version>1.0.7-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.6</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.6</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.6</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</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-installer-factory-configuration] 25/40:
[maven-release-plugin] prepare release
org.apache.sling.installer.factory.configuration-1.0.6
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 810da2c20b16803c994504e25cd1fc72e37cd491
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon May 14 08:58:01 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.6
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1338080 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 288c55d..faf8547 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.5-SNAPSHOT</version>
+ <version>1.0.6</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.6</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.6</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.6</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-installer-factory-configuration] 40/40:
[maven-release-plugin] copy for tag
org.apache.sling.installer.factory.configuration-1.0.10
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit d4606f0133f4a69e416017ceb2a5ec54be60367d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Feb 13 13:54:05 2013 +0000
[maven-release-plugin] copy for tag org.apache.sling.installer.factory.configuration-1.0.10
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.10@1445604 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 19/40:
[maven-release-plugin] prepare release
org.apache.sling.installer.factory.configuration-1.0.4
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit e1310c7d0db72244f1cad1afc2da2e08a7dcfd39
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 15:22:21 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.4
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1226815 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a56506b..6e4be6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.4</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.4</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.4</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-installer-factory-configuration] 07/40:
Update to recent snapshot
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 6f0696324800be77bf2d9cb2db1179e8caad40e9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 3 09:01:37 2011 +0000
Update to recent snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1153397 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 200bc4a..38099ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11-SNAPSHOT</version>
+ <version>12-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-installer-factory-configuration] 20/40:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 9710bf44e3e6bc3144c123b751fa7ff55879c055
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 15:22:51 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1226817 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e4be6d..288c55d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.4</version>
+ <version>1.0.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.4</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.4</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.4</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</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-installer-factory-configuration] 22/40: 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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 9e61c0dea13dd179f381a759fba6e07f62d0a95a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jan 12 07:28:01 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1230423 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 04a7c57..288c55d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 33/40:
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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 37b0bad46c0b639d4fc0aaff97e1358ff99df1d5
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/installer/factories/configuration@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 e2f78b3..a9d32a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-configuration] 29/40:
Prepare for release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit f9baad29afc002333e102bbac9ad515a9b86eeed
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 17 12:24:23 2012 +0000
Prepare for release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1339566 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9b0170c..011b96a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>12</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-installer-factory-configuration] 04/40: 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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 1861468090232d905ce4b3f5dc7e047e6f447aa5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 14 14:20:41 2011 +0000
Use released versions.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1146727 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 5921fb3..a1af47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.1-SNAPSHOT</version>
+ <version>3.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 01/40:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 524e5afa0f0e970dff6936fa873e1e9f223da925
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 7 06:20:17 2011 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1143663 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9c14a44..a1af47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.0</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.0</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.0</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</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-installer-factory-configuration] 15/40:
SLING-2342 : Support old factory configurations
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 4186ea683f703c0de9a168fafdb6214c23de2814
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Dec 22 10:52:58 2011 +0000
SLING-2342 : Support old factory configurations
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1222174 13f79535-47bb-0310-9956-ffa450edef68
---
.../factories/configuration/impl/AbstractConfigTask.java | 2 +-
.../installer/factories/configuration/impl/ConfigUtil.java | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
index 5b98118..84cdfa9 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/AbstractConfigTask.java
@@ -90,6 +90,6 @@ abstract class AbstractConfigTask extends InstallTask {
protected Configuration getConfiguration(final ConfigurationAdmin ca,
final boolean createIfNeeded)
throws IOException, InvalidSyntaxException {
- return ConfigUtil.getConfiguration(ca, this.factoryPid, (this.factoryPid != null ? this.aliasPid : this.configPid), createIfNeeded);
+ return ConfigUtil.getConfiguration(ca, this.factoryPid, (this.factoryPid != null && this.aliasPid != null ? this.aliasPid : this.configPid), createIfNeeded);
}
}
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
index 582e6ca..552345c 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
@@ -147,8 +147,18 @@ abstract class ConfigUtil {
+ "))");
}
if (configs == null || configs.length == 0) {
- if (createIfNeeded) {
- result = ca.createFactoryConfiguration(factoryPid, null);
+ // check for old style with alias pid
+ configs = ca.listConfigurations(
+ "(&(" + ConfigurationAdmin.SERVICE_FACTORYPID
+ + "=" + factoryPid + ")(" + ALIAS_KEY + "=" + configPid
+ + "))");
+
+ if (configs == null || configs.length == 0) {
+ if (createIfNeeded) {
+ result = ca.createFactoryConfiguration(factoryPid, null);
+ }
+ } else {
+ result = configs[0];
}
} else {
result = configs[0];
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 39/40:
[maven-release-plugin] prepare release
org.apache.sling.installer.factory.configuration-1.0.10
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 811a9bc7b36f703129de03e95b071e94ecae7ceb
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Feb 13 13:53:53 2013 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.10
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1445603 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index e1d2bfc..2496d82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.9-SNAPSHOT</version>
+ <version>1.0.10</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.10</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.10</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.10</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-installer-factory-configuration] 10/40:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 51d351da97aeebaa44bc43ec3208e2c2b210a69a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 10 12:45:20 2011 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1156154 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0b60702..4d1ee5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.2</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.2</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.2</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</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-installer-factory-configuration] 23/40:
SLING-2451 : NPE while trying to persist new configuration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 391053f5070e3374b94952d80e2c98eeb392798e
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Mar 28 23:43:58 2012 +0000
SLING-2451 : NPE while trying to persist new configuration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1306644 13f79535-47bb-0310-9956-ffa450edef68
---
.../installer/factories/configuration/impl/ConfigTaskCreator.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index 8f4f3bc..4072e83 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -112,9 +112,8 @@ public class ConfigTaskCreator
}
}
if ( persist ) {
- Map<String, Object> attrs = null;
+ final Map<String, Object> attrs = new HashMap<String, Object>();
if ( config.getBundleLocation() != null ) {
- attrs = new HashMap<String, Object>();
attrs.put(InstallableResource.INSTALLATION_HINT, config.getBundleLocation());
}
attrs.put(Constants.SERVICE_PID, event.getPid());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 09/40:
[maven-release-plugin] prepare release
org.apache.sling.installer.factory.configuration-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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 87eefa953930ce5bfe67edd76b925a6b772b486d
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Aug 10 12:44:53 2011 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.2
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1156152 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index be4e0bb..0b60702 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.2</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.2</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-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-installer-factory-configuration] 32/40: Use
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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit b4a83d7a04fd8b73061255761c78c5a73da3d68a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 17 12:28:05 2012 +0000
Use latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1339571 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f5cf9d1..e2f78b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-configuration] 21/40: Use
latest snapshot
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 9e18ab7bee9042494d326635f0398137a1fe89da
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 15:37:12 2012 +0000
Use latest snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1226829 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 288c55d..04a7c57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.0</version>
+ <version>3.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 35/40:
Merge branch 'SLING-2527'
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit e94e4d86cec88c75643db734d6e10deea5332f36
Author: Ian Boston <ie...@apache.org>
AuthorDate: Thu Sep 27 10:07:25 2012 +0000
Merge branch 'SLING-2527'
* SLING-2527:
Adjusted API Bundle version number to 1.0-SNAPSHOT after feedback.
SLING-2527 Splits API from core in installer set of bundles.
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1390919 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 79f08fe..b14e846 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,8 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.3.0</version>
+ <artifactId>org.apache.sling.installer.api</artifactId>
+ <version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 17/40:
Prepare release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 31ab8992a854be549a8d4214062c2d98beed2b98
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jan 3 15:13:42 2012 +0000
Prepare release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1226806 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 05d88f1..d113576 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.3-SNAPSHOT</version>
+ <version>3.2.4</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 38/40: 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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit cd1c4823bc0c337d51fda3db0aadf15233067f58
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/installer/factories/configuration@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 b7a7310..e1d2bfc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-configuration] 34/40: 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 annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit bf04de16fe563689c883fc1b425aaaf98f602c60
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/installer/factories/configuration@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 a9d32a0..79f08fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,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-installer-factory-configuration] 24/40:
SLING-2450 : JcrInstaller generates incorrect node name in
/apps/system/config (or else the installer doesn't process the nodename
properly)
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 6a4fc7e8bd19025aba085479612053b1e0c810b4
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Mar 30 00:08:56 2012 +0000
SLING-2450 : JcrInstaller generates incorrect node name in /apps/system/config (or else the installer doesn't process the nodename properly)
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1307172 13f79535-47bb-0310-9956-ffa450edef68
---
.../configuration/impl/ConfigTaskCreator.java | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index 4072e83..3ee9fde 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -91,7 +91,16 @@ public class ConfigTaskCreator
@SuppressWarnings("unchecked")
public void configurationEvent(final ConfigurationEvent event) {
synchronized ( ConfigTaskCreator.getLock() ) {
- final String id = (event.getFactoryPid() == null ? "" : event.getFactoryPid() + ".") + event.getPid();
+ final String id;
+ final String pid;
+ if (event.getFactoryPid() == null ) {
+ id = event.getPid();
+ pid = id;
+ } else {
+ pid = (event.getPid().startsWith(event.getFactoryPid() + '.') ?
+ event.getPid().substring(event.getFactoryPid().length() + 1) : event.getPid());
+ id = event.getFactoryPid() + '.' + event.getPid();
+ }
if ( event.getType() == ConfigurationEvent.CM_DELETED ) {
this.changeListener.resourceRemoved(InstallableResource.TYPE_CONFIG, id);
} else {
@@ -113,10 +122,15 @@ public class ConfigTaskCreator
}
if ( persist ) {
final Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put(Constants.SERVICE_PID, event.getPid());
+ if ( event.getFactoryPid() == null ) {
+ attrs.put(InstallableResource.RESOURCE_URI_HINT, pid);
+ } else {
+ attrs.put(InstallableResource.RESOURCE_URI_HINT, event.getFactoryPid() + '-' + pid);
+ }
if ( config.getBundleLocation() != null ) {
attrs.put(InstallableResource.INSTALLATION_HINT, config.getBundleLocation());
}
- attrs.put(Constants.SERVICE_PID, event.getPid());
// Factory?
if (event.getFactoryPid() != null) {
attrs.put(ConfigurationAdmin.SERVICE_FACTORYPID, event.getFactoryPid());
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 06/40:
SLING-2163 : Persisting a new configuration is missing PID and factory PID
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 07a6bfd110c4a56f2367207b32a4dbaddddaa9fa
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Jul 29 11:26:28 2011 +0000
SLING-2163 : Persisting a new configuration is missing PID and factory PID
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1152171 13f79535-47bb-0310-9956-ffa450edef68
---
.../installer/factories/configuration/impl/ConfigRemoveTask.java | 7 +++----
.../installer/factories/configuration/impl/ConfigTaskCreator.java | 5 +++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
index 0acb4b9..a7eb86c 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigRemoveTask.java
@@ -51,21 +51,20 @@ public class ConfigRemoveTask extends AbstractConfigTask {
final Configuration cfg = getConfiguration(ca, false);
if (cfg == null) {
this.getLogger().debug("Cannot delete config , pid={} not found, ignored ({})", getCompositePid(), getResource());
- this.setFinishedState(ResourceState.IGNORED);
} else {
if ( !ConfigUtil.isSameData(cfg.getProperties(), this.getResource().getDictionary()) ) {
- this.getLogger().debug("Configuration has changed after it has been installed. Not removing!");
- this.setFinishedState(ResourceState.IGNORED);
+ this.getLogger().debug("Configuration has changed after it has been installed!");
} else {
this.getLogger().debug("Deleting config {} ({})", getCompositePid(), getResource());
cfg.delete();
ctx.log("Deleted configuration {} from resource {}", getCompositePid(), getResource());
- this.setFinishedState(ResourceState.UNINSTALLED);
}
}
} catch (Exception e) {
this.getLogger().debug("Exception during removal of config " + this.getResource() + " : " + e.getMessage() + ". Retrying later.", e);
}
+ // we always set to uninstalled as the resource really has been deleted
+ this.setFinishedState(ResourceState.UNINSTALLED);
}
}
}
\ No newline at end of file
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index 3857e27..8554f80 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -108,6 +108,11 @@ public class ConfigTaskCreator
attrs = new HashMap<String, Object>();
attrs.put(InstallableResource.INSTALLATION_HINT, config.getBundleLocation());
}
+ attrs.put(Constants.SERVICE_PID, event.getPid());
+ // Factory?
+ if (event.getFactoryPid() != null) {
+ attrs.put(ConfigurationAdmin.SERVICE_FACTORYPID, event.getFactoryPid());
+ }
this.changeListener.resourceAddedOrUpdated(InstallableResource.TYPE_CONFIG, id, null, dict, attrs);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 16/40: Use
new change task instead of own copy
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit ccfad3a3e035734f8d7aa8ee43b602eea7c843d8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Dec 23 11:36:05 2011 +0000
Use new change task instead of own copy
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1222647 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../configuration/impl/ChangeStateTask.java | 51 ----------------------
.../configuration/impl/ConfigTaskCreator.java | 1 +
3 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index 62a3ed3..05d88f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.0</version>
+ <version>3.2.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ChangeStateTask.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ChangeStateTask.java
deleted file mode 100644
index d7ba948..0000000
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ChangeStateTask.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.installer.factories.configuration.impl;
-
-import org.apache.sling.installer.api.tasks.InstallationContext;
-import org.apache.sling.installer.api.tasks.ResourceState;
-import org.apache.sling.installer.api.tasks.TaskResourceGroup;
-
-/**
- * Simple general task, setting the state of a registered resource.
- */
-public class ChangeStateTask extends AbstractConfigTask {
-
- private static final String ORDER = "00-";
-
- private final ResourceState state;
-
- public ChangeStateTask(final TaskResourceGroup r,
- final ResourceState s) {
- super(r, null);
- this.state = s;
- }
-
- /**
- * @see org.apache.sling.installer.api.tasks.InstallTask#execute(org.apache.sling.installer.api.tasks.InstallationContext)
- */
- public void execute(final InstallationContext ctx) {
- this.setFinishedState(this.state);
- }
-
- @Override
- public String getSortKey() {
- return ORDER + getResource().getEntityId();
- }
-}
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
index b8f8ea7..8f4f3bc 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigTaskCreator.java
@@ -24,6 +24,7 @@ import java.util.Map;
import org.apache.sling.installer.api.InstallableResource;
import org.apache.sling.installer.api.ResourceChangeListener;
+import org.apache.sling.installer.api.tasks.ChangeStateTask;
import org.apache.sling.installer.api.tasks.InstallTask;
import org.apache.sling.installer.api.tasks.InstallTaskFactory;
import org.apache.sling.installer.api.tasks.RegisteredResource;
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 12/40:
temporarily using snapshots during release vote
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit f856909330e01fb79a0e2ef3247c9f8e3d81af8f
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 20:10:55 2011 +0000
temporarily using snapshots during release vote
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1163785 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index eca2370..d326732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</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-installer-factory-configuration] 37/40:
Update to released versions or latest snapshot
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit fe306edd27068a62b154891d5511132bc97698e1
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Nov 16 08:09:45 2012 +0000
Update to released versions or latest snapshot
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1410240 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b14e846..b7a7310 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 30/40:
[maven-release-plugin] prepare release
org.apache.sling.installer.factory.configuration-1.0.8
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 6a56a1f80f7facc6096eb6760df71626837c50b9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu May 17 12:24:47 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.installer.factory.configuration-1.0.8
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1339567 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 011b96a..59f2cdf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
</parent>
<artifactId>org.apache.sling.installer.factory.configuration</artifactId>
- <version>1.0.7-SNAPSHOT</version>
+ <version>1.0.8</version>
<packaging>bundle</packaging>
<name>Apache Sling Installer Configuration Admin Support</name>
@@ -35,9 +35,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</connection>
- <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/installer/factories/configuration/</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.8</connection>
+ <developerConnection> scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.installer.factory.configuration-1.0.8</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.installer.factory.configuration-1.0.8</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-installer-factory-configuration] 11/40:
SLING-2187 - adding new module to contain our custom notice file;
adding remote-resources plugin configuration to parent pom and removing all
existing appended-resources NOTICE files
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 673c0d39e8da97c3596878ad72c757b654441455
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Wed Aug 31 19:23:49 2011 +0000
SLING-2187 - adding new module to contain our custom notice file; adding remote-resources plugin configuration to parent pom and removing all existing appended-resources NOTICE files
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1163752 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4d1ee5e..eca2370 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>11</version>
+ <version>12-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-installer-factory-configuration] 03/40:
svn:ignore
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit fd87bcceb90559c08af16b423af0436e48b54d32
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Jul 7 14:12:26 2011 +0000
svn:ignore
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1143834 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 36/40:
FELIX-2578 : Filter value should be escaped
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 380293d97c0aebd20d84376d67e23435399f6a88
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Fri Oct 5 12:03:02 2012 +0000
FELIX-2578 : Filter value should be escaped
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1394467 13f79535-47bb-0310-9956-ffa450edef68
---
.../factories/configuration/impl/ConfigUtil.java | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
index 552345c..43e4826 100644
--- a/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
+++ b/src/main/java/org/apache/sling/installer/factories/configuration/impl/ConfigUtil.java
@@ -120,18 +120,28 @@ abstract class ConfigUtil {
return cleanedConfig;
}
+ /**
+ * Encode the value for the ldap filter: \, *, (, and ) should be escaped.
+ */
+ private static String encode(final String value) {
+ return value.replace("\\", "\\\\")
+ .replace("*", "\\*")
+ .replace("(", "\\(")
+ .replace(")", "\\)");
+ }
+
public static Configuration getConfiguration(final ConfigurationAdmin ca,
final String factoryPid,
final String configPid,
final boolean createIfNeeded)
- throws IOException, InvalidSyntaxException {
+ throws IOException, InvalidSyntaxException {
Configuration result = null;
if (factoryPid == null) {
if (createIfNeeded) {
result = ca.getConfiguration(configPid, null);
} else {
- String filter = "(" + Constants.SERVICE_PID + "=" + configPid
+ String filter = "(" + Constants.SERVICE_PID + "=" + encode(configPid)
+ ")";
Configuration[] configs = ca.listConfigurations(filter);
if (configs != null && configs.length > 0) {
@@ -142,15 +152,15 @@ abstract class ConfigUtil {
Configuration configs[] = null;
if ( configPid != null ) {
configs = ca.listConfigurations("(&("
- + ConfigurationAdmin.SERVICE_FACTORYPID + "=" + factoryPid
- + ")(" + Constants.SERVICE_PID + "=" + configPid
+ + ConfigurationAdmin.SERVICE_FACTORYPID + "=" + encode(factoryPid)
+ + ")(" + Constants.SERVICE_PID + "=" + encode(configPid)
+ "))");
}
if (configs == null || configs.length == 0) {
// check for old style with alias pid
configs = ca.listConfigurations(
"(&(" + ConfigurationAdmin.SERVICE_FACTORYPID
- + "=" + factoryPid + ")(" + ALIAS_KEY + "=" + configPid
+ + "=" + factoryPid + ")(" + ALIAS_KEY + "=" + encode(configPid)
+ "))");
if (configs == null || configs.length == 0) {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 05/40:
SLING-2150 : Update plugins to use the latest available versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 8632a71c4c4c8c60789f77aae36168efc3a219e0
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jul 20 12:21:40 2011 +0000
SLING-2150 : Update plugins to use the latest available versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1148722 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a1af47a..200bc4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>10</version>
+ <version>11-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-installer-factory-configuration] 02/40: Use
latest snapshot during release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit 1df84f29a1415fdb1e937c56ac625908743ea5a9
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 7 06:29:12 2011 +0000
Use latest snapshot during release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1143670 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a1af47a..5921fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.installer.core</artifactId>
- <version>3.2.0</version>
+ <version>3.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-installer-factory-configuration] 08/40:
Using latest released parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.installer.factory.configuration-1.0.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-configuration.git
commit c4d51fb46c021d7b36c6dca112339c8c4e74d5da
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Aug 8 11:31:38 2011 +0000
Using latest released parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration@1154924 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 38099ba..be4e0bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12-SNAPSHOT</version>
+ <version>11</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>.