Author: norman
Date: Sun Dec 19 10:56:59 2010
New Revision: 1050802
URL: http://svn.apache.org/viewvc?rev=1050802&view=rev
Log:
More package rename etc in container-spring, we are getting closer
Added:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/AbstractJamesResourceLoader.java
- copied, changed from r1050800,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/AbstractJamesResourceLoader.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/ConfigurationProvider.java
- copied, changed from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/JamesResourceLoader.java
- copied, changed from r1050800,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/JamesResourceLoader.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/LogProvider.java
- copied, changed from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringConfigurationProvider.java
- copied, changed from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringLogProvider.java
- copied, changed from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
- copied, changed from r1050797,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
- copied, changed from r1050797,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
- copied, changed from r1050797,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java
Removed:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/AbstractJamesResourceLoader.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/JamesResourceLoader.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/config/JamesLoaderBeanFactoryPostProcessor.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
james/server/trunk/container-spring/src/main/java/org/apache/james/protocols/spring/BeanFactoryProtocolHandlerChain.java
james/server/trunk/container-spring/src/main/java/org/apache/james/resolver/spring/SpringFileSystem.java
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/config/JamesLoaderBeanFactoryPostProcessor.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/config/JamesLoaderBeanFactoryPostProcessor.java?rev=1050802&r1=1050801&r2=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/config/JamesLoaderBeanFactoryPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/config/JamesLoaderBeanFactoryPostProcessor.java
Sun Dec 19 10:56:59 2010
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
+import org.apache.james.container.spring.io.api.ConfigurationProvider;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;
import org.springframework.beans.factory.config.BeanDefinition;
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java?rev=1050802&r1=1050801&r2=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/JamesServerApplicationContext.java
Sun Dec 19 10:56:59 2010
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.container.spring.context;
-import org.apache.james.container.spring.io.AbstractJamesResourceLoader;
-import org.apache.james.container.spring.io.JamesResourceLoader;
+import org.apache.james.container.spring.io.api.AbstractJamesResourceLoader;
+import org.apache.james.container.spring.io.api.JamesResourceLoader;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.core.io.Resource;
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java?rev=1050802&r1=1050801&r2=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/context/web/JamesServerWebApplicationContext.java
Sun Dec 19 10:56:59 2010
@@ -18,8 +18,8 @@
****************************************************************/
package org.apache.james.container.spring.context.web;
-import org.apache.james.container.spring.io.AbstractJamesResourceLoader;
-import org.apache.james.container.spring.io.JamesResourceLoader;
+import org.apache.james.container.spring.io.api.AbstractJamesResourceLoader;
+import org.apache.james.container.spring.io.api.JamesResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.web.context.support.XmlWebApplicationContext;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/AbstractJamesResourceLoader.java
(from r1050800,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/AbstractJamesResourceLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/AbstractJamesResourceLoader.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/AbstractJamesResourceLoader.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/AbstractJamesResourceLoader.java&r1=1050800&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/AbstractJamesResourceLoader.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/AbstractJamesResourceLoader.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.io;
+package org.apache.james.container.spring.io.api;
import java.io.File;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/ConfigurationProvider.java
(from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/ConfigurationProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/ConfigurationProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java&r1=1050795&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/ConfigurationProvider.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/ConfigurationProvider.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.api;
+package org.apache.james.container.spring.io.api;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/JamesResourceLoader.java
(from r1050800,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/JamesResourceLoader.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/JamesResourceLoader.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/JamesResourceLoader.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/JamesResourceLoader.java&r1=1050800&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/JamesResourceLoader.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/JamesResourceLoader.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.io;
+package org.apache.james.container.spring.io.api;
import org.springframework.core.io.ResourceLoader;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/LogProvider.java
(from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/LogProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/LogProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java&r1=1050795&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/LogProvider.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/api/LogProvider.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.api;
+package org.apache.james.container.spring.io.api;
import org.apache.commons.logging.Log;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringConfigurationProvider.java
(from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringConfigurationProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringConfigurationProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java&r1=1050795&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringConfigurationProvider.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringConfigurationProvider.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.impl;
+package org.apache.james.container.spring.io.impl;
import java.io.IOException;
import java.util.HashMap;
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.XMLConfiguration;
-import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
+import org.apache.james.container.spring.io.api.ConfigurationProvider;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.ResourceLoaderAware;
import org.springframework.core.io.Resource;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringLogProvider.java
(from r1050795,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringLogProvider.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringLogProvider.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java&r1=1050795&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/SpringLogProvider.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/io/impl/SpringLogProvider.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.impl;
+package org.apache.james.container.spring.io.impl;
import java.util.HashMap;
import java.util.Iterator;
@@ -24,7 +24,7 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.Log4JLogger;
-import org.apache.james.container.spring.lifecycle.api.LogProvider;
+import org.apache.james.container.spring.io.api.LogProvider;
import org.springframework.beans.factory.InitializingBean;
/**
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
(from r1050797,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java&r1=1050797&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/api/AbstractLifeCycleBeanPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/AbstractLifeCycleBeanPostProcessor.java
Sun Dec 19 10:56:59 2010
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.api;
+package org.apache.james.container.spring.lifecycle;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
(from r1050797,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java&r1=1050797&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/CommonsConfigurableBeanPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/CommonsConfigurableBeanPostProcessor.java
Sun Dec 19 10:56:59 2010
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.impl;
+package org.apache.james.container.spring.lifecycle;
import org.apache.commons.configuration.HierarchicalConfiguration;
-import
org.apache.james.container.spring.lifecycle.api.AbstractLifeCycleBeanPostProcessor;
-import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
+import org.apache.james.container.spring.io.api.ConfigurationProvider;
import org.apache.james.lifecycle.api.Configurable;
/**
Copied:
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
(from r1050797,
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java?p2=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java&p1=james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java&r1=1050797&r2=1050802&rev=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/impl/LogEnabledBeanPostProcessor.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/container/spring/lifecycle/LogEnabledBeanPostProcessor.java
Sun Dec 19 10:56:59 2010
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.container.spring.lifecycle.impl;
+package org.apache.james.container.spring.lifecycle;
-import
org.apache.james.container.spring.lifecycle.api.AbstractLifeCycleBeanPostProcessor;
-import org.apache.james.container.spring.lifecycle.api.LogProvider;
+import org.apache.james.container.spring.io.api.LogProvider;
import org.apache.james.lifecycle.api.LogEnabled;
/**
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/protocols/spring/BeanFactoryProtocolHandlerChain.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/protocols/spring/BeanFactoryProtocolHandlerChain.java?rev=1050802&r1=1050801&r2=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/protocols/spring/BeanFactoryProtocolHandlerChain.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/protocols/spring/BeanFactoryProtocolHandlerChain.java
Sun Dec 19 10:56:59 2010
@@ -28,8 +28,8 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.logging.Log;
-import org.apache.james.container.spring.lifecycle.api.ConfigurationProvider;
-import org.apache.james.container.spring.lifecycle.api.LogProvider;
+import org.apache.james.container.spring.io.api.ConfigurationProvider;
+import org.apache.james.container.spring.io.api.LogProvider;
import org.apache.james.protocols.api.ExtensibleHandler;
import org.apache.james.protocols.api.HandlersPackage;
import org.apache.james.protocols.api.ProtocolHandlerChain;
Modified:
james/server/trunk/container-spring/src/main/java/org/apache/james/resolver/spring/SpringFileSystem.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/java/org/apache/james/resolver/spring/SpringFileSystem.java?rev=1050802&r1=1050801&r2=1050802&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/java/org/apache/james/resolver/spring/SpringFileSystem.java
(original)
+++
james/server/trunk/container-spring/src/main/java/org/apache/james/resolver/spring/SpringFileSystem.java
Sun Dec 19 10:56:59 2010
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.james.resolver.spring;
-import org.apache.james.container.spring.io.JamesResourceLoader;
+import org.apache.james.container.spring.io.api.JamesResourceLoader;
import org.apache.james.resolver.api.FileSystem;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
