Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 25476 invoked from network); 6 Feb 2010 12:50:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Feb 2010 12:50:50 -0000 Received: (qmail 76791 invoked by uid 500); 6 Feb 2010 12:50:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 76692 invoked by uid 500); 6 Feb 2010 12:50:50 -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 76683 invoked by uid 99); 6 Feb 2010 12:50:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 06 Feb 2010 12:50:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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; Sat, 06 Feb 2010 12:50:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9363623889BB; Sat, 6 Feb 2010 12:50:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r907207 [1/2] - in /cxf/trunk: ./ api/ common/common/ common/common/src/main/java/org/apache/cxf/helpers/ common/common/src/main/java/org/apache/cxf/staxutils/ integration/jbi/ maven-plugins/codegen-plugin/ maven-plugins/corba/ parent/ rt/b... Date: Sat, 06 Feb 2010 12:50:26 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100206125027.9363623889BB@eris.apache.org> Author: dkulp Date: Sat Feb 6 12:50:23 2010 New Revision: 907207 URL: http://svn.apache.org/viewvc?rev=907207&view=rev Log: Add java5 profile that activates on java5 Move all deps provided in java6 into java5 profile Mark spring as provided or optional in most places Modified: cxf/trunk/api/pom.xml cxf/trunk/common/common/pom.xml cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java cxf/trunk/integration/jbi/pom.xml cxf/trunk/maven-plugins/codegen-plugin/pom.xml cxf/trunk/maven-plugins/corba/pom.xml cxf/trunk/parent/pom.xml cxf/trunk/pom.xml cxf/trunk/rt/bindings/coloc/pom.xml cxf/trunk/rt/bindings/corba/pom.xml cxf/trunk/rt/bindings/http/pom.xml cxf/trunk/rt/bindings/jbi/pom.xml cxf/trunk/rt/bindings/object/pom.xml cxf/trunk/rt/bindings/soap/pom.xml cxf/trunk/rt/core/pom.xml cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java cxf/trunk/rt/databinding/jaxb/pom.xml cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java cxf/trunk/rt/databinding/xmlbeans/pom.xml cxf/trunk/rt/frontend/jaxws/pom.xml cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java cxf/trunk/rt/frontend/js/pom.xml cxf/trunk/rt/frontend/simple/pom.xml cxf/trunk/rt/management-web/pom.xml cxf/trunk/rt/management/pom.xml cxf/trunk/rt/testsupport/pom.xml cxf/trunk/rt/transports/jbi/pom.xml cxf/trunk/rt/transports/jms/pom.xml cxf/trunk/rt/ws/addr/pom.xml cxf/trunk/rt/ws/policy/pom.xml cxf/trunk/rt/ws/rm/pom.xml cxf/trunk/rt/ws/security/pom.xml cxf/trunk/systests/jaxws/pom.xml cxf/trunk/testutils/pom.xml cxf/trunk/tools/common/pom.xml cxf/trunk/tools/javato/ws/pom.xml cxf/trunk/tools/validator/pom.xml cxf/trunk/tools/validator/src/test/java/org/apache/cxf/tools/validator/internal/WSDLRefValidatorTest.java cxf/trunk/tools/wsdlto/core/pom.xml cxf/trunk/tools/wsdlto/misc/pom.xml Modified: cxf/trunk/api/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/api/pom.xml (original) +++ cxf/trunk/api/pom.xml Sat Feb 6 12:50:23 2010 @@ -43,10 +43,6 @@ easymockclassextension test - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - org.apache.cxf @@ -71,18 +67,10 @@ org.apache.geronimo.specs - geronimo-annotation_1.0_spec - - - org.apache.geronimo.specs geronimo-j2ee-connector_1.5_spec provided - ${stax.impl.groupId} - ${stax.impl.artifactId} - - org.apache.neethi neethi @@ -91,6 +79,11 @@ cxf-common-schemas ${project.version} + + commons-lang + commons-lang + true + @@ -244,6 +237,26 @@ + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + + + Modified: cxf/trunk/common/common/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/common/common/pom.xml (original) +++ cxf/trunk/common/common/pom.xml Sat Feb 6 12:50:23 2010 @@ -51,24 +51,17 @@ org.springframework spring-core + true org.springframework spring-beans + true org.springframework spring-context - - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - - - - javax.xml.bind - jaxb-api + true @@ -78,18 +71,9 @@ - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - test - - - - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec - - wsdl4j wsdl4j + true @@ -100,6 +84,7 @@ commons-lang commons-lang + true @@ -120,36 +105,15 @@ cglib cglib-nodep provided - - - - ${stax.impl.groupId} - ${stax.impl.artifactId} - test - javax.xml.soap - saaj-api + + xerces + xercesImpl test - - ${saaj.impl.groupId} - ${saaj.impl.artifactId} - test - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - test - - - - xerces - xercesImpl - test - @@ -169,6 +133,52 @@ + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + test + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + javax.xml.bind + jaxb-api + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + test + + + javax.xml.soap + saaj-api + test + + + ${saaj.impl.groupId} + ${saaj.impl.artifactId} + test + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + test + + + + Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java Sat Feb 6 12:50:23 2010 @@ -37,6 +37,7 @@ import javax.wsdl.PortType; import javax.wsdl.factory.WSDLFactory; import javax.wsdl.xml.WSDLReader; +import javax.xml.namespace.QName; public class WSDLHelper { @@ -57,6 +58,10 @@ } return null; } + + public static String writeQName(Definition def, QName qname) { + return def.getPrefix(qname.getNamespaceURI()) + ":" + qname.getLocalPart(); + } public BindingOperation getBindingOperation(Binding binding, String operationName) { if (operationName == null) { Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/helpers/XMLUtils.java Sat Feb 6 12:50:23 2010 @@ -35,7 +35,6 @@ import java.util.WeakHashMap; import java.util.logging.Level; import java.util.logging.Logger; -import javax.wsdl.Definition; import javax.xml.namespace.QName; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -387,10 +386,6 @@ } } - public static String writeQName(Definition def, QName qname) { - return def.getPrefix(qname.getNamespaceURI()) + ":" + qname.getLocalPart(); - } - public static InputStream getInputStream(Document doc) throws Exception { DOMImplementationLS impl = null; DOMImplementation docImpl = doc.getImplementation(); Modified: cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java URL: http://svn.apache.org/viewvc/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original) +++ cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Sat Feb 6 12:50:23 2010 @@ -354,7 +354,6 @@ InputSource src = ((SAXSource)source).getInputSource(); if (src.getSystemId() == null && src.getPublicId() == null && ((SAXSource)source).getXMLReader() != null) { - //OK - reader is OK. We'll use that out StreamWriterContentHandler ch = new StreamWriterContentHandler(writer); XMLReader reader = ((SAXSource)source).getXMLReader(); @@ -1083,6 +1082,8 @@ } catch (Exception ex) { //ignore } + } else if (source instanceof SAXSource) { + return createXMLStreamReader(((SAXSource)source).getInputSource()); } XMLInputFactory factory = getXMLInputFactory(); Modified: cxf/trunk/integration/jbi/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/integration/jbi/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/integration/jbi/pom.xml (original) +++ cxf/trunk/integration/jbi/pom.xml Sat Feb 6 12:50:23 2010 @@ -84,6 +84,21 @@ org.apache.servicemix.specs.jbi-api-1.0 provided + + org.springframework + spring-core + test + + + org.springframework + spring-beans + test + + + org.springframework + spring-context + test + Modified: cxf/trunk/maven-plugins/codegen-plugin/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/maven-plugins/codegen-plugin/pom.xml (original) +++ cxf/trunk/maven-plugins/codegen-plugin/pom.xml Sat Feb 6 12:50:23 2010 @@ -40,11 +40,11 @@ junit test - + org.apache.maven.shared maven-artifact-resolver - 1.0 - + 1.0 + org.apache.maven maven-core @@ -98,7 +98,22 @@ cxf-tools-wsdlto-frontend-jaxws ${project.version} - + + org.springframework + spring-core + true + + + org.springframework + spring-beans + true + + + org.springframework + spring-context + true + + ant ant @@ -109,6 +124,7 @@ + ibmjdk Modified: cxf/trunk/maven-plugins/corba/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/corba/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/maven-plugins/corba/pom.xml (original) +++ cxf/trunk/maven-plugins/corba/pom.xml Sat Feb 6 12:50:23 2010 @@ -39,7 +39,18 @@ junit test - + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + org.apache.maven maven-plugin-api Modified: cxf/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/parent/pom.xml (original) +++ cxf/trunk/parent/pom.xml Sat Feb 6 12:50:23 2010 @@ -650,6 +650,10 @@ javax.xml.bind activation + + javax.xml.bind + jaxb-api + @@ -990,6 +994,14 @@ ${abdera.version} + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + javax.mail mail Modified: cxf/trunk/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/pom.xml (original) +++ cxf/trunk/pom.xml Sat Feb 6 12:50:23 2010 @@ -44,6 +44,7 @@ false 2.3.0-SNAPSHOT 2.3.0-SNAPSHOT + 1.6 @@ -179,6 +180,21 @@ process-test-sources + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + ${jdk.version} + ${jdk.version} + 256M + ${compiler.fork} + + + + org.apache.maven.plugins @@ -379,6 +395,15 @@ + + jdk15 + + 1.5 + + + 1.5 + + Modified: cxf/trunk/rt/bindings/coloc/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/coloc/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/bindings/coloc/pom.xml (original) +++ cxf/trunk/rt/bindings/coloc/pom.xml Sat Feb 6 12:50:23 2010 @@ -33,8 +33,14 @@ - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec + org.springframework + spring-beans + provided + + + org.springframework + spring-core + provided org.apache.cxf @@ -63,4 +69,19 @@ test + + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + + Modified: cxf/trunk/rt/bindings/corba/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/corba/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/bindings/corba/pom.xml (original) +++ cxf/trunk/rt/bindings/corba/pom.xml Sat Feb 6 12:50:23 2010 @@ -65,6 +65,22 @@ easymockclassextension test + + org.springframework + spring-core + test + + + org.springframework + spring-beans + test + + + org.springframework + spring-context + test + + Modified: cxf/trunk/rt/bindings/http/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/http/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/bindings/http/pom.xml (original) +++ cxf/trunk/rt/bindings/http/pom.xml Sat Feb 6 12:50:23 2010 @@ -82,29 +82,15 @@ test - org.slf4j - slf4j-jdk14 - test - - - org.easymock - easymockclassextension - test - - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec + org.slf4j + slf4j-jdk14 test - org.apache.geronimo.specs - geronimo-activation_1.1_spec + org.easymock + easymockclassextension test - - javax.xml.bind - jaxb-api - @@ -133,5 +119,28 @@ - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + test + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + test + + + javax.xml.bind + jaxb-api + + + + Modified: cxf/trunk/rt/bindings/jbi/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/jbi/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/bindings/jbi/pom.xml (original) +++ cxf/trunk/rt/bindings/jbi/pom.xml Sat Feb 6 12:50:23 2010 @@ -32,7 +32,21 @@ - + + org.springframework + spring-beans + provided + + + org.springframework + spring-core + provided + + + org.springframework + spring-context + test + org.apache.cxf cxf-api Modified: cxf/trunk/rt/bindings/object/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/object/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/bindings/object/pom.xml (original) +++ cxf/trunk/rt/bindings/object/pom.xml Sat Feb 6 12:50:23 2010 @@ -31,6 +31,16 @@ + + org.springframework + spring-beans + provided + + + org.springframework + spring-core + provided + org.apache.cxf Modified: cxf/trunk/rt/bindings/soap/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/soap/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/bindings/soap/pom.xml (original) +++ cxf/trunk/rt/bindings/soap/pom.xml Sat Feb 6 12:50:23 2010 @@ -31,6 +31,16 @@ + + org.springframework + spring-core + true + + + org.springframework + spring-beans + true + org.apache.cxf @@ -88,26 +98,6 @@ test - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - test - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - compile - true - - - javax.xml.bind - jaxb-api - - - ${saaj.impl.groupId} - ${saaj.impl.artifactId} - true - - org.apache.mina mina-core 2.0.0-M6 @@ -133,5 +123,34 @@ + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + test + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + compile + true + + + javax.xml.bind + jaxb-api + + + ${saaj.impl.groupId} + ${saaj.impl.artifactId} + true + + + + Modified: cxf/trunk/rt/core/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/core/pom.xml (original) +++ cxf/trunk/rt/core/pom.xml Sat Feb 6 12:50:23 2010 @@ -69,13 +69,20 @@ org.springframework spring-core + true - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec + org.springframework + spring-beans + true + org.springframework + spring-context + true + + + xml-resolver xml-resolver true @@ -91,7 +98,10 @@ easymockclassextension test - + + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + com.sun.xml.fastinfoset FastInfoset @@ -99,5 +109,4 @@ - Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java (original) +++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/attachment/ByteDataSource.java Sat Feb 6 12:50:23 2010 @@ -36,6 +36,10 @@ public ByteDataSource(byte[] dataParam) { this(dataParam, 0, dataParam.length); } + public ByteDataSource(byte[] dataParam, String ct) { + this(dataParam, 0, dataParam.length); + contentType = ct; + } public ByteDataSource(byte[] dataParam, int offsetParam, int lengthParam) { this.data = dataParam; Modified: cxf/trunk/rt/databinding/jaxb/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/pom.xml (original) +++ cxf/trunk/rt/databinding/jaxb/pom.xml Sat Feb 6 12:50:23 2010 @@ -110,29 +110,12 @@ ${project.version} - org.apache.cxf cxf-testutils ${project.version} test - - - org.apache.geronimo.specs - geronimo-javamail_1.4_spec - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - - - - ${stax.impl.groupId} - ${stax.impl.artifactId} - - - com.sun.xml.bind jaxb-impl @@ -146,11 +129,34 @@ asm true - - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - test - - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + test + + + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + + + + + Modified: cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original) +++ cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Sat Feb 6 12:50:23 2010 @@ -307,7 +307,15 @@ } - contextClasses = new LinkedHashSet>(); + contextClasses = new LinkedHashSet>() { + @Override + public boolean add(Class e) { + if (e == null) { + Thread.dumpStack(); + } + return super.add(e); + } + }; for (ServiceInfo serviceInfo : service.getServiceInfos()) { JAXBContextInitializer initializer = new JAXBContextInitializer(serviceInfo, contextClasses, typeRefs); Modified: cxf/trunk/rt/databinding/xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/xmlbeans/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/databinding/xmlbeans/pom.xml (original) +++ cxf/trunk/rt/databinding/xmlbeans/pom.xml Sat Feb 6 12:50:23 2010 @@ -61,6 +61,8 @@ ${project.version} + + org.apache.cxf cxf-tools-wsdlto-core @@ -88,15 +90,6 @@ - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec - - - ${stax.impl.groupId} - ${stax.impl.artifactId} - - - org.apache.cxf cxf-rt-transports-local ${project.version} @@ -157,12 +150,12 @@ src/test/resources/wsdl - src/test/resources/wsdl/xmlbeanstest.wsdl - xmlbeans - - -classdir - ${basedir}/target/generated/src/test/resources - + src/test/resources/wsdl/xmlbeanstest.wsdl + xmlbeans + + -classdir + ${basedir}/target/generated/src/test/resources + @@ -174,4 +167,23 @@ + + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + + + + Modified: cxf/trunk/rt/frontend/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/pom.xml (original) +++ cxf/trunk/rt/frontend/jaxws/pom.xml Sat Feb 6 12:50:23 2010 @@ -56,14 +56,6 @@ - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - asm asm @@ -107,15 +99,6 @@ - javax.xml.soap - saaj-api - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - provided - - org.springframework spring-web provided @@ -131,30 +114,28 @@ org.springframework spring-aop provided - ${spring.version} org.springframework spring-beans provided - ${spring.version} org.springframework spring-context provided - ${spring.version} org.springframework spring-core provided - ${spring.version} - ${saaj.impl.groupId} - ${saaj.impl.artifactId} - + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + provided + + @@ -197,6 +178,42 @@ + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + + + javax.xml.soap + saaj-api + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + + + ${saaj.impl.groupId} + ${saaj.impl.artifactId} + + + Modified: cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/SwAOutInterceptor.java Sat Feb 6 12:50:23 2010 @@ -24,7 +24,6 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.StringWriter; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; @@ -40,7 +39,6 @@ import javax.imageio.ImageIO; import javax.imageio.ImageWriter; import javax.imageio.stream.ImageOutputStream; -import javax.mail.util.ByteArrayDataSource; import javax.xml.bind.JAXBContext; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -48,6 +46,7 @@ import javax.xml.transform.stream.StreamSource; import org.apache.cxf.attachment.AttachmentImpl; +import org.apache.cxf.attachment.ByteDataSource; import org.apache.cxf.binding.soap.SoapMessage; import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor; import org.apache.cxf.binding.soap.model.SoapBodyInfo; @@ -181,7 +180,7 @@ LOG, ct)); } - dh = new DataHandler(new ByteArrayDataSource(bos.toByteArray(), ct)); + dh = new DataHandler(new ByteDataSource(bos.toByteArray(), ct)); } else if (o instanceof DataHandler) { dh = (DataHandler) o; ct = dh.getContentType(); @@ -198,13 +197,13 @@ if (ct == null) { ct = "application/octet-stream"; } - dh = new DataHandler(new ByteArrayDataSource((byte[])o, ct)); + dh = new DataHandler(new ByteDataSource((byte[])o, ct)); } else if (o instanceof String) { if (ct == null) { ct = "text/plain; charset=\'UTF-8\'"; } try { - dh = new DataHandler(new ByteArrayDataSource((String)o, ct)); + dh = new DataHandler(new ByteDataSource(((String)o).getBytes("UTF-8"), ct)); } catch (IOException e) { throw new Fault(e); } @@ -233,25 +232,23 @@ if (src.getInputStream() != null) { ByteArrayOutputStream bos = new ByteArrayOutputStream(2048); IOUtils.copy(src.getInputStream(), bos, 1024); - ds = new ByteArrayDataSource(bos.toByteArray(), ct); + ds = new ByteDataSource(bos.toByteArray(), ct); } else { - ds = new ByteArrayDataSource(IOUtils.toString(src.getReader()), + ds = new ByteDataSource(IOUtils.toString(src.getReader()).getBytes("UTF-8"), ct); } } catch (IOException e) { throw new Fault(e); } } else { - StringWriter stringWriter = new StringWriter(); - XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(stringWriter); + ByteArrayOutputStream bwriter = new ByteArrayOutputStream(); + XMLStreamWriter writer = StaxUtils.createXMLStreamWriter(bwriter); try { StaxUtils.copy((Source)o, writer); writer.flush(); - ds = new ByteArrayDataSource(stringWriter.toString(), ct); + ds = new ByteDataSource(bwriter.toByteArray(), ct); } catch (XMLStreamException e1) { throw new Fault(e1); - } catch (IOException e) { - throw new Fault(e); } } return ds; Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java (original) +++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/ContextPropertiesMappingTest.java Sat Feb 6 12:50:23 2010 @@ -25,13 +25,13 @@ import javax.activation.DataHandler; import javax.activation.DataSource; -import javax.mail.util.ByteArrayDataSource; import javax.xml.ws.BindingProvider; import javax.xml.ws.handler.MessageContext; import javax.xml.ws.handler.MessageContext.Scope; import org.apache.cxf.attachment.AttachmentImpl; +import org.apache.cxf.attachment.ByteDataSource; import org.apache.cxf.jaxws.context.WrappedMessageContext; import org.apache.cxf.message.Attachment; import org.apache.cxf.message.Exchange; @@ -100,7 +100,7 @@ Collection attachments = new LinkedList(); - DataSource source = new ByteArrayDataSource(new byte[0], "text/xml"); + DataSource source = new ByteDataSource(new byte[0], "text/xml"); DataHandler handler1 = new DataHandler(source); attachments.add(new AttachmentImpl("part1", handler1)); Modified: cxf/trunk/rt/frontend/js/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/js/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/frontend/js/pom.xml (original) +++ cxf/trunk/rt/frontend/js/pom.xml Sat Feb 6 12:50:23 2010 @@ -42,23 +42,11 @@ xmlbeans - javax.xml.bind - jaxb-api - - - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec - - org.apache.cxf cxf-api ${project.version} - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - - org.apache.cxf cxf-rt-frontend-jaxws ${project.version} @@ -77,4 +65,27 @@ + + + jdk15 + + 1.5 + + + + javax.xml.bind + jaxb-api + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + + + Modified: cxf/trunk/rt/frontend/simple/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/simple/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/frontend/simple/pom.xml (original) +++ cxf/trunk/rt/frontend/simple/pom.xml Sat Feb 6 12:50:23 2010 @@ -34,6 +34,22 @@ + org.springframework + spring-core + true + + + org.springframework + spring-beans + true + + + org.springframework + spring-context + true + + + junit junit test Modified: cxf/trunk/rt/management-web/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/management-web/pom.xml (original) +++ cxf/trunk/rt/management-web/pom.xml Sat Feb 6 12:50:23 2010 @@ -39,6 +39,10 @@ test + commons-lang + commons-lang + + org.apache.cxf cxf-common-utilities ${project.version} Modified: cxf/trunk/rt/management/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/management/pom.xml (original) +++ cxf/trunk/rt/management/pom.xml Sat Feb 6 12:50:23 2010 @@ -57,6 +57,17 @@ org.springframework spring-core + provided + + + org.springframework + spring-beans + test + + + org.springframework + spring-context + test Modified: cxf/trunk/rt/testsupport/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/testsupport/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/testsupport/pom.xml (original) +++ cxf/trunk/rt/testsupport/pom.xml Sat Feb 6 12:50:23 2010 @@ -30,11 +30,6 @@ cxf-rt-transports-http ${project.version} - org.apache.cxf cxf-rt-bindings-soap @@ -49,30 +44,7 @@ org.codehaus.jra jra - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - - - javax.xml.soap - saaj-api - - - javax.xml.bind - jaxb-api - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - + org.apache.cxf cxf-api @@ -88,4 +60,40 @@ 1.9.6.2 + + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + javax.xml.soap + saaj-api + + + javax.xml.bind + jaxb-api + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + + + Modified: cxf/trunk/rt/transports/jbi/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jbi/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/transports/jbi/pom.xml (original) +++ cxf/trunk/rt/transports/jbi/pom.xml Sat Feb 6 12:50:23 2010 @@ -54,10 +54,6 @@ ${project.version} - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - org.apache.cxf cxf-testutils ${project.version} @@ -146,5 +142,18 @@ - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + + + + Modified: cxf/trunk/rt/transports/jms/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/transports/jms/pom.xml (original) +++ cxf/trunk/rt/transports/jms/pom.xml Sat Feb 6 12:50:23 2010 @@ -65,11 +65,6 @@ test - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - test - org.apache.geronimo.specs @@ -109,10 +104,6 @@ - javax.xml.bind - jaxb-api - - com.sun.xml.bind jaxb-impl @@ -192,5 +183,24 @@ + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + test + + + javax.xml.bind + jaxb-api + + + + Modified: cxf/trunk/rt/ws/addr/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/addr/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/ws/addr/pom.xml (original) +++ cxf/trunk/rt/ws/addr/pom.xml Sat Feb 6 12:50:23 2010 @@ -31,8 +31,19 @@ + + org.springframework + spring-core + true + + + org.springframework + spring-beans + true + + junit junit test @@ -49,10 +60,6 @@ ${project.version} - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - - org.apache.cxf cxf-common-utilities ${project.version} @@ -64,12 +71,9 @@ ${project.version} - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - + - + org.apache.cxf cxf-testutils @@ -79,5 +83,22 @@ - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + + Modified: cxf/trunk/rt/ws/policy/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/policy/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/ws/policy/pom.xml (original) +++ cxf/trunk/rt/ws/policy/pom.xml Sat Feb 6 12:50:23 2010 @@ -31,16 +31,21 @@ - - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - test - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - + org.springframework + spring-beans + provided + + + org.springframework + spring-core + provided + + + org.springframework + spring-context + provided + org.apache.cxf cxf-common-utilities @@ -70,6 +75,9 @@ test + + + org.apache.cxf cxf-testutils @@ -85,7 +93,7 @@ org.easymock easymockclassextension test - + @@ -136,7 +144,7 @@ generate-test-sources generate-test-sources - ${basedir}/target/generated/src/test/java + ${basedir}/target/generated/src/test/java ${basedir}/src/test/resources/attachment/wsdl11/calculator-binding.wsdl @@ -152,5 +160,23 @@ - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + test + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + + Modified: cxf/trunk/rt/ws/rm/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/rm/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/ws/rm/pom.xml (original) +++ cxf/trunk/rt/ws/rm/pom.xml Sat Feb 6 12:50:23 2010 @@ -33,8 +33,14 @@ - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec + org.springframework + spring-beans + provided + + + org.springframework + spring-core + provided org.apache.cxf @@ -85,6 +91,21 @@ test + + org.springframework + spring-core + provided + + + org.springframework + spring-beans + provided + + + org.springframework + spring-context + provided + @@ -126,11 +147,27 @@ - - org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version} - - + + org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version} + + + + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + + + Modified: cxf/trunk/rt/ws/security/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/rt/ws/security/pom.xml (original) +++ cxf/trunk/rt/ws/security/pom.xml Sat Feb 6 12:50:23 2010 @@ -87,10 +87,7 @@ ${project.version} provided - - javax.xml.soap - saaj-api - + org.apache.ws.security wss4j @@ -168,11 +165,6 @@ ${project.version} test - - ${saaj.impl.groupId} - ${saaj.impl.artifactId} - test - @@ -193,6 +185,23 @@ + + jdk15 + + 1.5 + + + + javax.xml.soap + saaj-api + + + ${saaj.impl.groupId} + ${saaj.impl.artifactId} + test + + + Modified: cxf/trunk/systests/jaxws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/systests/jaxws/pom.xml (original) +++ cxf/trunk/systests/jaxws/pom.xml Sat Feb 6 12:50:23 2010 @@ -88,6 +88,10 @@ geronimo-servlet_2.5_spec + org.apache.geronimo.specs + geronimo-javamail_1.4_spec + + org.apache.cxf cxf-common-utilities ${project.version} Modified: cxf/trunk/testutils/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/testutils/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/testutils/pom.xml (original) +++ cxf/trunk/testutils/pom.xml Sat Feb 6 12:50:23 2010 @@ -43,30 +43,6 @@ jra - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - - - javax.xml.soap - saaj-api - - - javax.xml.bind - jaxb-api - - - org.apache.geronimo.specs - geronimo-annotation_1.0_spec - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - - org.apache.cxf cxf-api ${project.version} @@ -284,5 +260,38 @@ - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + javax.xml.soap + saaj-api + + + javax.xml.bind + jaxb-api + + + org.apache.geronimo.specs + geronimo-annotation_1.0_spec + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + + + + Modified: cxf/trunk/tools/common/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/tools/common/pom.xml (original) +++ cxf/trunk/tools/common/pom.xml Sat Feb 6 12:50:23 2010 @@ -66,10 +66,6 @@ jaxb-impl - - javax.xml.soap - saaj-api - org.apache.cxf @@ -88,25 +84,33 @@ cxf-rt-core ${project.version} - - - - - org.apache.geronimo.specs - geronimo-ws-metadata_2.0_spec - - - - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - test - - + + + + jdk15 + + 1.5 + + + + javax.xml.soap + saaj-api + + + org.apache.geronimo.specs + geronimo-ws-metadata_2.0_spec + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + test + + + javax.xml.soap + saaj-api + + + + Modified: cxf/trunk/tools/javato/ws/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/javato/ws/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/tools/javato/ws/pom.xml (original) +++ cxf/trunk/tools/javato/ws/pom.xml Sat Feb 6 12:50:23 2010 @@ -32,7 +32,7 @@ ../../../parent/pom.xml - + org.apache.cxf cxf-tools-common @@ -69,24 +69,21 @@ ${project.version} - - org.apache.cxf - cxf-rt-core - ${project.version} - - org.apache.cxf - cxf-rt-javascript - ${project.version} + org.apache.cxf + cxf-rt-core + ${project.version} - javax.xml.bind - jaxb-api + org.apache.cxf + cxf-rt-javascript + ${project.version} + junit junit @@ -114,16 +111,7 @@ - - javax.xml.soap - saaj-api - - - ${stax.impl.groupId} - ${stax.impl.artifactId} - runtime - org.apache.cxf @@ -159,11 +147,6 @@ - org.apache.geronimo.specs - geronimo-jaxws_2.1_spec - - - org.apache.cxf cxf-testutils ${project.version} @@ -213,5 +196,32 @@ + + + jdk15 + + 1.5 + + + + javax.xml.bind + jaxb-api + + + javax.xml.soap + saaj-api + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + runtime + + + org.apache.geronimo.specs + geronimo-jaxws_2.1_spec + + + + Modified: cxf/trunk/tools/validator/pom.xml URL: http://svn.apache.org/viewvc/cxf/trunk/tools/validator/pom.xml?rev=907207&r1=907206&r2=907207&view=diff ============================================================================== --- cxf/trunk/tools/validator/pom.xml (original) +++ cxf/trunk/tools/validator/pom.xml Sat Feb 6 12:50:23 2010 @@ -70,20 +70,13 @@ jaxb-impl - - javax.xml.soap - saaj-api - + org.apache.ws.commons.schema XmlSchema - - ${stax.impl.groupId} - ${stax.impl.artifactId} - runtime - + org.apache.cxf cxf-common-utilities @@ -96,23 +89,38 @@ ${project.version} - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec + org.apache.cxf + cxf-rt-core + ${project.version} - - org.apache.cxf - cxf-rt-core - ${project.version} - - - - org.apache.cxf - cxf-api - ${project.version} - - - + + org.apache.cxf + cxf-api + ${project.version} + - + + + jdk15 + + 1.5 + + + + org.apache.geronimo.specs + geronimo-stax-api_1.0_spec + + + ${stax.impl.groupId} + ${stax.impl.artifactId} + runtime + + + javax.xml.soap + saaj-api + + + +