Author: dkulp
Date: Wed May 23 01:26:32 2012
New Revision: 1341705
URL: http://svn.apache.org/viewvc?rev=1341705&view=rev
Log:
Merged revisions 1340324 via svn merge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1340324 | dkulp | 2012-05-18 20:47:52 -0400 (Fri, 18 May 2012) | 1 line
Left a sleep in
........
Modified:
cxf/branches/2.5.x-fixes/ (props changed)
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java?rev=1341705&r1=1341704&r2=1341705&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
(original)
+++
cxf/branches/2.5.x-fixes/systests/uncategorized/src/test/java/org/apache/cxf/systest/wsdl/CrossSchemaImportsTests.java
Wed May 23 01:26:32 2012
@@ -44,7 +44,6 @@ public class CrossSchemaImportsTests ext
@Test
public void testJaxbCrossSchemaImport() throws Exception {
- Thread.sleep(100000);
testUtilities.setBus((Bus)applicationContext.getBean("cxf"));
testUtilities.addDefaultNamespaces();
Server s = testUtilities.getServerForService(new
QName("http://apache.org/type_test/doc";,
