See <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/1279/changes>
Changes: [gjoseph] MAGNOLIA-3001 replaced all leftover usages of FactoryUtil by ComponentsTestUtil in tests ------------------------------------------ [...truncated 806 lines...] 2010-02-01 15:49:01,017 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.26 sec Running info.magnolia.module.mail.setup.MailModuleVersionHandlerTest 2010-02-01 15:49:02,114 WARN info.magnolia.importexport.BootstrapUtil : Deleted already existing node for bootstrapping: /modules/mail/config/smtp 2010-02-01 15:49:02,121 WARN info.magnolia.importexport.BootstrapUtil : Deleted already existing node for bootstrapping: /modules/mail/config/factory 2010-02-01 15:49:02,131 WARN info.magnolia.importexport.BootstrapUtil : Deleted already existing node for bootstrapping: /modules/mail/config/handler 2010-02-01 15:49:04,690 WARN info.magnolia.module.InstallContextImpl : > Property "class" was expected to exist at /modules/adminInterface/commands/default/sendMail with value "info.magnolia.cms.mail.commands.MailCommand" but has the value "custom-command-class" instead. Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.458 sec Running info.magnolia.module.mail.HtmlMailTest 2010-02-01 15:49:09,249 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:09,310 INFO fo.magnolia.module.mail.handlers.SimpleMailHandler: Mail has been sent to: [[email protected]] 2010-02-01 15:49:10,311 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config 2010-02-01 15:49:10,913 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:10,973 INFO info.magnolia.module.mail.templates.MgnlEmail : No content 2010-02-01 15:49:10,973 INFO info.magnolia.module.mail.templates.MgnlEmail : Found new attachment with name :att 2010-02-01 15:49:10,980 INFO fo.magnolia.module.mail.handlers.SimpleMailHandler: Mail has been sent to: [[email protected]] 2010-02-01 15:49:11,980 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config 2010-02-01 15:49:12,444 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:12,592 INFO info.magnolia.module.mail.templates.MgnlEmail : No content 2010-02-01 15:49:12,592 INFO info.magnolia.module.mail.templates.MgnlEmail : Found new attachment with name :att1 2010-02-01 15:49:12,592 INFO info.magnolia.module.mail.templates.MgnlEmail : Found new attachment with name :att2 2010-02-01 15:49:12,597 INFO fo.magnolia.module.mail.handlers.SimpleMailHandler: Mail has been sent to: [[email protected]] 2010-02-01 15:49:13,597 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config 2010-02-01 15:49:14,119 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:14,164 INFO info.magnolia.module.mail.templates.MgnlEmail : Found new attachment with name :att1 2010-02-01 15:49:14,194 INFO fo.magnolia.module.mail.handlers.SimpleMailHandler: Mail has been sent to: [[email protected]] 2010-02-01 15:49:15,195 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.537 sec Running info.magnolia.module.mail.AttachmentMailTest 2010-02-01 15:49:15,729 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:16,774 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.578 sec Results : Tests run: 13, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar] [INFO] Building jar: <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-mail/target/magnolia-module-mail-4.3-SNAPSHOT.jar> [INFO] Preparing checkstyle:check [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-mail/pom.xml> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-mail/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-mail/4.3-SNAPSHOT/pom.xml [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-mail/target/magnolia-module-mail-4.3-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-mail/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-mail/4.3-SNAPSHOT/magnolia-module-mail-4.3-SNAPSHOT.jar [INFO] [checkstyle:checkstyle] [WARNING] File encoding has not been set, using platform encoding MacRoman, i.e. build is platform dependent! [INFO] Starting audit... Audit done. [INFO] [checkstyle:check {execution: default}] [INFO] [install:install] [INFO] Installing <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-mail/target/magnolia-module-mail-4.3-SNAPSHOT.jar> to /usr/local/hudson/maven-local-repo/info/magnolia/magnolia-module-mail/4.3-SNAPSHOT/magnolia-module-mail-4.3-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] Building magnolia-module-workflow [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean] [INFO] Deleting directory <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target> [INFO] [enforcer:enforce {execution: enforce}] [INFO] [setproperty:set-property {execution: currentDate}] [INFO] Property magnoliaCurrentDate set to value 1. February 2010 (scope: project) [INFO] Property magnoliaReleaseDate set to value 1. February 2010 (scope: project) [INFO] Property magnoliaNiceVersion set to value 4.3 (Snapshot: 01.02.2010 15:49:20) (scope: project) [INFO] Property magnoliaNiceName set to value Magnolia Workflow Module (scope: project) [INFO] [remote-resources:process {execution: default}] [INFO] [resources:resources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 33 resources [INFO] Copying 1 resource [INFO] Copying 3 resources [INFO] [compiler:compile] [INFO] Compiling 34 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/classes> [INFO] [compiler:testCompile {execution: compile-tests}] [INFO] Compiling 1 source file to <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/test-classes> [INFO] [resources:testResources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/src/test/resources> [INFO] Copying 0 resource [INFO] Copying 3 resources [INFO] [compiler:testCompile] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test] [INFO] Surefire report directory: <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running info.magnolia.module.workflow.setup.WorkflowModuleVersionHandlerTest 2010-02-01 15:49:25,841 INFO info.magnolia.jackrabbit.ProviderImpl : Custom node types registered using /mgnl-nodetypes/owfe-nodetypes.xml 2010-02-01 15:49:25,845 INFO info.magnolia.jackrabbit.ProviderImpl : Registering nodetype {}workItem 2010-02-01 15:49:25,872 INFO info.magnolia.jackrabbit.ProviderImpl : Registering nodetype {}expression 2010-02-01 15:49:27,449 INFO info.magnolia.jackrabbit.ProviderImpl : Custom node types registered using /mgnl-nodetypes/owfe-nodetypes.xml 2010-02-01 15:49:27,453 INFO info.magnolia.jackrabbit.ProviderImpl : Registering nodetype {}workItem 2010-02-01 15:49:27,478 INFO info.magnolia.jackrabbit.ProviderImpl : Registering nodetype {}expression Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.336 sec Results : Tests run: 2, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar] [INFO] Building jar: <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT.jar> [INFO] [assembly:single {execution: default-assembly}] [INFO] Building zip: <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT-bundle.zip> [INFO] Building tar : <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT-bundle.tar.gz> [INFO] Preparing checkstyle:check [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/pom.xml> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-workflow/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-workflow/4.3-SNAPSHOT/pom.xml [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-workflow/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-workflow/4.3-SNAPSHOT/magnolia-module-workflow-4.3-SNAPSHOT.jar [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT-bundle.zip> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-workflow/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-workflow/4.3-SNAPSHOT/magnolia-module-workflow-4.3-SNAPSHOT-bundle.zip [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT-bundle.tar.gz> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-workflow/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-workflow/4.3-SNAPSHOT/magnolia-module-workflow-4.3-SNAPSHOT-bundle.tar.gz [INFO] [checkstyle:checkstyle] [WARNING] File encoding has not been set, using platform encoding MacRoman, i.e. build is platform dependent! [INFO] Starting audit... Audit done. [INFO] [checkstyle:check {execution: default}] [INFO] [install:install] [INFO] Installing <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT.jar> to /usr/local/hudson/maven-local-repo/info/magnolia/magnolia-module-workflow/4.3-SNAPSHOT/magnolia-module-workflow-4.3-SNAPSHOT.jar [INFO] Installing <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT-bundle.zip> to /usr/local/hudson/maven-local-repo/info/magnolia/magnolia-module-workflow/4.3-SNAPSHOT/magnolia-module-workflow-4.3-SNAPSHOT-bundle.zip [INFO] Installing <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-workflow/target/magnolia-module-workflow-4.3-SNAPSHOT-bundle.tar.gz> to /usr/local/hudson/maven-local-repo/info/magnolia/magnolia-module-workflow/4.3-SNAPSHOT/magnolia-module-workflow-4.3-SNAPSHOT-bundle.tar.gz [INFO] ------------------------------------------------------------------------ [INFO] Building magnolia-module-cache [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean] [INFO] Deleting directory <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target> [INFO] [enforcer:enforce {execution: enforce}] [INFO] [setproperty:set-property {execution: currentDate}] [INFO] Property magnoliaCurrentDate set to value 1. February 2010 (scope: project) [INFO] Property magnoliaReleaseDate set to value 1. February 2010 (scope: project) [INFO] Property magnoliaNiceVersion set to value 4.3 (Snapshot: 01.02.2010 15:49:37) (scope: project) [INFO] Property magnoliaNiceName set to value Magnolia Cache Module (scope: project) [INFO] [remote-resources:process {execution: default}] [INFO] [resources:resources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 8 resources [INFO] Copying 1 resource [INFO] Copying 3 resources [INFO] [compiler:compile] [INFO] Compiling 64 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target/classes> [INFO] [compiler:testCompile {execution: compile-tests}] [INFO] Compiling 9 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target/test-classes> [INFO] [resources:testResources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] skip non existing resourceDirectory <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/src/test/resources> [INFO] Copying 0 resource [INFO] Copying 3 resources [INFO] [compiler:testCompile] [INFO] Nothing to compile - all classes are up to date [INFO] [surefire:test] [INFO] Surefire report directory: <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running info.magnolia.module.cache.executor.SetExpirationHeadersTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.13 sec Running info.magnolia.module.cache.util.GZipUtilTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 sec Running info.magnolia.module.cache.filter.CacheHeadersFilterTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.013 sec Running info.magnolia.module.cache.executor.AbstractExecutorTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running info.magnolia.module.cache.filter.CacheConfigurationSetupTest 2010-02-01 15:49:43,210 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:43,535 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config 2010-02-01 15:49:44,379 WARN fo.magnolia.objectfactory.ObservedComponentFactory: Configuration for class info.magnolia.logging.AuditLoggingManager does not exist at [config:/server/auditLogging], will return null. 2010-02-01 15:49:44,517 WARN info.magnolia.context.AbstractRepositoryStrategy : won't close session because of registered observation listener config Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.068 sec Running info.magnolia.module.cache.filter.GZipFilterTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.07 sec Running info.magnolia.module.cache.filter.CacheFilterTest 2010-02-01 15:49:44,830 WARN info.magnolia.module.cache.executor.UseCache : Unable to change status on already commited response $Proxy2. 2010-02-01 15:49:44,851 WARN info.magnolia.module.cache.executor.Store : Response body for 200:/dummy is empty. Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.106 sec Running info.magnolia.module.cache.filter.StandaloneGZipFilterTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec Running info.magnolia.module.cache.filter.CachedPageTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Results : Tests run: 39, Failures: 0, Errors: 0, Skipped: 0 [HUDSON] Recording test results [INFO] [jar:jar] [INFO] Building jar: <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target/magnolia-module-cache-4.3-SNAPSHOT.jar> [INFO] Preparing checkstyle:check [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/pom.xml> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-cache/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-cache/4.3-SNAPSHOT/pom.xml [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target/magnolia-module-cache-4.3-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-module-cache/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-module-cache/4.3-SNAPSHOT/magnolia-module-cache-4.3-SNAPSHOT.jar [INFO] [checkstyle:checkstyle] [WARNING] File encoding has not been set, using platform encoding MacRoman, i.e. build is platform dependent! [INFO] Starting audit... Audit done. [INFO] [checkstyle:check {execution: default}] [INFO] [install:install] [INFO] Installing <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-module-cache/target/magnolia-module-cache-4.3-SNAPSHOT.jar> to /usr/local/hudson/maven-local-repo/info/magnolia/magnolia-module-cache/4.3-SNAPSHOT/magnolia-module-cache-4.3-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] Building CMS Tag Library [INFO] task-segment: [clean, install] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean] [INFO] Deleting directory <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/target> [INFO] [enforcer:enforce {execution: enforce}] [INFO] [2-xdoclet2:xdoclet {execution: xdoclet-tld}] log4j:WARN No appenders could be found for logger (org.generama.defaults.QDoxPlugin). log4j:WARN Please initialize the log4j system properly. Running org.xdoclet.plugin.web.TaglibPlugin Unknown tag: @TODO: in <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/src/main/java/info/magnolia/cms/taglibs/EditButton.java> (line 187) [INFO] [setproperty:set-property {execution: currentDate}] [INFO] Property magnoliaCurrentDate set to value 1. February 2010 (scope: project) [INFO] Property magnoliaReleaseDate set to value 1. February 2010 (scope: project) [INFO] Property magnoliaNiceVersion set to value 4.3 (Snapshot: 01.02.2010 15:49:53) (scope: project) [INFO] Property magnoliaNiceName set to value CMS Tag Library (scope: project) [INFO] [remote-resources:process {execution: default}] [INFO] [resources:resources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] Copying 0 resource [INFO] Copying 1 resource [INFO] Copying 3 resources [INFO] [compiler:compile] [INFO] Compiling 32 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/target/classes> [INFO] [compiler:testCompile {execution: compile-tests}] [INFO] Compiling 5 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/target/test-classes> [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/pom.xml> to /usr/local/hudson/data/jobs/magnolia_main-trunk/modules/info.magnolia$magnolia-taglib-cms/builds/2010-02-01_15-46-08/archive/info.magnolia/magnolia-taglib-cms/4.3-SNAPSHOT/pom.xml [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Compilation failure <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/src/test/java/info/magnolia/cms/taglibs/ContentNodeIteratorTest.java>:[68,75] package FactoryUtil does not exist <http://hudson.magnolia-cms.com/job/magnolia_main-trunk/ws/trunk/magnolia-taglib-cms/src/test/java/info/magnolia/cms/taglibs/ContentNodeIteratorTest.java>:[68,8] cannot find symbol symbol : variable FactoryUtil location: class info.magnolia.cms.taglibs.ContentNodeIteratorTest [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 3 minutes 41 seconds [INFO] Finished at: Mon Feb 01 15:49:54 CET 2010 [INFO] Final Memory: 47M/63M [INFO] ------------------------------------------------------------------------ Waiting for Hudson to finish collecting data Sending e-mails to: [email protected] [email protected] channel stopped ---------------------------------------------------------------- For list details see http://www.magnolia-cms.com/home/community/mailing-lists.html To unsubscribe, E-mail to: <[email protected]> ----------------------------------------------------------------
