Author: sergeyb
Date: Wed Oct 15 02:05:36 2008
New Revision: 704813
URL: http://svn.apache.org/viewvc?rev=704813&view=rev
Log:
DOSGI : applying first patch for CXF-1866 on behalf of David B.
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandler.java
cxf/sandbox/dosgi/parent/pom.xml
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java?rev=704813&r1=704812&r2=704813&view=diff
==============================================================================
---
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
(original)
+++
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/OsgiUtils.java
Wed Oct 15 02:05:36 2008
@@ -385,16 +385,18 @@
}
static IntentMap readIntentMap(BundleContext bundleContext) {
+ List<String> springIntentLocations = new ArrayList<String>();
for (String mapFile : INTENT_MAP) {
if (bundleContext.getBundle().getResource(mapFile) == null) {
LOG.info("Could not find intent map file " + mapFile);
return null;
}
+ springIntentLocations.add("classpath:" + mapFile);
}
try {
OsgiBundleXmlApplicationContext ctx =
- new OsgiBundleXmlApplicationContext(INTENT_MAP);
+ new
OsgiBundleXmlApplicationContext(springIntentLocations.toArray(new String []
{}));
ctx.setPublishContextAsService(false);
ctx.setBundleContext(bundleContext);
ctx.refresh();
Modified:
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandler.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandler.java?rev=704813&r1=704812&r2=704813&view=diff
==============================================================================
---
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandler.java
(original)
+++
cxf/sandbox/dosgi/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/ServiceInvocationHandler.java
Wed Oct 15 02:05:36 2008
@@ -55,8 +55,13 @@
}
}
}
- throw new InvocationTargetException(
- new ServiceException(REMOTE_EXCEPTION_TYPE, theCause));
+
+ // davidb temporary
+ throw new RuntimeException(theCause);
+
+ // davidb TODO removed the following as it is not yet available in
equinox
+// throw new InvocationTargetException(
+// new ServiceException(REMOTE_EXCEPTION_TYPE, theCause));
}
}
Modified: cxf/sandbox/dosgi/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/parent/pom.xml?rev=704813&r1=704812&r2=704813&view=diff
==============================================================================
--- cxf/sandbox/dosgi/parent/pom.xml (original)
+++ cxf/sandbox/dosgi/parent/pom.xml Wed Oct 15 02:05:36 2008
@@ -18,7 +18,7 @@
<properties>
<cxf.version>2.0.8</cxf.version>
<spring.version>2.5.5</spring.version>
- <spring.osgi.version>1.1.0</spring.osgi.version>
+ <spring.osgi.version>1.1.2</spring.osgi.version>
<servicemix.kernel.version>1.0.0-rc1</servicemix.kernel.version>
<servicemix.feature.version>4.0-m1</servicemix.feature.version>
