You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/04/14 15:47:14 UTC
[1/3] karaf git commit: [KARAF-3802] Fix problem with the logic
Repository: karaf
Updated Branches:
refs/heads/master 8db31d312 -> 6657400bd
[KARAF-3802] Fix problem with the logic
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ac12c659
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ac12c659
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ac12c659
Branch: refs/heads/master
Commit: ac12c659274e8cb924a377a9af557867cec2a2ae
Parents: 8db31d3
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Apr 14 15:28:47 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Apr 14 15:28:58 2016 +0200
----------------------------------------------------------------------
.../features/internal/region/Subsystem.java | 24 ++++++++++++--------
1 file changed, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/ac12c659/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
index d8863e5..6a518d5 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/region/Subsystem.java
@@ -372,13 +372,22 @@ public class Subsystem extends ResourceImpl {
infos.put(bi, null);
}
}
+ boolean removeServiceRequirements;
+ if (FeaturesService.SERVICE_REQUIREMENTS_DISABLE.equals(serviceRequirements)) {
+ removeServiceRequirements = true;
+ } else if (feature != null && FeaturesService.SERVICE_REQUIREMENTS_DEFAULT.equals(serviceRequirements)) {
+ removeServiceRequirements = !FeaturesNamespaces.URI_1_3_0.equals(feature.getNamespace())
+ && !FeaturesNamespaces.URI_1_4_0.equals(feature.getNamespace());
+ } else {
+ removeServiceRequirements = false;
+ }
for (Map.Entry<BundleInfo, Conditional> entry : infos.entrySet()) {
final BundleInfo bi = entry.getKey();
final String loc = bi.getLocation();
downloader.download(loc, new DownloadCallback() {
@Override
public void downloaded(StreamProvider provider) throws Exception {
- ResourceImpl res = createResource(loc, getMetadata(provider), serviceRequirements);
+ ResourceImpl res = createResource(loc, getMetadata(provider), removeServiceRequirements);
bundles.put(loc, res);
}
});
@@ -388,7 +397,7 @@ public class Subsystem extends ResourceImpl {
downloader.download(loc, new DownloadCallback() {
@Override
public void downloaded(StreamProvider provider) throws Exception {
- ResourceImpl res = createResource(loc, getMetadata(provider), serviceRequirements);
+ ResourceImpl res = createResource(loc, getMetadata(provider), removeServiceRequirements);
bundles.put(loc, res);
}
});
@@ -398,7 +407,7 @@ public class Subsystem extends ResourceImpl {
downloader.download(loc, new DownloadCallback() {
@Override
public void downloaded(StreamProvider provider) throws Exception {
- ResourceImpl res = createResource(loc, getMetadata(provider), serviceRequirements);
+ ResourceImpl res = createResource(loc, getMetadata(provider), removeServiceRequirements);
bundles.put(loc, res);
}
});
@@ -410,7 +419,7 @@ public class Subsystem extends ResourceImpl {
downloader.download(loc, new DownloadCallback() {
@Override
public void downloaded(StreamProvider provider) throws Exception {
- ResourceImpl res = createResource(loc, getMetadata(provider), serviceRequirements);
+ ResourceImpl res = createResource(loc, getMetadata(provider), removeServiceRequirements);
bundles.put(loc, res);
}
});
@@ -589,12 +598,7 @@ public class Subsystem extends ResourceImpl {
return policy;
}
- ResourceImpl createResource(String uri, Map<String, String> headers, String serviceRequirements) throws Exception {
- boolean removeServiceRequirements = false;
- if (feature != null && FeaturesService.SERVICE_REQUIREMENTS_DEFAULT.equals(serviceRequirements)
- && !FeaturesNamespaces.URI_1_3_0.equals(uri)) {
- removeServiceRequirements = true;
- }
+ ResourceImpl createResource(String uri, Map<String, String> headers, boolean removeServiceRequirements) throws Exception {
try {
return ResourceBuilder.build(uri, headers, removeServiceRequirements);
} catch (BundleException e) {
[3/3] karaf git commit: Fix indentation problem
Posted by gn...@apache.org.
Fix indentation problem
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6657400b
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6657400b
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6657400b
Branch: refs/heads/master
Commit: 6657400bd4f6f3ec0985f90f63835d11505e8610
Parents: dde032a
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Apr 14 15:30:01 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Apr 14 15:30:01 2016 +0200
----------------------------------------------------------------------
assemblies/features/enterprise/src/main/feature/feature.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6657400b/assemblies/features/enterprise/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/enterprise/src/main/feature/feature.xml b/assemblies/features/enterprise/src/main/feature/feature.xml
index b3a2da7..beef8a8 100644
--- a/assemblies/features/enterprise/src/main/feature/feature.xml
+++ b/assemblies/features/enterprise/src/main/feature/feature.xml
@@ -123,7 +123,7 @@
<feature version="[1.1,2)">transaction-api</feature>
<feature version="[2.0.0,2.2.0)">persistence-api</feature>
<bundle dependency="true">mvn:org.apache.felix/org.apache.felix.coordinator/${felix.coordinator.version}</bundle>
- <bundle dependency="true">mvn:org.osgi/org.osgi.service.jdbc/${org.osgi.service.jdbc.version}</bundle>
+ <bundle dependency="true">mvn:org.osgi/org.osgi.service.jdbc/${org.osgi.service.jdbc.version}</bundle>
<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/${aries.jpa.version}</bundle>
<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/${aries.jpa.version}</bundle>
<bundle>mvn:org.apache.aries.jpa/org.apache.aries.jpa.support/${aries.jpa.version}</bundle>
[2/3] karaf git commit: [KARAF-4486] LDAPOptions sets
Context.SECURITY_AUTHENTICATION only if username is provided
Posted by gn...@apache.org.
[KARAF-4486] LDAPOptions sets Context.SECURITY_AUTHENTICATION only if username is provided
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dde032a9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dde032a9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dde032a9
Branch: refs/heads/master
Commit: dde032a99b355c710193b83d0f7437d9caaeda8a
Parents: ac12c65
Author: Guillaume Nodet <gn...@apache.org>
Authored: Thu Apr 14 15:29:45 2016 +0200
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Thu Apr 14 15:29:45 2016 +0200
----------------------------------------------------------------------
.../apache/karaf/jaas/modules/ldap/LDAPOptions.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dde032a9/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java
----------------------------------------------------------------------
diff --git a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java
index a173b3e..3342636 100644
--- a/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java
+++ b/jaas/modules/src/main/java/org/apache/karaf/jaas/modules/ldap/LDAPOptions.java
@@ -144,9 +144,15 @@ public class LDAPOptions {
env.put(Context.INITIAL_CONTEXT_FACTORY, getInitialContextFactory());
env.put(Context.PROVIDER_URL, getConnectionURL());
if (getConnectionUsername() != null && getConnectionUsername().trim().length() > 0) {
- env.put(Context.SECURITY_AUTHENTICATION, getAuthentication());
+ String auth = getAuthentication();
+ if (auth == null) {
+ auth = DEFAULT_AUTHENTICATION;
+ }
+ env.put(Context.SECURITY_AUTHENTICATION, auth);
env.put(Context.SECURITY_PRINCIPAL, getConnectionUsername());
env.put(Context.SECURITY_CREDENTIALS, getConnectionPassword());
+ } else if (getAuthentication() != null) {
+ env.put(Context.SECURITY_AUTHENTICATION, getAuthentication());
}
if (getSsl()) {
setupSsl(env);
@@ -202,11 +208,7 @@ public class LDAPOptions {
}
public String getAuthentication() {
- String authentication = (String) options.get(AUTHENTICATION);
- if (authentication == null) {
- authentication = DEFAULT_AUTHENTICATION;
- }
- return authentication;
+ return (String) options.get(AUTHENTICATION);
}
public boolean getSsl() {