9:45 a.m.
Author: ropalka
Date: 2012-03-12 10:45:11 -0400 (Mon, 12 Mar 2012)
New Revision: 15920
Added:
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml
Removed:
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml
Modified:
stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
Log:
[JBWS-3451] use custom appclient-ws.xml config, do not override provided default one
Modified: stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-03-12 14:43:38 UTC (rev
15919)
+++ stack/cxf/trunk/modules/testsuite/shared-tests/pom.xml 2012-03-12 14:45:11 UTC (rev
15920)
@@ -141,8 +141,8 @@
<configuration>
<tasks>
<copy
-
file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml"
-
tofile="${jboss.home}/appclient/configuration/appclient.xml"
+
file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient-ws.xml"
+
tofile="${jboss.home}/appclient/configuration/appclient-ws.xml"
failonerror="false"
verbose="true"
overwrite="true"
Added: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml
(rev 0)
+++
stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient-ws.xml 2012-03-12
14:45:11 UTC (rev 15920)
@@ -0,0 +1,115 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2011, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<server xmlns="urn:jboss:domain:1.2">
+
+ <extensions>
+ <extension module="org.jboss.as.connector"/>
+ <extension module="org.jboss.as.ee"/>
+ <extension module="org.jboss.as.ejb3"/>
+ <extension module="org.jboss.as.logging"/>
+ <extension module="org.jboss.as.naming"/>
+ <extension module="org.jboss.as.remoting"/>
+ <extension module="org.jboss.as.security"/>
+ <extension module="org.jboss.as.webservices"/>
+ </extensions>
+
+ <profile>
+ <subsystem xmlns="urn:jboss:domain:logging:1.1">
+ <console-handler name="CONSOLE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t)
%s%E%n"/>
+ </formatter>
+ </console-handler>
+
+ <periodic-rotating-file-handler name="FILE">
+ <level name="INFO"/>
+ <formatter>
+ <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t)
%s%E%n"/>
+ </formatter>
+ <file relative-to="jboss.server.log.dir"
path="appclient.log"/>
+ <suffix value=".yyyy-MM-dd"/>
+ <append value="true"/>
+ </periodic-rotating-file-handler>
+
+ <logger category="com.arjuna">
+ <level name="WARN"/>
+ </logger>
+ <logger category="sun.rmi">
+ <level name="WARN"/>
+ </logger>
+ <logger category="jacorb">
+ <level name="WARN"/>
+ </logger>
+ <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not
found" messages during startup -->
+ <logger category="jacorb.config">
+ <level name="ERROR"/>
+ </logger>
+
+ <root-logger>
+ <level name="INFO"/>
+ <handlers>
+ <handler name="CONSOLE"/>
+ <handler name="FILE"/>
+ </handlers>
+ </root-logger>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:ejb3:1.2" />
+ <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
+ <subsystem xmlns="urn:jboss:domain:security:1.0">
+ <security-domains>
+ <security-domain name="other"
cache-type="default">
+ <authentication>
+ <login-module code="UsersRoles"
flag="required"/>
+ </authentication>
+ </security-domain>
+ <security-domain name="jboss-web-policy"
cache-type="default">
+ <authorization>
+ <policy-module code="Delegating"
flag="required"/>
+ </authorization>
+ </security-domain>
+ <security-domain name="jboss-ejb-policy"
cache-type="default">
+ <authorization>
+ <policy-module code="Delegating"
flag="required"/>
+ </authorization>
+ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:remoting:1.1">
+ <connector name="remoting-connector"
socket-binding="remoting"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:webservices:1.1"/>
+ </profile>
+
+ <interfaces>
+ <interface name="public">
+ <inet-address value="${jboss.bind.address:127.0.0.1}"/>
+ </interface>
+ </interfaces>
+
+ <socket-binding-group name="standard-sockets"
default-interface="public">
+ <socket-binding name="remoting" port="4448"/>
+ </socket-binding-group>
+
+</server>
Deleted: stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-12
14:43:38 UTC (rev 15919)
+++ stack/cxf/trunk/modules/testsuite/src/test/resources/jboss711/appclient.xml 2012-03-12
14:45:11 UTC (rev 15920)
@@ -1,115 +0,0 @@
-<!--
- ~ JBoss, Home of Professional Open Source.
- ~ Copyright 2011, Red Hat, Inc., and individual contributors
- ~ as indicated by the @author tags. See the copyright.txt file in the
- ~ distribution for a full listing of individual contributors.
- ~
- ~ This is free software; you can redistribute it and/or modify it
- ~ under the terms of the GNU Lesser General Public License as
- ~ published by the Free Software Foundation; either version 2.1 of
- ~ the License, or (at your option) any later version.
- ~
- ~ This software is distributed in the hope that it will be useful,
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- ~ Lesser General Public License for more details.
- ~
- ~ You should have received a copy of the GNU Lesser General Public
- ~ License along with this software; if not, write to the Free
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- -->
-
-<server xmlns="urn:jboss:domain:1.2">
-
- <extensions>
- <extension module="org.jboss.as.connector"/>
- <extension module="org.jboss.as.ee"/>
- <extension module="org.jboss.as.ejb3"/>
- <extension module="org.jboss.as.logging"/>
- <extension module="org.jboss.as.naming"/>
- <extension module="org.jboss.as.remoting"/>
- <extension module="org.jboss.as.security"/>
- <extension module="org.jboss.as.webservices"/>
- </extensions>
-
- <profile>
- <subsystem xmlns="urn:jboss:domain:logging:1.1">
- <console-handler name="CONSOLE">
- <level name="INFO"/>
- <formatter>
- <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t)
%s%E%n"/>
- </formatter>
- </console-handler>
-
- <periodic-rotating-file-handler name="FILE">
- <level name="INFO"/>
- <formatter>
- <pattern-formatter pattern="%d{HH:mm:ss,SSS} %-5p [%c] (%t)
%s%E%n"/>
- </formatter>
- <file relative-to="jboss.server.log.dir"
path="appclient.log"/>
- <suffix value=".yyyy-MM-dd"/>
- <append value="true"/>
- </periodic-rotating-file-handler>
-
- <logger category="com.arjuna">
- <level name="WARN"/>
- </logger>
- <logger category="sun.rmi">
- <level name="WARN"/>
- </logger>
- <logger category="jacorb">
- <level name="WARN"/>
- </logger>
- <!-- set jacorb.config to ERROR to avoid the "jacorb.properties not
found" messages during startup -->
- <logger category="jacorb.config">
- <level name="ERROR"/>
- </logger>
-
- <root-logger>
- <level name="INFO"/>
- <handlers>
- <handler name="CONSOLE"/>
- <handler name="FILE"/>
- </handlers>
- </root-logger>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:ee:1.0"/>
- <subsystem xmlns="urn:jboss:domain:ejb3:1.2" />
- <subsystem xmlns="urn:jboss:domain:naming:1.0"/>
- <subsystem xmlns="urn:jboss:domain:security:1.0">
- <security-domains>
- <security-domain name="other"
cache-type="default">
- <authentication>
- <login-module code="UsersRoles"
flag="required"/>
- </authentication>
- </security-domain>
- <security-domain name="jboss-web-policy"
cache-type="default">
- <authorization>
- <policy-module code="Delegating"
flag="required"/>
- </authorization>
- </security-domain>
- <security-domain name="jboss-ejb-policy"
cache-type="default">
- <authorization>
- <policy-module code="Delegating"
flag="required"/>
- </authorization>
- </security-domain>
- </security-domains>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:remoting:1.1">
- <connector name="remoting-connector"
socket-binding="remoting"/>
- </subsystem>
- <subsystem xmlns="urn:jboss:domain:webservices:1.1"/>
- </profile>
-
- <interfaces>
- <interface name="public">
- <inet-address value="${jboss.bind.address:127.0.0.1}"/>
- </interface>
- </interfaces>
-
- <socket-binding-group name="standard-sockets"
default-interface="public">
- <socket-binding name="remoting" port="4448"/>
- </socket-binding-group>
-
-</server>