cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1347007 - in /cxf/branches/2.5.x-fixes/systests/jaxrs/src/test: java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java resources/jaxrs_logging_atompull/WEB-INF/beans.xml
Date Wed, 06 Jun 2012 17:57:14 GMT
Author: dkulp
Date: Wed Jun  6 17:57:14 2012
New Revision: 1347007

URL: http://svn.apache.org/viewvc?rev=1347007&view=rev
Log:
Merged revisions 1346559 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1346559 | dkulp | 2012-06-05 16:07:52 -0400 (Tue, 05 Jun 2012) | 2 lines

  Some java 7 test order and cleanup fixes.

........

Modified:
    cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
    cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml

Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=1347007&r1=1347006&r2=1347007&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
Wed Jun  6 17:57:14 2012
@@ -82,8 +82,10 @@ public class JAXRSLoggingAtomPullSpringT
         System.setProperty("systemtests.jaxrs.logs.folder", resourceDir);
         launchServer(SpringServer.class, true);
         context = JAXBContext.newInstance(org.apache.cxf.management.web.logging.LogRecord.class);
+        createStaticBus();
+        System.clearProperty("systemtests.jaxrs.logs.folder");
     }
-
+    
     @Ignore
     public static class SpringServer extends AbstractSpringServer {
         public static final int PORT = allocatePortAsInt(SpringServer.class);
@@ -97,7 +99,6 @@ public class JAXRSLoggingAtomPullSpringT
         Storage.clearRecords();
     }
 
-    
     @Test
     public void testFeed() throws Exception {
         String listing = WebClient.create("http://localhost:" + PORT + "/services").get(String.class);
@@ -135,6 +136,9 @@ public class JAXRSLoggingAtomPullSpringT
     
     @Test
     public void testPagedFeed() throws Exception {
+        WebClient wcReset = WebClient.create("http://localhost:" + PORT + "/reset");
+        wcReset.post(null);
+        
         WebClient wc = WebClient.create("http://localhost:" + PORT + "/resource2/paged");
         wc.path("/log").get();
         Thread.sleep(3000);
@@ -324,6 +328,7 @@ public class JAXRSLoggingAtomPullSpringT
     private String fillPagedEntries(List<Entry> entries, String href, int expected,

                                     String rel, boolean relExpected) {
         Feed feed = getFeed(href);
+
         assertEquals(expected, feed.getEntries().size());
         entries.addAll(feed.getEntries());
         

Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml?rev=1347007&r1=1347006&r2=1347007&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
(original)
+++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
Wed Jun  6 17:57:14 2012
@@ -35,7 +35,6 @@ http://www.springframework.org/schema/ut
 http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<import resource="classpath:META-INF/cxf/cxf.xml" />
-	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
 	<bean id = "atomPullServer" class="org.apache.cxf.management.web.logging.atom.AtomPullServer"

 	      init-method="init">



Mime
View raw message