cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lmo...@apache.org
Subject svn commit: r979862 [4/19] - in /cxf/sandbox/oauth_1.0a: ./ api/ api/src/main/java/org/apache/cxf/ api/src/main/java/org/apache/cxf/endpoint/ api/src/main/java/org/apache/cxf/phase/ api/src/main/java/org/apache/cxf/ws/addressing/ api/src/main/java/org/...
Date Tue, 27 Jul 2010 20:47:12 GMT
Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml Tue Jul 27 20:46:55 2010
@@ -1,226 +1,202 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements. See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership. The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License. You may obtain a copy of the License at
- 
-  http://www.apache.org/licenses/LICENSE-2.0
- 
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied. See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.cxf.samples</groupId>
-    <artifactId>wssec</artifactId>
-    <version>1.0</version>
-    <name>WS-Security Demo</name>
-    <properties>
-        <cxf.version>[2,)</cxf.version>
-    </properties>
-    <build>
-        <sourceDirectory>src</sourceDirectory>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
-                <executions>
-                    <execution>
-                        <id>generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <wsdlOptions>
-                                <wsdlOption>
-                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
-                                </wsdlOption>
-                            </wsdlOptions>
-                        </configuration>
-                        <goals>
-                            <goal>wsdl2java</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copyxmlfiles</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <copy file="${basedir}/src/demo/wssec/server/wssec.xml" todir="${basedir}/target/classes/demo/wssec/server"/>
-                                <copy file="${basedir}/src/demo/wssec/client/wssec.xml" todir="${basedir}/target/classes/demo/wssec/client"/>
-                                <copy todir="${basedir}/target/classes/certs">
-                                    <fileset dir="${basedir}/certs"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <profiles>
-        <profile>
-            <id>server</id>
-            <build>
-                <defaultGoal>test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>java</executable>
-                                    <arguments>
-                                        <argument>-classpath</argument>
-                                        <classpath/>
-                                        <argument>demo.wssec.server.Server</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>client</id>
-            <build>
-                <defaultGoal>test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <mainClass>demo.wssec.client.Client</mainClass>
-                                    <arguments>
-                                        <argument>${basedir}/wsdl/hello_world.wsdl</argument>
-                                        <argument>secure</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>client.unauthenticated</id>
-            <build>
-                <defaultGoal>test</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <phase>test</phase>
-                                <goals>
-                                    <goal>java</goal>
-                                </goals>
-                                <configuration>
-                                    <mainClass>demo.wssec.client.Client</mainClass>
-                                    <arguments>
-                                        <argument>${basedir}/wsdl/hello_world_no_policy.wsdl</argument>
-                                        <argument>secure</argument>
-                                    </arguments>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
-    </profiles>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-       
-
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-security</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>${cxf.version}</version>
-        </dependency>
-        
-
-    </dependencies>
-</project>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+ 
+  http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.cxf.samples</groupId>
+    <artifactId>wssec_ut_policy</artifactId>
+    <name>WS-Security Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <cxf.version>${project.version}</cxf.version>
+    </properties>
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-codegen-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <wsdlOptions>
+                                <wsdlOption>
+                                    <wsdl>${basedir}/wsdl/hello_world.wsdl</wsdl>
+                                </wsdlOption>
+                            </wsdlOptions>
+                        </configuration>
+                        <goals>
+                            <goal>wsdl2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copyxmlfiles</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <copy file="${basedir}/src/demo/wssec/server/wssec.xml" todir="${basedir}/target/classes/demo/wssec/server"/>
+                                <copy file="${basedir}/src/demo/wssec/client/wssec.xml" todir="${basedir}/target/classes/demo/wssec/client"/>
+                                <copy todir="${basedir}/target/classes/certs">
+                                    <fileset dir="${basedir}/certs"/>
+                                </copy>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>server</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>exec</goal>
+                                </goals>
+                                <configuration>
+                                    <executable>java</executable>
+                                    <arguments>
+                                        <argument>-classpath</argument>
+                                        <classpath/>
+                                        <argument>demo.wssec.server.Server</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>client</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>demo.wssec.client.Client</mainClass>
+                                    <arguments>
+                                        <argument>${basedir}/wsdl/hello_world.wsdl</argument>
+                                        <argument>secure</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>client.unauthenticated</id>
+            <build>
+                <defaultGoal>test</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>test</phase>
+                                <goals>
+                                    <goal>java</goal>
+                                </goals>
+                                <configuration>
+                                    <mainClass>demo.wssec.client.Client</mainClass>
+                                    <arguments>
+                                        <argument>${basedir}/wsdl/hello_world_no_policy.wsdl</argument>
+                                        <argument>secure</argument>
+                                    </arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http-jetty</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+       
+
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-security</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-ws-policy</artifactId>
+            <version>${cxf.version}</version>
+        </dependency>
+        
+
+    </dependencies>
+</project>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/ws_security/ut_sign/pom.xml Tue Jul 27 20:46:55 2010
@@ -19,11 +19,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
-    <artifactId>wssec</artifactId>
-    <version>1.0</version>
+    <artifactId>wssec_ut_sign</artifactId>
     <name>WS-Security Demo</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <resources>
@@ -48,7 +53,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -115,35 +120,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
 
     <dependencies>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,11 +20,16 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first</artifactId>
-    <version>1.0</version>
     <packaging>war</packaging>
     <name>WSDL first demo using Document/Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
+        <cxf.release.base>${basedir}/../..</cxf.release.base>
     </properties>
     <build>
         <resources>
@@ -40,7 +45,7 @@
                 <plugin>
                     <artifactId>maven-war-plugin</artifactId>
                     <configuration>
-                        <webXml>../../etc/web.xml</webXml>
+                        <webXml>${cxf.release.base}/etc/web.xml</webXml>
                         <webResources>
                             <resource>
                                 <directory>wsdl</directory>
@@ -72,7 +77,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -145,35 +150,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
 
     <dependencies>
@@ -197,6 +173,7 @@
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.7</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_dynamic_client/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_dynamic_client</artifactId>
-    <version>1.0</version>
     <name>CXF Dynamic Client Sample</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <defaultGoal>install</defaultGoal>
@@ -39,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -109,35 +113,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_https/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_https/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_https/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_https/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_https</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using HTTPS</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -217,36 +222,6 @@
                 </plugins>
             </build>
         </profile>
-
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_pure_xml/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_pure_xml</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using BARE Style in XML Binding (pure XML over HTTP)</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -111,35 +115,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_rpclit/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,11 +20,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_rpclit</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using RPC-Literal Style</name>
+
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
+
     <build>
         <sourceDirectory>src</sourceDirectory>
         <plugins>
@@ -38,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -111,35 +118,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_soap12/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_soap12</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using SOAP12 in Document/Literal Style</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -137,35 +141,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xml_wrapped/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_xml_wrapped</artifactId>
-    <version>1.0</version>
     <name>CXF sample using WRAPPED Style in XML Binding (pure XML over HTTP)</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
+
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
     <build>
         <sourceDirectory>src</sourceDirectory>
@@ -38,7 +43,7 @@
             <plugin>
                 <groupId>org.apache.cxf</groupId>
                 <artifactId>cxf-codegen-plugin</artifactId>
-                <version>LATEST</version>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
                         <id>generate-sources</id>
@@ -137,35 +142,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/distribution/src/main/release/samples/wsdl_first_xmlbeans/pom.xml Tue Jul 27 20:46:55 2010
@@ -20,10 +20,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.cxf.samples</groupId>
     <artifactId>wsdl_first_xmlbeans</artifactId>
-    <version>1.0</version>
     <name>WSDL first demo using Document/Literal Style and XMLBeans DataBinding</name>
+    <parent>
+        <groupId>org.apache.cxf.samples</groupId>
+        <artifactId>cxf-samples</artifactId>
+        <version>2.3.0-SNAPSHOT</version>
+    </parent>
     <properties>
-        <cxf.version>[2,)</cxf.version>
+        <cxf.version>${project.version}</cxf.version>
     </properties>
 	<build>
 		<sourceDirectory>src</sourceDirectory>
@@ -46,16 +50,9 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>					
-				</configuration>
-			</plugin>
-			<plugin>
 				<groupId>org.apache.cxf</groupId>
 				<artifactId>cxf-codegen-plugin</artifactId>
-				<version>LATEST</version>
+				<version>${project.version}</version>
 				<executions>
 					<execution>
 						<id>generate-sources</id>
@@ -130,35 +127,6 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>snapshots</id>
-            <repositories>
-                <repository>
-                    <id>apache-snapshots</id>
-                    <name>Apache SNAPSHOT Repository</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-            <pluginRepositories>
-                <pluginRepository>
-                    <id>apache-snapshots</id>
-                    <name>Apache Maven Plugin Snapshots</name>
-                    <url>https://repository.apache.org/content/groups/snapshots-group/</url>
-                    <releases>
-                        <enabled>false</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>true</enabled>
-                    </snapshots>
-                </pluginRepository>
-            </pluginRepositories>
-        </profile>
     </profiles>    
     <dependencies>
         <dependency>

Modified: cxf/sandbox/oauth_1.0a/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java (original)
+++ cxf/sandbox/oauth_1.0a/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java Tue Jul 27 20:46:55 2010
@@ -33,13 +33,13 @@ import javax.jbi.messaging.MessagingExce
 import javax.jbi.servicedesc.ServiceEndpoint;
 import javax.jws.WebService;
 import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
+import org.xml.sax.InputSource;
+
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusException;
 import org.apache.cxf.common.i18n.Message;
@@ -48,6 +48,7 @@ import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.jaxws.EndpointImpl;
 import org.apache.cxf.jaxws.EndpointUtils;
 import org.apache.cxf.jbi.ServiceConsumer;
+import org.apache.cxf.staxutils.StaxUtils;
 import org.apache.cxf.transport.ConduitInitiatorManager;
 import org.apache.cxf.transport.jbi.JBITransportFactory;
 
@@ -228,12 +229,10 @@ public class CXFServiceUnit {
                 Class<?> clz = classes.iterator().next();
                 ws = clz.getAnnotation(WebService.class);
             }
-            if (ws != null) { 
-                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-                factory.setNamespaceAware(true);
-                DocumentBuilder builder = factory.newDocumentBuilder();
-                doc = builder.parse(ws.wsdlLocation());
-                
+            if (ws != null) {
+                InputSource in = new InputSource(ws.wsdlLocation());
+                StaxUtils.createXMLStreamReader(in);
+                doc = StaxUtils.read(in);
             } else { 
                 LOG.severe(new Message("SU.COULDNOT.GET.ANNOTATION", LOG).toString());
             }

Modified: cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java (original)
+++ cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/cxf/WorkManagerThreadPool.java Tue Jul 27 20:46:55 2010
@@ -24,7 +24,7 @@ import javax.resource.spi.work.WorkEvent
 import javax.resource.spi.work.WorkException;
 import javax.resource.spi.work.WorkManager;
 
-import org.mortbay.thread.ThreadPool;
+import org.eclipse.jetty.util.thread.ThreadPool;
 
 /**
  * The adapter for using Application Server's thread pool. 

Modified: cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java (original)
+++ cxf/sandbox/oauth_1.0a/integration/jca/src/main/java/org/apache/cxf/jca/servant/EJBEndpoint.java Tue Jul 27 20:46:55 2010
@@ -41,8 +41,8 @@ import org.apache.cxf.jaxws.JaxWsServerF
 import org.apache.cxf.jca.cxf.WorkManagerThreadPool;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
 import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngineFactory;
-import org.mortbay.jetty.AbstractConnector;
-import org.mortbay.jetty.nio.SelectChannelConnector;
+import org.eclipse.jetty.server.AbstractConnector;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 
 
 public class EJBEndpoint {

Propchange: cxf/sandbox/oauth_1.0a/maven-plugins/archetypes/cxf-jaxws-javafirst/
            ('svn:mergeinfo' removed)

Modified: cxf/sandbox/oauth_1.0a/maven-plugins/codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/maven-plugins/codegen-plugin/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/maven-plugins/codegen-plugin/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/maven-plugins/codegen-plugin/pom.xml Tue Jul 27 20:46:55 2010
@@ -115,11 +115,11 @@
         </dependency>
 
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant</artifactId>
         </dependency>
         <dependency>
-            <groupId>ant</groupId>
+            <groupId>org.apache.ant</groupId>
             <artifactId>ant-nodeps</artifactId>
         </dependency>
     </dependencies>

Modified: cxf/sandbox/oauth_1.0a/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/parent/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/parent/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/parent/pom.xml Tue Jul 27 20:46:55 2010
@@ -36,7 +36,7 @@
         <surefire.fork.mode>once</surefire.fork.mode>
         <surefire.format>brief</surefire.format>
         <surefire.usefile>false</surefire.usefile>
-        <surefire.parallel.mode/>
+        <surefire.parallel.mode />
         <surefire.fork.vmargs>-ea</surefire.fork.vmargs>
         <server.launcher.vmargs>-ea</server.launcher.vmargs>
         <compile.flags>-Xlint:unchecked,deprecation,fallthrough,finally</compile.flags>
@@ -48,25 +48,31 @@
         <saaj.impl.version>1.3.2</saaj.impl.version>
 
         <!-- please maintain alphabetical order here -->
-        <abdera.version>1.0</abdera.version>
-        <activemq.version>5.3.1</activemq.version>
+        <abdera.version>1.1</abdera.version>
+        <activemq.version>5.3.2</activemq.version>
         <derby.version>10.2.2.0</derby.version>
         <jaxb.version>2.1</jaxb.version>
         <jaxb.impl.version>2.1.13</jaxb.impl.version>
         <jaxb.xjc.version>2.1.13</jaxb.xjc.version>
+        <jaxb22.version>2.2.1</jaxb22.version>
+        <jaxb22.impl.version>2.2.1.1</jaxb22.impl.version>
+        <jaxb22.xjc.version>2.2.1.1</jaxb22.xjc.version>
         <jdom.version>1.0</jdom.version>
-        <jetty.version>6.1.21</jetty.version>
+        <jetty.version>7.1.5.v20100705</jetty.version>
         <msv.version>2009.1</msv.version>
         <rhino.version>1.7R1</rhino.version>
         <saaj.version>1.3</saaj.version>
+	<servlet-api.group>org.apache.geronimo.specs</servlet-api.group>
+	<servlet-api.artifact>geronimo-servlet_3.0_spec</servlet-api.artifact>
+	<servlet-api.version>1.0</servlet-api.version>
         <spring.version>2.5.6</spring.version>
         <spring.mock>spring-test</spring.mock>
         <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
         <stax.impl.artifactId>woodstox-core-asl</stax.impl.artifactId>
-        <stax.impl.version>4.0.7</stax.impl.version>
+        <stax.impl.version>4.0.8</stax.impl.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <xmlbeans.version>2.4.0</xmlbeans.version>
-        <xmlschema.version>1.4.5</xmlschema.version>
+        <xmlschema.version>1.4.6</xmlschema.version>
         <checkstyle.extension />
 
         <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode>
@@ -75,7 +81,7 @@
 
         <pmd.eclipse.ruleset>cxf-pmd-ruleset.xml</pmd.eclipse.ruleset>
 
-        <resources.base.path/>
+        <resources.base.path />
 
     </properties>
 
@@ -252,6 +258,7 @@
                         <argLine>${surefire.fork.vmargs}</argLine>
                         <parallel>${surefire.parallel.mode}</parallel>
                         <systemPropertyVariables>
+                                <useRandomPorts>true</useRandomPorts>
                                 <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
                                 <java.awt.headless>${java.awt.headless}</java.awt.headless>
                                 <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
@@ -326,6 +333,12 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <dependency>
                 <groupId>cglib</groupId>
                 <artifactId>cglib-nodep</artifactId>
                 <version>2.1_3</version>
@@ -415,14 +428,14 @@
                 <version>4aug2000r7-dev</version>
             </dependency>
             <dependency>
-                <groupId>ant</groupId>
+                <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
-                <version>1.6.5</version>
+                <version>1.8.1</version>
             </dependency>
             <dependency>
-                <groupId>ant</groupId>
+                <groupId>org.apache.ant</groupId>
                 <artifactId>ant-nodeps</artifactId>
-                <version>1.6.5</version>
+                <version>1.8.1</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.parsers</groupId>
@@ -432,7 +445,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.specs</groupId>
                 <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-                <version>1.3.0</version>
+                <version>1.5.0</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -510,29 +523,35 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
-                <version>1.5.8</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.5.8</version>
+                <version>1.6.1</version>
             </dependency>
             <dependency>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty</artifactId>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-server</artifactId>
                 <version>${jetty.version}</version>
                 <exclusions>
                     <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>servlet-api-2.5</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.mortbay.jetty</groupId>
+                        <groupId>javax.servlet</groupId>
                         <artifactId>servlet-api</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-webapp</artifactId>
+                <version>${jetty.version}</version>
+	    </dependency>
+            <dependency>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-servlet</artifactId>
+                <version>${jetty.version}</version>
+	    </dependency>
+            <dependency>
                 <groupId>xalan</groupId>
                 <artifactId>xalan</artifactId>
                 <version>2.7.1</version>
@@ -798,7 +817,7 @@
             <dependency>
               <groupId>commons-codec</groupId>
               <artifactId>commons-codec</artifactId>
-              <version>1.3</version>
+              <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
@@ -869,19 +888,19 @@
                 <version>1.1.1</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.2</version>
+                <groupId>${servlet-api.group}</groupId>
+                <artifactId>${servlet-api.artifact}</artifactId>
+                <version>${servlet-api.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-javamail_1.4_spec</artifactId>
-                <version>1.6</version>
+                <version>1.7.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.2</version>
+                <version>1.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
@@ -906,11 +925,11 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-                <version>1.1.2</version>
+                <version>1.1.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                <artifactId>geronimo-jaxws_2.2_spec</artifactId>
                 <version>1.0</version>
             </dependency>
             <dependency>
@@ -948,7 +967,7 @@
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.4</version>
+                <version>2.5</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
@@ -1032,7 +1051,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>
-                <version>1.2.7</version>
+                <version>1.2.9</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -1075,7 +1094,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-impl</artifactId>
-                <version>1.2.7</version>
+                <version>1.2.9</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -1142,7 +1161,7 @@
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>woodstox-core-asl</artifactId>
-                <version>4.0.7</version>
+                <version>4.0.8</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.msv</groupId>
@@ -1189,6 +1208,18 @@
 
     <profiles>
         <profile>
+            <id>jdk15</id>
+            <activation>
+                <jdk>1.5</jdk>
+            </activation>
+            <properties>
+                <jaxb.version>${jaxb22.version}</jaxb.version>
+                <jaxb.impl.version>${jaxb22.impl.version}</jaxb.impl.version>
+                <jaxb.xjc.version>${jaxb22.impl.version}</jaxb.xjc.version>
+                <jdk.version>1.5</jdk.version>
+            </properties>
+        </profile>
+        <profile>
             <id>validateServices</id>
             <properties>
                 <cxf.validateServices>true</cxf.validateServices>
@@ -1319,6 +1350,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-eclipse-plugin</artifactId>
+                        <inherited>true</inherited>
                         <executions>
                             <execution>
                                 <id>setup.eclipse.project</id>

Modified: cxf/sandbox/oauth_1.0a/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/pom.xml Tue Jul 27 20:46:55 2010
@@ -161,6 +161,7 @@
         <module>rt</module>
         <module>integration</module>
         <module>maven-plugins</module>
+	<!--module>test-samples</module-->
         <module>systests</module>
     </modules>
 
@@ -431,6 +432,11 @@
             <plugins>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>properties-maven-plugin </artifactId>
+                    <version>1.0-alpha-2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>1.5</version>
                 </plugin>
@@ -488,6 +494,11 @@
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.1.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>2.3.1</version>
                     <configuration>
@@ -502,6 +513,29 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>1.4</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>ant-contrib</groupId>
+                            <artifactId>ant-contrib</artifactId>
+                            <version>1.0b3</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>ant</groupId>
+                                    <artifactId>ant</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.ant</groupId>
+                            <artifactId>ant-trax</artifactId>
+                            <version>1.8.0</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.ant</groupId>
+                            <artifactId>ant-nodeps</artifactId>
+                            <version>1.8.1</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/coloc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/coloc/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/coloc/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/coloc/pom.xml Tue Jul 27 20:46:55 2010
@@ -79,7 +79,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+                    <artifactId>geronimo-jaxws_2.2_spec</artifactId>
                 </dependency>
             </dependencies>
         </profile>

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DatabindingOutSetupInterceptor.java Tue Jul 27 20:46:55 2010
@@ -33,6 +33,7 @@ import org.apache.cxf.helpers.DOMUtils;
 import org.apache.cxf.helpers.MapNamespaceContext;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.InterceptorChain;
+import org.apache.cxf.interceptor.MessageSenderInterceptor;
 import org.apache.cxf.interceptor.StaxOutInterceptor;
 import org.apache.cxf.interceptor.WrappedOutInterceptor;
 import org.apache.cxf.message.Message;
@@ -65,7 +66,6 @@ public class DatabindingOutSetupIntercep
                 nsMap.addNamespace(WSDLConstants.NP_SCHEMA_XSD, WSDLConstants.NS_SCHEMA_XSD);
                 writer.setNamespaceContext(nsMap);
             } catch (XMLStreamException e) {
-                e.printStackTrace();
                 // ignore
             }
             message.setContent(XMLStreamWriter.class, writer);
@@ -74,10 +74,9 @@ public class DatabindingOutSetupIntercep
             wrappedOut.addAfter(getId());
             chain.add(wrappedOut);
 
-            XMLMessageOutInterceptor xmlOut = new XMLMessageOutInterceptor(Phase.PRE_LOGICAL);
+            final XMLMessageOutInterceptor xmlOut = new XMLMessageOutInterceptor(Phase.PRE_LOGICAL);
             xmlOut.addAfter(wrappedOut.getId());
             chain.add(xmlOut);
-            
 
             Endpoint ep = message.getExchange().get(Endpoint.class);
             URIMapper mapper = (URIMapper) ep.getService().get(URIMapper.class.getName());
@@ -88,9 +87,18 @@ public class DatabindingOutSetupIntercep
             boolean putOrPost = verb.equals(HttpConstants.POST) || verb.equals(HttpConstants.PUT);
             
             if (putOrPost) { 
-                chain.doIntercept(message);
                 chain.add(new URIParameterOutInterceptor());
                 chain.add(new DocumentWriterInterceptor());
+                chain.add(new AbstractPhaseInterceptor<Message>("remove-writer", 
+                        Phase.PREPARE_SEND) {
+                    {
+                        addAfter(xmlOut.getId());
+                        addBefore(MessageSenderInterceptor.class.getName());
+                    }
+                    public void handleMessage(Message message) throws Fault {
+                        message.removeContent(XMLStreamWriter.class);
+                    }
+                });
                 chain.add(STAX_OUT);
             } else {
                 chain.add(new URIParameterOutInterceptor());

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DocumentWriterInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DocumentWriterInterceptor.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DocumentWriterInterceptor.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/http/src/main/java/org/apache/cxf/binding/http/interceptor/DocumentWriterInterceptor.java Tue Jul 27 20:46:55 2010
@@ -22,6 +22,7 @@ import javax.xml.stream.XMLStreamExcepti
 import javax.xml.stream.XMLStreamWriter;
 
 import org.w3c.dom.Document;
+import org.w3c.dom.Node;
 
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.message.Message;
@@ -36,7 +37,8 @@ public class DocumentWriterInterceptor e
     }
 
     public void handleMessage(Message message) throws Fault {
-        Document doc = message.getContent(Document.class);
+        Node n = message.getContent(Node.class);
+        Document doc = (Document)n;
         XMLStreamWriter writer = message.getContent(XMLStreamWriter.class);
         
         try {

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/http/src/test/java/org/apache/cxf/binding/http/bare/BareServiceTest.java Tue Jul 27 20:46:55 2010
@@ -187,7 +187,7 @@ public class BareServiceTest extends Abs
         HttpURLConnection c = (HttpURLConnection)url.openConnection();
         c.setRequestMethod("GET");
 
-        assertEquals("text/xml; charset=utf-8", c.getContentType());
+        assertEquals("text/xml;charset=utf-8", c.getContentType().toLowerCase());
 
         Document doc = DOMUtils.readXml(c.getErrorStream());
         Message msg = new Message("SIMPLE_TYPE", IriDecoderHelper.BUNDLE);
@@ -216,7 +216,7 @@ public class BareServiceTest extends Abs
         HttpURLConnection c = (HttpURLConnection)url.openConnection();
         c.setRequestMethod("GET");
 
-        assertEquals("text/xml; charset=utf-8", c.getContentType());
+        assertEquals("text/xml;charset=utf-8", c.getContentType().toLowerCase());
 
         Document doc = DOMUtils.readXml(c.getInputStream());
         addNamespace("b", "http://bare.http.binding.cxf.apache.org/");

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/jbi/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/jbi/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/jbi/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/jbi/pom.xml Tue Jul 27 20:46:55 2010
@@ -149,13 +149,15 @@
                         <DynamicImport-Package>
                         </DynamicImport-Package>
                         <Import-Package>
-                        *
+                           javax.xml.stream*;version="[0.0,2)",
+                           *
                         </Import-Package>
                         <Export-Package>
                         org.apache.cxf.*;version=${project.version};-split-package:=merge-first,
                         META-INF.cxf.binding.jbi
                         </Export-Package>
                         <_failok>true</_failok>
+                        <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                     </instructions>
                 </configuration>
             </plugin>

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/soap/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/soap/pom.xml?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/soap/pom.xml (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/soap/pom.xml Tue Jul 27 20:46:55 2010
@@ -101,7 +101,7 @@
             <groupId>org.apache.mina</groupId>
             <artifactId>mina-core</artifactId>
             <version>2.0.0-M6</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/CheckFaultInterceptor.java Tue Jul 27 20:46:55 2010
@@ -62,7 +62,7 @@ public class CheckFaultInterceptor exten
             throw new SoapFault(new Message("XML_STREAM_EXC", LOG), e, 
                                 message.getVersion().getSender());
         }
-        if (message.getVersion().getFault().equals(xmlReader.getName())) {
+        if (message.getVersion().getFault().equals(xmlReader.getName()) && isRequestor(message)) {
             Endpoint ep = message.getExchange().get(Endpoint.class);
             message.getInterceptorChain().abort();
             if (ep.getInFaultObserver() != null) {

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/Soap11FaultOutInterceptor.java Tue Jul 27 20:46:55 2010
@@ -23,8 +23,6 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamWriter;
 
 import org.w3c.dom.Document;
@@ -35,6 +33,7 @@ import org.apache.cxf.binding.soap.Soap1
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapMessage;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.phase.Phase;
 import org.apache.cxf.staxutils.StaxUtils;
@@ -101,26 +100,20 @@ public class Soap11FaultOutInterceptor e
                         sb.append(ste.getClassName() + "!" + ste.getMethodName() + "!" + ste.getFileName()  
                                 + "!" + ste.getLineNumber() + "\n");
                     }
-                    try {
-                        Element detail = fault.getDetail(); 
-                        if (detail == null) {
-                            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-                            factory.setNamespaceAware(true);
-                            Document doc = factory.newDocumentBuilder().newDocument();
-                            Element stackTrace = doc.createElementNS(Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
-                            stackTrace.setTextContent(sb.toString());
-                            detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
-                            fault.setDetail(detail);
-                            detail.appendChild(stackTrace);
-                        } else {
-                            Element stackTrace = detail.getOwnerDocument().createElementNS(
-                                    Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
-                            stackTrace.setTextContent(sb.toString());
-                            detail.appendChild(stackTrace);
-                        }                    
-                    } catch (ParserConfigurationException pe) {
-                        // move on...
-                    }
+                    Element detail = fault.getDetail(); 
+                    if (detail == null) {
+                        Document doc = XMLUtils.newDocument();
+                        Element stackTrace = doc.createElementNS(Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
+                        stackTrace.setTextContent(sb.toString());
+                        detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
+                        fault.setDetail(detail);
+                        detail.appendChild(stackTrace);
+                    } else {
+                        Element stackTrace = detail.getOwnerDocument().createElementNS(
+                                Soap11.SOAP_NAMESPACE, Fault.STACKTRACE);
+                        stackTrace.setTextContent(sb.toString());
+                        detail.appendChild(stackTrace);
+                    }                    
                 }
     
                 if (fault.hasDetails()) {

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapOutInterceptor.java Tue Jul 27 20:46:55 2010
@@ -223,6 +223,9 @@ public class SoapOutInterceptor extends 
                     continue;
                 }
                 Object arg = objs.get(part);
+                if (arg == null) {
+                    continue;
+                }
                 objs.remove(part);
                 if (!(startedHeader || preexistingHeaders)) {
                     try {
@@ -255,12 +258,11 @@ public class SoapOutInterceptor extends 
     protected DataWriter<XMLStreamWriter> getDataWriter(Message message) {
         Service service = ServiceModelUtil.getService(message.getExchange());
         DataWriter<XMLStreamWriter> dataWriter = service.getDataBinding().createWriter(XMLStreamWriter.class);
-        dataWriter.setAttachments(message.getAttachments());
-        
         if (dataWriter == null) {
             throw new Fault(new org.apache.cxf.common.i18n.Message("NO_DATAWRITER", BUNDLE, service
                 .getName()));
         }
+        dataWriter.setAttachments(message.getAttachments());
 
         return dataWriter;
     }

Modified: cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/jms/interceptor/SoapFaultFactory.java Tue Jul 27 20:46:55 2010
@@ -23,7 +23,6 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -34,6 +33,7 @@ import org.apache.cxf.binding.soap.SoapB
 import org.apache.cxf.binding.soap.SoapFault;
 import org.apache.cxf.binding.soap.SoapVersion;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.helpers.XMLUtils;
 import org.apache.cxf.interceptor.Fault;
 
 /**
@@ -67,9 +67,7 @@ public class SoapFaultFactory  {
         QName subCode = jmsFault.getSubCode();
         fault.setSubCode(subCode);
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setNamespaceAware(true);
-            Document doc = factory.newDocumentBuilder().newDocument();
+            Document doc = XMLUtils.newDocument();
             Element detail = doc.createElementNS(Soap11.SOAP_NAMESPACE, "detail");
             Element detailChild = doc.createElementNS(subCode.getNamespaceURI(), subCode.getLocalPart());
             detailChild.setTextContent(fault.getReason());
@@ -91,24 +89,20 @@ public class SoapFaultFactory  {
         if (null == detail) {
             return fault;
         }
-
-        try {
-            setDetail(fault, detail);
-        } catch (Exception ex) {
-            LogUtils.log(LOG, Level.SEVERE, "MARSHAL_FAULT_DETAIL_EXC", ex); 
-            ex.printStackTrace();
-        }
+        setDetail(fault, detail);
         return fault;
     }
     
-    void setDetail(SoapFault fault, Object detail) throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        factory.setNamespaceAware(true);
-        Document doc = factory.newDocumentBuilder().newDocument();
-        Element elem = null;
-        
-        elem =  (Element)doc.getFirstChild();
-        fault.setDetail(elem);
+    void setDetail(SoapFault fault, Object detail) {
+        Element el = null;
+        if (detail instanceof Element) {
+            el = (Element)detail;
+        } else if (detail instanceof Document) {
+            el = ((Document)detail).getDocumentElement();
+        }
+        if (el != null) {
+            fault.setDetail(el);
+        }
     }
     
     public String toString(Fault f) {

Modified: cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/AttachmentSerializer.java Tue Jul 27 20:46:55 2010
@@ -129,7 +129,7 @@ public class AttachmentSerializer {
         StringBuilder mimeBodyCt = new StringBuilder();
         String bodyType = getHeaderValue("Content-Type", null);
         if (bodyType == null) {
-            mimeBodyCt.append("application/xop+xml; charset=")
+            mimeBodyCt.append((xop ? "application/xop+xml" : "text/xml") + "; charset=")
                 .append(encoding)
                 .append("; type=\"")
                 .append(bodyCt)

Modified: cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/attachment/DelegatingInputStream.java Tue Jul 27 20:46:55 2010
@@ -23,7 +23,7 @@ package org.apache.cxf.attachment;
 import java.io.IOException;
 import java.io.InputStream;
 
-final class DelegatingInputStream extends InputStream {
+public class DelegatingInputStream extends InputStream {
     private InputStream is;
     private AttachmentDeserializer deserializer;
     private boolean isClosed;

Modified: cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java?rev=979862&r1=979861&r2=979862&view=diff
==============================================================================
--- cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java (original)
+++ cxf/sandbox/oauth_1.0a/rt/core/src/main/java/org/apache/cxf/bus/extension/ExtensionFragmentParser.java Tue Jul 27 20:46:55 2010
@@ -19,20 +19,17 @@
 
 package org.apache.cxf.bus.extension;
 
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.stream.XMLStreamException;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import org.xml.sax.SAXException;
+import org.apache.cxf.staxutils.StaxUtils;
 
 public class ExtensionFragmentParser {
 
@@ -45,15 +42,8 @@ public class ExtensionFragmentParser {
     List<Extension> getExtensions(InputStream is) {
         Document document = null;
         try {
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            factory.setNamespaceAware(true);
-            DocumentBuilder parser = factory.newDocumentBuilder();
-            document = parser.parse(is);
-        } catch (ParserConfigurationException ex) {
-            throw new ExtensionException(ex);
-        } catch (SAXException ex) {
-            throw new ExtensionException(ex);
-        } catch (IOException ex) {
+            document = StaxUtils.read(is);
+        } catch (XMLStreamException ex) {
             throw new ExtensionException(ex);
         }
         



Mime
View raw message