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/27 13:48:00 UTC
svn commit: r490490 - in /cocoon/trunk:
blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/screens/
core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/
core/cocoon-core/src/main/java/org/apache/cocoo...
Author: cziegeler
Date: Wed Dec 27 04:47:59 2006
New Revision: 490490
URL: http://svn.apache.org/viewvc?view=rev&rev=490490
Log:
Rename package
Added:
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/
- copied from r490447, cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/container/spring/
Removed:
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/core/
Modified:
cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/screens/employee-result.xml
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNodeBuilder.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java
cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractElementParser.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/CocoonNamespaceHandler.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.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/ResourceUtils.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/RunningModeHelper.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ServletContextFactoryBean.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsElementParser.java
cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsProperties.java
Modified: cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/screens/employee-result.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/screens/employee-result.xml?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/screens/employee-result.xml (original)
+++ cocoon/trunk/blocks/cocoon-javaflow/cocoon-javaflow-sample/src/main/resources/COB-INF/screens/employee-result.xml Wed Dec 27 04:47:59 2006
@@ -25,6 +25,7 @@
<column title="Apache OJB example">
<p>The values retrieved from the database:</p>
<table>
+ <jx:set var="nrOfItems" value="${employee.size()}"/>
<jx:forEach var="item" items="${employee}">
<tr>
<td>ID: </td><td>${item.id}</td>
@@ -35,7 +36,7 @@
</tr>
</jx:forEach>
</table>
- <p><a href="insertEmployee.do">insert</a></p>
+ <p><a href="insertEmployee.do?id=${nrOfItems+1}">insert</a></p>
</column>
</row>
</body>
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNodeBuilder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNodeBuilder.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNodeBuilder.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/FlowNodeBuilder.java Wed Dec 27 04:47:59 2006
@@ -20,7 +20,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.components.treeprocessor.AbstractParentProcessingNodeBuilder;
import org.apache.cocoon.components.treeprocessor.ProcessingNode;
-import org.apache.cocoon.core.container.spring.ResourceUtils;
+import org.apache.cocoon.spring.impl.ResourceUtils;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.core.io.Resource;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Container.java Wed Dec 27 04:47:59 2006
@@ -21,6 +21,7 @@
import javax.servlet.ServletContext;
import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.spring.impl.ServletContextFactoryBean;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
import org.springframework.context.ConfigurableApplicationContext;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java Wed Dec 27 04:47:59 2006
@@ -23,6 +23,10 @@
import java.util.Properties;
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;
import org.apache.cocoon.xml.dom.DomHelper;
import org.springframework.beans.factory.BeanDefinitionStoreException;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java Wed Dec 27 04:47:59 2006
@@ -26,6 +26,9 @@
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.configuration.impl.MutableSettings;
import org.apache.cocoon.configuration.impl.PropertyHelper;
+import org.apache.cocoon.spring.impl.AbstractSettingsBeanFactoryPostProcessor;
+import org.apache.cocoon.spring.impl.Constants;
+import org.apache.cocoon.spring.impl.ResourceUtils;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.HierarchicalBeanFactory;
import org.springframework.core.io.Resource;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java Wed Dec 27 04:47:59 2006
@@ -34,7 +34,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.configuration.impl.MutableSettings;
-import org.apache.cocoon.core.container.spring.ResourceUtils;
+import org.apache.cocoon.spring.impl.ResourceUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanDefinitionStoreException;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java Wed Dec 27 04:47:59 2006
@@ -30,12 +30,12 @@
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.treeprocessor.ProcessorComponentInfo;
import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.core.container.spring.AbstractElementParser;
import org.apache.cocoon.generation.Generator;
import org.apache.cocoon.matching.Matcher;
import org.apache.cocoon.reading.Reader;
import org.apache.cocoon.selection.Selector;
import org.apache.cocoon.serialization.Serializer;
+import org.apache.cocoon.spring.impl.AbstractElementParser;
import org.apache.cocoon.transformation.Transformer;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java Wed Dec 27 04:47:59 2006
@@ -33,7 +33,7 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
import org.apache.cocoon.Constants;
-import org.apache.cocoon.core.container.spring.ResourceUtils;
+import org.apache.cocoon.spring.impl.ResourceUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.io.DefaultResourceLoader;
Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java?view=diff&rev=490490&r1=490489&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java (original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java Wed Dec 27 04:47:59 2006
@@ -23,12 +23,12 @@
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.configuration.impl.MutableSettings;
-import org.apache.cocoon.core.container.spring.ServletContextFactoryBean;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.mock.MockContext;
import org.apache.cocoon.environment.mock.MockRequest;
import org.apache.cocoon.environment.mock.MockRequestAttributes;
import org.apache.cocoon.environment.mock.MockResponse;
+import org.apache.cocoon.spring.impl.ServletContextFactoryBean;
import org.springframework.beans.factory.config.BeanDefinitionHolder;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractElementParser.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractElementParser.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/AbstractElementParser.java Wed Dec 27 04:47:59 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.spring.impl;
import java.io.IOException;
import java.util.Arrays;
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=490490&r1=490447&r2=490490
==============================================================================
--- 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 Wed Dec 27 04:47:59 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.spring.impl;
import java.util.HashSet;
import java.util.Iterator;
@@ -28,6 +28,7 @@
import org.apache.cocoon.configuration.Settings;
import org.apache.cocoon.configuration.impl.MutableSettings;
+import org.apache.cocoon.core.container.spring.SubSettingsBeanFactoryPostProcessor;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonNamespaceHandler.java Wed Dec 27 04:47:59 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.spring.impl;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/CocoonPropertyOverrideConfigurer.java Wed Dec 27 04:47:59 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.spring.impl;
import java.util.Properties;
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=490490&r1=490447&r2=490490
==============================================================================
--- 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 Wed Dec 27 04:47:59 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.spring.impl;
/**
* Some constants for the spring integration.
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ResourceUtils.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ResourceUtils.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ResourceUtils.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ResourceUtils.java Wed Dec 27 04:47:59 2006
@@ -14,7 +14,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.spring.impl;
import java.io.File;
import java.io.IOException;
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/RunningModeHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/RunningModeHelper.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/RunningModeHelper.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/RunningModeHelper.java Wed Dec 27 04:47:59 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.spring.impl;
import org.apache.cocoon.configuration.SettingsDefaults;
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ServletContextFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ServletContextFactoryBean.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ServletContextFactoryBean.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/ServletContextFactoryBean.java Wed Dec 27 04:47:59 2006
@@ -14,7 +14,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.spring.impl;
import javax.servlet.ServletContext;
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=490490&r1=490447&r2=490490
==============================================================================
--- 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 Wed Dec 27 04:47:59 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.spring.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -168,10 +168,10 @@
final Properties properties = new Properties();
// now read all properties from the properties directory
- ResourceUtils.readProperties(org.apache.cocoon.core.container.spring.Constants.DEFAULT_PROPERTIES_LOCATION,
+ ResourceUtils.readProperties(org.apache.cocoon.spring.impl.Constants.DEFAULT_PROPERTIES_LOCATION,
properties, this.getResourceLoader(), this.logger);
// read all properties from the mode dependent directory
- ResourceUtils.readProperties(org.apache.cocoon.core.container.spring.Constants.DEFAULT_PROPERTIES_LOCATION
+ ResourceUtils.readProperties(org.apache.cocoon.spring.impl.Constants.DEFAULT_PROPERTIES_LOCATION
+ "/" + mode, properties, this.getResourceLoader(), this.logger);
// fill from the servlet context
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsElementParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsElementParser.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsElementParser.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsElementParser.java Wed Dec 27 04:47:59 2006
@@ -16,11 +16,12 @@
* 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.spring.impl;
import javax.servlet.ServletContext;
import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.core.container.spring.SitemapNamespaceHandler;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.RootBeanDefinition;
Modified: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsProperties.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsProperties.java?view=diff&rev=490490&r1=490447&r2=490490
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsProperties.java (original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsProperties.java Wed Dec 27 04:47:59 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.spring.impl;
import java.util.Properties;