You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2012/03/23 15:31:55 UTC
svn commit: r1304372 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/simple/src/main/resources/schemas/blueprint/simple.xsd
Author: ningjiang
Date: Fri Mar 23 14:31:55 2012
New Revision: 1304372
URL: http://svn.apache.org/viewvc?rev=1304372&view=rev
Log:
Merged revisions 1304287 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1304287 | ningjiang | 2012-03-23 19:44:10 +0800 (Fri, 23 Mar 2012) | 9 lines
Merged revisions 1304248 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1304248 | ningjiang | 2012-03-23 17:46:10 +0800 (Fri, 23 Mar 2012) | 1 line
CXF-4197 Fixed the simple blueprint schema issue
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/resources/schemas/blueprint/simple.xsd
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.5.x-fixes:r1304287
Merged /cxf/trunk:r1304248
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/resources/schemas/blueprint/simple.xsd
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/resources/schemas/blueprint/simple.xsd?rev=1304372&r1=1304371&r2=1304372&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/resources/schemas/blueprint/simple.xsd (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/simple/src/main/resources/schemas/blueprint/simple.xsd Fri Mar 23 14:31:55 2012
@@ -17,12 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<xsd:schema xmlns="http://cxf.apache.org/simple"
+<xsd:schema xmlns="http://cxf.apache.org/blueprint/simple"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:beans="http://www.osgi.org/xmlns/blueprint/v1.0.0"
xmlns:cxf-beans="http://cxf.apache.org/configuration/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
targetNamespace="http://cxf.apache.org/blueprint/simple"
elementFormDefault="qualified"
attributeFormDefault="unqualified" >