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/12/26 00:06:23 UTC
svn commit: r490197 - in /cocoon/trunk/core:
cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/
cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/
Author: cziegeler
Date: Mon Dec 25 15:06:22 2006
New Revision: 490197
URL: http://svn.apache.org/viewvc?view=rev&rev=490197
Log:
Move cocoon specific class back to core
Correct version info
Added:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
- copied unchanged from r490034, cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
Removed:
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
Modified:
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java (contents, props changed)
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java Mon Dec 25 15:06:22 2006
@@ -43,7 +43,7 @@
*
* @version $Id: AbstractElementParser.java 463297 2006-10-12 16:03:45Z
* cziegeler $
- * @since 2.2
+ * @since 1.0
*/
public abstract class AbstractElementParser implements BeanDefinitionParser {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java Mon Dec 25 15:06:22 2006
@@ -52,7 +52,7 @@
* @see SettingsBeanFactoryPostProcessor
* @see SubSettingsBeanFactoryPostProcessor
*
- * @since 2.2
+ * @since 1.0
* @version $Id$
*/
public abstract class AbstractSettingsBeanFactoryPostProcessor
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java Mon Dec 25 15:06:22 2006
@@ -30,7 +30,7 @@
* can be used (this should be a subclass of the {@link SettingsBeanFactoryPostProcessor}).
*
* @version $Id$
- * @since 2.2
+ * @since 1.0
*/
public class CocoonNamespaceHandler extends NamespaceHandlerSupport {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java Mon Dec 25 15:06:22 2006
@@ -34,7 +34,7 @@
*
* @version $Id: CocoonPropertyOverrideConfigurer.java 470754 2006-11-03
* 10:47:52Z lgawron $
- * @since 2.2
+ * @since 1.0
*/
public class CocoonPropertyOverrideConfigurer extends PropertyOverrideConfigurer {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/Constants.java Mon Dec 25 15:06:22 2006
@@ -22,7 +22,7 @@
* Some constants for the spring integration.
*
* @version $Id$
- * @since 2.2
+ * @since 1.0
*/
public abstract class Constants {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java Mon Dec 25 15:06:22 2006
@@ -36,7 +36,7 @@
* Utility class for Spring resource handling.
*
* @version $Id$
- * @since 2.2
+ * @since 1.0
*/
public abstract class ResourceUtils {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java Mon Dec 25 15:06:22 2006
@@ -21,9 +21,9 @@
import org.apache.cocoon.configuration.SettingsDefaults;
/**
- * Helper class to determine the running mode
+ * Helper class to determine the running mode.
*
- * @since 2.2
+ * @since 1.0
* @version $Id$
*/
public class RunningModeHelper {
Propchange: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/ServletContextFactoryBean.java Mon Dec 25 15:06:22 2006
@@ -26,7 +26,7 @@
* This avoids a dependence to Springs ServletContextAware interface.
*
* @version $Id$
- * @since 2.2
+ * @since 1.0
*/
public class ServletContextFactoryBean implements FactoryBean, ServletContextAware {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java Mon Dec 25 15:06:22 2006
@@ -38,7 +38,7 @@
* them in the spring configuration files.
* In addition this bean acts as a factory bean providing the settings object.
*
- * @since 2.2
+ * @since 1.0
* @version $Id$
*/
public class SettingsBeanFactoryPostProcessor
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java Mon Dec 25 15:06:22 2006
@@ -34,7 +34,7 @@
* @see SettingsBeanFactoryPostProcessor
* @version $Id: SettingsElementParser.java 470732 2006-11-03 09:10:13Z
* cziegeler $
- * @since 2.2
+ * @since 1.0
*/
public class SettingsElementParser extends AbstractElementParser {
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java?view=diff&rev=490197&r1=490196&r2=490197
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/SettingsProperties.java Mon Dec 25 15:06:22 2006
@@ -24,7 +24,7 @@
/**
* A properties implementation using the settings object.
- * @since 2.2
+ * @since 1.0
* @version $Id$
*/
public class SettingsProperties extends Properties {