Author: dkulp Date: Wed Oct 8 11:43:00 2008 New Revision: 702961 URL: http://svn.apache.org/viewvc?rev=702961&view=rev Log: Merged revisions 702959 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes
................ r702959 | dkulp | 2008-10-08 14:38:22 -0400 (Wed, 08 Oct 2008) | 11 lines 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.0.x-fixes/ (props changed) cxf/branches/2.0.x-fixes/distribution/bundle/all/pom.xml cxf/branches/2.0.x-fixes/distribution/bundle/minimal/pom.xml cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Oct 8 11:43:00 2008 @@ -1,3 +1,3 @@ -/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873 -/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656 +/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959 +/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957 /incubator/cxf/trunk:434594-651668 Propchange: cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.0.x-fixes/distribution/bundle/all/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/bundle/all/pom.xml?rev=702961&r1=702960&r2=702961&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/bundle/all/pom.xml (original) +++ cxf/branches/2.0.x-fixes/distribution/bundle/all/pom.xml Wed Oct 8 11:43:00 2008 @@ -229,6 +229,7 @@ com.sun*;resolution:=optional, javax.jms*;resolution:=optional, repackage;resolution:=optional, + javax.resource.spi*;resolution:=optional, javax.xml.soap, junit.framework*;resolution:=optional, org.apache.commons.lang*;resolution:=optional, Modified: cxf/branches/2.0.x-fixes/distribution/bundle/minimal/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/bundle/minimal/pom.xml?rev=702961&r1=702960&r2=702961&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/distribution/bundle/minimal/pom.xml (original) +++ cxf/branches/2.0.x-fixes/distribution/bundle/minimal/pom.xml Wed Oct 8 11:43:00 2008 @@ -151,6 +151,7 @@ com.sun*;resolution:=optional, javax.jms*;resolution:=optional, repackage;resolution:=optional, + javax.resource.spi*;resolution:=optional, javax.xml.soap, junit.framework*;resolution:=optional, org.apache.commons.lang*;resolution:=optional, Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java?rev=702961&r1=702960&r2=702961&view=diff ============================================================================== --- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java (original) +++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/outbound/ManagedConnectionFactoryImpl.java Wed Oct 8 11:43:00 2008 @@ -137,7 +137,6 @@ LoggerHelper.initializeLoggingOnWriter(printWriter); } - @SuppressWarnings("unchecked") public ManagedConnection matchManagedConnections(Set mcs, Subject subject, ConnectionRequestInfo reqInfo) throws ResourceException {
