cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r689120 - in /cxf/branches/2.1.x-fixes: ./ rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/
Date Tue, 26 Aug 2008 15:56:02 GMT
Author: dkulp
Date: Tue Aug 26 08:56:01 2008
New Revision: 689120

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

........
  r688596 | bimargulies | 2008-08-24 21:33:43 -0400 (Sun, 24 Aug 2008) | 5 lines
  
  Improve error message that results from (e.g.) use of Holder with Simple 
  front end. Remove entirely Aegis test of nonexisting feature whose only 
  test case has been @Ignored for a long time.
........

Removed:
    cxf/branches/2.1.x-fixes/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/client/HeaderTest.java
Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
    cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 26 08:56:01 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 26 08:56:01 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596

Modified: cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=689120&r1=689119&r2=689120&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
Tue Aug 26 08:56:01 2008
@@ -885,6 +885,11 @@
         el.setNillable(true);
 
         XmlSchemaType tp = (XmlSchemaType)mpi.getXmlSchema();
+        if (tp == null) {
+            throw new ServiceConstructionException(new Message("INTRACTABLE_PART", LOG,
+                                                               mpi.getName(),
+                                                               mpi.getMessageInfo().getName()));
+        }
         el.setSchemaTypeName(tp.getQName());
         mpi.setXmlSchema(el);
     }

Modified: cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties?rev=689120&r1=689119&r2=689120&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
(original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMessages.properties
Tue Aug 26 08:56:01 2008
@@ -27,4 +27,7 @@
 REFERENCE_TO_UNDEFINED_TYPE = Schema element {0} references undefined type {1} for service
{2}.
 COULD_NOT_FIND_PART = Could not find a message part matching name {0}.  Possible values are
{1}.
 UNMAPPABLE_PORT_TYPE= Service class {0} method {1} part {2} cannot be mapped to schema. Check
for use of a JAX-WS-specific type \
-  without the JAX-WS service factory bean.
\ No newline at end of file
+  without the JAX-WS service factory bean.
+INTRACTABLE_PART= Message part {0} of Message {1} cannot be processed. This can be caused
by the use of JAX-WS-specific types \
+ without the JAX-WS service factory bean.
+ 
\ No newline at end of file



Mime
View raw message