servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r1554380 - in /servicemix/smx5/trunk: assemblies/apache-servicemix/src/main/filtered-resources/features.xml itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
Date Tue, 31 Dec 2013 07:42:50 GMT
Author: ffang
Date: Tue Dec 31 07:42:50 2013
New Revision: 1554380

URL: http://svn.apache.org/r1554380
Log:
[SM-2210]CXF WS-RM itest fails with NPE

Modified:
    servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
    servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala

Modified: servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml?rev=1554380&r1=1554379&r2=1554380&view=diff
==============================================================================
--- servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
(original)
+++ servicemix/smx5/trunk/assemblies/apache-servicemix/src/main/filtered-resources/features.xml
Tue Dec 31 07:42:50 2013
@@ -156,6 +156,7 @@
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-security-signature/${version}</bundle>
     </feature>
     <feature name="examples-cxf-ws-rm" version="${version}" resolver="(obr)">
+        <feature version="${cxf.version}">cxf</feature>
         <bundle>mvn:org.apache.servicemix.examples/cxf-ws-rm/${version}</bundle>
     </feature>
     <feature name="examples-cxf-wsn-receive" version="${version}" resolver="(obr)">

Modified: servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala?rev=1554380&r1=1554379&r2=1554380&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
(original)
+++ servicemix/smx5/trunk/itests/src/test/scala/org/apache/servicemix/itests/ExamplesIntegrationTests.scala
Tue Dec 31 07:42:50 2013
@@ -137,7 +137,6 @@ class CxfExamplesTest extends ExamplesIn
     expect { logging.containsMessage( _.contains("Setting the server's publish address to
be /HelloWorld")) }
   }
 
-  @Ignore("SM-2210: Test fails with NPE but example works fine in container")
   @Test
   def testCxfWsRm = testWithFeature("examples-cxf-ws-rm") {
     expect { logging.containsMessage( _.contains("Setting the server's publish address to
be /HelloWorld")) }



Mime
View raw message