[jbossws-commits] JBossWS SVN: r2420 - in trunk: build/etc and 5 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Wed Feb 21 06:15:17 EST 2007


Author: thomas.diesler at jboss.com
Date: 2007-02-21 06:15:17 -0500 (Wed, 21 Feb 2007)
New Revision: 2420

Removed:
   trunk/jbossws-tests/src/main/resources/jaxrpc/samples-override/exception/META-INF/
Modified:
   trunk/build/etc/jbossws-component-info.xml
   trunk/build/version.properties
   trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java
   trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java
   trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
   trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
   trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
Log:
prepare for jbossws-2.0.0.CR4

Modified: trunk/build/etc/jbossws-component-info.xml
===================================================================
--- trunk/build/etc/jbossws-component-info.xml	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/build/etc/jbossws-component-info.xml	2007-02-21 11:15:17 UTC (rev 2420)
@@ -31,8 +31,6 @@
     </import>
     <import componentref="jboss/remoting">
       <compatible version="1.4.3.GA"/>
-      <compatible version="2.2.0.Alpha2"/>
-      <compatible version="2.2.0.Alpha7"/>
       <compatible version="@jboss-remoting@"/>
     </import>
     <import componentref="sun-jaxb">

Modified: trunk/build/version.properties
===================================================================
--- trunk/build/version.properties	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/build/version.properties	2007-02-21 11:15:17 UTC (rev 2420)
@@ -6,7 +6,7 @@
 specification.version=jbossws-1.2
 
 version.id=2.0.0.CR4
-repository.id=snapshot
+repository.id=2.0.0.CR4
 
 implementation.title=JBoss Web Services (JBossWS)
 implementation.url=http://www.jboss.org/products/jbossws
@@ -19,14 +19,14 @@
 javassist=3.5.0.CR1
 jboss-jbossxb=1.0.0.CR9
 jboss-microcontainer=1.0.2
-jboss-remoting=2.0.0.GA
+jboss-remoting=2.2.0.Alpha7
 sun-jaxb=2.0.3
 
 # thirdparty library versions
 apache-ant=1.6.5
 apache-collections=3.1
 apache-log4j=1.2.8
-apache-logging=1.0.5.GA-jboss
+apache-logging=1.1.0.jboss
 apache-tomcat=5.5.20
 apache-xalan=j_2.7.0
 apache-xerces=2.9.0

Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServiceRefMetaDataAdaptor.java	2007-02-21 11:15:17 UTC (rev 2420)
@@ -29,10 +29,10 @@
 
 import javax.xml.namespace.QName;
 
-import org.jboss.webservice.metadata.serviceref.HandlerMetaData;
-import org.jboss.webservice.metadata.serviceref.InitParamMetaData;
-import org.jboss.webservice.metadata.serviceref.PortComponentRefMetaData;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
+import org.jboss.metadata.serviceref.HandlerMetaData;
+import org.jboss.metadata.serviceref.InitParamMetaData;
+import org.jboss.metadata.serviceref.PortComponentRefMetaData;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
 import org.jboss.ws.core.server.UnifiedDeploymentInfo;
 import org.jboss.ws.metadata.j2ee.UnifiedHandlerMetaData;
 import org.jboss.ws.metadata.j2ee.UnifiedPortComponentRefMetaData;

Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java
===================================================================
--- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/WebServiceClientDeployer.java	2007-02-21 11:15:17 UTC (rev 2420)
@@ -33,9 +33,9 @@
 
 import org.jboss.deployment.DeploymentException;
 import org.jboss.deployment.DeploymentInfo;
+import org.jboss.metadata.serviceref.ServiceRefMetaData;
 import org.jboss.system.ServiceMBeanSupport;
 import org.jboss.util.naming.Util;
-import org.jboss.webservice.metadata.serviceref.ServiceRefMetaData;
 import org.jboss.ws.WSException;
 import org.jboss.ws.core.jaxrpc.client.ServiceReferenceable;
 import org.jboss.ws.core.server.UnifiedDeploymentInfo;

Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1205/JBWS1205TestCase.java	2007-02-21 11:15:17 UTC (rev 2420)
@@ -61,6 +61,12 @@
 
    public void testEndpoint() throws Exception
    {
+      if (isTargetJBoss50())
+      {
+         System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets");
+         return;
+      }
+      
       port.performTest();
    }
 }

Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/webserviceref/WebServiceRefServletTestCase.java	2007-02-21 11:15:17 UTC (rev 2420)
@@ -76,6 +76,12 @@
 
    public void testServletClient() throws Exception
    {
+      if (isTargetJBoss50())
+      {
+         System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets");
+         return;
+      }
+      
       URL url = new URL(TARGET_ENDPOINT_ADDRESS + "-servlet-client?echo=HelloWorld");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       String retStr = br.readLine();

Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java
===================================================================
--- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java	2007-02-21 03:23:00 UTC (rev 2419)
+++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/wsse/WebClientTestCase.java	2007-02-21 11:15:17 UTC (rev 2420)
@@ -48,6 +48,12 @@
     */
    public void testWebClient() throws Exception
    {
+      if (isTargetJBoss50())
+      {
+         System.out.println("FIXME: [JBAS-3824] Fix ENC for EJB2.1 and Servlets");
+         return;
+      }
+      
       URL url = new URL("http://" + getServerHost() + ":8080/jaxrpc-wsse-rpc/RpcTestClientServlet?input=Hello");
       BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream()));
       String res = br.readLine();




More information about the jbossws-commits mailing list