cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1532463 - in /cxf/trunk: core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
Date Tue, 15 Oct 2013 18:11:43 GMT
Author: dkulp
Date: Tue Oct 15 18:11:43 2013
New Revision: 1532463

URL: http://svn.apache.org/r1532463
Log:
[CXF-5332] Fix issues of treating strings starting with # as references in all cases.

Modified:
    cxf/trunk/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
    cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml

Modified: cxf/trunk/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/trunk/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=1532463&r1=1532462&r2=1532463&view=diff
==============================================================================
--- cxf/trunk/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++ cxf/trunk/core/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Tue Oct 15 18:11:43 2013
@@ -453,7 +453,7 @@ public abstract class AbstractBeanDefini
         }
         
         if (!StringUtils.isEmpty(val)) {
-            if (val.startsWith("#")) {
+            if (val.startsWith("#") && !val.startsWith("#{")) {
                 bean.addPropertyReference(propertyName, val.substring(1));
             } else {
                 bean.addPropertyValue(propertyName, val);

Modified: cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml?rev=1532463&r1=1532462&r2=1532463&view=diff
==============================================================================
--- cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
(original)
+++ cxf/trunk/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
Tue Oct 15 18:11:43 2013
@@ -33,5 +33,10 @@
 			<bean class="org.apache.cxf.systest.jaxws.TestServiceImpl" />
 		</jaxws:serviceBean>
 	</jaxws:server>
-
+	<jaxws:server address="#{'http://localhost:${testutil.ports.org.apache.cxf.systest.jaxws.CXF5061Test}/cxf5061b'
+ T(java.lang.Math).random()}"
+		serviceClass="org.apache.cxf.systest.jaxws.TestService">
+		<jaxws:serviceBean>
+			<bean class="org.apache.cxf.systest.jaxws.TestServiceImpl" />
+		</jaxws:serviceBean>
+	</jaxws:server>
 </beans>



Mime
View raw message