cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r490948 - in /cocoon/trunk/core: cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/ cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/ cocoon-configuration...
Date Fri, 29 Dec 2006 08:01:22 GMT
Author: cziegeler
Date: Fri Dec 29 00:01:21 2006
New Revision: 490948

URL: http://svn.apache.org/viewvc?view=rev&rev=490948
Log:
Move public stuff to configuration-api, move impl stuff to spring module

Added:
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/MutableSettings.java
      - copied, changed from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/MutableSettings.java
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java
      - copied, changed from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/PropertyHelper.java
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java
      - copied unchanged from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DeploymentUtil.java
      - copied, changed from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/DeploymentUtil.java
Removed:
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/DeploymentUtil.java
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/MutableSettings.java
    cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/PropertyHelper.java
Modified:
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/AbstractTestCase.java
    cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonUtils.java
    cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.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/DefaultBlockResourcesHolder.java
    cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/SettingsBeanFactoryPostProcessor.java
    cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java

Copied: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/MutableSettings.java
(from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/MutableSettings.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/MutableSettings.java?view=diff&rev=490948&p1=cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/MutableSettings.java&r1=490929&p2=cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/MutableSettings.java&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/MutableSettings.java
(original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/MutableSettings.java
Fri Dec 29 00:01:21 2006
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.configuration.impl;
+package org.apache.cocoon.configuration;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -22,8 +22,6 @@
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.SettingsDefaults;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang.math.NumberUtils;
 

Copied: cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java
(from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/PropertyHelper.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java?view=diff&rev=490948&p1=cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/PropertyHelper.java&r1=490929&p2=cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/PropertyHelper.java
(original)
+++ cocoon/trunk/core/cocoon-configuration/cocoon-configuration-api/src/main/java/org/apache/cocoon/configuration/PropertyHelper.java
Fri Dec 29 00:01:21 2006
@@ -16,12 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.configuration.impl;
+package org.apache.cocoon.configuration;
 
 import java.util.Iterator;
 import java.util.Properties;
 
-import org.apache.cocoon.configuration.Settings;
 
 /**
  * Helper class for replacing property references with the value of the

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=490948&r1=490947&r2=490948
==============================================================================
--- 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 Fri
Dec 29 00:01:21 2006
@@ -21,8 +21,8 @@
 
 import junit.framework.TestCase;
 
+import org.apache.cocoon.configuration.MutableSettings;
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.MutableSettings;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.mock.MockContext;
 import org.apache.cocoon.environment.mock.MockRequest;

Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java?view=diff&rev=490948&r1=490947&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java
(original)
+++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java
Fri Dec 29 00:01:21 2006
@@ -18,7 +18,7 @@
  */
 package org.apache.cocoon.core.container.util;
 
-import org.apache.cocoon.configuration.impl.PropertyHelper;
+import org.apache.cocoon.configuration.PropertyHelper;
 
 import junit.framework.TestCase;
 

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=490948&r1=490947&r2=490948
==============================================================================
--- 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 00:01:21 2006
@@ -22,10 +22,10 @@
 import java.util.List;
 import java.util.Properties;
 
+import org.apache.cocoon.configuration.MutableSettings;
+import org.apache.cocoon.configuration.PropertyHelper;
 import org.apache.cocoon.configuration.PropertyProvider;
 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.ResourceUtils;
 import org.apache.cocoon.spring.impl.AbstractSettingsBeanFactoryPostProcessor;
 import org.apache.cocoon.spring.impl.Constants;

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java?view=diff&rev=490948&r1=490947&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java
Fri Dec 29 00:01:21 2006
@@ -32,8 +32,8 @@
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.configuration.MutableSettings;
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.MutableSettings;
 import org.apache.cocoon.spring.ResourceUtils;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonUtils.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonUtils.java?view=diff&rev=490948&r1=490947&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonUtils.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonUtils.java
Fri Dec 29 00:01:21 2006
@@ -19,8 +19,8 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
+import org.apache.cocoon.configuration.PropertyHelper;
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.PropertyHelper;
 
 /**
  * Some utility methods for handling Avalon stuff.

Modified: cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java?view=diff&rev=490948&r1=490947&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java
(original)
+++ cocoon/trunk/core/cocoon-sitemap/cocoon-sitemap-impl/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java
Fri Dec 29 00:01:21 2006
@@ -26,8 +26,8 @@
 import java.util.Set;
 
 import org.apache.avalon.excalibur.pool.Recyclable;
+import org.apache.cocoon.configuration.PropertyHelper;
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.PropertyHelper;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;

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=490948&r1=490947&r2=490948
==============================================================================
--- 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 00:01:21 2006
@@ -26,8 +26,8 @@
 
 import javax.servlet.ServletContext;
 
+import org.apache.cocoon.configuration.MutableSettings;
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.MutableSettings;
 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/DefaultBlockResourcesHolder.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DefaultBlockResourcesHolder.java?view=diff&rev=490948&r1=490947&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DefaultBlockResourcesHolder.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DefaultBlockResourcesHolder.java
Fri Dec 29 00:01:21 2006
@@ -20,7 +20,6 @@
 import java.util.Map;
 
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.DeploymentUtil;
 import org.apache.cocoon.spring.BlockResourcesHolder;
 
 /**

Copied: cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DeploymentUtil.java
(from r490929, cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/DeploymentUtil.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DeploymentUtil.java?view=diff&rev=490948&p1=cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/DeploymentUtil.java&r1=490929&p2=cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DeploymentUtil.java&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/DeploymentUtil.java
(original)
+++ cocoon/trunk/core/cocoon-spring/src/main/java/org/apache/cocoon/spring/impl/DeploymentUtil.java
Fri Dec 29 00:01:21 2006
@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.cocoon.configuration.impl;
+package org.apache.cocoon.spring.impl;
 
 import java.io.File;
 import java.io.FileOutputStream;

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=490948&r1=490947&r2=490948
==============================================================================
--- 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 00:01:21 2006
@@ -25,11 +25,11 @@
 import java.util.Iterator;
 import java.util.Properties;
 
+import org.apache.cocoon.configuration.MutableSettings;
+import org.apache.cocoon.configuration.PropertyHelper;
 import org.apache.cocoon.configuration.PropertyProvider;
 import org.apache.cocoon.configuration.Settings;
 import org.apache.cocoon.configuration.SettingsDefaults;
-import org.apache.cocoon.configuration.impl.MutableSettings;
-import org.apache.cocoon.configuration.impl.PropertyHelper;
 import org.apache.cocoon.spring.ResourceUtils;
 
 /**

Modified: cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java?view=diff&rev=490948&r1=490947&r2=490948
==============================================================================
--- cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java
(original)
+++ cocoon/trunk/core/cocoon-xml/cocoon-xml-resolver/src/main/java/org/apache/cocoon/core/xml/resolver/CocoonSystemResolver.java
Fri Dec 29 00:01:21 2006
@@ -19,8 +19,8 @@
 import java.io.File;
 
 import org.apache.cocoon.configuration.Settings;
-import org.apache.cocoon.configuration.impl.DeploymentUtil;
 import org.apache.cocoon.core.xml.impl.DefaultEntityResolver;
+import org.apache.cocoon.spring.impl.DeploymentUtil;
 
 /**
  * 



Mime
View raw message