Merge branch 'KARAF-3646' of https://github.com/albertocsm/karaf-cellar
Conflicts:
assembly/src/main/resources/features.xml
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/c05e1e0f
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/c05e1e0f
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/c05e1e0f
Branch: refs/heads/master
Commit: c05e1e0f78b958dd4db2334a3851b94a9f6aa984
Parents: 778fcd4 da1fdb3
Author: Jean-Baptiste Onofré <[email protected]>
Authored: Sun Sep 20 21:06:44 2015 +0200
Committer: Jean-Baptiste Onofré <[email protected]>
Committed: Sun Sep 20 21:06:44 2015 +0200
----------------------------------------------------------------------
dosgi/pom.xml | 8 ++-
.../cellar/dosgi/RemoteServiceCallHandler.java | 51 +++++++++++++++++---
pom.xml | 8 ++-
3 files changed, 58 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/c05e1e0f/dosgi/pom.xml
----------------------------------------------------------------------
diff --cc dosgi/pom.xml
index 43f8f71,d39d1d8..71c3531
--- a/dosgi/pom.xml
+++ b/dosgi/pom.xml
@@@ -57,6 -53,10 +57,11 @@@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
++ <version>3.3.2</version>
+ </dependency>
<!-- Logging Dependencies -->
<dependency>
@@@ -85,19 -81,20 +90,20 @@@
<configuration>
<instructions>
<Export-Package>
-
org.apache.karaf.cellar.dosgi*;version="${project.version}"
+ !org.apache.karaf.cellar.dosgi.internal.osgi,
+ org.apache.karaf.cellar.dosgi*
</Export-Package>
<Import-Package>
-
org.apache.karaf.cellar.core*;version="${project.version}",
- org.apache.felix.service.command,
- org.apache.felix.gogo.commands,
- org.apache.karaf.shell.console;version="[3,5)",
-
org.apache.karaf.shell.console.commands;version="[3,5)",
-
org.apache.karaf.shell.console.completer;version="[3,5)",
- org.apache.karaf.shell.commands;version="[3,5)",
- org.osgi*,
- org.slf4j;version="[1.6,2)";resolution:=optional
+ org.slf4j;version="[1.6,2)";resolution:=optional,
+ org.apache.karaf.shell*;resolution:=optional,
+ *
</Import-Package>
-
<DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,*</DynamicImport-Package>
+
<DynamicImport-Package>javax.*,org.w3c.*,org.xml.*,org.apache.karaf.cellar.*</DynamicImport-Package>
+ <Private-Package>
+ org.apache.karaf.cellar.dosgi.internal.osgi,
-
org.apache.karaf.util.tracker;-split-package:=merge-first
++
org.apache.karaf.util.tracker;-split-package:=merge-first,
++
org.apache.commons.lang3*;-split-package:=merge-first
+ </Private-Package>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/c05e1e0f/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
----------------------------------------------------------------------
diff --cc
dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
index c6f5732,78a38fd..810d4f4
---
a/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
+++
b/dosgi/src/main/java/org/apache/karaf/cellar/dosgi/RemoteServiceCallHandler.java
@@@ -85,18 -86,13 +87,12 @@@ public class RemoteServiceCallHandler e
}
}
+ RemoteServiceResult result = new
RemoteServiceResult(event.getId());
+ EventProducer producer =
eventTransportFactory.getEventProducer(Constants.RESULT_PREFIX +
Constants.SEPARATOR + event.getSourceNode().getId() + event.getEndpointId(),
false);
try {
- Method method;
- if (classes.length > 0) {
- method =
targetService.getClass().getMethod(event.getMethod(), classes);
- } else {
- method =
targetService.getClass().getMethod(event.getMethod());
- }
-
+ Method method = getMethod(classes, targetService, event);
Object obj = method.invoke(targetService,
event.getArguments().toArray());
- RemoteServiceResult result = new
RemoteServiceResult(event.getId());
result.setResult(obj);
-
- EventProducer producer =
eventTransportFactory.getEventProducer(Constants.RESULT_PREFIX +
Constants.SEPARATOR + event.getSourceNode().getId() + event.getEndpointId(),
false);
producer.produce(result);
} catch (NoSuchMethodException e) {
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/c05e1e0f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a542bfc,28e794f..c1f0b11
--- a/pom.xml
+++ b/pom.xml
@@@ -45,12 -44,11 +45,11 @@@
<jclouds.version>1.8.1</jclouds.version>
<joda-time.version>2.5</joda-time.version>
<junit.version>4.11</junit.version>
- <karaf.version>4.0.0.M1</karaf.version>
- <osgi.version>5.0.0</osgi.version>
+ <karaf.version>4.0.0</karaf.version>
+ <osgi.version>6.0.0</osgi.version>
<osgi.compendium.version>5.0.0</osgi.compendium.version>
<slf4j.version>1.7.7</slf4j.version>
-
- <apache.commons.lang3.version>3.3.2</apache.commons.lang3.version>
+
<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
</properties>
<modules>
