Author: dkulp
Date: Wed Oct 8 11:38:22 2008
New Revision: 702959
URL: http://svn.apache.org/viewvc?rev=702959&view=rev
Log:
Merged revisions 702957 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r702957 | dkulp | 2008-10-08 14:33:50 -0400 (Wed, 08 Oct 2008) | 4 lines
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/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml
cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml
cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 8 11:38:22 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml?rev=702959&r1=702958&r2=702959&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/all/pom.xml Wed Oct 8
11:38:22 2008
@@ -264,6 +264,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/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml?rev=702959&r1=702958&r2=702959&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/jaxrs/pom.xml Wed Oct 8
11:38:22 2008
@@ -119,6 +119,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/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml?rev=702959&r1=702958&r2=702959&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/distribution/bundle/minimal/pom.xml Wed Oct 8
11:38:22 2008
@@ -153,6 +153,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/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java?rev=702959&r1=702958&r2=702959&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
(original)
+++
cxf/branches/2.1.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java
Wed Oct 8 11:38:22 2008
@@ -137,7 +137,6 @@
LoggerHelper.initializeLoggingOnWriter(printWriter);
}
- @SuppressWarnings("unchecked")
public ManagedConnection matchManagedConnections(Set mcs, Subject subject,
ConnectionRequestInfo reqInfo) throws ResourceException {
Modified:
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java?rev=702959&r1=702958&r2=702959&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/bindings/corba/src/main/java/org/apache/cxf/binding/corba/CorbaConduit.java
Wed Oct 8 11:38:22 2008
@@ -88,7 +88,7 @@
return orbConfig;
}
- protected synchronized void prepareOrb() {
+ public synchronized void prepareOrb() {
if (orb == null) {
orb = CorbaBindingHelper.getDefaultORB(orbConfig);
}
