JBossWS SVN: r15371 - stack/cxf/branches/JBWS-3393/modules/client.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-14 10:19:55 -0500 (Wed, 14 Dec 2011)
New Revision: 15371
Modified:
stack/cxf/branches/JBWS-3393/modules/client/pom.xml
Log:
No need anymore for the classpath entry in manifest given the AS7 modular approach
Modified: stack/cxf/branches/JBWS-3393/modules/client/pom.xml
===================================================================
--- stack/cxf/branches/JBWS-3393/modules/client/pom.xml 2011-12-14 13:07:25 UTC (rev 15370)
+++ stack/cxf/branches/JBWS-3393/modules/client/pom.xml 2011-12-14 15:19:55 UTC (rev 15371)
@@ -261,29 +261,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <dependencies>
- <dependency>
- <artifactId>maven-archiver</artifactId>
- <groupId>org.apache.maven</groupId>
- <version>2.4</version>
- </dependency>
- </dependencies>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathLayoutType>custom</classpathLayoutType>
- <!--a bug in http://jira.codehaus.org/browse/MJAR-118, this needs to be reviewed(remove one $) when maven jar plugin is updated-->
- <customClasspathLayout>$${artifact.artifactId}.$${artifact.extension}</customClasspathLayout>
- </manifest>
- <manifestEntries>
- <Class-Path>jbossws-common-tools.jar jaxws-api.jar jboss-logging.jar jboss-logging-spi.jar jboss-logging-log4j.jar jcl-over-slf4j.jar slf4j-api.jar slf4j-jboss-logging.jar stax-api.jar wstx.jar wstx-lgpl.jar</Class-Path>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<failIfNoTests>false</failIfNoTests>
13 years
JBossWS SVN: r15370 - stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-14 08:07:25 -0500 (Wed, 14 Dec 2011)
New Revision: 15370
Modified:
stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
Log:
[JBWS-3398] Re-use WebservicesMetadata from ASIL
Modified: stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java
===================================================================
--- stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-12-13 11:42:56 UTC (rev 15369)
+++ stack/cxf/trunk/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2011-12-14 13:07:25 UTC (rev 15370)
@@ -105,7 +105,7 @@
private void processWSDDContribution(DDEndpoint endpoint, ArchiveDeployment dep)
{
- WebservicesMetaData webservices = WebservicesFactory.loadFromVFSRoot(dep.getRootFile());
+ WebservicesMetaData webservices = dep.getAttachment(WebservicesMetaData.class);
if (webservices != null)
{
for (WebserviceDescriptionMetaData wsDesc : webservices.getWebserviceDescriptions())
13 years
JBossWS SVN: r15369 - in shared-testsuite/trunk/testsuite/src/test: java/org/jboss/test/ws/jaxws and 4 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-13 06:42:56 -0500 (Tue, 13 Dec 2011)
New Revision: 15369
Added:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/AS2961TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointIface.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointImpl.java
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/WEB-INF/
shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/WEB-INF/web.xml
Modified:
shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
Log:
[AS7-2961] providing test case
Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-13 10:33:06 UTC (rev 15368)
+++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-jars-jaxws.xml 2011-12-13 11:42:56 UTC (rev 15369)
@@ -1150,6 +1150,14 @@
</classes>
</war>
+ <!-- jaxws-as2961 -->
+ <war warfile="${tests.output.dir}/test-libs/jaxws-as2961.war" webxml="${tests.output.dir}/test-resources/jaxws/as2961/WEB-INF/web.xml">
+ <classes dir="${tests.output.dir}/test-classes">
+ <include name="org/jboss/test/ws/jaxws/as2961/EndpointImpl.class"/>
+ <include name="org/jboss/test/ws/jaxws/as2961/EndpointIface.class"/>
+ </classes>
+ </war>
+
<!-- jaxws-jbws3367 -->
<war warfile="${tests.output.dir}/test-libs/jaxws-jbws3367-usecase1.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3367/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/AS2961TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/AS2961TestCase.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/AS2961TestCase.java 2011-12-13 11:42:56 UTC (rev 15369)
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package org.jboss.test.ws.jaxws.as2961;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+
+import junit.framework.Test;
+
+import org.jboss.wsf.test.JBossWSTest;
+import org.jboss.wsf.test.JBossWSTestSetup;
+
+/**
+ * [AS7-2961] Tests JNDI lookup in pojo endpoint constructor.
+ *
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+public class AS2961TestCase extends JBossWSTest
+{
+
+ public static Test suite()
+ {
+ return new JBossWSTestSetup(AS2961TestCase.class, "jaxws-as2961.war");
+ }
+
+ public void testEndpoint() throws Exception
+ {
+ final QName serviceName = new QName("org.jboss.test.ws.jaxws.as2961", "SimpleService");
+ final URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-as2961/SimpleService?wsdl");
+ final Service service = Service.create(wsdlURL, serviceName);
+ final EndpointIface port = service.getPort(EndpointIface.class);
+ final String result = port.echo("hello");
+ assertEquals("hello", result);
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointIface.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointIface.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointIface.java 2011-12-13 11:42:56 UTC (rev 15369)
@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+package org.jboss.test.ws.jaxws.as2961;
+
+import javax.jws.WebService;
+import javax.jws.soap.SOAPBinding;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService
+@SOAPBinding
+public interface EndpointIface
+{
+
+ String echo(String s);
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointImpl.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointImpl.java (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/as2961/EndpointImpl.java 2011-12-13 11:42:56 UTC (rev 15369)
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package org.jboss.test.ws.jaxws.as2961;
+
+import javax.jws.WebService;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
+/**
+ * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
+ */
+@WebService(
+ endpointInterface = "org.jboss.test.ws.jaxws.as2961.EndpointIface",
+ targetNamespace = "org.jboss.test.ws.jaxws.as2961",
+ serviceName = "SimpleService"
+)
+public class EndpointImpl
+{
+
+ private String string1;
+
+ public EndpointImpl()
+ {
+ try
+ {
+ final InitialContext ctx = new InitialContext();
+ string1 = (String)ctx.lookup("java:comp/env/org.jboss.test.ws.jaxws.as2961.EndpointImpl/string1");
+ }
+ catch (final NamingException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public String echo(final String s)
+ {
+ if (!"Ahoj 1".equals(string1)) throw new RuntimeException("JNDI lookup in constructor failed");
+ return s;
+ }
+
+}
Added: shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/WEB-INF/web.xml
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/WEB-INF/web.xml (rev 0)
+++ shared-testsuite/trunk/testsuite/src/test/resources/jaxws/as2961/WEB-INF/web.xml 2011-12-13 11:42:56 UTC (rev 15369)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ metadata-complete="false">
+ <servlet>
+ <servlet-name>TestService</servlet-name>
+ <servlet-class>org.jboss.test.ws.jaxws.as2961.EndpointImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestService</servlet-name>
+ <url-pattern>/SimpleService</url-pattern>
+ </servlet-mapping>
+ <env-entry>
+ <env-entry-name>org.jboss.test.ws.jaxws.as2961.EndpointImpl/string1</env-entry-name>
+ <env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>Ahoj 1</env-entry-value>
+ </env-entry>
+</web-app>
\ No newline at end of file
13 years
JBossWS SVN: r15368 - shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-13 05:33:06 -0500 (Tue, 13 Dec 2011)
New Revision: 15368
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java
Log:
fixing RemoteIface
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2011-12-13 10:32:29 UTC (rev 15367)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.java 2011-12-13 10:33:06 UTC (rev 15368)
@@ -30,5 +30,5 @@
*/
public interface EJB3RemoteInterface extends EJBObject
{
- String echo(String input);
+ String echo(String input) throws java.rmi.RemoteException;
}
13 years
JBossWS SVN: r15367 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-13 05:32:29 -0500 (Tue, 13 Dec 2011)
New Revision: 15367
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
sync. jboss-ejb-client version with upstream
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-13 10:15:08 UTC (rev 15366)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-13 10:32:29 UTC (rev 15367)
@@ -1519,7 +1519,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.0.Beta7</version>
+ <version>1.0.0.Beta8</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
@@ -1708,7 +1708,6 @@
<!-- # TODO: remote JNDI support (non EJB objects) -->
<exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
</excludes>
</configuration>
13 years
JBossWS SVN: r15366 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-13 05:15:08 -0500 (Tue, 13 Dec 2011)
New Revision: 15366
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
sync. jboss-ejb-client version with upstream
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-12-13 08:15:09 UTC (rev 15365)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-12-13 10:15:08 UTC (rev 15366)
@@ -1289,7 +1289,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-ejb-client</artifactId>
- <version>1.0.0.Beta7</version>
+ <version>1.0.0.Beta8</version>
<exclusions>
<exclusion>
<groupId>org.jboss.remoting3</groupId>
13 years
JBossWS SVN: r15365 - stack/cxf/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2011-12-13 03:15:09 -0500 (Tue, 13 Dec 2011)
New Revision: 15365
Modified:
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
Excluding failing test
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-07 15:06:22 UTC (rev 15364)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-13 08:15:09 UTC (rev 15365)
@@ -1708,6 +1708,7 @@
<!-- # TODO: remote JNDI support (non EJB objects) -->
<exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
</excludes>
</configuration>
13 years
JBossWS SVN: r15364 - stack/native/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-07 10:06:22 -0500 (Wed, 07 Dec 2011)
New Revision: 15364
Modified:
stack/native/trunk/modules/testsuite/pom.xml
Log:
updating excludes
Modified: stack/native/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/native/trunk/modules/testsuite/pom.xml 2011-12-07 14:29:18 UTC (rev 15363)
+++ stack/native/trunk/modules/testsuite/pom.xml 2011-12-07 15:06:22 UTC (rev 15364)
@@ -1409,11 +1409,16 @@
<!-- JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
+ <!-- # TODO: appclient -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
+
+ <!-- # TODO: remote JNDI support (non EJB objects) -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
+ <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
+
<!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
<exclude>org/jboss/test/ws/jaxws/wsaddressing/replyto/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
<!-- # Remote JNDI lookup & jaxrpc client issues -->
<exclude>org/jboss/test/ws/benchmark/jaxrpc/BenchmarkDocEJBTestCase*</exclude>
@@ -1498,9 +1503,6 @@
<exclude>org/jboss/test/ws/jaxrpc/overloaded/OverloadedTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/DynamicHandlerTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/dynamichandler/StaticHandlerTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
- <exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/wsaddr/replyto/AddressingReplyToTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleEncryptTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/wssecurity/SimpleSignTestCase*</exclude>
13 years
JBossWS SVN: r15363 - in shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws: jaxrpc/samples/serviceref and 3 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-07 09:29:18 -0500 (Wed, 07 Dec 2011)
New Revision: 15363
Modified:
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
Log:
fixing tests for AS7
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/secureejb/SecureEJBTestCase.java 2011-12-07 14:29:18 UTC (rev 15363)
@@ -80,7 +80,7 @@
public void testBasicSecuredSLSB() throws Exception
{
InitialContext iniCtx = getInitialContext();
- OrganizationHome home = (OrganizationHome)iniCtx.lookup("ejb/BasicSecuredSLSB");
+ OrganizationHome home = (OrganizationHome)iniCtx.lookup(isTargetJBoss6() ? "ejb/BasicSecuredSLSB" : "ejb:/jaxrpc-samples-secureejb//BasicSecuredSLSB!" + OrganizationHome.class.getName());
OrganizationRemote bean = home.create();
String info = bean.getContactInfo("mafia");
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-07 14:29:18 UTC (rev 15363)
@@ -52,12 +52,11 @@
public void testEJBClient() throws Exception
{
InitialContext iniCtx = getInitialContext();
- EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/EJBClient");
+ EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient" : "ejb:/jaxrpc-samples-serviceref-ejb-client//EJBClient!" + EJBRemoteHome.class.getName());
EJBRemote ejbRemote = ejbHome.create();
String helloWorld = "Hello World!";
Object retObj = ejbRemote.echo(helloWorld);
assertEquals(helloWorld, retObj);
-
}
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581EarTestCase.java 2011-12-07 14:29:18 UTC (rev 15363)
@@ -58,7 +58,7 @@
public void testEJBVehicle() throws Exception
{
- EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote");
+ EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName());
String retStr = remote.runTest("Hello World!");
assertEquals("Hello World!", retStr);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581WarTestCase.java 2011-12-07 14:29:18 UTC (rev 15363)
@@ -58,7 +58,7 @@
public void testEJBVehicle() throws Exception
{
- EJB3Remote remote = (EJB3Remote)getInitialContext().lookup("/EJB3Bean/remote");
+ EJB3Remote remote = (EJB3Remote)getInitialContext().lookup(isTargetJBoss6() ? "/EJB3Bean/remote" : "ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName());
String retStr = remote.runTest("Hello World!");
assertEquals("Hello World!", retStr);
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2011-12-07 14:29:18 UTC (rev 15363)
@@ -57,7 +57,7 @@
public void testRemoteAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
- EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("/FooBean01/remote");
+ EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/remote" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName());
String helloWorld = "Hello world!";
Object retObj = ejb3Remote.echo(helloWorld);
@@ -69,7 +69,7 @@
public void testNarrowedRemoteAccess() throws Exception
{
InitialContext iniCtx = getInitialContext();
- Object obj = iniCtx.lookup("/FooBean01/home");
+ Object obj = iniCtx.lookup(isTargetJBoss6() ? "/FooBean01/home" : "ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName());
EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class);
EJB3RemoteInterface ejb3Remote = ejb3Home.create();
@@ -98,4 +98,5 @@
Definition wsdlDefinition = wsdlReader.readWSDL(wsdlURL.toString());
assertNotNull(wsdlDefinition);
}
+
}
Modified: shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java
===================================================================
--- shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
+++ shared-testsuite/trunk/testsuite/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.java 2011-12-07 14:29:18 UTC (rev 15363)
@@ -73,7 +73,7 @@
public void testEJBClient() throws Exception
{
InitialContext iniCtx = getInitialContext();
- EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("/EJBClient/remote");
+ EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup(isTargetJBoss6() ? "/EJBClient/remote" : "ejb:/jaxws-samples-serviceref-ejb-client//EJBClient!" + EJBRemote.class.getName());
String helloWorld = "Hello World!";
Object retObj = ejbRemote.echo(helloWorld);
13 years
JBossWS SVN: r15362 - in stack/cxf/trunk/modules/testsuite: cxf-tests/scripts and 1 other directories.
by jbossws-commits＠lists.jboss.org
Author: ropalka
Date: 2011-12-07 09:28:26 -0500 (Wed, 07 Dec 2011)
New Revision: 15362
Modified:
stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
stack/cxf/trunk/modules/testsuite/pom.xml
Log:
enabling tests plus fixing excludes
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-06 19:33:25 UTC (rev 15361)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/scripts/cxf-jars-jaxws.xml 2011-12-07 14:28:26 UTC (rev 15362)
@@ -58,6 +58,9 @@
<metainf dir="${tests.output.dir}/test-resources/jaxws/cxf/bus/META-INF">
<include name="wsdl/**/*" />
</metainf>
+ <manifest>
+ <attribute name="Dependencies" value="org.apache.cxf"/>
+ </manifest>
</jar>
<!-- jaxws-cxf-bus-servlet-client -->
Modified: stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java
===================================================================
--- stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-12-06 19:33:25 UTC (rev 15361)
+++ stack/cxf/trunk/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/EJB3ClientBusTestCase.java 2011-12-07 14:28:26 UTC (rev 15362)
@@ -49,7 +49,8 @@
{
String host = getServerHost();
InitialContext iniCtx = getInitialContext();
- EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)iniCtx.lookup("/EJB3Client/remote");
+ Object obj = iniCtx.lookup(isTargetJBoss6() ? "/EJB3Client/remote" : "ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName());
+ EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj;
ejb3Remote.testBusCreation();
ejb3Remote.testSOAPConnection(host);
ejb3Remote.testWebServiceClient(host);
Modified: stack/cxf/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-06 19:33:25 UTC (rev 15361)
+++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-12-07 14:28:26 UTC (rev 15362)
@@ -1624,7 +1624,6 @@
<configuration>
<testExcludes>
<!-- EJB3 client API dependencies -->
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
</testExcludes>
</configuration>
@@ -1696,21 +1695,18 @@
<!-- TODO: tests using org.jboss.ejb3.client.ClientLauncher -->
<exclude>org/jboss/test/ws/jaxws/samples/webserviceref/**</exclude>
- <!-- # [JBWS-3234] JNDI over RMI not available on AS7 -->
- <exclude>org/jboss/test/ws/jaxws/jbws944/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/samples/serviceref/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/jbws1581/**</exclude>
- <exclude>org/jboss/test/ws/jaxws/cxf/bus/*EJB3*</exclude>
-
<!-- # [JBWS-3249] Restore UsernameAuthorizationCustomFileTestCase on AS7 -->
<exclude>org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase*</exclude>
- <!-- JAXR not available -->
+ <!-- # TODO: JAXR not available -->
<exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude>
- <!-- TODO: JSR109 w/ jaxrpc, remote JNDI support -->
- <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
+ <!-- # TODO: appclient -->
+ <exclude>org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefClientTestCase*</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefClientTestCase*</exclude>
+
+ <!-- # TODO: remote JNDI support (non EJB objects) -->
+ <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude>
<exclude>org/jboss/test/ws/jaxrpc/samples/serviceref/ServiceRefEJBTestCase*</exclude>
</excludes>
13 years