Author: dkulp Date: Wed Jul 8 01:34:17 2009 New Revision: 792014 URL: http://svn.apache.org/viewvc?rev=792014&view=rev Log: Merged revisions 791950 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r791950 | dkulp | 2009-07-07 15:31:56 -0400 (Tue, 07 Jul 2009) | 13 lines Merged revisions 791538 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r791538 | dkulp | 2009-07-06 12:52:00 -0400 (Mon, 06 Jul 2009) | 5 lines Update javascript stuff to run with java6. 1) Add a timeout so if something goes wrong, exception is thrown, not a hang 2) Use specific (working) version of Xerces and not the broken junk in the JDK for the validation. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/javascript/pom.xml cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 8 01:34:17 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/javascript/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/pom.xml?rev=792014&r1=792013&r2=792014&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/javascript/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/javascript/pom.xml Wed Jul 8 01:34:17 2009 @@ -37,12 +37,6 @@ <dependency> <groupId>org.apache.cxf</groupId> - <artifactId>cxf-rt-databinding-aegis</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-local</artifactId> <version>${project.version}</version> </dependency> @@ -90,6 +84,18 @@ <scope>test</scope> </dependency> <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-databinding-aegis</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> <groupId>rhino</groupId> <artifactId>js</artifactId> <version>${rhino.version}</version> Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java?rev=792014&r1=792013&r2=792014&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java (original) +++ cxf/branches/2.1.x-fixes/rt/javascript/src/main/java/org/apache/cxf/javascript/JavascriptUtils.java Wed Jul 8 01:34:17 2009 @@ -29,7 +29,6 @@ import org.w3c.dom.Attr; -import org.apache.cxf.aegis.type.mtom.AbstractXOPType; import org.apache.cxf.common.WSDLConstants; import org.apache.cxf.common.xmlschema.SchemaCollection; import org.apache.cxf.common.xmlschema.XmlSchemaConstants; @@ -253,7 +252,7 @@ // We could do something much more complex in terms of evaluating whether the type // permits the contentType attribute. This, however, is enough to clue us in for what Aegis // does. - if (AbstractXOPType.XML_MIME_BASE64.equals(typeName)) { + if (new QName("http://www.w3.org/2005/05/xmlmime";, "base64Binary").equals(typeName)) { return true; } Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java?rev=792014&r1=792013&r2=792014&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java (original) +++ cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/AnyTest.java Wed Jul 8 01:34:17 2009 @@ -27,6 +27,7 @@ import org.apache.cxf.javascript.JavascriptTestUtilities.JSRunnable; import org.apache.cxf.javascript.JavascriptTestUtilities.Notifier; import org.apache.cxf.javascript.fortest.AnyImpl; + import org.junit.Before; import org.junit.Test; import org.mozilla.javascript.Context; @@ -65,7 +66,8 @@ implementor = (AnyImpl)rawImplementor; implementor.reset(); } - + + private Void acceptOneChalk(Context context) { LOG.info("About to call accept1 with Chalk" + getAddress()); implementor.prepareToWaitForOneWay(); @@ -136,7 +138,6 @@ assertEquals("after chalk", implementor.getAfter()); return null; } - @Test public void callAcceptNRaw() { testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() { @@ -164,6 +165,7 @@ return null; } + @Test public void callReturnAny1() throws Exception { testUtilities.runInsideContext(Void.class, new JSRunnable<Void>() { @@ -172,6 +174,7 @@ } }); } + Modified: cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java?rev=792014&r1=792013&r2=792014&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java (original) +++ cxf/branches/2.1.x-fixes/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/AnyImpl.java Wed Jul 8 01:34:17 2009 @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import uri.cxf_apache_org.jstest.any.AcceptAny; import uri.cxf_apache_org.jstest.types.any.AcceptAny1; @@ -189,10 +190,13 @@ return; } try { - onewayNotify.await(); - onewayNotify = null; + if (!onewayNotify.await(5000, TimeUnit.MILLISECONDS)) { + throw new RuntimeException("Did not get the oneway!"); + } } catch (InterruptedException e) { // + } finally { + onewayNotify = null; } } }
