8:25 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-05-22 09:25:27 -0400 (Tue, 22 May 2007)
New Revision: 3184
Removed:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java
Modified:
trunk/integration/jbws/ant-import/build-testsuite.xml
trunk/integration/jbws/src/test/resources/excludes-jboss42.txt
trunk/testsuite/ant-import/build-jars-jaxws.xml
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java
Log:
Fix native jboss42
Modified: trunk/integration/jbws/ant-import/build-testsuite.xml
===================================================================
--- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-22 13:06:13 UTC (rev
3183)
+++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-22 13:25:27 UTC (rev
3184)
@@ -69,9 +69,12 @@
<pathelement location="${jboss.client}/jaxb-impl.jar"/>
<pathelement location="${jboss.client}/jboss-common-client.jar"/>
<pathelement location="${jboss.client}/jboss-ejb3x.jar"/>
+ <pathelement location="${jboss.client}/jboss-j2ee.jar"/>
+ <pathelement location="${jboss.client}/stax-api.jar"/>
<pathelement location="${jboss.client}/jbosssx-client.jar"/>
</path>
<path id="tests.client.classpath">
+ <pathelement location="${jboss.client}/commons-logging.jar"/>
<pathelement location="${jboss.client}/javassist.jar"/>
<pathelement
location="${jboss.client}/jboss-annotations-ejb3.jar"/>
<pathelement location="${jboss.client}/jboss-xml-binding.jar"/>
@@ -79,6 +82,9 @@
<pathelement location="${jboss.client}/wsdl4j.jar"/>
<pathelement location="${jboss.client}/log4j.jar"/>
<pathelement location="${jboss.client}/jbossall-client.jar"/>
+ <pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/>
+ <pathelement
location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/>
+ <pathelement
location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/>
<path refid="javac.classpath"/>
</path>
</target>
Modified: trunk/integration/jbws/src/test/resources/excludes-jboss42.txt
===================================================================
--- trunk/integration/jbws/src/test/resources/excludes-jboss42.txt 2007-05-22 13:06:13 UTC
(rev 3183)
+++ trunk/integration/jbws/src/test/resources/excludes-jboss42.txt 2007-05-22 13:25:27 UTC
(rev 3184)
@@ -1,12 +1,5 @@
+#
+# $Id$
+#
-org/jboss/test/ws/jaxws/samples/context/**
-org/jboss/test/ws/jaxws/samples/handlerchain/**
-org/jboss/test/ws/jaxws/samples/httpbinding/**
-org/jboss/test/ws/jaxws/samples/jaxr/**
-org/jboss/test/ws/jaxws/samples/jsr181ejb/**
-org/jboss/test/ws/jaxws/samples/logicalhandler/**
-org/jboss/test/ws/jaxws/samples/provider/**
-org/jboss/test/ws/jaxws/samples/retail/**
-org/jboss/test/ws/jaxws/samples/webservice/**
-org/jboss/test/ws/jaxws/samples/webserviceref/**
-org/jboss/test/ws/jaxws/samples/wssecurity/**
+# Nothing to exclude
Modified: trunk/testsuite/ant-import/build-jars-jaxws.xml
===================================================================
--- trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-22 13:06:13 UTC (rev 3183)
+++ trunk/testsuite/ant-import/build-jars-jaxws.xml 2007-05-22 13:25:27 UTC (rev 3184)
@@ -42,11 +42,6 @@
<include
name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/>
</fileset>
</jar>
- <jar
jarfile="${tests.output.dir}/libs/jaxws-samples-context-jboss4x.jar">
- <fileset dir="${tests.output.dir}/classes">
- <include
name="org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.class"/>
- </fileset>
- </jar>
<!-- jaxws-samples-eardeployment -->
<war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war"
webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml">
Deleted:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java 2007-05-22
13:06:13 UTC (rev 3183)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/EndpointNoInjectEJB.java 2007-05-22
13:25:27 UTC (rev 3184)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt 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.samples.context;
-
-// $Id$
-
-import javax.annotation.Resource;
-import javax.annotation.security.RolesAllowed;
-import javax.ejb.EJBContext;
-import javax.ejb.Stateless;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.jws.soap.SOAPBinding.Style;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-import org.jboss.annotation.security.SecurityDomain;
-import org.jboss.ws.core.CommonMessageContext;
-import org.jboss.ws.core.jaxws.handler.SOAPMessageContextJAXWS;
-import org.jboss.ws.core.soap.MessageContextAssociation;
-import org.jboss.wsf.spi.annotation.WebContext;
-import org.jboss.wsf.spi.invocation.WebServiceContextEJB;
-
-@WebService(name = "TestEndpoint", targetNamespace =
"http://org.jboss.ws/jaxws/context")
-@SOAPBinding(style = Style.RPC)
-@Stateless
-
-@WebContext(contextRoot = "/jaxws-samples-context", urlPattern =
"/*", authMethod = "BASIC", transportGuarantee = "NONE",
secureWSDLAccess = false)
-@SecurityDomain("JBossWS")
-@RolesAllowed("friend")
-public class EndpointNoInjectEJB
-{
- // @Resource
- WebServiceContext wsCtx;
-
- @Resource
- EJBContext ejbCtx;
-
- @WebMethod
- public String testGetMessageContext()
- {
- // @Resource WebServiceContext for jbossas-4.x
- // http://jira.jboss.org/jira/browse/JBWS-1468
- if (wsCtx == null)
- {
- CommonMessageContext msgContext =
MessageContextAssociation.peekMessageContext();
- wsCtx = new WebServiceContextEJB((SOAPMessageContextJAXWS)msgContext, ejbCtx);
- }
-
- SOAPMessageContext jaxwsContext = (SOAPMessageContext)wsCtx.getMessageContext();
- return jaxwsContext != null ? "pass" : "fail";
- }
-
- @WebMethod
- public String testGetUserPrincipal()
- {
- return wsCtx.getUserPrincipal().getName();
- }
-
- @WebMethod
- public boolean testIsUserInRole(String role)
- {
- return wsCtx.isUserInRole(role);
- }
-}
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-05-22
13:06:13 UTC (rev 3183)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/context/WebServiceContextEJBTestCase.java 2007-05-22
13:25:27 UTC (rev 3184)
@@ -33,7 +33,6 @@
import junit.framework.Test;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.JBossWSTestHelper;
import org.jboss.test.ws.JBossWSTestSetup;
/**
@@ -45,11 +44,10 @@
public class WebServiceContextEJBTestCase extends JBossWSTest
{
private static TestEndpoint port;
-
+
public static Test suite()
{
- String endpointJar = (JBossWSTestHelper.isTargetJBoss50() ?
"jaxws-samples-context.jar" : "jaxws-samples-context-jboss4x.jar");
- return JBossWSTestSetup.newTestSetup(WebServiceContextEJBTestCase.class,
endpointJar);
+ return JBossWSTestSetup.newTestSetup(WebServiceContextEJBTestCase.class,
"jaxws-samples-context.jar");
}
public void setUp() throws Exception
@@ -59,12 +57,12 @@
URL wsdlURL = new
File("resources/jaxws/samples/context/WEB-INF/wsdl/TestEndpoint.wsdl").toURL();
QName qname = new QName("http://org.jboss.ws/jaxws/context",
"TestEndpointService");
Service service = Service.create(wsdlURL, qname);
- port = (TestEndpoint)service.getPort(TestEndpoint.class);
-
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+
BindingProvider bp = (BindingProvider)port;
bp.getRequestContext().put(BindingProvider.USERNAME_PROPERTY,
"kermit");
bp.getRequestContext().put(BindingProvider.PASSWORD_PROPERTY,
"thefrog");
- }
+ }
}
public void testGetWebContext() throws Exception
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-05-22
13:06:13 UTC (rev 3183)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean01.java 2007-05-22
13:25:27 UTC (rev 3184)
@@ -27,7 +27,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.wsf.spi.annotation.WebContext;
/**
@@ -40,7 +39,6 @@
@WebContext(contextRoot="/jaxws-samples-webservice01-ejb3",
urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
-@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@Stateless
public class EJB3Bean01 implements EJB3RemoteInterface
{
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-05-22
13:06:13 UTC (rev 3183)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.java 2007-05-22
13:25:27 UTC (rev 3184)
@@ -29,7 +29,6 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.wsf.spi.annotation.WebContext;
/**
@@ -44,7 +43,6 @@
@WebContext(contextRoot="/jaxws-samples-webservice02-ejb3",
urlPattern="/*")
@SOAPBinding(style = SOAPBinding.Style.RPC)
@Remote(EJB3RemoteInterface.class)
-@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@Stateless
public class EJB3Bean02 implements EJB3RemoteInterface
{
Modified:
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java
===================================================================
---
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-05-22
13:06:13 UTC (rev 3183)
+++
trunk/testsuite/src/java/org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean03.java 2007-05-22
13:25:27 UTC (rev 3184)
@@ -25,7 +25,6 @@
import javax.ejb.Stateless;
import javax.jws.WebService;
-import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.wsf.spi.annotation.WebContext;
/**
@@ -37,7 +36,6 @@
@WebService(endpointInterface =
"org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03",
targetNamespace = "http://www.openuri.org/2004/04/HelloWorld", serviceName =
"TestService")
@WebContext(contextRoot="/jaxws-samples-webservice03-ejb3",
urlPattern="/*")
@Remote(EJB3RemoteInterface.class)
-@RemoteBinding(jndiBinding = "/ejb3/EJB3EndpointInterface")
@Stateless
public class EJB3Bean03 implements EJB3RemoteInterface
{