svn commit: r758443 - in /cxf/dosgi/trunk: distribution/single-bundle/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/

[davidb]

Author: davidb
Date: Wed Mar 25 21:47:13 2009
New Revision: 758443

URL: http://svn.apache.org/viewvc?rev=758443&view=rev
Log:
Fix for CXF-2121

Modified:
    cxf/dosgi/trunk/distribution/single-bundle/pom.xml
    
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
    
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java

Modified: cxf/dosgi/trunk/distribution/single-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/single-bundle/pom.xml?rev=758443&r1=758442&r2=758443&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/single-bundle/pom.xml (original)
+++ cxf/dosgi/trunk/distribution/single-bundle/pom.xml Wed Mar 25 21:47:13 2009
@@ -225,6 +225,7 @@
               org.osgi.*
             </Import-Package>
             <Export-Package>
+              '=META-INF.cxf',
               org.apache.cxf.dosgi.singlebundle;version="${pom.version}"
             </Export-Package>
             <Embed-Dependency>*;scope=compile;inline=false</Embed-Dependency>
@@ -240,6 +241,7 @@
               !*
             </_exportcontents> 
             <DynamicImport-Package>*</DynamicImport-Package>
+            <_failok>true</_failok>
             <_removeheaders>
               Ignore-Package,
               Include-Resource,

Modified: 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java?rev=758443&r1=758442&r2=758443&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
 Wed Mar 25 21:47:13 2009
@@ -104,10 +104,12 @@
         factory.getServiceFactory().setDataBinding(new AegisDatabinding());
         factory.setServiceBean(serviceBean);
 
+        ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
         try {
             String [] intents = 
                 applyIntents(dswContext, callingContext, 
factory.getFeatures(), factory, sd);
 
+            
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
             Server server = factory.create();
             getDistributionProvider().addExposedService(serviceReference, 
registerPublication(server, intents, address));
             addAddressProperty(sd.getProperties(), address);
@@ -115,6 +117,8 @@
         } catch (IntentUnsatifiedException iue) {
             getDistributionProvider().intentsUnsatisfied(serviceReference);
             throw iue;
+        } finally {
+            Thread.currentThread().setContextClassLoader(oldClassLoader);
         }       
     }
     

Modified: 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=758443&r1=758442&r2=758443&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
 Wed Mar 25 21:47:13 2009
@@ -100,10 +100,13 @@
         factory.getServiceFactory().setDataBinding(new AegisDatabinding());
         factory.setServiceBean(serviceBean);
         
+        ClassLoader oldClassLoader = 
Thread.currentThread().getContextClassLoader();
         try {
             String [] intents = applyIntents(
                 dswContext, callingContext, factory.getFeatures(), factory, 
sd);
         
+            
+            
Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader());
             Server server = factory.create();
             getDistributionProvider().addExposedService(serviceReference, 
registerPublication(server, intents));
             addAddressProperty(sd.getProperties(), address);
@@ -111,6 +114,8 @@
         } catch (IntentUnsatifiedException iue) {
             getDistributionProvider().intentsUnsatisfied(serviceReference);
             throw iue;
+        } finally {
+            Thread.currentThread().setContextClassLoader(oldClassLoader);
         }
     }