Author: amichai
Date: Fri May 24 18:14:54 2013
New Revision: 1486143
URL: http://svn.apache.org/r1486143
Log:
DOSGI-162 Fix compile errors when compiling against osgi 4.3.1 - added missing
fixes
Modified:
cxf/dosgi/trunk/distribution/subsystem/pom.xml
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
cxf/dosgi/trunk/parent/pom.xml
Modified: cxf/dosgi/trunk/distribution/subsystem/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/subsystem/pom.xml?rev=1486143&r1=1486142&r2=1486143&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/subsystem/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/subsystem/pom.xml Fri May 24 18:14:54 2013
@@ -69,10 +69,9 @@
<version>1.1.1</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>${osgi.version}</version>
- </dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified:
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java?rev=1486143&r1=1486142&r2=1486143&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-topology-manager/src/main/java/org/apache/cxf/dosgi/topologymanager/exporter/TopologyManagerExport.java
Fri May 24 18:14:54 2013
@@ -193,7 +193,8 @@ public class TopologyManagerExport {
private void exportExistingServices() {
try {
- ServiceReference[] references = bctx.getServiceReferences(null,
DOSGI_SERVICES);
+ // cast to String is necessary for compiling against OSGi core
version >= 4.3
+ ServiceReference[] references =
bctx.getServiceReferences((String)null, DOSGI_SERVICES);
if (references != null) {
for (ServiceReference sref : references) {
triggerExport(sref);
Modified: cxf/dosgi/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1486143&r1=1486142&r2=1486143&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Fri May 24 18:14:54 2013
@@ -36,6 +36,12 @@
<!-- Some versions of libraries used are different to the ones from CXF,
this is
generally caused by the fact that not all versions are available yet
as
OSGi bundles. -->
+
+ <!-- Note: the Felix Framework bundle contains the org.osgi core packages,
+ which may override the standalone org.osgi dependency bundles -
+ so if the org.osgi bundle versions are modified below, the
+ corresponding Felix Framework version must be updated as well. -->
+
<properties>
<!-- portable text resource processing -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
