cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
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 GMT
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 @@
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -71,18 +67,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${stax.impl.groupId}</groupId>
-            <artifactId>${stax.impl.artifactId}</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
         </dependency>
@@ -91,6 +79,11 @@
             <artifactId>cxf-common-schemas</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
@@ -244,6 +237,26 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${stax.impl.groupId}</groupId>
+                    <artifactId>${stax.impl.artifactId}</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
 </project>

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 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -78,18 +71,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -100,6 +84,7 @@
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -120,36 +105,15 @@
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
             <scope>provided</scope>
-        </dependency> 
-
-        <dependency>
-            <groupId>${stax.impl.groupId}</groupId>
-            <artifactId>${stax.impl.artifactId}</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
+            <!-- this is probably not quite what we want in terms of the behavior of the other tests 
+                 than the schema surgery test. -->
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${saaj.impl.groupId}</groupId>
-            <artifactId>${saaj.impl.artifactId}</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-	<dependency>
-<!-- this is probably not quite what we want in terms of the behavior of the other tests 
-     than the schema surgery test. -->
-	  <groupId>xerces</groupId>
-	  <artifactId>xercesImpl</artifactId>
-	  <scope>test</scope>
-	</dependency>
     </dependencies>
 
     <profiles>
@@ -169,6 +133,52 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                 <jdk>1.5</jdk>
+             </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${stax.impl.groupId}</groupId>
+                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${saaj.impl.groupId}</groupId>
+                    <artifactId>${saaj.impl.artifactId}</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+
+            </dependencies>
+        </profile>
     </profiles>
 
 </project>

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 @@
             <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

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 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-    	<dependency>
+        <dependency>
             <groupId>org.apache.maven.shared</groupId>
             <artifactId>maven-artifact-resolver</artifactId>
-      	    <version>1.0</version>
-    	</dependency>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-core</artifactId>
@@ -98,7 +98,22 @@
             <artifactId>cxf-tools-wsdlto-frontend-jaxws</artifactId>
             <version>${project.version}</version>
         </dependency>
-                     
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
@@ -109,6 +124,7 @@
         </dependency>
     </dependencies>
     
+
     <profiles>
         <profile>
             <id>ibmjdk</id>

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 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>

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 @@
                         <groupId>javax.xml.bind</groupId>
                         <artifactId>activation</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.bind</groupId>
+                        <artifactId>jaxb-api</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -990,6 +994,14 @@
                 <version>${abdera.version}</version>
                 <exclusions>
                     <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>javax.mail</groupId>
                         <artifactId>mail</artifactId>
                     </exclusion>

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 @@
         <compiler.fork>false</compiler.fork>
         <cxf.build-utils.version>2.3.0-SNAPSHOT</cxf.build-utils.version>
         <cxf.xjc-utils.version>2.3.0-SNAPSHOT</cxf.xjc-utils.version>
+        <jdk.version>1.6</jdk.version>
     </properties>
 
     <distributionManagement>
@@ -179,6 +180,21 @@
             </properties>
             <build>
                 <defaultGoal>process-test-sources</defaultGoal>
+                <pluginManagement>
+                    <plugins>
+                        <plugin>
+                            <groupId>org.apache.maven.plugins</groupId>
+                            <artifactId>maven-compiler-plugin</artifactId>
+                            <version>2.0.2</version>
+                            <configuration>
+                                <source>${jdk.version}</source>
+                                <target>${jdk.version}</target>
+                                <maxmem>256M</maxmem>
+                                <fork>${compiler.fork}</fork>
+                            </configuration>
+                        </plugin>
+                    </plugins>
+                </pluginManagement>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -379,6 +395,15 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <properties>
+                <jdk.version>1.5</jdk.version>
+            </properties>
+        </profile>
     </profiles>
 
 

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 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -63,4 +69,19 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 

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 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>slf4j-jdk14</artifactId>
-             <scope>test</scope>
-         </dependency>
-        <dependency>
-            <groupId>org.easymock</groupId>
-            <artifactId>easymockclassextension</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -133,5 +119,28 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
 
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>

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 @@
     </parent>
 
     <dependencies>
+        <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-beans</artifactId>
+             <scope>provided</scope>
+         </dependency>
+         <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-core</artifactId>
+             <scope>provided</scope>
+         </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>

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 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -88,26 +98,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <scope>compile</scope>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${saaj.impl.groupId}</groupId>
-            <artifactId>${saaj.impl.artifactId}</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
             <version>2.0.0-M6</version>
@@ -133,5 +123,34 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    <scope>compile</scope>
+                    <optional>true</optional>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${saaj.impl.groupId}</groupId>
+                    <artifactId>${saaj.impl.artifactId}</artifactId>
+                    <optional>true</optional>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
+
 </project>

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 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <optional>true</optional>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
         </dependency>
         <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-context</artifactId>
+             <optional>true</optional>
+         </dependency>
+
+        <dependency>
             <groupId>xml-resolver</groupId>
             <artifactId>xml-resolver</artifactId>
             <optional>true</optional>
@@ -91,7 +98,10 @@
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.fastinfoset</groupId>
             <artifactId>FastInfoset</artifactId>
@@ -99,5 +109,4 @@
         </dependency>
     </dependencies>
 
-
 </project>

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 @@
             <version>${project.version}</version>
         </dependency>
        
-
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-javamail_1.4_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>${stax.impl.groupId}</groupId>
-            <artifactId>${stax.impl.artifactId}</artifactId>
-        </dependency>
-
-
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -146,11 +129,34 @@
             <artifactId>asm</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-
+    <profiles>
+         <profile>
+             <id>jdk15</id>
+             <activation>
+                 <jdk>1.5</jdk>
+             </activation>
+             <dependencies>
+                 <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                     <scope>test</scope>
+                 </dependency>
+                 <dependency>
+                      <groupId>org.apache.geronimo.specs</groupId>
+                      <artifactId>geronimo-javamail_1.4_spec</artifactId>
+                  </dependency>
+                  <dependency>
+                      <groupId>org.apache.geronimo.specs</groupId>
+                      <artifactId>geronimo-activation_1.1_spec</artifactId>
+                  </dependency>
+
+                  <dependency>
+                      <groupId>${stax.impl.groupId}</groupId>
+                      <artifactId>${stax.impl.artifactId}</artifactId>
+                  </dependency>
+
+             </dependencies>
+         </profile>
+    </profiles>
 </project>

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<Class<?>>();
+        contextClasses = new LinkedHashSet<Class<?>>() {
+            @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 @@
             <version>${project.version}</version>
         </dependency>
         
+
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-wsdlto-core</artifactId>
@@ -88,15 +90,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-	    <groupId>${stax.impl.groupId}</groupId>
-	    <artifactId>${stax.impl.artifactId}</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-local</artifactId>
             <version>${project.version}</version>
@@ -157,12 +150,12 @@
                             <testWsdlRoot>src/test/resources/wsdl</testWsdlRoot>
                             <wsdlOptions>
                                 <wsdlOption>
-                                  <wsdl>src/test/resources/wsdl/xmlbeanstest.wsdl</wsdl>
-                                  <dataBinding>xmlbeans</dataBinding>
-                                  <extraargs>
-                                    <arg>-classdir</arg>
-                                    <arg>${basedir}/target/generated/src/test/resources</arg>
-                                  </extraargs>
+                                    <wsdl>src/test/resources/wsdl/xmlbeanstest.wsdl</wsdl>
+                                    <dataBinding>xmlbeans</dataBinding>
+                                    <extraargs>
+                                        <arg>-classdir</arg>
+                                        <arg>${basedir}/target/generated/src/test/resources</arg>
+                                    </extraargs>
                                 </wsdlOption>
                             </wsdlOptions>
                         </configuration>
@@ -174,4 +167,23 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${stax.impl.groupId}</groupId>
+                    <artifactId>${stax.impl.artifactId}</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
          </dependency> 
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
         </dependency>
@@ -107,15 +99,6 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <scope>provided</scope>
-        </dependency>        
-        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
             <scope>provided</scope>
@@ -131,30 +114,28 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aop</artifactId>
             <scope>provided</scope>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <scope>provided</scope>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
             <scope>provided</scope>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
             <scope>provided</scope>
-            <version>${spring.version}</version>
         </dependency>
         <dependency>
-            <groupId>${saaj.impl.groupId}</groupId>
-            <artifactId>${saaj.impl.artifactId}</artifactId>
-        </dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>        
+
     </dependencies>
 
     <build>
@@ -197,6 +178,42 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${stax.impl.groupId}</groupId>
+                    <artifactId>${stax.impl.artifactId}</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+                <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>${saaj.impl.groupId}</groupId>
+                     <artifactId>${saaj.impl.artifactId}</artifactId>
+                 </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
 </project>

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<Attachment> attachments = new LinkedList<Attachment>();
 
-        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 @@
             <artifactId>xmlbeans</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
             <version>${project.version}</version>
@@ -77,4 +65,27 @@
 
     </dependencies>
 
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                </dependency>
+
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+             <groupId>org.springframework</groupId>
+             <artifactId>spring-context</artifactId>
+             <optional>true</optional>
+         </dependency>
+
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

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 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</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 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

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 @@
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!--dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${project.version}</version>
-        </dependency-->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-soap</artifactId>
@@ -49,30 +44,7 @@
             <groupId>org.codehaus.jra</groupId>
             <artifactId>jra</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
@@ -88,4 +60,40 @@
             <version>1.9.6.2</version>
         </dependency>
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>

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 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-       </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
@@ -146,5 +142,18 @@
             </plugin>
         </plugins>
     </build>
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+               </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -109,10 +104,6 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
@@ -192,5 +183,24 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 
 </project>

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 @@
     </parent>
 
        
+
     <dependencies>
         <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
@@ -49,10 +60,6 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</version>
@@ -64,12 +71,9 @@
             <version>${project.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
+
         
-		<!-- Test stuff -->
+        <!-- Test stuff -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
@@ -79,5 +83,22 @@
 
     </dependencies>
 
-
+    <profiles>
+         <profile>
+             <id>jdk15</id>
+             <activation>
+                 <jdk>1.5</jdk>
+             </activation>
+             <dependencies>
+                 <dependency>
+                      <groupId>org.apache.geronimo.specs</groupId>
+                      <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                  </dependency>
+                  <dependency>
+                      <groupId>org.apache.geronimo.specs</groupId>
+                      <artifactId>geronimo-activation_1.1_spec</artifactId>
+                  </dependency>
+             </dependencies>
+         </profile>
+    </profiles>
 </project>

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 @@
     </parent>
 
     <dependencies>
-        
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-	    <scope>test</scope>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.geronimo.specs</groupId>
-	    <artifactId>geronimo-annotation_1.0_spec</artifactId>
-	</dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
@@ -70,6 +75,9 @@
             <scope>test</scope>
         </dependency>
         
+
+
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
@@ -85,7 +93,7 @@
             <groupId>org.easymock</groupId>
             <artifactId>easymockclassextension</artifactId>
             <scope>test</scope>
-        </dependency>  
+        </dependency>
     </dependencies>
 
     <build>
@@ -136,7 +144,7 @@
                         <id>generate-test-sources</id>
                         <phase>generate-test-sources</phase>
                         <configuration>
-                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>                            
+                            <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
                             <wsdlOptions>
                                 <wsdlOption>
                                     <wsdl>${basedir}/src/test/resources/attachment/wsdl11/calculator-binding.wsdl</wsdl>
@@ -152,5 +160,23 @@
         </plugins>
     </build>
 
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -85,6 +91,21 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
     </dependencies>
 
@@ -126,11 +147,27 @@
                     </execution>
                 </executions>
                 <configuration>
-                     <extensions>
-                         <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
-                     </extensions>
-                 </configuration>
+                    <extensions>
+                        <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+                    </extensions>
+                </configuration>
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>

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 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
@@ -168,11 +165,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${saaj.impl.groupId}</groupId>
-            <artifactId>${saaj.impl.artifactId}</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 
@@ -193,6 +185,23 @@
                 </dependency>
             </dependencies>
         </profile>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${saaj.impl.groupId}</groupId>
+                    <artifactId>${saaj.impl.artifactId}</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 
 </project>

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 @@
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-javamail_1.4_spec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
             <version>${project.version}</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 @@
             <artifactId>jra</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-activation_1.1_spec</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
             <version>${project.version}</version>
@@ -284,5 +260,38 @@
         </plugins>
     </build>
 
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>javax.xml.soap</groupId>
+                     <artifactId>saaj-api</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>javax.xml.bind</groupId>
+                     <artifactId>jaxb-api</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-annotation_1.0_spec</artifactId>
+                 </dependency>
+                 <dependency>
+                     <groupId>org.apache.geronimo.specs</groupId>
+                     <artifactId>geronimo-activation_1.1_spec</artifactId>
+                 </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
             <artifactId>jaxb-impl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -88,25 +84,33 @@
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!--dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-core</artifactId>
-            <classifier>tests</classifier>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency-->
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
+
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                    <scope>test</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>

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 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <dependencies>    
+    <dependencies>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-tools-common</artifactId>
@@ -69,24 +69,21 @@
             <version>${project.version}</version>
         </dependency>
         
-        <dependency>
-	     <groupId>org.apache.cxf</groupId>
-	     <artifactId>cxf-rt-core</artifactId>
-	     <version>${project.version}</version>
-        </dependency>
 
         <dependency>
-	     <groupId>org.apache.cxf</groupId>
-	     <artifactId>cxf-rt-javascript</artifactId>
-	     <version>${project.version}</version>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-javascript</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
 
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -114,16 +111,7 @@
         </dependency>
 
 
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
 
-        <dependency>
-	    <groupId>${stax.impl.groupId}</groupId>
-	    <artifactId>${stax.impl.artifactId}</artifactId>
-            <scope>runtime</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -159,11 +147,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxws_2.1_spec</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-testutils</artifactId>
             <version>${project.version}</version>
@@ -213,5 +196,32 @@
 
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${stax.impl.groupId}</groupId>
+                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 
 </project>

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 @@
             <artifactId>jaxb-impl</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.soap</groupId>
-            <artifactId>saaj-api</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.ws.commons.schema</groupId>
             <artifactId>XmlSchema</artifactId>
         </dependency>
 
-        <dependency>
-	    <groupId>${stax.impl.groupId}</groupId>
-	    <artifactId>${stax.impl.artifactId}</artifactId>
-            <scope>runtime</scope>
-        </dependency>
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-common-utilities</artifactId>
@@ -96,23 +89,38 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-core</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-rt-core</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-
-	<dependency>
-	    <groupId>org.apache.cxf</groupId>
-	    <artifactId>cxf-api</artifactId>
-	    <version>${project.version}</version>
-	</dependency>
-
-
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
-
+    <profiles>
+        <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+                </dependency>
+                <dependency>
+                    <groupId>${stax.impl.groupId}</groupId>
+                    <artifactId>${stax.impl.artifactId}</artifactId>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>javax.xml.soap</groupId>
+                    <artifactId>saaj-api</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 </project>



Mime
View raw message