Author: ropalka Date: 2012-02-17 07:27:21 -0500 (Fri, 17 Feb 2012) New Revision: 15680 Added: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties Removed: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jndi.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jndi.properties Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties Log: Merged revisions 15675 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15675 | ropalka | 2012-02-17 12:32:54 +0100 (Fri, 17 Feb 2012) | 1 line [JBWS-3435] make jndi & ejb client properties up2date. Also fixing host name filtering ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668 + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675 Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties (from rev 15675, stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/appclient.jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory +java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client +java.naming.provider.url=remote://@jboss.bind.address@:4448 +jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jboss-ejb-client.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -1,30 +1,5 @@ -# -# 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. -# remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false - remote.connections=default - -remote.connection.default.host=localhost +remote.connection.default.host=(a)jboss.bind.address@ remote.connection.default.port=4447 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false - - Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming -java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties (from rev 15675, stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/src/test/etc/server.jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory +java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client +java.naming.provider.url=remote://@jboss.bind.address@:4447 +jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler \ No newline at end of file Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties (from rev 15675, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/appclient.jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory +java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client +java.naming.provider.url=remote://@jboss.bind.address@:4448 +jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -1,30 +1,5 @@ -# -# 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. -# remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false - remote.connections=default - -remote.connection.default.host=localhost +remote.connection.default.host=(a)jboss.bind.address@ remote.connection.default.port=4447 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false - - Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming -java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties (from rev 15675, stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory +java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client +java.naming.provider.url=remote://@jboss.bind.address@:4447 +jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler \ No newline at end of file Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-17 12:27:21 UTC (rev 15680) @@ -135,6 +135,7 @@ <!-- copy etc files --> <testResource> <directory>src/test/etc</directory> + <filtering>true</filtering> </testResource> <!-- copy handler definitions --> <testResource> @@ -265,10 +266,6 @@ <value>${jboss.bind.address}</value> </property> <property> - <name>java.naming.provider.url</name> - <value>jnp://${jboss.bind.address}:1099</value> - </property> - <property> <name>java.protocol.handler.pkgs</name> <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> </property> @@ -359,10 +356,6 @@ <value>${jboss.bind.address}</value> </property> <property> - <name>java.naming.provider.url</name> - <value>jnp://${jboss.bind.address}:1099</value> - </property> - <property> <name>java.protocol.handler.pkgs</name> <value>org.jboss.net.protocol|org.jboss.vfs.protocol|org.jboss.virtual.protocol</value> </property> @@ -1159,11 +1152,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.jboss.naming</groupId> - <artifactId>jnp-client</artifactId> - <version>5.0.5.Final</version> - </dependency> - <dependency> <groupId>org.jboss.ejb3</groupId> <artifactId>jboss-ejb3-ext-api</artifactId> <version>2.0.0-beta-1</version> Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties (from rev 15675, stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/appclient.jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory +java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client +java.naming.provider.url=remote://@jboss.bind.address@:4448 +jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -1,30 +1,5 @@ -# -# 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. -# remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false - remote.connections=default - -remote.connection.default.host=localhost +remote.connection.default.host=(a)jboss.bind.address@ remote.connection.default.port=4447 remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false - - Deleted: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jndi.properties =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2012-02-17 12:07:13 UTC (rev 15679) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -1,3 +0,0 @@ -java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces:org.jboss.ejb.client.naming -java.naming.provider.url=jnp://@jboss.bind.address@:1099 \ No newline at end of file Copied: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties (from rev 15675, stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties) =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties (rev 0) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties 2012-02-17 12:27:21 UTC (rev 15680) @@ -0,0 +1,5 @@ +java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory +java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client +java.naming.provider.url=remote://@jboss.bind.address@:4447 +jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false +jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler \ No newline at end of file