Author: jasha
Date: Sat Jul  7 21:49:20 2012
New Revision: 1358651

URL: http://svn.apache.org/viewvc?rev=1358651&view=rev
Log:
RAVE-709 Remove version numbers in URLs for Spring XSDs

Modified:
    
rave/trunk/rave-components/rave-commons/src/test/resources/applicationContext-test.xml
    
rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
    
rave/trunk/rave-components/rave-core/src/test/resources/test-applicationContext.xml
    rave/trunk/rave-components/rave-core/src/test/resources/test-dataContext.xml
    
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
    
rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
    rave/trunk/rave-components/rave-jpa/src/test/resources/test-dataContext.xml
    
rave/trunk/rave-components/rave-web/src/main/resources/org/apache/rave/web-applicationContext.xml
    
rave/trunk/rave-components/rave-web/src/test/resources/test-applicationContext.xml
    
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
    
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
    
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml
    rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
    
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
    rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml
    rave/trunk/rave-portal/src/test/resources/test-dataContext.xml
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/resources/org/apache/rave/opensocial-provider-applicationContext.xml
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-dataContext.xml
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
    
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
    
rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml

Modified: 
rave/trunk/rave-components/rave-commons/src/test/resources/applicationContext-test.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/test/resources/applicationContext-test.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-commons/src/test/resources/applicationContext-test.xml
 (original)
+++ 
rave/trunk/rave-components/rave-commons/src/test/resources/applicationContext-test.xml
 Sat Jul  7 21:49:20 2012
@@ -1,25 +1,25 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean id="portalPropertyPlaceholder" 
class="org.apache.rave.util.OverridablePropertyPlaceholderConfigurer">
         <property name="systemPropertiesModeName" 
value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>

Modified: 
rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-components/rave-core/src/main/resources/org/apache/rave/core-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -16,20 +16,14 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-
-  $Id$
--->
+  -->
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
-       xmlns:tx="http://www.springframework.org/schema/tx";
-       xmlns:p="http://www.springframework.org/schema/p";
        xmlns:aop="http://www.springframework.org/schema/aop";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-
-        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop.xsd";>
 
     <!-- make the the portal.properties props available to autowire injectors, 
location of the properties can
      be overridden by setting a system property "portal.override.properties" 
-->

Modified: 
rave/trunk/rave-components/rave-core/src/test/resources/test-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/resources/test-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/test/resources/test-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-components/rave-core/src/test/resources/test-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <import resource="classpath:org/apache/rave/core-applicationContext.xml"/>
 

Modified: 
rave/trunk/rave-components/rave-core/src/test/resources/test-dataContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/resources/test-dataContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-core/src/test/resources/test-dataContext.xml 
(original)
+++ 
rave/trunk/rave-components/rave-core/src/test/resources/test-dataContext.xml 
Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean id="dataSourcePopulator" 
class="org.apache.rave.jdbc.util.DataSourcePopulator">
         <property name="executeScriptQuery" value="SELECT * FROM WIDGET"/>

Modified: 
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-components/rave-jpa/src/main/resources/org/apache/rave/jpa-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -8,7 +8,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -16,20 +16,18 @@
   KIND, either express or implied.  See the License for the
   specific language governing permissions and limitations
   under the License.
-  
-  $Id$
--->
+  -->
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
        xmlns:tx="http://www.springframework.org/schema/tx";
        xmlns:p="http://www.springframework.org/schema/p";
        xmlns:aop="http://www.springframework.org/schema/aop";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-        http://www.springframework.org/schema/oxm 
http://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd
-        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx.xsd
+        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop.xsd";>
 
     <!-- make the the portal.properties props available to autowire injectors, 
location of the properties can
      be overridden by setting a system property "portal.override.properties" 
-->

Modified: 
rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-components/rave-jpa/src/test/resources/test-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <import resource="classpath:org/apache/rave/jpa-applicationContext.xml"/>
 

Modified: 
rave/trunk/rave-components/rave-jpa/src/test/resources/test-dataContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-jpa/src/test/resources/test-dataContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-jpa/src/test/resources/test-dataContext.xml 
(original)
+++ rave/trunk/rave-components/rave-jpa/src/test/resources/test-dataContext.xml 
Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean id="dataSourcePopulator" 
class="org.apache.rave.jdbc.util.DataSourcePopulator">
         <property name="executeScriptQuery" value="SELECT * FROM WIDGET"/>

Modified: 
rave/trunk/rave-components/rave-web/src/main/resources/org/apache/rave/web-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/resources/org/apache/rave/web-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-web/src/main/resources/org/apache/rave/web-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-components/rave-web/src/main/resources/org/apache/rave/web-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -20,8 +20,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd";>
 
     <!--
     rave-web component base-package scan

Modified: 
rave/trunk/rave-components/rave-web/src/test/resources/test-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/test/resources/test-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-components/rave-web/src/test/resources/test-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-components/rave-web/src/test/resources/test-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,7 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean id="portalPropertyPlaceholder" 
class="org.apache.rave.util.OverridablePropertyPlaceholderConfigurer">
         <property name="systemPropertiesModeName" 
value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>

Modified: 
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
 (original)
+++ 
rave/trunk/rave-integration-tests/rave-core-tests/src/main/resources/applicationContext-tests.xml
 Sat Jul  7 21:49:20 2012
@@ -22,9 +22,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://www.springframework.org/schema/context
-  http://www.springframework.org/schema/context/spring-context.xsd";>
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/context
+                           
http://www.springframework.org/schema/context/spring-context.xsd";>
 
 
   <context:annotation-config/>

Modified: 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
 (original)
+++ 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext-security.xml
 Sat Jul  7 21:49:20 2012
@@ -25,9 +25,9 @@
        xmlns:security="http://www.springframework.org/schema/security";
        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-3.1.xsd
+          http://www.springframework.org/schema/beans/spring-beans.xsd
           http://www.springframework.org/schema/security
-          
http://www.springframework.org/schema/security/spring-security-3.1.xsd";>
+          http://www.springframework.org/schema/security/spring-security.xsd";>
     <security:http auto-config="true" use-expressions="true" 
disable-url-rewriting="true">
         <security:intercept-url pattern="/static/**" access="permitAll"/>
         <security:intercept-url pattern="/login" access="permitAll"/>

Modified: 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml 
(original)
+++ 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml 
Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -21,8 +21,10 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:p="http://www.springframework.org/schema/p";
        xmlns:util="http://www.springframework.org/schema/util";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-                           http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util
+                           
http://www.springframework.org/schema/util/spring-util.xsd";>
 
     <import resource="classpath*:org/apache/rave/core-applicationContext.xml"/>
     <import resource="classpath*:org/apache/rave/jpa-applicationContext.xml"/>

Modified: 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml 
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dataContext.xml 
Sat Jul  7 21:49:20 2012
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <!--
         Bean that executes the given set of resources (SQL scripts) in order

Modified: 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml 
(original)
+++ 
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/dispatcher-servlet.xml 
Sat Jul  7 21:49:20 2012
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
@@ -22,10 +22,10 @@
        xmlns:mvc="http://www.springframework.org/schema/mvc";
        xmlns:oxm="http://www.springframework.org/schema/oxm";
        xmlns:p="http://www.springframework.org/schema/p";
-       xsi:schemaLocation="http://www.springframework.org/schema/mvc 
http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
-        http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/oxm 
http://www.springframework.org/schema/oxm/spring-oxm-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/mvc 
http://www.springframework.org/schema/mvc/spring-mvc.xsd
+        http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/oxm 
http://www.springframework.org/schema/oxm/spring-oxm.xsd";>
 
     <!--
     Scans the classpath of this application for @Components to deploy as beans

Modified: rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml 
(original)
+++ rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml Sat 
Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <import resource="classpath:org/apache/rave/core-applicationContext.xml"/>
     <import resource="classpath:org/apache/rave/jpa-applicationContext.xml"/>

Modified: rave/trunk/rave-portal/src/test/resources/test-dataContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/test-dataContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/test-dataContext.xml (original)
+++ rave/trunk/rave-portal/src/test/resources/test-dataContext.xml Sat Jul  7 
21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean id="dataSourcePopulator" 
class="org.apache.rave.jdbc.util.DataSourcePopulator">
         <property name="executeScriptQuery" value="SELECT * FROM WIDGET"/>

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/resources/org/apache/rave/opensocial-provider-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/resources/org/apache/rave/opensocial-provider-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/resources/org/apache/rave/opensocial-provider-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/resources/org/apache/rave/opensocial-provider-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -21,10 +21,10 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
        xmlns:util="http://www.springframework.org/schema/util";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-
-        http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util.xsd";>
 
     <!-- rave-opensocial-provider base-package scan -->
     <context:component-scan 
base-package="org.apache.rave.provider.opensocial"/>

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -1,31 +1,29 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/beans";
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
-       xmlns:tx="http://www.springframework.org/schema/tx";
-       xmlns:p="http://www.springframework.org/schema/p";
        xmlns:aop="http://www.springframework.org/schema/aop";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop.xsd";>
 
     <!-- make the the rave.shindig.properties props available to autowire 
injectors, location of the properties can
      be overridden by setting a system property 
"rave-shindig.override.properties" -->

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-dataContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-dataContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-dataContext.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-core/src/test/resources/rave-shindig-test-dataContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
 
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean primary="true" id="dataSourcePopulator" 
class="org.apache.rave.jdbc.util.DataSourcePopulator">
         <property name="executeScriptQuery" value="SELECT * FROM PERSON"/>

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/modules-context.xml
 Sat Jul  7 21:49:20 2012
@@ -1,24 +1,25 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <!-- Define the Default Guice Modules Here-->
     <bean class="org.apache.rave.commoncontainer.ConfigurablePropertiesModule" 
/>

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -1,20 +1,20 @@
 <!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
   -->
 
 <beans xmlns="http://www.springframework.org/schema/beans";
@@ -23,10 +23,10 @@
        xmlns:tx="http://www.springframework.org/schema/tx";
        xmlns:p="http://www.springframework.org/schema/p";
        xmlns:aop="http://www.springframework.org/schema/aop";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx-3.1.xsd
-        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/tx 
http://www.springframework.org/schema/tx/spring-tx.xsd
+        http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop.xsd";>
 
     <!-- make the the rave.shindig.properties props available to autowire 
injectors, location of the properties can
      be overridden by setting a system property 
"rave-shindig.override.properties" -->

Modified: 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -19,7 +19,8 @@
         
 <beans xmlns="http://www.springframework.org/schema/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-3.1.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                           
http://www.springframework.org/schema/beans/spring-beans.xsd";>
 
     <bean id="dataSourcePopulator" 
class="org.apache.rave.jdbc.util.DataSourcePopulator">
         <property name="executeScriptQuery" value="SELECT * FROM 
RAVE_SHINDIG_SEQUENCES"/>

Modified: 
rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml
URL: 
http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml?rev=1358651&r1=1358650&r2=1358651&view=diff
==============================================================================
--- 
rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml
 (original)
+++ 
rave/trunk/rave-providers/rave-w3c-provider/src/main/resources/org/apache/rave/w3c-provider-applicationContext.xml
 Sat Jul  7 21:49:20 2012
@@ -7,7 +7,7 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
 
-      http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
@@ -21,9 +21,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
        xmlns:context="http://www.springframework.org/schema/context";
        xmlns:util="http://www.springframework.org/schema/util";
-       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context-3.1.xsd
-        http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util-2.0.xsd";>
+       xsi:schemaLocation="http://www.springframework.org/schema/beans 
http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context 
http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/util 
http://www.springframework.org/schema/util/spring-util.xsd";>
 
     <!-- rave-w3c-provider base-package scan -->
     <context:component-scan base-package="org.apache.rave.provider.w3c"/>


Reply via email to