12:33 p.m.
Author: thomas.diesler(a)jboss.com
Date: 2007-11-05 13:33:05 -0500 (Mon, 05 Nov 2007)
New Revision: 4989
Added:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.java
Modified:
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
Log:
Fix JBWS-1762 regression
Modified:
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-11-05
18:30:16 UTC (rev 4988)
+++
stack/native/branches/jbossws-native-2.0.2/ant-import-tests/build-jars-jaxrpc.xml 2007-11-05
18:33:05 UTC (rev 4989)
@@ -2549,6 +2549,26 @@
</jar>
<!-- jaxrpc-jbws1762 -->
+ <jar
destfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar">
+ <fileset dir="${tests.output.dir}/classes">
+ <include
name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.class"/>
+ <include
name="org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.class"/>
+ </fileset>
+ <metainf
dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF">
+ <include name="webservices.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="ejb-jar.xml"/>
+ <include name="wsdl/**"/>
+ </metainf>
+ <metainf
dir="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged">
+ <include name="jboss.xml"/>
+ </metainf>
+ </jar>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+ <unjar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.jar"
dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+ <copy
todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar/META-INF"
file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/jboss.xml"
+ overwrite="true"/>
+
<war warfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
webxml="${tests.output.dir}/resources/jaxrpc/jbws1762/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/classes">
<include
name="org/jboss/test/ws/jaxrpc/jbws1762/services/POJOIface.class"/>
@@ -2563,6 +2583,25 @@
</war>
<mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
<unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+
+ <ear jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.ear"
appxml="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml">
+ <fileset dir="${tests.output.dir}/libs">
+ <include name="jaxrpc-jbws1762-packaged.jar"/>
+ <include name="jaxrpc-jbws1762-packaged.war"/>
+ </fileset>
+ </ear>
+ <mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear"/>
+ <mkdir
dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
+ <copy
file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml"
todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/META-INF"/>
+ <mkdir
dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war"/>
+ <copy
todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.war">
+ <fileset
dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.war"/>
+ </copy>
+ <mkdir
dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar"/>
+ <copy
todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.ear/jaxrpc-jbws1762-exploded.jar">
+ <fileset
dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.jar"/>
+ </copy>
+
<jar
jarfile="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.sar">
<fileset dir="${tests.output.dir}/libs">
<include name="jaxrpc-jbws1762-packaged.war"/>
@@ -2573,7 +2612,7 @@
</jar>
<mkdir dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar"/>
<mkdir
dir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
- <copy
file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"
todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"/>
+ <copy
todir="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/META-INF"
file="${tests.output.dir}/resources/jaxrpc/jbws1762/META-INF/jboss-service.xml"/>
<unwar src="${tests.output.dir}/libs/jaxrpc-jbws1762-packaged.war"
dest="${tests.output.dir}/libs/jaxrpc-jbws1762-exploded.sar/jaxrpc-jbws1762-exploded.war"/>
<!-- jaxrpc-jbws1792 -->
Added:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java
(rev 0)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/AbstractEJB2Test.java 2007-11-05
18:33:05 UTC (rev 4989)
@@ -0,0 +1,63 @@
+/*
+ * 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.jaxrpc.jbws1762;
+
+import java.io.File;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.test.ws.jaxrpc.jbws1762.services.EJB2Iface;
+import org.jboss.ws.core.jaxrpc.client.ServiceFactoryImpl;
+import org.jboss.ws.core.jaxrpc.client.ServiceImpl;
+import org.jboss.wsf.test.JBossWSTest;
+
+/**
+ * [JBWS-1762] web.xml modified to web.xml.org - subsequent runs fail
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Oct 20, 2007
+ */
+public abstract class AbstractEJB2Test extends JBossWSTest
+{
+ private EJB2Iface ejb2Proxy;
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" +
getWSDLLocation());
+ URL mappingURL = new
File("resources/jaxrpc/jbws1762/META-INF/jaxrpc-mapping.xml").toURL();
+ QName serviceName = new
QName("http://org.jboss.test.webservice/jbws1762", "EJB2Bean");
+
+ ServiceFactoryImpl factory = new ServiceFactoryImpl();
+ ServiceImpl service = (ServiceImpl)factory.createService(wsdlURL, serviceName,
mappingURL);
+ ejb2Proxy = (EJB2Iface)service.getPort(EJB2Iface.class);
+ }
+
+ protected abstract String getWSDLLocation();
+
+ public void testEJB2() throws Exception
+ {
+ assertEquals(ejb2Proxy.echo("Hello!"), "Hello!");
+ }
+}
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-11-05
18:30:16 UTC (rev 4988)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/exploded_ear_pojo/Iteration1TestCase.java 2007-11-05
18:33:05 UTC (rev 4989)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxrpc-jbws1762-exploded-war/POJOBean?wsdl";
+ return "jaxrpc-jbws1762/POJOBean?wsdl";
}
}
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-11-05
18:30:16 UTC (rev 4988)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/packaged_ear_pojo/Iteration1TestCase.java 2007-11-05
18:33:05 UTC (rev 4989)
@@ -42,6 +42,6 @@
public String getWSDLLocation()
{
- return "jaxrpc-jbws1762-packaged-war/POJOBean?wsdl";
+ return "jaxrpc-jbws1762/POJOBean?wsdl";
}
}
Added:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.java
(rev 0)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Bean.java 2007-11-05
18:33:05 UTC (rev 4989)
@@ -0,0 +1,60 @@
+/*
+ * 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.jaxrpc.jbws1762.services;
+
+import javax.ejb.SessionBean;
+import javax.ejb.SessionContext;
+
+/**
+ * EJB2 bean
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Oct 20, 2007
+ */
+public class EJB2Bean implements SessionBean, EJB2Iface
+{
+ public String echo(String msg)
+ {
+ return msg;
+ }
+
+ public void setSessionContext(SessionContext ctx)
+ {
+ }
+
+ public void ejbCreate()
+ {
+ }
+
+ public void ejbRemove()
+ {
+ }
+
+ public void ejbActivate()
+ {
+ }
+
+ public void ejbPassivate()
+ {
+ }
+}
Added:
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.java
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.java
(rev 0)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/java/org/jboss/test/ws/jaxrpc/jbws1762/services/EJB2Iface.java 2007-11-05
18:33:05 UTC (rev 4989)
@@ -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.jaxrpc.jbws1762.services;
+
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+/**
+ * EJB2 interface
+ *
+ * @author richard.opalka(a)jboss.com
+ *
+ * @since Oct 20, 2007
+ */
+public interface EJB2Iface extends Remote
+{
+ String echo(String msg) throws RemoteException;
+}
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml 2007-11-05
18:30:16 UTC (rev 4988)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/exploded/application.xml 2007-11-05
18:33:05 UTC (rev 4989)
@@ -9,7 +9,7 @@
<module>
<web>
<web-uri>jaxrpc-jbws1762-exploded.war</web-uri>
- <context-root>jaxrpc-jbws1762-exploded-war</context-root>
+ <context-root>jaxrpc-jbws1762</context-root>
</web>
</module>
</application>
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml 2007-11-05
18:30:16 UTC (rev 4988)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/resources/jaxrpc/jbws1762/META-INF/packaged/application.xml 2007-11-05
18:33:05 UTC (rev 4989)
@@ -9,7 +9,7 @@
<module>
<web>
<web-uri>jaxrpc-jbws1762-packaged.war</web-uri>
- <context-root>jaxrpc-jbws1762-packaged-war</context-root>
+ <context-root>jaxrpc-jbws1762</context-root>
</web>
</module>
</application>
Modified:
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt
===================================================================
---
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-05
18:30:16 UTC (rev 4988)
+++
stack/native/branches/jbossws-native-2.0.2/src/test/resources/test-excludes-jboss500.txt 2007-11-05
18:33:05 UTC (rev 4989)
@@ -17,6 +17,10 @@
org/jboss/test/ws/jaxws/jbws1762/packaged_ear_ejb3/**
org/jboss/test/ws/jaxws/jbws1762/packaged_ear_pojo/**
+# [JBAS-4940] Deployment.types not propagated
+org/jboss/test/ws/jaxws/jbws1762/exploded_jar_ejb3/**
+org/jboss/test/ws/jaxws/jbws1762/packaged_jar_ejb3/**
+
# [JBAS-4890] EJBAccessException: Caller unauthorized
org/jboss/test/ws/jaxws/samples/context/**