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 2014/04/22 14:32:21 UTC
[3/6] git commit: [KARAF-2923] Use standard service namespace,
remote IdentityCapability
[KARAF-2923] Use standard service namespace, remote IdentityCapability
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/99449184
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/99449184
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/99449184
Branch: refs/heads/master
Commit: 99449184b6f8462bc6e2d334a95ed6ccc6ab70c5
Parents: 0cb8c91
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Tue Apr 22 09:29:25 2014 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Tue Apr 22 14:31:49 2014 +0200
----------------------------------------------------------------------
.../resources/etc/config.properties | 8 +--
.../standard/src/main/feature/feature.xml | 2 +-
features/core/pom.xml | 2 +-
.../internal/resolver/IdentityCapability.java | 63 --------------------
.../internal/resolver/ResourceBuilder.java | 1 +
.../internal/resolver/ResourceImpl.java | 10 +++-
.../internal/resolver/ServiceNamespace.java | 30 ----------
.../karaf/features/internal/service/f07.xml | 2 +-
instance/pom.xml | 2 +-
management/server/pom.xml | 2 +-
shell/core/pom.xml | 2 +-
11 files changed, 18 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
index 3aeac29..d9f3114 100644
--- a/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/etc/config.properties
@@ -122,14 +122,10 @@ org.osgi.framework.system.packages.extra= \
org.osgi.framework.system.capabilities= \
${eecap-${java.specification.version}}, \
- service-reference;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \
- service-reference;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \
- service-reference;effective:=active;objectClass=org.osgi.service.url.URLHandlers, \
+ osgi.service;effective:=active;objectClass=org.osgi.service.packageadmin.PackageAdmin, \
+ osgi.service;effective:=active;objectClass=org.osgi.service.startlevel.StartLevel, \
${services-${karaf.framework}}
-services-felix= \
- service-reference;effective:=active;objectClass=org.apache.felix.framework.monitor.MonitoringService
-
eecap-1.7= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7"
eecap-1.6= osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0,1.1,1.2", \
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index e7d77c5..eb11953 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -36,7 +36,7 @@
<bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.api/${aries.proxy.api.version}</bundle>
<bundle start-level="20">mvn:org.apache.aries.proxy/org.apache.aries.proxy.impl/${aries.proxy.version}</bundle>
<capability>
- service-reference;effective:=active;objectClass=org.apache.aries.proxy.ProxyManager
+ osgi.service;effective:=active;objectClass=org.apache.aries.proxy.ProxyManager
</capability>
</feature>
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/features/core/pom.xml
----------------------------------------------------------------------
diff --git a/features/core/pom.xml b/features/core/pom.xml
index 8998ba9..52500d8 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -126,7 +126,7 @@
*
</Import-Package>
<Provide-Capability>
- service-reference;effective:=active;objectClass=org.apache.karaf.features.FeaturesService
+ osgi.service;effective:=active;objectClass=org.apache.karaf.features.FeaturesService
</Provide-Capability>
<Private-Package>
org.apache.karaf.features.internal.*,
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/features/core/src/main/java/org/apache/karaf/features/internal/resolver/IdentityCapability.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/IdentityCapability.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/IdentityCapability.java
deleted file mode 100644
index 20e94fa..0000000
--- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/IdentityCapability.java
+++ /dev/null
@@ -1,63 +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.karaf.features.internal.resolver;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.osgi.framework.Version;
-import org.osgi.framework.namespace.IdentityNamespace;
-import org.osgi.resource.Capability;
-import org.osgi.resource.Resource;
-
-public class IdentityCapability extends BaseClause implements Capability
-{
- private final Resource m_resource;
- private final Map<String, String> m_dirs;
- private final Map<String, Object> m_attrs;
-
- public IdentityCapability(Resource resource, String name, String type, Version version)
- {
- m_resource = resource;
- m_dirs = new HashMap<String, String>();
- m_attrs = new HashMap<String, Object>();
- m_attrs.put(IdentityNamespace.IDENTITY_NAMESPACE, name);
- m_attrs.put(IdentityNamespace.CAPABILITY_TYPE_ATTRIBUTE, type);
- m_attrs.put(IdentityNamespace.CAPABILITY_VERSION_ATTRIBUTE, version);
- }
-
- public String getNamespace()
- {
- return IdentityNamespace.IDENTITY_NAMESPACE;
- }
-
- public Map<String, String> getDirectives()
- {
- return m_dirs;
- }
-
- public Map<String, Object> getAttributes()
- {
- return m_attrs;
- }
-
- public Resource getResource()
- {
- return m_resource;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java
index 941ed8c..68f8af6 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceBuilder.java
@@ -32,6 +32,7 @@ import org.osgi.framework.Version;
import org.osgi.framework.namespace.IdentityNamespace;
import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.namespace.service.ServiceNamespace;
import org.osgi.resource.Capability;
import org.osgi.resource.Requirement;
import org.osgi.resource.Resource;
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceImpl.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceImpl.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceImpl.java
index 18e0dc3..873720e 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceImpl.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ResourceImpl.java
@@ -17,7 +17,9 @@
package org.apache.karaf.features.internal.resolver;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.osgi.framework.Version;
import org.osgi.framework.namespace.IdentityNamespace;
@@ -39,7 +41,13 @@ public class ResourceImpl implements Resource {
public ResourceImpl(String name, String type, Version version)
{
m_caps = new ArrayList<Capability>();
- m_caps.add(0, new IdentityCapability(this, name, type, version));
+ Map<String, String> dirs = new HashMap<String, String>();
+ Map<String, Object> attrs = new HashMap<String, Object>();
+ attrs.put(IdentityNamespace.IDENTITY_NAMESPACE, name);
+ attrs.put(IdentityNamespace.CAPABILITY_TYPE_ATTRIBUTE, type);
+ attrs.put(IdentityNamespace.CAPABILITY_VERSION_ATTRIBUTE, version);
+ CapabilityImpl identity = new CapabilityImpl(this, IdentityNamespace.IDENTITY_NAMESPACE, dirs, attrs);
+ m_caps.add(identity);
m_reqs = new ArrayList<Requirement>();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ServiceNamespace.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ServiceNamespace.java b/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ServiceNamespace.java
deleted file mode 100644
index 4fe3bf8..0000000
--- a/features/core/src/main/java/org/apache/karaf/features/internal/resolver/ServiceNamespace.java
+++ /dev/null
@@ -1,30 +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.karaf.features.internal.resolver;
-
-import org.osgi.resource.Namespace;
-
-/**
- */
-public final class ServiceNamespace extends Namespace {
-
- public static final String SERVICE_NAMESPACE = "service-reference";
-
- private ServiceNamespace() {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/features/core/src/test/resources/org/apache/karaf/features/internal/service/f07.xml
----------------------------------------------------------------------
diff --git a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f07.xml b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f07.xml
index 8165d14..354ba86 100644
--- a/features/core/src/test/resources/org/apache/karaf/features/internal/service/f07.xml
+++ b/features/core/src/test/resources/org/apache/karaf/features/internal/service/f07.xml
@@ -28,7 +28,7 @@
<bundle>mvn:org.springframework/spring-web/2.5.6.SEC02</bundle>
</conditional>
<capability>
- service-reference;effective:=active;objectClass=org.apache.aries.proxy.ProxyManager
+ osgi.service;effective:=active;objectClass=org.apache.aries.proxy.ProxyManager
</capability>
<scoping>
<export namespace="osgi.service">
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/instance/pom.xml
----------------------------------------------------------------------
diff --git a/instance/pom.xml b/instance/pom.xml
index 8d6ba13..4d1962b 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -164,7 +164,7 @@
*
</Import-Package>
<Provide-Capability>
- service-reference;effective:=active;objectClass=org.apache.karaf.instance.core.InstanceService
+ osgi.service;effective:=active;objectClass=org.apache.karaf.instance.core.InstanceService
</Provide-Capability>
<Private-Package>
org.apache.karaf.jpm,
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/management/server/pom.xml
----------------------------------------------------------------------
diff --git a/management/server/pom.xml b/management/server/pom.xml
index c522874..f5ad253 100644
--- a/management/server/pom.xml
+++ b/management/server/pom.xml
@@ -118,7 +118,7 @@
org.apache.karaf.util.tracker
</Private-Package>
<Provide-Capability>
- service-reference;effective:=active;objectClass=javax.management.MBeanServer
+ osgi.service;effective:=active;objectClass=javax.management.MBeanServer
</Provide-Capability>
<Bundle-Activator>
org.apache.karaf.management.internal.Activator
http://git-wip-us.apache.org/repos/asf/karaf/blob/99449184/shell/core/pom.xml
----------------------------------------------------------------------
diff --git a/shell/core/pom.xml b/shell/core/pom.xml
index 572430c..d6af05d 100644
--- a/shell/core/pom.xml
+++ b/shell/core/pom.xml
@@ -156,7 +156,7 @@
org.apache.felix.service.threadio,
</Private-Package>
<Provide-Capability>
- service-reference;effective:=active;objectClass=org.apache.karaf.shell.api.console.SessionFactory
+ osgi.service;effective:=active;objectClass=org.apache.karaf.shell.api.console.SessionFactory
</Provide-Capability>
<Bundle-Activator>
org.apache.karaf.shell.impl.console.osgi.Activator