You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/09/28 16:50:33 UTC

svn commit: r450878 - in /cocoon/trunk: blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/ blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/coco...

Author: cziegeler
Date: Thu Sep 28 07:50:32 2006
New Revision: 450878

URL: http://svn.apache.org/viewvc?view=rev&rev=450878
Log:
Move Spring sample to sample block

Added:
    cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/
    cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java
      - copied, changed from r450873, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java
    cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml
      - copied, changed from r450875, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml
Removed:
    cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java
    cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml
Modified:
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java

Copied: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java (from r450873, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java?view=diff&rev=450878&p1=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java&r1=450873&p2=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java&r2=450878
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/java/org/apache/cocoon/core/container/spring/test/TestBean.java Thu Sep 28 07:50:32 2006
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.core.container.spring;
+package org.apache.cocoon.core.container.spring.test;
 
 import org.apache.cocoon.configuration.Settings;
 

Copied: cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml (from r450875, cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml?view=diff&rev=450878&p1=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml&r1=450875&p2=cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml&r2=450878
==============================================================================
--- cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/applicationContext.xml (original)
+++ cocoon/trunk/blocks/cocoon-core-samples-main/cocoon-core-samples-main-sample/src/main/resources/COB-INF/spring/config/spring/applicationContext.xml Thu Sep 28 07:50:32 2006
@@ -21,11 +21,11 @@
 <beans>
 
 	<bean id="spring-test"
-	      class="org.apache.cocoon.core.container.spring.TestBean"
+	      class="org.apache.cocoon.core.container.spring.test.TestBean"
 	      abstract="false"
 	      singleton="true"
 	      lazy-init="default">
-      <property name="settings"><ref bean="org.apache.cocoon.configuration.Settings"/></property>
+      <property name="settings" ref="org.apache.cocoon.configuration.Settings"/>
 	  <property name="javaVersion" value="${java.specification.version}"/>
 	</bean>
 

Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java?view=diff&rev=450878&r1=450877&r2=450878
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java Thu Sep 28 07:50:32 2006
@@ -40,7 +40,7 @@
 public abstract class CocoonTestCase extends ContainerTestCase {
 
     /**
-     * @see org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.spring.CocoonXmlWebApplicationContext)
+     * @see org.apache.cocoon.core.container.ContainerTestCase#addComponents(org.apache.cocoon.core.container.spring.test.CocoonXmlWebApplicationContext)
      */
     protected void addComponents(ConfigurationInfo info) 
     throws Exception {