svn commit: r821145 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java

[dkulp]

Author: dkulp
Date: Fri Oct  2 19:53:32 2009
New Revision: 821145

URL: http://svn.apache.org/viewvc?rev=821145&view=rev
Log:
Merged revisions 821012 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r821012 | dkulp | 2009-10-02 09:26:44 -0400 (Fri, 02 Oct 2009) | 1 line
  
  [CXF-2436] Allow java.net.Remote interface for sei
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
    
cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java

Propchange: cxf/branches/2.2.x-fixes/
            ('svn:mergeinfo' removed)

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java?rev=821145&r1=821144&r2=821145&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/JaxwsServiceBuilder.java
 Fri Oct  2 19:53:32 2009
@@ -41,14 +41,6 @@
         setServiceFactory(serviceFactory);
         setBindingConfig(new JaxWsSoapBindingConfiguration(serviceFactory));
     }
-
-    @Override
-    public void validate() {
-        Class clz = getServiceClass();
-        if (java.rmi.Remote.class.isAssignableFrom(clz)) {
-            throw new RuntimeException("JAXWS SEIs may not implement the 
java.rmi.Remote interface.");
-        }
-    }
     
     public File getOutputFile() {
         JaxWsImplementorInfo jaxwsImpl = 
serviceFactory.getJaxWsImplementorInfo();

Modified: 
cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=821145&r1=821144&r2=821145&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
 Fri Oct  2 19:53:32 2009
@@ -363,17 +363,6 @@
     }
 
     @Test
-    public void testWrongInterface() throws Exception {
-        env.put(ToolConstants.CFG_CLASSNAME, 
"org.apache.cxf.tools.java2wsdl.processor.Hello");
-        processor.setEnvironment(env);
-        try {
-            processor.process();
-        } catch (RuntimeException e) {
-            assertEquals("JAXWS SEIs may not implement the java.rmi.Remote 
interface.", e.getMessage());
-        }
-    }
-
-    @Test
     public void testDateAdapter() throws Exception {
         env.put(ToolConstants.CFG_CLASSNAME, 
"org.apache.cxf.tools.fortest.date.EchoDate");
         env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + 
"/echo_date.wsdl");