You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2012/11/13 11:51:25 UTC
svn commit: r1408675 - in /cxf/dosgi/trunk/dsw/cxf-dsw: pom.xml
src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java
Author: sergeyb
Date: Tue Nov 13 10:51:25 2012
New Revision: 1408675
URL: http://svn.apache.org/viewvc?rev=1408675&view=rev
Log:
[DOSGI-69] Enabling DSW to work without the internet connection, applying a patch on behalf of Tomasz Kleszczynski
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml?rev=1408675&r1=1408674&r2=1408675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/pom.xml Tue Nov 13 10:51:25 2012
@@ -87,6 +87,11 @@
<artifactId>spring-osgi-core</artifactId>
<version>${spring.osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
</dependencies>
<build>
Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java?rev=1408675&r1=1408674&r2=1408675&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/qos/IntentUtils.java Tue Nov 13 10:51:25 2012
@@ -12,6 +12,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.remoteserviceadmin.RemoteConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
public class IntentUtils {
@@ -67,8 +68,13 @@ public class IntentUtils {
Thread.currentThread().setContextClassLoader(PolicyNamespaceHandler.class.getClassLoader());
LOG.debug("Loading Intent map from {}", springIntentLocations);
- OsgiBundleXmlApplicationContext ctx = new OsgiBundleXmlApplicationContext(springIntentLocations
- .toArray(new String[] {}));
+ OsgiBundleXmlApplicationContext ctx = new OsgiBundleXmlApplicationContext (springIntentLocations.toArray(new String[] {})) {
+ @Override
+ protected void initBeanDefinitionReader(XmlBeanDefinitionReader pBeanDefinitionReader) {
+ super.initBeanDefinitionReader(pBeanDefinitionReader);
+ pBeanDefinitionReader.setValidating(false);
+ }
+ };
ctx.setPublishContextAsService(false);
ctx.setBundleContext(bundleContext);
ctx.refresh();