cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1532474 - in /cxf/branches/2.6.x-fixes: api/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:27:19 GMT
Author: dkulp
Date: Tue Oct 15 18:27:19 2013
New Revision: 1532474

URL: http://svn.apache.org/r1532474
Log:
Merged revisions 1532465 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1532465 | dkulp | 2013-10-15 14:20:09 -0400 (Tue, 15 Oct 2013) | 10 lines

  Merged revisions 1532463 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1532463 | dkulp | 2013-10-15 14:11:43 -0400 (Tue, 15 Oct 2013) | 2 lines

    [CXF-5332] Fix issues of treating strings starting with # as references in all cases.

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
    cxf/branches/2.6.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml

Modified: cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java?rev=1532474&r1=1532473&r2=1532474&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
(original)
+++ cxf/branches/2.6.x-fixes/api/src/main/java/org/apache/cxf/configuration/spring/AbstractBeanDefinitionParser.java
Tue Oct 15 18:27:19 2013
@@ -451,7 +451,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/branches/2.6.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml?rev=1532474&r1=1532473&r2=1532474&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
(original)
+++ cxf/branches/2.6.x-fixes/systests/jaxws/src/test/resources/org/apache/cxf/systest/jaxws/springWebService.xml
Tue Oct 15 18:27:19 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