Author: thomas.diesler(a)jboss.com Date: 2007-03-31 10:44:57 -0400 (Sat, 31 Mar 2007) New Revision: 2736 Modified: trunk/build/version.properties trunk/integration-jboss50/build.xml trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/ejb-jar.xml trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml Log: Fix invalid DDs Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-03-31 13:58:18 UTC (rev 2735) +++ trunk/build/version.properties 2007-03-31 14:44:57 UTC (rev 2736) @@ -23,7 +23,7 @@ stax-api=1.0 # Build and Tomcat -jboss-jbossxb=2.0.0.CR1 +jboss-jbossxb=2.0.0.CR2 jboss-microcontainer=2.0.0.Beta3 jboss-remoting=2.2.0.Alpha7 Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-03-31 13:58:18 UTC (rev 2735) +++ trunk/integration-jboss50/build.xml 2007-03-31 14:44:57 UTC (rev 2736) @@ -151,6 +151,9 @@ <include name="jbossws-jboss50-integration.jar"/> </fileset> </copy> + + <copy todir="${jboss50.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <copy todir="${jboss50.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> </target> <!-- ================================================================== --> Modified: trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java =================================================================== --- trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-03-31 13:58:18 UTC (rev 2735) +++ trunk/jbossws-tests/src/java/org/jboss/test/ws/jaxrpc/serviceref/ServiceRefEJBTestCase.java 2007-03-31 14:44:57 UTC (rev 2736) @@ -76,7 +76,7 @@ public void testEJBClient() throws Exception { InitialContext iniCtx = getInitialContext(); - EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/ejb/EJBClient"); + EJBRemoteHome ejbHome = (EJBRemoteHome)iniCtx.lookup("/EJBClient"); EJBRemote ejbRemote = ejbHome.create(); String helloWorld = "Hello World!"; Modified: trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/ejb-jar.xml 2007-03-31 13:58:18 UTC (rev 2735) +++ trunk/jbossws-tests/src/resources/jaxrpc/jbws1011/META-INF/ejb-jar.xml 2007-03-31 14:44:57 UTC (rev 2736) @@ -1,24 +1,18 @@ <?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"> +<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.jaxrpc.jbws1011.SimpleEntityHome - </local-home> + <local-home> org.jboss.test.ws.jaxrpc.jbws1011.SimpleEntityHome </local-home> <local>org.jboss.test.ws.jaxrpc.jbws1011.SimpleEntityLocal</local> - <ejb-class> - org.jboss.test.ws.jaxrpc.jbws1011.SimpleEntityBean - </ejb-class> + <ejb-class> org.jboss.test.ws.jaxrpc.jbws1011.SimpleEntityBean </ejb-class> <persistence-type>Container</persistence-type> <prim-key-class>java.lang.String</prim-key-class> - <reentrant>False</reentrant> + <reentrant>false</reentrant> <cmp-version>2.x</cmp-version> <abstract-schema-name>Simple</abstract-schema-name> <cmp-field> @@ -33,6 +27,6 @@ <ejb-class>org.jboss.test.ws.jaxrpc.jbws1011.TestEndpointBean</ejb-class> <session-type>Stateless</session-type> <transaction-type>Container</transaction-type> - </session> + </session> </enterprise-beans> </ejb-jar> \ No newline at end of file Modified: trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-03-31 13:58:18 UTC (rev 2735) +++ trunk/jbossws-tests/src/resources/jaxrpc/serviceref/META-INF/ejb-jar.xml 2007-03-31 14:44:57 UTC (rev 2736) @@ -7,7 +7,7 @@ <enterprise-beans> <session> - <ejb-name>ejb/EJBClient</ejb-name> + <ejb-name>EJBClient</ejb-name> <home>org.jboss.test.ws.jaxrpc.serviceref.EJBRemoteHome</home> <remote>org.jboss.test.ws.jaxrpc.serviceref.EJBRemote</remote> <ejb-class>org.jboss.test.ws.jaxrpc.serviceref.EJBClient</ejb-class>