JBossWS SVN: r6871 - stack/native/trunk/modules/client/src/main/resources/META-INF.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-02 13:47:02 -0400 (Fri, 02 May 2008)
New Revision: 6871
Modified:
stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml
stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml
Log:
[JBWS-2014] Add ##SOAP11_HTTP_MTOM to standard WS-Security configs
Modified: stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml
===================================================================
--- stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml 2008-05-02 17:44:55 UTC (rev 6870)
+++ stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-client-config.xml 2008-05-02 17:47:02 UTC (rev 6871)
@@ -49,7 +49,7 @@
<config-name>Standard WSSecurity Client</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurityHandlerOutbound</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerClient</javaee:handler-class>
Modified: stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml
===================================================================
--- stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2008-05-02 17:44:55 UTC (rev 6870)
+++ stack/native/trunk/modules/client/src/main/resources/META-INF/standard-jaxws-endpoint-config.xml 2008-05-02 17:47:02 UTC (rev 6871)
@@ -65,7 +65,7 @@
<config-name>Standard WSSecurity Endpoint</config-name>
<post-handler-chains>
<javaee:handler-chain>
- <javaee:protocol-bindings>##SOAP11_HTTP</javaee:protocol-bindings>
+ <javaee:protocol-bindings>##SOAP11_HTTP ##SOAP11_HTTP_MTOM</javaee:protocol-bindings>
<javaee:handler>
<javaee:handler-name>WSSecurity Handler</javaee:handler-name>
<javaee:handler-class>org.jboss.ws.extensions.security.jaxws.WSSecurityHandlerServer</javaee:handler-class>
16 years, 8 months
JBossWS SVN: r6870 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils.
by jbossws-commits@lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-05-02 13:44:55 -0400 (Fri, 02 May 2008)
New Revision: 6870
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
Log:
[JBWS-2172] Avoid using BufferedReader's readLine() to preserve carriage returns
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2008-05-02 16:33:45 UTC (rev 6869)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/core/utils/MimeUtils.java 2008-05-02 17:44:55 UTC (rev 6870)
@@ -290,17 +290,12 @@
Object converted = null;
try
{
- BufferedReader br = new BufferedReader(new InputStreamReader(in));
- StringBuilder sb = new StringBuilder();
- String line = null;
-
- while ((line = br.readLine()) != null) {
- sb.append(line + "\n");
+ StringBuilder out = new StringBuilder();
+ byte[] b = new byte[4096];
+ for (int n; (n = in.read(b)) != -1;) {
+ out.append(new String(b, 0, n));
}
-
- br.close();
-
- converted = sb.toString();
+ converted = out.toString();
}
catch (IOException e)
{
16 years, 8 months
JBossWS SVN: r6869 - stack/metro/trunk/modules/testsuite.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 12:33:45 -0400 (Fri, 02 May 2008)
New Revision: 6869
Modified:
stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
Log:
[JBWS-2163] wsconsume for maven build. Exclude wsit rm
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-02 16:14:05 UTC (rev 6868)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-05-02 16:33:45 UTC (rev 6869)
@@ -90,3 +90,4 @@
# [JBWS-2163] wsconsume for maven build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/wsit/rm/**
\ No newline at end of file
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-02 16:14:05 UTC (rev 6868)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-05-02 16:33:45 UTC (rev 6869)
@@ -90,3 +90,4 @@
# [JBWS-2163] wsconsume for maven build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/wsit/rm/**
\ No newline at end of file
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-02 16:14:05 UTC (rev 6868)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-05-02 16:33:45 UTC (rev 6869)
@@ -96,3 +96,4 @@
# [JBWS-2163] wsconsume for maven build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/wsit/rm/**
\ No newline at end of file
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-02 16:14:05 UTC (rev 6868)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-05-02 16:33:45 UTC (rev 6869)
@@ -111,3 +111,4 @@
# [JBWS-2163] wsconsume for maven build
org/jboss/test/ws/jaxws/complex/**
org/jboss/test/ws/jaxws/holder/**
+org/jboss/test/ws/wsit/rm/**
\ No newline at end of file
16 years, 8 months
JBossWS SVN: r6868 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 12:14:05 -0400 (Fri, 02 May 2008)
New Revision: 6868
Modified:
stack/native/trunk/build.xml
Log:
Load the properties from the effective maven settings
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-05-02 16:14:00 UTC (rev 6867)
+++ stack/native/trunk/build.xml 2008-05-02 16:14:05 UTC (rev 6868)
@@ -34,30 +34,39 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <!--
- Loads the jboss.home properties from the effective maven settings
- -->
<target name="mvn-settings">
+ <!-- Loads the properties from the effective maven settings -->
<mkdir dir="${stack.output.dir}"/>
- <exec dir="${basedir}" executable="mvn" failonerror="true" output="${stack.output.dir}/effective-settings.txt">
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/>
<arg value="help:effective-settings"/>
</exec>
- <loadfile srcfile="${stack.output.dir}/effective-settings.txt" property="mvn.effective.settings">
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="\[INFO\](.*)" replace=""/>
- <replaceregex pattern="Effective settings:" replace=""/>
- <replaceregex pattern=".\?xml(.*)\?\>" replace=""/>
- </tokenfilter>
- </filterchain>
- </loadfile>
- <echo message="${mvn.effective.settings}" file="${stack.output.dir}/effective-settings.xml"/>
- <xmlproperty file="${stack.output.dir}/effective-settings.xml"/>
- <property name="jboss421.home" value="${settings.profiles.profile.properties.jboss421.home}"/>
- <property name="jboss422.home" value="${settings.profiles.profile.properties.jboss422.home}"/>
- <property name="jboss423.home" value="${settings.profiles.profile.properties.jboss423.home}"/>
- <property name="jboss500.home" value="${settings.profiles.profile.properties.jboss500.home}"/>
- <property name="jboss501.home" value="${settings.profiles.profile.properties.jboss501.home}"/>
+ <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
+ <condition property="jboss421.home" value="${profiles.profile.properties.jboss421.home}">
+ <isset property="profiles.profile.properties.jboss421.home"/>
+ </condition>
+ <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}">
+ <isset property="profiles.profile.properties.jboss422.home"/>
+ </condition>
+ <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
+ <isset property="profiles.profile.properties.jboss423.home"/>
+ </condition>
+ <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
+ <isset property="profiles.profile.properties.jboss500.home"/>
+ </condition>
+ <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
+ <isset property="profiles.profile.properties.jboss501.home"/>
+ </condition>
+
+ <!-- Loads the properties from the user profile -->
+ <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
+ <property name="jboss421.home" value="${profiles.profile.properties.jboss421.home}"/>
+ <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/>
+ <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
+ <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
+ <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
+
+ <echo/>
<echo message="jboss421.home=${jboss421.home}"/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
16 years, 8 months
JBossWS SVN: r6867 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 12:14:00 -0400 (Fri, 02 May 2008)
New Revision: 6867
Modified:
stack/cxf/trunk/build.xml
Log:
Load the properties from the effective maven settings
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-05-02 16:13:55 UTC (rev 6866)
+++ stack/cxf/trunk/build.xml 2008-05-02 16:14:00 UTC (rev 6867)
@@ -38,30 +38,39 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <!--
- Loads the jboss.home properties from the effective maven settings
- -->
<target name="mvn-settings">
+ <!-- Loads the properties from the effective maven settings -->
<mkdir dir="${stack.output.dir}"/>
- <exec dir="${basedir}" executable="mvn" failonerror="true" output="${stack.output.dir}/effective-settings.txt">
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/>
<arg value="help:effective-settings"/>
</exec>
- <loadfile srcfile="${stack.output.dir}/effective-settings.txt" property="mvn.effective.settings">
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="\[INFO\](.*)" replace=""/>
- <replaceregex pattern="Effective settings:" replace=""/>
- <replaceregex pattern=".\?xml(.*)\?\>" replace=""/>
- </tokenfilter>
- </filterchain>
- </loadfile>
- <echo message="${mvn.effective.settings}" file="${stack.output.dir}/effective-settings.xml"/>
- <xmlproperty file="${stack.output.dir}/effective-settings.xml"/>
- <property name="jboss421.home" value="${settings.profiles.profile.properties.jboss421.home}"/>
- <property name="jboss422.home" value="${settings.profiles.profile.properties.jboss422.home}"/>
- <property name="jboss423.home" value="${settings.profiles.profile.properties.jboss423.home}"/>
- <property name="jboss500.home" value="${settings.profiles.profile.properties.jboss500.home}"/>
- <property name="jboss501.home" value="${settings.profiles.profile.properties.jboss501.home}"/>
+ <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
+ <condition property="jboss421.home" value="${profiles.profile.properties.jboss421.home}">
+ <isset property="profiles.profile.properties.jboss421.home"/>
+ </condition>
+ <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}">
+ <isset property="profiles.profile.properties.jboss422.home"/>
+ </condition>
+ <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
+ <isset property="profiles.profile.properties.jboss423.home"/>
+ </condition>
+ <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
+ <isset property="profiles.profile.properties.jboss500.home"/>
+ </condition>
+ <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
+ <isset property="profiles.profile.properties.jboss501.home"/>
+ </condition>
+
+ <!-- Loads the properties from the user profile -->
+ <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
+ <property name="jboss421.home" value="${profiles.profile.properties.jboss421.home}"/>
+ <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/>
+ <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
+ <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
+ <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
+
+ <echo/>
<echo message="jboss421.home=${jboss421.home}"/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
16 years, 8 months
JBossWS SVN: r6866 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 12:13:55 -0400 (Fri, 02 May 2008)
New Revision: 6866
Modified:
stack/metro/trunk/build.xml
Log:
Load the properties from the effective maven settings
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-05-02 15:03:59 UTC (rev 6865)
+++ stack/metro/trunk/build.xml 2008-05-02 16:13:55 UTC (rev 6866)
@@ -38,30 +38,39 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <!--
- Loads the jboss.home properties from the effective maven settings
- -->
<target name="mvn-settings">
+ <!-- Loads the properties from the effective maven settings -->
<mkdir dir="${stack.output.dir}"/>
- <exec dir="${basedir}" executable="mvn" failonerror="true" output="${stack.output.dir}/effective-settings.txt">
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="-Doutput=${stack.output.dir}/effective-settings.xml"/>
<arg value="help:effective-settings"/>
</exec>
- <loadfile srcfile="${stack.output.dir}/effective-settings.txt" property="mvn.effective.settings">
- <filterchain>
- <tokenfilter>
- <replaceregex pattern="\[INFO\](.*)" replace=""/>
- <replaceregex pattern="Effective settings:" replace=""/>
- <replaceregex pattern=".\?xml(.*)\?\>" replace=""/>
- </tokenfilter>
- </filterchain>
- </loadfile>
- <echo message="${mvn.effective.settings}" file="${stack.output.dir}/effective-settings.xml"/>
- <xmlproperty file="${stack.output.dir}/effective-settings.xml"/>
- <property name="jboss421.home" value="${settings.profiles.profile.properties.jboss421.home}"/>
- <property name="jboss422.home" value="${settings.profiles.profile.properties.jboss422.home}"/>
- <property name="jboss423.home" value="${settings.profiles.profile.properties.jboss423.home}"/>
- <property name="jboss500.home" value="${settings.profiles.profile.properties.jboss500.home}"/>
- <property name="jboss501.home" value="${settings.profiles.profile.properties.jboss501.home}"/>
+ <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/>
+ <condition property="jboss421.home" value="${profiles.profile.properties.jboss421.home}">
+ <isset property="profiles.profile.properties.jboss421.home"/>
+ </condition>
+ <condition property="jboss422.home" value="${profiles.profile.properties.jboss422.home}">
+ <isset property="profiles.profile.properties.jboss422.home"/>
+ </condition>
+ <condition property="jboss423.home" value="${profiles.profile.properties.jboss423.home}">
+ <isset property="profiles.profile.properties.jboss423.home"/>
+ </condition>
+ <condition property="jboss500.home" value="${profiles.profile.properties.jboss500.home}">
+ <isset property="profiles.profile.properties.jboss500.home"/>
+ </condition>
+ <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}">
+ <isset property="profiles.profile.properties.jboss501.home"/>
+ </condition>
+
+ <!-- Loads the properties from the user profile -->
+ <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/>
+ <property name="jboss421.home" value="${profiles.profile.properties.jboss421.home}"/>
+ <property name="jboss422.home" value="${profiles.profile.properties.jboss422.home}"/>
+ <property name="jboss423.home" value="${profiles.profile.properties.jboss423.home}"/>
+ <property name="jboss500.home" value="${profiles.profile.properties.jboss500.home}"/>
+ <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/>
+
+ <echo/>
<echo message="jboss421.home=${jboss421.home}"/>
<echo message="jboss422.home=${jboss422.home}"/>
<echo message="jboss423.home=${jboss423.home}"/>
16 years, 8 months
JBossWS SVN: r6865 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 11:03:59 -0400 (Fri, 02 May 2008)
New Revision: 6865
Modified:
stack/native/trunk/build.xml
Log:
Restore ant target clean
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-05-02 15:03:53 UTC (rev 6864)
+++ stack/native/trunk/build.xml 2008-05-02 15:03:59 UTC (rev 6865)
@@ -108,4 +108,19 @@
</exec>
</target>
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
+
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
+ </target>
+
</project>
16 years, 8 months
JBossWS SVN: r6864 - stack/cxf/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 11:03:53 -0400 (Fri, 02 May 2008)
New Revision: 6864
Modified:
stack/cxf/trunk/build.xml
Log:
Restore ant target clean
Modified: stack/cxf/trunk/build.xml
===================================================================
--- stack/cxf/trunk/build.xml 2008-05-02 15:03:48 UTC (rev 6863)
+++ stack/cxf/trunk/build.xml 2008-05-02 15:03:53 UTC (rev 6864)
@@ -107,4 +107,19 @@
</exec>
</target>
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
+
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
+ </target>
+
</project>
16 years, 8 months
JBossWS SVN: r6863 - stack/metro/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 11:03:48 -0400 (Fri, 02 May 2008)
New Revision: 6863
Modified:
stack/metro/trunk/build.xml
Log:
Restore ant target clean
Modified: stack/metro/trunk/build.xml
===================================================================
--- stack/metro/trunk/build.xml 2008-05-02 14:52:02 UTC (rev 6862)
+++ stack/metro/trunk/build.xml 2008-05-02 15:03:48 UTC (rev 6863)
@@ -107,4 +107,19 @@
</exec>
</target>
+ <!-- ================================================================== -->
+ <!-- Miscellaneous -->
+ <!-- ================================================================== -->
+
+ <target name="clean" depends="prepare" description="Cleans up most generated files.">
+
+ <echo message="*************************************"/>
+ <echo message="* mvn clean *"/>
+ <echo message="*************************************"/>
+
+ <exec dir="${basedir}" executable="mvn" failonerror="true">
+ <arg value="clean"/>
+ </exec>
+ </target>
+
</project>
16 years, 8 months
JBossWS SVN: r6862 - stack/native/trunk.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-05-02 10:52:02 -0400 (Fri, 02 May 2008)
New Revision: 6862
Modified:
stack/native/trunk/build.xml
Log:
Load the jboss.home properties from the effective maven settings
Modified: stack/native/trunk/build.xml
===================================================================
--- stack/native/trunk/build.xml 2008-05-02 14:51:53 UTC (rev 6861)
+++ stack/native/trunk/build.xml 2008-05-02 14:52:02 UTC (rev 6862)
@@ -38,6 +38,7 @@
Loads the jboss.home properties from the effective maven settings
-->
<target name="mvn-settings">
+ <mkdir dir="${stack.output.dir}"/>
<exec dir="${basedir}" executable="mvn" failonerror="true" output="${stack.output.dir}/effective-settings.txt">
<arg value="help:effective-settings"/>
</exec>
@@ -107,19 +108,4 @@
</exec>
</target>
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
-
- <echo message="*************************************"/>
- <echo message="* mvn clean *"/>
- <echo message="*************************************"/>
-
- <exec dir="${basedir}" executable="mvn" failonerror="true">
- <arg value="clean"/>
- </exec>
- </target>
-
</project>
16 years, 8 months