Author: cschneider
Date: Sun Aug 25 15:00:55 2013
New Revision: 1517305
URL: http://svn.apache.org/r1517305
Log:
DOSGI-203 Upgrade to cxf 2.7.6
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceManagerTest.java
cxf/dosgi/trunk/parent/pom.xml
Modified:
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceManagerTest.java
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceManagerTest.java?rev=1517305&r1=1517304&r2=1517305&view=diff
==============================================================================
---
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceManagerTest.java
(original)
+++
cxf/dosgi/trunk/dsw/cxf-dsw/src/test/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceManagerTest.java
Sun Aug 25 15:00:55 2013
@@ -78,6 +78,7 @@ public class HttpServiceManagerTest exte
final HttpService httpService = new DummyHttpService(config);
ServiceReference sr = c.createMock(ServiceReference.class);
expect(sr.getProperty(EasyMock.eq("service.id"))).andReturn(12345L).atLeastOnce();
+
expect(servletContext.getResourceAsStream((String)EasyMock.anyObject())).andReturn(null).anyTimes();
c.replay();
HttpServiceManager h = new HttpServiceManager(dswContext, null, null,
null) {
Modified: cxf/dosgi/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/dosgi/trunk/parent/pom.xml?rev=1517305&r1=1517304&r2=1517305&view=diff
==============================================================================
--- cxf/dosgi/trunk/parent/pom.xml (original)
+++ cxf/dosgi/trunk/parent/pom.xml Sun Aug 25 15:00:55 2013
@@ -48,7 +48,7 @@
<osgi.version>4.2.0</osgi.version>
<osgi.enterprise.version>4.2.0</osgi.enterprise.version>
- <cxf.version>2.7.2</cxf.version>
+ <cxf.version>2.7.6</cxf.version>
<cxf.build-utils.version>2.5.0</cxf.build-utils.version>
<felix.version>3.2.2</felix.version>
<spring.version>3.0.6.RELEASE</spring.version>
