svn commit: r702957 - in /cxf/trunk: distribution/bundle/all/ distribution/bundle/jaxrs/ distribution/bundle/minimal/ integration/jca/src/main/java/org/apache/cxf/jca/outbound/ rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/

[dkulp]

Author: dkulp
Date: Wed Oct  8 11:33:50 2008
New Revision: 702957

URL: http://svn.apache.org/viewvc?rev=702957&view=rev
Log:
Mark resource.spi stuff optional in the osgi manifest
Remove an unneeded SuppressWarnings
Make the prepareOrb call public to make it callable by interceptors if needed

Modified:
    cxf/trunk/distribution/bundle/all/pom.xml
    cxf/trunk/distribution/bundle/jaxrs/pom.xml
    cxf/trunk/distribution/bundle/minimal/pom.xml
    
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
    
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java

Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=702957&r1=702956&r2=702957&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Wed Oct  8 11:33:50 2008
@@ -263,6 +263,7 @@
                             javax.jms*;resolution:=optional,
                             javax.ws.rs*;resolution:=optional,
                             repackage;resolution:=optional,
+                            javax.resource.spi*;resolution:=optional,
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             org.apache.abdera*;resolution:=optional,

Modified: cxf/trunk/distribution/bundle/jaxrs/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/jaxrs/pom.xml?rev=702957&r1=702956&r2=702957&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/trunk/distribution/bundle/jaxrs/pom.xml Wed Oct  8 11:33:50 2008
@@ -118,6 +118,7 @@
                             javax.jms*;resolution:=optional,
                             javax.ws.rs*;resolution:=optional,
                             repackage;resolution:=optional,
+                            javax.resource.spi*;resolution:=optional,
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             org.apache.abdera*;resolution:=optional,

Modified: cxf/trunk/distribution/bundle/minimal/pom.xml
URL: 
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/minimal/pom.xml?rev=702957&r1=702956&r2=702957&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/minimal/pom.xml (original)
+++ cxf/trunk/distribution/bundle/minimal/pom.xml Wed Oct  8 11:33:50 2008
@@ -152,6 +152,7 @@
                             javax.jms*;resolution:=optional,
                             javax.ws.rs*;resolution:=optional,
                             repackage;resolution:=optional,
+                            javax.resource.spi*;resolution:=optional,
                             javax.xml.soap,
                             junit.framework*;resolution:=optional,
                             org.apache.abdera*;resolution:=optional,

Modified: 
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java?rev=702957&r1=702956&r2=702957&view=diff
==============================================================================
--- 
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
 (original)
+++ 
cxf/trunk/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
 Wed Oct  8 11:33:50 2008
@@ -137,7 +137,6 @@
         LoggerHelper.initializeLoggingOnWriter(printWriter);
     }
     
-    @SuppressWarnings("unchecked")
     public ManagedConnection matchManagedConnections(Set mcs, Subject subject, 
             ConnectionRequestInfo reqInfo) throws ResourceException {
 

Modified: 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=702957&r1=702956&r2=702957&view=diff
==============================================================================
--- 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 (original)
+++ 
cxf/trunk/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
 Wed Oct  8 11:33:50 2008
@@ -88,7 +88,7 @@
         return orbConfig;
     }
     
-    protected synchronized void prepareOrb() {
+    public synchronized void prepareOrb() {
         if (orb == null) {
             orb = CorbaBindingHelper.getDefaultORB(orbConfig);
         }