Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 67168 invoked from network); 8 Dec 2008 16:52:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Dec 2008 16:52:48 -0000 Received: (qmail 79108 invoked by uid 500); 8 Dec 2008 16:53:01 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 79056 invoked by uid 500); 8 Dec 2008 16:53:01 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 79047 invoked by uid 99); 8 Dec 2008 16:53:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 08:53:00 -0800 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Dec 2008 16:52:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 54431238889E; Mon, 8 Dec 2008 08:52:23 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r724401 - in /cxf/branches/2.1.x-fixes: ./ distribution/src/main/release/samples/configuration_interceptor/ distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/ maven-plugins/archetypes/cxf-http-basic/src/... Date: Mon, 08 Dec 2008 16:52:22 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081208165223.54431238889E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon Dec 8 08:52:22 2008 New Revision: 724401 URL: http://svn.apache.org/viewvc?rev=724401&view=rev Log: Merged revisions 720218,720293,720316,722129,723338,723716 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r720218 | eglynn | 2008-11-24 11:17:34 -0500 (Mon, 24 Nov 2008) | 2 lines Fix for handleMessage() being called instead of handleFault() on JAX-WS SOAPHandlers for incoming fault messages. Also fix for incomplete population of SAAJ model in the presence of faults. ........ r720293 | dkulp | 2008-11-24 16:13:05 -0500 (Mon, 24 Nov 2008) | 2 lines Use the packagename, not groupId, to define the package ........ r720316 | dkulp | 2008-11-24 17:38:05 -0500 (Mon, 24 Nov 2008) | 2 lines Add wtp config ........ r722129 | seanoc | 2008-12-01 12:02:35 -0500 (Mon, 01 Dec 2008) | 1 line Added xmlbeans binding codegen test. ........ r723338 | ningjiang | 2008-12-04 09:44:16 -0500 (Thu, 04 Dec 2008) | 1 line CXF-1931 added setDataBinding into EndpointImpl ........ r723716 | seanoc | 2008-12-05 06:41:37 -0500 (Fri, 05 Dec 2008) | 1 line Fixed so that configuration is being picked up correctly. ........ Added: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/client.xml - copied unchanged from r723716, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/client.xml cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/server.xml - copied unchanged from r723716, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/server.xml cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java - copied unchanged from r723716, cxf/trunk/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/AntClient.java cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/ - copied from r722129, cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java - copied unchanged from r722129, cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/xmlbeans/XmlbeansBindingTest.java cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl - copied unchanged from r722129, cxf/trunk/tools/wsdlto/test/src/test/resources/wsdl2java_wsdl/xmlbeanstest.wsdl Removed: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/client.xml Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/build.xml cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/Client.java cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/pom.xml cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorld.java cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java cxf/branches/2.1.x-fixes/tools/wsdlto/test/pom.xml cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Dec 8 08:52:22 2008 @@ -1 +1 @@ -/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015 4,711193,711388,711410,711490,711635,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327,719354-719680,720053,720119,720238,720497,721221,721241,721501,723024,723338 +/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015 4,711193,711388,711410,711490,711635,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327,719354-719680,720053,720119,720218,720238,720293-720316,720497,721221,721241,721501,722129,723024,723338,723716 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/build.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/build.xml?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/build.xml (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/build.xml Mon Dec 8 08:52:22 2008 @@ -26,12 +26,15 @@ - + - + Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/pom.xml Mon Dec 8 08:52:22 2008 @@ -1,180 +1,184 @@ - - - 4.0.0 - org.apache.cxf.samples - configuration_interceptor - 1.0 - - [2,) - - - src - - - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.cxf - cxf-codegen-plugin - LATEST - - - generate-sources - generate-sources - - - - ${basedir}/wsdl/hello_world.wsdl - - - - - wsdl2java - - - - - - maven-antrun-plugin - - - copyxmlfiles - generate-sources - - run - - - - - - - - - - - - - - - server - - test - - - org.codehaus.mojo - exec-maven-plugin - - - test - - exec - - - java - - -Dcxf.config.file=${basedir}/src/demo/stream/server/server.xml - -classpath - - demo.stream.server.Server - - - - - - - - - - client - - test - - - org.codehaus.mojo - exec-maven-plugin - - - test - - java - - - demo.stream.client.Client - - ${basedir}/wsdl/hello_world.wsdl - insecure - - - - - - - - - - - - apache-snapshots - Apache SNAPSHOT Repository - http://people.apache.org/repo/m2-snapshot-repository/ - - true - - - - apache-incubating - Apache Incubating Repository - http://people.apache.org/repo/m2-incubating-repository/ - - - - java.net - http://download.java.net/maven/1/ - legacy - - - - - apache-plugin-snapshots - Apache Maven Plugin Snapshots - http://people.apache.org/repo/m2-snapshot-repository - - false - - - true - - - - apache-plugin-incubating - Apache Plugin Incubating Repository - http://people.apache.org/repo/m2-incubating-repository/ - - - - - org.apache.cxf - cxf-rt-frontend-jaxws - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http - ${cxf.version} - - - org.apache.cxf - cxf-rt-transports-http-jetty - ${cxf.version} - - - org.apache.cxf - cxf-rt-management - ${cxf.version} - - + + + 4.0.0 + org.apache.cxf.samples + configuration_interceptor + 1.0 + + [2,) + + + src + + + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.cxf + cxf-codegen-plugin + LATEST + + + generate-sources + generate-sources + + + + ${basedir}/wsdl/hello_world.wsdl + + + + + wsdl2java + + + + + + maven-antrun-plugin + + + copyxmlfiles + generate-sources + + run + + + + + + + + + + + + + + + + server + + test + + + org.codehaus.mojo + exec-maven-plugin + + + test + + exec + + + java + + -Dcxf.config.file=${basedir}/src/demo/stream/server/server.xml + -classpath + + demo.stream.server.Server + + + + + + + + + + client + + test + + + org.codehaus.mojo + exec-maven-plugin + + + test + + exec + + + java + + -Dcxf.config.file=${basedir}/src/demo/stream/client/client.xml + -classpath + + demo.stream.client.Client + + + + + + + + + + + + apache-snapshots + Apache SNAPSHOT Repository + http://people.apache.org/repo/m2-snapshot-repository/ + + true + + + + apache-incubating + Apache Incubating Repository + http://people.apache.org/repo/m2-incubating-repository/ + + + + java.net + http://download.java.net/maven/1/ + legacy + + + + + apache-plugin-snapshots + Apache Maven Plugin Snapshots + http://people.apache.org/repo/m2-snapshot-repository + + false + + + true + + + + apache-plugin-incubating + Apache Plugin Incubating Repository + http://people.apache.org/repo/m2-incubating-repository/ + + + + + org.apache.cxf + cxf-rt-frontend-jaxws + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http + ${cxf.version} + + + org.apache.cxf + cxf-rt-transports-http-jetty + ${cxf.version} + + + org.apache.cxf + cxf-rt-management + ${cxf.version} + + + Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/Client.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/Client.java?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/Client.java (original) +++ cxf/branches/2.1.x-fixes/distribution/src/main/release/samples/configuration_interceptor/src/demo/stream/client/Client.java Mon Dec 8 08:52:22 2008 @@ -19,14 +19,11 @@ package demo.stream.client; -import java.io.File; import java.net.URL; import javax.xml.namespace.QName; -//import javax.xml.ws.ProtocolException; import org.apache.hello_world_soap_http.Greeter; -//import org.apache.hello_world_soap_http.PingMeFault; import org.apache.hello_world_soap_http.SOAPService; -//import org.apache.hello_world_soap_http.types.FaultDetail; + public final class Client { @@ -38,21 +35,8 @@ } public static void main(String args[]) throws Exception { - - if (args.length == 0) { - System.out.println("please specify wsdl"); - System.exit(1); - } - - URL wsdlURL; - File wsdlFile = new File(args[0]); - if (wsdlFile.exists()) { - wsdlURL = wsdlFile.toURL(); - } else { - wsdlURL = new URL(args[0]); - } - - System.out.println(wsdlURL); + + URL wsdlURL = Client.class.getResource("hello_world.wsdl"); SOAPService ss = new SOAPService(wsdlURL, SERVICE_NAME); Greeter port = ss.getSoapPort(); String resp; Modified: cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/pom.xml?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/pom.xml (original) +++ cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/pom.xml Mon Dec 8 08:52:22 2008 @@ -5,9 +5,9 @@ ## to you under the Apache License, Version 2.0 (the ## "License"); you may not use this file except in compliance ## with the License. You may obtain a copy of the License at -## +## ## http://www.apache.org/licenses/LICENSE-2.0 -## +## ## Unless required by applicable law or agreed to in writing, ## software distributed under the License is distributed on an ## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,29 +23,42 @@ war Simple CXF project using spring configuration - - org.apache.cxf - cxf-rt-frontend-jaxws - ${project.version} - - - org.apache.cxf - cxf-rt-transports-http - ${project.version} - + + org.apache.cxf + cxf-rt-frontend-jaxws + ${project.version} + + + org.apache.cxf + cxf-rt-transports-http + ${project.version} + - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - - + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.maven.plugins + maven-eclipse-plugin + + [artifactId]-[version] + true + true + 2.0 + + + + + + Modified: cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorld.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorld.java?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorld.java (original) +++ cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorld.java Mon Dec 8 08:52:22 2008 @@ -14,7 +14,7 @@ ## KIND, either express or implied. See the License for the ## specific language governing permissions and limitations ## under the License. -package ${groupId}; +package ${packageName}; import javax.jws.WebService; Modified: cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java (original) +++ cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/java/HelloWorldImpl.java Mon Dec 8 08:52:22 2008 @@ -15,11 +15,11 @@ ## specific language governing permissions and limitations ## under the License. -package ${groupId}; +package ${packageName}; import javax.jws.WebService; -@WebService(endpointInterface = "${groupId}.HelloWorld") +@WebService(endpointInterface = "${packageName}.HelloWorld") public class HelloWorldImpl implements HelloWorld { public String sayHi(String text) { Modified: cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml (original) +++ cxf/branches/2.1.x-fixes/maven-plugins/archetypes/cxf-http-basic/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/beans.xml Mon Dec 8 08:52:22 2008 @@ -29,7 +29,7 @@ Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java Mon Dec 8 08:52:22 2008 @@ -953,7 +953,6 @@ } } - @Test public void testServerEndpointRemoteFault() throws PingException { @@ -967,10 +966,10 @@ if (!outbound) { LogicalMessage msg = ctx.getMessage(); String payload = convertDOMToString(msg.getPayload()); - assertTrue("expected faultstring in: " + payload, - payload.indexOf( - "servant throws SOAPFaultException" - + "") > -1); + assertTrue(payload.indexOf( + "" + + "servant throws SOAPFaultException" + + "") > -1); } } catch (Exception e) { e.printStackTrace(); Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/pom.xml?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/test/pom.xml (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/pom.xml Mon Dec 8 08:52:22 2008 @@ -94,6 +94,13 @@ ${project.version} test + + + org.apache.cxf + cxf-rt-databinding-xmlbeans + ${project.version} + test + com.sun.xml.bind Modified: cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java?rev=724401&r1=724400&r2=724401&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java (original) +++ cxf/branches/2.1.x-fixes/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java Mon Dec 8 08:52:22 2008 @@ -34,7 +34,7 @@ @Test public void testLoadPlugins() throws Exception { PluginLoader loader = PluginLoader.getInstance(); - assertEquals(2, loader.getPlugins().size()); + assertEquals(3, loader.getPlugins().size()); Plugin plugin = getPlugin(loader, 0); assertNotNull(plugin.getName()); @@ -59,7 +59,7 @@ Map databindings = loader.getDataBindings(); assertNotNull(databindings); - assertEquals(1, databindings.size()); + assertEquals(2, databindings.size()); DataBinding databinding = getDataBinding(databindings, 0); assertEquals("jaxb", databinding.getName());