Menu
▾
▴
[Jboss-svn-commits] JBossWS SVN: r541 - in trunk/src: main/java/org/jboss/ws/integration/jboss test test/ant test/java/org/jboss/test/ws test/java/org/jboss/test/ws/jbws1010 test/java/org/jboss/test/ws/jbws1011 test/resources test/resources/jbws1011 test/resources/jbws1011/META-INF test/resources/jbws1011/META-INF/wsdl test/resources/samples
|
From: <jbo...@li...> - 2006-07-03 13:16:17
|
Author: dar...@jb...
Date: 2006-07-03 09:16:02 -0400 (Mon, 03 Jul 2006)
New Revision: 541
Added:
trunk/src/test/java/org/jboss/test/ws/jbws1011/
trunk/src/test/java/org/jboss/test/ws/jbws1011/JBWS1011TestCase.java
trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityBean.java
trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityHome.java
trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityLocal.java
trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpoint.java
trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpointBean.java
trunk/src/test/resources/jbws1011/
trunk/src/test/resources/jbws1011/META-INF/
trunk/src/test/resources/jbws1011/META-INF/application-client.xml
trunk/src/test/resources/jbws1011/META-INF/ejb-jar.xml
trunk/src/test/resources/jbws1011/META-INF/jaxrpc-mapping.xml
trunk/src/test/resources/jbws1011/META-INF/jboss-client.xml
trunk/src/test/resources/jbws1011/META-INF/jbosscmp-jdbc.xml
trunk/src/test/resources/jbws1011/META-INF/webservices.xml
trunk/src/test/resources/jbws1011/META-INF/wsdl/
trunk/src/test/resources/jbws1011/META-INF/wsdl/TestService.wsdl
trunk/src/test/resources/jbws1011/wstools-config.xml
trunk/src/test/resources/tests-tomcat-excludes.txt
Removed:
trunk/src/test/resources/samples/samples-tomcat-excludes.txt
Modified:
trunk/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java
trunk/src/test/ant/build-jars.xml
trunk/src/test/build.xml
trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java
Log:
JBWS-1011 NullPointerException deploying JSR-109 deployment that contains entity beans in addition to the session bean exposed as a WS endpoint.
Modified: trunk/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/main/java/org/jboss/ws/integration/jboss/ApplicationMetaDataAdaptor.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -65,7 +65,11 @@
while (it.hasNext())
{
BeanMetaData bmd = (BeanMetaData)it.next();
- beans.add(buildUnifiedBeanMetaData(bmd));
+ UnifiedBeanMetaData ubmd = buildUnifiedBeanMetaData(bmd);
+ if (ubmd != null)
+ {
+ beans.add(ubmd);
+ }
}
umd.setEnterpriseBeans(beans);
}
Modified: trunk/src/test/ant/build-jars.xml
===================================================================
--- trunk/src/test/ant/build-jars.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/ant/build-jars.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -315,8 +315,37 @@
<include name="jaxrpc-mapping.xml"/>
<include name="wsdl/**"/>
</metainf>
- </jar>
+ </jar>
+ <!-- jbossws-jbws1011 -->
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityLocal.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityHome.class"/>
+ <include name="org/jboss/test/ws/jbws1011/SimpleEntityBean.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ <include name="org/jboss/test/ws/jbws1011/TestEndpointBean.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jbosscmp-jdbc.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/TestService.wsdl"/>
+ </metainf>
+ </jar>
+ <jar destfile="${build.test.dir}/libs/jbossws-jbws1011-client.jar">
+ <fileset dir="${build.test.dir}/classes">
+ <include name="org/jboss/test/ws/jbws1011/TestEndpoint.class"/>
+ </fileset>
+ <metainf dir="${build.test.dir}/resources/jbws1011/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ </jar>
+
<!-- jbossws-jaxws-provider-jaxb -->
<war warfile="${build.test.dir}/libs/jbossws-jaxws-provider-jaxb.war" webxml="${build.test.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml">
<classes dir="${build.test.dir}/classes">
Modified: trunk/src/test/build.xml
===================================================================
--- trunk/src/test/build.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/build.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -113,7 +113,7 @@
<condition property="tests.excludesfile" value="${tests.noexcludes.file}">
<isset property="jbossws.target.server.jboss"/>
</condition>
- <condition property="tests.excludesfile" value="${test.resources.dir}/samples/samples-tomcat-excludes.txt">
+ <condition property="tests.excludesfile" value="${test.resources.dir}/tests-tomcat-excludes.txt">
<isset property="jbossws.target.server.tomcat"/>
</condition>
Modified: trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1010/JBWS1010TestCase.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -30,6 +30,11 @@
import org.jboss.test.ws.JBossWSTestSetup;
import org.jboss.test.ws.jbws231.JBWS231TestCase;
+/**
+ *
+ * @author dar...@jb...
+ * @since 27-June-2006
+ */
public class JBWS1010TestCase extends JBossWSTest
{
Added: trunk/src/test/java/org/jboss/test/ws/jbws1011/JBWS1011TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1011/JBWS1011TestCase.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1011/JBWS1011TestCase.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,67 @@
+/*
+ * 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.jbws1011;
+
+import javax.naming.InitialContext;
+import javax.xml.rpc.Service;
+
+import junit.framework.Test;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.test.ws.JBossWSTestSetup;
+
+/**
+ * Test case to test that a deployment containg a stateless session bean exposed
+ * as a web service and a CMP entity bean (exposed using local interfaces) can be
+ * correctly deployed.
+ *
+ * @author dar...@jb...
+ * @since 03-July-2006
+ */
+public class JBWS1011TestCase extends JBossWSTest
+{
+
+ private static TestEndpoint port;
+
+ public static Test suite() throws Exception
+ {
+ return JBossWSTestSetup.newTestSetup(JBWS1011TestCase.class, "jbossws-jbws1011.jar, jbossws-jbws1011-client.jar");
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ if (port == null)
+ {
+ InitialContext iniCtx = getInitialContext();
+ Service service = (Service)iniCtx.lookup("java:comp/env/service/TestService");
+ port = (TestEndpoint)service.getPort(TestEndpoint.class);
+ }
+ }
+
+ public void testCall() throws Exception
+ {
+ String response = port.echoString("Hello");
+ assertEquals("Hello", response);
+ }
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jbws1011/JBWS1011TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityBean.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityBean.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityBean.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,82 @@
+/*
+ * 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.jbws1011;
+
+import javax.ejb.CreateException;
+import javax.ejb.EntityBean;
+import javax.ejb.EntityContext;
+
+/**
+ *
+ * @author dar...@jb...
+ * @since 03-July-2006
+ */
+public abstract class SimpleEntityBean implements EntityBean
+{
+
+ private EntityContext context;
+
+ public String ejbCreate(final String id) throws CreateException
+ {
+ setId(id);
+ return null;
+ }
+
+ public void ejbPostCreate(final String id)
+ {
+ }
+
+ public abstract void setId(final String id);
+
+ public abstract String getId();
+
+ public void setEntityContext(final EntityContext context)
+ {
+ this.context = context;
+ }
+
+ public void unsetEntityContext()
+ {
+ context = null;
+ }
+
+ public void ejbRemove()
+ {
+ }
+
+ public void ejbActivate()
+ {
+ }
+
+ public void ejbPassivate()
+ {
+ }
+
+ public void ejbLoad()
+ {
+ }
+
+ public void ejbStore()
+ {
+ }
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityHome.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityHome.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityHome.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,44 @@
+/*
+ * 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.jbws1011;
+
+import java.util.Collection;
+
+import javax.ejb.CreateException;
+import javax.ejb.EJBLocalHome;
+import javax.ejb.FinderException;
+
+/**
+ *
+ * @author dar...@jb...
+ * @since 03-July-2006
+ */
+public interface SimpleEntityHome extends EJBLocalHome
+{
+
+ public SimpleEntityLocal create(String id) throws CreateException;
+
+ public SimpleEntityLocal findByPrimaryKey(String id) throws FinderException;
+
+ public Collection findAll() throws FinderException;
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityHome.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityLocal.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityLocal.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityLocal.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,36 @@
+/*
+ * 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.jbws1011;
+
+import javax.ejb.EJBLocalObject;
+
+/**
+ *
+ * @author dar...@jb...
+ * @since 03-July-2006
+ */
+public interface SimpleEntityLocal extends EJBLocalObject
+{
+
+ public String getId();
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jbws1011/SimpleEntityLocal.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpoint.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpoint.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpoint.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,37 @@
+/*
+ * 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.jbws1011;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ *
+ * @author dar...@jb...
+ * @since 03-July-2006
+ */
+public interface TestEndpoint extends Remote
+{
+
+ public String echoString(final String message) throws RemoteException;
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpoint.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpointBean.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpointBean.java 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpointBean.java 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,40 @@
+package org.jboss.test.ws.jbws1011;
+
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+public class TestEndpointBean implements SessionBean
+{
+
+ /** */
+ private static final long serialVersionUID = 4273529627421651843L;
+
+ private SessionContext context;
+
+ public void ejbCreate()
+ {
+ }
+
+ public String echoString(final String message)
+ {
+ return message;
+ }
+
+ public void setSessionContext(final SessionContext context)
+ {
+ this.context = context;
+ }
+
+ public void ejbRemove()
+ {
+ }
+
+ public void ejbActivate()
+ {
+ }
+
+ public void ejbPassivate()
+ {
+ }
+
+}
Property changes on: trunk/src/test/java/org/jboss/test/ws/jbws1011/TestEndpointBean.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/application-client.xml
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/application-client.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/application-client.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<application-client xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
+ version="1.4">
+
+ <display-name>TestService</display-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <service-interface>javax.xml.rpc.Service</service-interface>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component-ref>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1011.TestEndpoint</service-endpoint-interface>
+ </port-component-ref>
+ </service-ref>
+
+</application-client>
+
Property changes on: trunk/src/test/resources/jbws1011/META-INF/application-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/ejb-jar.xml
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/ejb-jar.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/ejb-jar.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1">
+ <enterprise-beans>
+
+ <entity>
+ <ejb-name>SimpleEntityBean</ejb-name>
+ <local-home>
+ org.jboss.test.ws.jbws1011.SimpleEntityHome
+ </local-home>
+ <local>org.jboss.test.ws.jbws1011.SimpleEntityLocal</local>
+ <ejb-class>
+ org.jboss.test.ws.jbws1011.SimpleEntityBean
+ </ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.String</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-version>2.x</cmp-version>
+ <abstract-schema-name>Simple</abstract-schema-name>
+ <cmp-field>
+ <field-name>id</field-name>
+ </cmp-field>
+ <primkey-field>id</primkey-field>
+ </entity>
+
+ <session>
+ <ejb-name>TestEndpointBean</ejb-name>
+ <service-endpoint>org.jboss.test.ws.jbws1011.TestEndpoint</service-endpoint>
+ <ejb-class>org.jboss.test.ws.jbws1011.TestEndpointBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jbws1011/META-INF/ejb-jar.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/jaxrpc-mapping.xml
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/jaxrpc-mapping.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/jaxrpc-mapping.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?><java-wsdl-mapping version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd'>
+ <package-mapping>
+ <package-type>org.jboss.test.ws.jbws1011</package-type>
+ <namespaceURI>http://org.jboss.test.ws/jbws1011/types</namespaceURI>
+ </package-mapping>
+ <service-interface-mapping>
+ <service-interface>org.jboss.test.ws.jbws1011.TestService</service-interface>
+ <wsdl-service-name xmlns:serviceNS='http://org.jboss.test.ws/jbws1011'>serviceNS:TestService</wsdl-service-name>
+ <port-mapping>
+ <port-name>TestEndpointPort</port-name>
+ <java-port-name>TestEndpointPort</java-port-name>
+ </port-mapping>
+ </service-interface-mapping>
+ <service-endpoint-interface-mapping>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1011.TestEndpoint</service-endpoint-interface>
+ <wsdl-port-type xmlns:portTypeNS='http://org.jboss.test.ws/jbws1011'>portTypeNS:TestEndpoint</wsdl-port-type>
+ <wsdl-binding xmlns:bindingNS='http://org.jboss.test.ws/jbws1011'>bindingNS:TestEndpointBinding</wsdl-binding>
+ <service-endpoint-method-mapping>
+ <java-method-name>echoString</java-method-name>
+ <wsdl-operation>echoString</wsdl-operation>
+ <method-param-parts-mapping>
+ <param-position>0</param-position>
+ <param-type>java.lang.String</param-type>
+ <wsdl-message-mapping>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1011'>wsdlMsgNS:TestEndpoint_echoString</wsdl-message>
+ <wsdl-message-part-name>String_1</wsdl-message-part-name>
+ <parameter-mode>IN</parameter-mode>
+ </wsdl-message-mapping>
+ </method-param-parts-mapping>
+ <wsdl-return-value-mapping>
+ <method-return-value>java.lang.String</method-return-value>
+ <wsdl-message xmlns:wsdlMsgNS='http://org.jboss.test.ws/jbws1011'>wsdlMsgNS:TestEndpoint_echoStringResponse</wsdl-message>
+ <wsdl-message-part-name>result</wsdl-message-part-name>
+ </wsdl-return-value-mapping>
+ </service-endpoint-method-mapping>
+ </service-endpoint-interface-mapping>
+</java-wsdl-mapping>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jbws1011/META-INF/jaxrpc-mapping.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/jboss-client.xml
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/jboss-client.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/jboss-client.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-client PUBLIC
+ "-//JBoss//DTD Application Client 4.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-client_4_0.dtd">
+
+<jboss-client>
+ <jndi-name>jbossws-client</jndi-name>
+
+ <service-ref>
+ <service-ref-name>service/TestService</service-ref-name>
+ <wsdl-override>http://@jbosstest.host.name@:8080/jbossws-jbws1011/TestEndpointBean?wsdl</wsdl-override>
+ </service-ref>
+
+</jboss-client>
Property changes on: trunk/src/test/resources/jbws1011/META-INF/jboss-client.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/jbosscmp-jdbc.xml
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/jbosscmp-jdbc.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/jbosscmp-jdbc.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jbosscmp-jdbc PUBLIC
+ "-//JBoss//DTD JBOSSCMP-JDBC 3.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jbosscmp-jdbc_3_2.dtd">
+
+<jbosscmp-jdbc>
+ <defaults>
+ <create-table>true</create-table>
+ <remove-table>true</remove-table>
+ </defaults>
+
+ <enterprise-beans>
+ <entity>
+ <ejb-name>SimpleEntityBean</ejb-name>
+ <table-name>Simple</table-name>
+ </entity>
+ </enterprise-beans>
+</jbosscmp-jdbc>
Property changes on: trunk/src/test/resources/jbws1011/META-INF/jbosscmp-jdbc.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/webservices.xml
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/webservices.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/webservices.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,15 @@
+<webservices version='1.1' xmlns='http://java.sun.com/xml/ns/j2ee' xmlns:impl='http://org.jboss.test.ws/jbws1011' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd'>
+ <webservice-description>
+ <webservice-description-name>TestService</webservice-description-name>
+ <wsdl-file>META-INF/wsdl/TestService.wsdl</wsdl-file>
+ <jaxrpc-mapping-file>META-INF/jaxrpc-mapping.xml</jaxrpc-mapping-file>
+ <port-component>
+ <port-component-name>TestEndpointPort</port-component-name>
+ <wsdl-port>impl:TestEndpointPort</wsdl-port>
+ <service-endpoint-interface>org.jboss.test.ws.jbws1011.TestEndpoint</service-endpoint-interface>
+ <service-impl-bean>
+ <ejb-link>TestEndpointBean</ejb-link>
+ </service-impl-bean>
+ </port-component>
+ </webservice-description>
+</webservices>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jbws1011/META-INF/webservices.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/META-INF/wsdl/TestService.wsdl
===================================================================
--- trunk/src/test/resources/jbws1011/META-INF/wsdl/TestService.wsdl 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/META-INF/wsdl/TestService.wsdl 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name='TestService' targetNamespace='http://org.jboss.test.ws/jbws1011' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.test.ws/jbws1011' xmlns:xsd='http://www.w3.org/2001/XMLSchema'>
+ <types/>
+ <message name='TestEndpoint_echoString'>
+ <part name='String_1' type='xsd:string'/>
+ </message>
+ <message name='TestEndpoint_echoStringResponse'>
+ <part name='result' type='xsd:string'/>
+ </message>
+ <portType name='TestEndpoint'>
+ <operation name='echoString' parameterOrder='String_1'>
+ <input message='tns:TestEndpoint_echoString'/>
+ <output message='tns:TestEndpoint_echoStringResponse'/>
+ </operation>
+ </portType>
+ <binding name='TestEndpointBinding' type='tns:TestEndpoint'>
+ <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/>
+ <operation name='echoString'>
+ <soap:operation soapAction=''/>
+ <input>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1011' use='literal'/>
+ </input>
+ <output>
+ <soap:body namespace='http://org.jboss.test.ws/jbws1011' use='literal'/>
+ </output>
+ </operation>
+ </binding>
+ <service name='TestService'>
+ <port binding='tns:TestEndpointBinding' name='TestEndpointPort'>
+ <soap:address location='REPLACE_WITH_ACTUAL_URL'/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
Property changes on: trunk/src/test/resources/jbws1011/META-INF/wsdl/TestService.wsdl
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: trunk/src/test/resources/jbws1011/wstools-config.xml
===================================================================
--- trunk/src/test/resources/jbws1011/wstools-config.xml 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/jbws1011/wstools-config.xml 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ wstools -cp ../../../../output/tests/classes -dest ./META-INF -config wstools-config.xml
+-->
+
+<configuration xmlns="http://www.jboss.org/jbossws-tools" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
+ <java-wsdl>
+ <service name="TestService" endpoint="org.jboss.test.ws.jbws1011.TestEndpoint" style="rpc">
+ </service>
+ <namespaces target-namespace="http://org.jboss.test.ws/jbws1011" type-namespace="http://org.jboss.test.ws/jbws1011/types"/>
+ <mapping file="jaxrpc-mapping.xml"/>
+ <webservices ejb-link="TestEndpointBean"/>
+ </java-wsdl>
+</configuration>
Property changes on: trunk/src/test/resources/jbws1011/wstools-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: trunk/src/test/resources/samples/samples-tomcat-excludes.txt
===================================================================
--- trunk/src/test/resources/samples/samples-tomcat-excludes.txt 2006-07-03 11:13:21 UTC (rev 540)
+++ trunk/src/test/resources/samples/samples-tomcat-excludes.txt 2006-07-03 13:16:02 UTC (rev 541)
@@ -1,5 +0,0 @@
-org/jboss/test/ws/samples/dynamichandler/**
-org/jboss/test/ws/samples/jmstransport/**
-org/jboss/test/ws/samples/jsr109ejb/**
-org/jboss/test/ws/samples/jsr181ejb/**
-org/jboss/test/ws/samples/secureejb/**
Copied: trunk/src/test/resources/tests-tomcat-excludes.txt (from rev 538, trunk/src/test/resources/samples/samples-tomcat-excludes.txt)
===================================================================
--- trunk/src/test/resources/samples/samples-tomcat-excludes.txt 2006-06-30 16:54:45 UTC (rev 538)
+++ trunk/src/test/resources/tests-tomcat-excludes.txt 2006-07-03 13:16:02 UTC (rev 541)
@@ -0,0 +1,6 @@
+org/jboss/test/ws/samples/dynamichandler/**
+org/jboss/test/ws/samples/jmstransport/**
+org/jboss/test/ws/samples/jsr109ejb/**
+org/jboss/test/ws/samples/jsr181ejb/**
+org/jboss/test/ws/samples/secureejb/**
+org/jboss/test/ws/jbws1011/**
|
