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/29 14:47:24 UTC
svn commit: r491006 - in /cocoon/trunk/core:
cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/
cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/
Author: cziegeler
Date: Fri Dec 29 05:47:23 2006
New Revision: 491006
URL: http://svn.apache.org/viewvc?view=rev&rev=491006
Log:
Move sitemap specific stuff into sitemap module
Added:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java (with props)
Modified:
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/Constants.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java
Added: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java?view=auto&rev=491006
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java (added)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java Fri Dec 29 05:47:23 2006
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+package org.apache.cocoon.core.container.spring;
+
+/**
+ * Some constants for the spring integration.
+ *
+ * @version $Id$
+ * @since 1.0
+ */
+public abstract class Constants {
+
+ /** The default location of spring related child configuration files. */
+ public static final String DEFAULT_CHILD_SPRING_CONFIGURATION_LOCATION = "config/spring";
+ public static final String DEFAULT_CHILD_PROPERTIES_LOCATION = "config/properties";
+}
Propchange: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/Constants.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java?view=diff&rev=491006&r1=491005&r2=491006
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java Fri Dec 29 05:47:23 2006
@@ -24,7 +24,6 @@
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.spring.impl.AbstractElementParser;
-import org.apache.cocoon.spring.impl.Constants;
import org.apache.cocoon.spring.impl.RunningModeHelper;
import org.apache.cocoon.spring.impl.SettingsElementParser;
import org.apache.cocoon.util.Deprecation;
@@ -143,7 +142,7 @@
final Properties globalSitemapVariables = this.getGlobalSitemapVariables(rootElement);
if ( globalSitemapVariables != null ) {
- def.getPropertyValues().addPropertyValue("globalSitemapVariables", globalSitemapVariables);
+ def.getPropertyValues().addPropertyValue("additionalProperties", globalSitemapVariables);
}
final List includes = this.getPropertyIncludes(componentsElement);
Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java?view=diff&rev=491006&r1=491005&r2=491006
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java Fri Dec 29 05:47:23 2006
@@ -28,7 +28,6 @@
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.spring.ResourceUtils;
import org.apache.cocoon.spring.impl.AbstractSettingsBeanFactoryPostProcessor;
-import org.apache.cocoon.spring.impl.Constants;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.HierarchicalBeanFactory;
import org.springframework.core.io.Resource;
@@ -48,8 +47,6 @@
protected boolean useDefaultIncludes = true;
- protected Properties globalSitemapVariables;
-
/**
* Initialize this settings.
* Setup the settings object.
@@ -73,8 +70,8 @@
this.directories = directories;
}
- public void setGlobalSitemapVariables(Properties globalSitemapVariables) {
- this.globalSitemapVariables = globalSitemapVariables;
+ public void setAdditionalProperties(Properties props) {
+ this.additionalProperties = props;
}
public void setUseDefaultIncludes(boolean useDefaultIncludes) {
@@ -138,9 +135,9 @@
}
}
- if ( globalSitemapVariables != null ) {
- PropertyHelper.replaceAll(globalSitemapVariables, s);
- properties.putAll(globalSitemapVariables);
+ if ( this.additionalProperties != null ) {
+ PropertyHelper.replaceAll(this.additionalProperties, s);
+ properties.putAll(this.additionalProperties);
}
PropertyHelper.replaceAll(properties, parent);
s.configure(properties);
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractSettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractSettingsBeanFactoryPostProcessor.java?view=diff&rev=491006&r1=491005&r2=491006
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractSettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractSettingsBeanFactoryPostProcessor.java Fri Dec 29 05:47:23 2006
@@ -70,6 +70,8 @@
protected ResourceLoader resourceLoader;
+ protected Properties additionalProperties;
+
/**
* @see org.springframework.beans.factory.config.PropertyPlaceholderConfigurer#setBeanFactory(org.springframework.beans.factory.BeanFactory)
*/
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/Constants.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/Constants.java?view=diff&rev=491006&r1=491005&r2=491006
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/Constants.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/Constants.java Fri Dec 29 05:47:23 2006
@@ -29,8 +29,4 @@
/** The default location of spring related configuration files. */
public static final String DEFAULT_SPRING_CONFIGURATION_LOCATION = "classpath*:META-INF/cocoon/spring";
public static final String DEFAULT_PROPERTIES_LOCATION = "classpath*:META-INF/cocoon/properties";
-
- /** The default location of spring related child configuration files. */
- public static final String DEFAULT_CHILD_SPRING_CONFIGURATION_LOCATION = "config/spring";
- public static final String DEFAULT_CHILD_PROPERTIES_LOCATION = "config/properties";
}
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java?view=diff&rev=491006&r1=491005&r2=491006
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java Fri Dec 29 05:47:23 2006
@@ -239,6 +239,11 @@
}
}
+ if ( this.additionalProperties != null ) {
+ PropertyHelper.replaceAll(this.additionalProperties, s);
+ properties.putAll(this.additionalProperties);
+ }
+
// now overwrite with system properties
try {
properties.putAll(System.getProperties());