Author: ffang Date: Thu Jun 20 07:14:27 2013 New Revision: 1494877 URL: http://svn.apache.org/r1494877 Log: Merged revisions 1493913,1494872 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1493913 | dkulp | 2013-06-18 04:07:27 +0800 (二, 18 6 2013) | 9 lines Merged revisions 1493644 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1493644 | ffang | 2013-06-17 01:20:32 -0400 (Mon, 17 Jun 2013) | 2 lines [CXF-5061]a testcase to demonstrate that valid WSDL could get generated for List of Complex Type ........ ................ r1494872 | ffang | 2013-06-20 14:45:56 +0800 (四, 20 6 2013) | 9 lines Merged revisions 1493983 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1493983 | ffang | 2013-06-18 09:48:16 +0800 (二, 18 6 2013) | 1 line [CXF-5061]add a package-info ........ ................ Added: cxf/branches/2.6.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java - copied unchanged from r1493913, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java cxf/branches/2.6.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestService.java - copied unchanged from r1493913, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestService.java cxf/branches/2.6.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java - copied unchanged from r1493913, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/TestServiceImpl.java cxf/branches/2.6.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/base/ - copied from r1493913, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/base/ cxf/branches/2.6.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/base/WrapperString.java - copied unchanged from r1493913, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/base/WrapperString.java cxf/branches/2.6.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/base/package-info.java - copied unchanged from r1494872, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/base/package-info.java cxf/branches/2.6.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml - copied unchanged from r1493913, cxf/branches/2.7.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml Modified: cxf/branches/2.6.x-fixes/ (props changed) Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1493913,1494872 Merged /cxf/trunk:r1493983 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available.
