Author: richard.opalka(a)jboss.com Date: 2011-07-28 06:09:12 -0400 (Thu, 28 Jul 2011) New Revision: 14763 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml Log: removing useless/unused test handlers Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java 2011-07-28 09:58:48 UTC (rev 14762) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ClientSideHandler.java 2011-07-28 10:09:12 UTC (rev 14763) @@ -1,41 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, 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. - */ -package org.jboss.test.ws.jaxws.enventry; - -import java.util.Properties; - -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public class ClientSideHandler extends EnvEntryHandler -{ - public InitialContext getInitialContext() throws NamingException - { - Properties env = new Properties(); - env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); - env.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.naming.client"); - env.setProperty(Context.PROVIDER_URL, "jnp://" + getServerHost() + ":1099"); - env.setProperty("j2ee.clientName", "jbossws-client"); - return new InitialContext(env); - } -} Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java 2011-07-28 09:58:48 UTC (rev 14762) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryHandler.java 2011-07-28 10:09:12 UTC (rev 14763) @@ -1,108 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, 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. - */ -package org.jboss.test.ws.jaxws.enventry; - -import javax.naming.InitialContext; -import javax.naming.NamingException; -import javax.xml.namespace.QName; -import javax.xml.rpc.JAXRPCException; -import javax.xml.rpc.handler.GenericHandler; -import javax.xml.rpc.handler.MessageContext; -import javax.xml.rpc.handler.soap.SOAPMessageContext; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPBodyElement; -import javax.xml.soap.SOAPElement; -import javax.xml.soap.SOAPMessage; - -import org.jboss.logging.Logger; - -abstract public class EnvEntryHandler extends GenericHandler -{ - // Provide logging - private static Logger log = Logger.getLogger(EnvEntryHandler.class); - - private QName[] headers = new QName[]{}; - - public QName[] getHeaders() - { - return headers; - } - - public boolean handleRequest(MessageContext msgContext) - { - String value = handleRequestAndResponse(msgContext); - log.info("handleRequest: " + value); - return true; - } - - public boolean handleResponse(MessageContext msgContext) - { - String value = handleRequestAndResponse(msgContext); - log.info("handleResponse: " + value); - return true; - } - - private String handleRequestAndResponse(MessageContext msgContext) - { - String value = null; - try - { - SOAPMessage soapMessage = ((SOAPMessageContext)msgContext).getMessage(); - SOAPBody soapBody = soapMessage.getSOAPBody(); - - SOAPBodyElement soapBodyElement = (SOAPBodyElement)soapBody.getChildElements().next(); - SOAPElement soapElement = (SOAPElement)soapBodyElement.getChildElements().next(); - value = soapElement.getValue(); - - InitialContext ic = getInitialContext(); - String strValue = (String)ic.lookup("java:comp/env/jaxws/entry1"); - Integer intValue = (Integer)ic.lookup("java:comp/env/jaxws/entry2"); - - value = value + ":" + getHandlerName() + ":" + strValue + ":" + intValue; - soapElement.setValue(value); - } - catch (Exception e) - { - throw new JAXRPCException(e); - } - - return value; - } - - private String getHandlerName() - { - String handlerName = getClass().getName(); - return handlerName.substring(handlerName.lastIndexOf(".") + 1); - } - - abstract public InitialContext getInitialContext() throws NamingException; - - /** - * Get the JBoss server host from system property "jboss.bind.address" - * This defaults to "" + getServerHost() + "" - */ - public String getServerHost() - { - String hostName = System.getProperty("jboss.bind.address", "localhost"); - return hostName; - } -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 09:58:48 UTC (rev 14762) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryJSETestCase.java 2011-07-28 10:09:12 UTC (rev 14763) @@ -39,7 +39,6 @@ */ public class EnvEntryJSETestCase extends JBossWSTest { - public static Test suite() { return new JBossWSTestSetup(EnvEntryJSETestCase.class, "jaxws-enventry-jse.war"); Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2011-07-28 09:58:48 UTC (rev 14762) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/EnvEntryServletTestCase.java 2011-07-28 10:09:12 UTC (rev 14763) @@ -38,7 +38,6 @@ */ public class EnvEntryServletTestCase extends JBossWSTest { - public static Test suite() { return new JBossWSTestSetup(EnvEntryServletTestCase.class, "jaxws-enventry-servlet.war"); @@ -49,7 +48,7 @@ URL url = new URL("http://" + getServerHost() + ":8080/jaxws-enventry-servlet"); BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); String line = br.readLine(); - + assertEquals("web:8", line); } } Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java 2011-07-28 09:58:48 UTC (rev 14762) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/enventry/ServerSideHandler.java 2011-07-28 10:09:12 UTC (rev 14763) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, 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. - */ -package org.jboss.test.ws.jaxws.enventry; - -import javax.naming.InitialContext; -import javax.naming.NamingException; - -public class ServerSideHandler extends EnvEntryHandler -{ - public InitialContext getInitialContext() throws NamingException - { - return new InitialContext(); - } -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml 2011-07-28 09:58:48 UTC (rev 14762) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/resources/jaxws/enventry/WEB-INF/servlet-web.xml 2011-07-28 10:09:12 UTC (rev 14763) @@ -20,7 +20,7 @@ <env-entry-type>java.lang.String</env-entry-type> <env-entry-value>web</env-entry-value> </env-entry> - + <env-entry> <env-entry-name>jaxws/entry2</env-entry-name> <env-entry-type>java.lang.Integer</env-entry-type> @@ -28,4 +28,3 @@ </env-entry> </web-app> -