See <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/27/changes>
Changes: [tmattsson] MAGNOLIA-3316 pre-execution templating, introduced RenderingModelFactory, ModelExecutionFilter and changed AbstractRenderer to reuse already created models + versionhandler and test cases [tmattsson] MAGNOLIA-3316 pre-execution magnolia-core introduced RequestDispatchUtil and expanded documentation of VirtualUriMapping ------------------------------------------ [...truncated 693 lines...] [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-gui/target/magnolia-gui-4.4-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-4.4-branch/modules/info.magnolia$magnolia-gui/builds/2010-10-14_13-30-07/archive/info.magnolia/magnolia-gui/4.4-20101014.113024-25/magnolia-gui-4.4-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] Building magnolia-module-exchange-simple [INFO] task-segment: [clean, deploy] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean] [INFO] Deleting directory <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target> [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/src/main/java'> for tasks ... [TASKS] Found 5. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/src/test/java'> for tasks ... [TASKS] Found 15. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/src/main/resources'> for tasks ... [TASKS] Found 0. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/src/main/resources'> for tasks ... [TASKS] Found 0. [TASKS] Skipping non-existent folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/generated-resources/taglibs'...> [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/src/test/resources'> for tasks ... [TASKS] Found 0. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/src/test/java'> for tasks ... [TASKS] Found 15. [TASKS] File encoding has not been set in pom.xml, using platform encoding UTF-8, i.e. build is platform dependent (see <a href="http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding";>Maven FAQ</a>). [INFO] [enforcer:enforce {execution: enforce}] [TASKS] Skipping maven reporter: there is already a result available. [INFO] [setproperty:set-property {execution: currentDate}] [INFO] Property magnoliaCurrentDate set to value 14. October 2010 (scope: project) [INFO] Property magnoliaReleaseDate set to value 14. October 2010 (scope: project) [INFO] Property magnoliaNiceVersion set to value 4.4 (Snapshot: 2010.10.14 13:32:47) (scope: project) [INFO] Property magnoliaNiceName set to value Magnolia Exchange Simple Module (scope: project) [TASKS] Skipping maven reporter: there is already a result available.[INFO] [remote-resources:process {execution: default}] [TASKS] Skipping maven reporter: there is already a result available.[INFO] [resources:resources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 1 resource [INFO] skip non existing resourceDirectory <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/generated-resources/taglibs> [INFO] Copying 3 resources [TASKS] Skipping maven reporter: there is already a result available. [INFO] [compiler:compile] [INFO] Compiling 12 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/classes> [TASKS] Skipping maven reporter: there is already a result available. [INFO] [compiler:testCompile {execution: compile-tests}] [INFO] Compiling 4 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/test-classes> [TASKS] Skipping maven reporter: there is already a result available.[INFO] [resources:testResources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 2 resources [INFO] Copying 0 resource [INFO] Copying 3 resources [TASKS] Skipping maven reporter: there is already a result available. [INFO] [compiler:testCompile] [INFO] Nothing to compile - all classes are up to date [TASKS] Skipping maven reporter: there is already a result available. [INFO] [surefire:test] [INFO] Surefire report directory: <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running info.magnolia.module.exchangesimple.SimpleSyndicatorTest 2010-10-14 13:32:51,964 ERROR fo.magnolia.module.exchangesimple.SimpleSyndicator: Failed to activate content. info.magnolia.cms.exchange.ExchangeException: Incorrect URL for subscriber EasyMock for interface info.magnolia.cms.exchange.Subscriber[prot://dummyURL/.magnolia/activation] at info.magnolia.module.exchangesimple.SimpleSyndicator.prepareConnection(SimpleSyndicator.java:218) at info.magnolia.module.exchangesimple.SimpleSyndicator.activate(SimpleSyndicator.java:168) at info.magnolia.module.exchangesimple.SimpleSyndicator$2.run(SimpleSyndicator.java:120) at EDU.oswego.cs.dl.util.concurrent.PooledExecutor$Worker.run(Unknown Source) at java.lang.Thread.run(Thread.java:619) 2010-10-14 13:32:51,967 ERROR fo.magnolia.module.exchangesimple.SimpleSyndicator: Incorrect URL for subscriber EasyMock for interface info.magnolia.cms.exchange.Subscriber[prot://dummyURL/.magnolia/activation] info.magnolia.cms.exchange.ExchangeException: Incorrect URL for subscriber EasyMock for interface info.magnolia.cms.exchange.Subscriber[prot://dummyURL/.magnolia/activation] at info.magnolia.module.exchangesimple.SimpleSyndicator.prepareConnection(SimpleSyndicator.java:218) at info.magnolia.module.exchangesimple.SimpleSyndicator.activate(SimpleSyndicator.java:168) at info.magnolia.module.exchangesimple.SimpleSyndicator$2.run(SimpleSyndicator.java:120) at EDU.oswego.cs.dl.util.concurrent.PooledExecutor$Worker.run(Unknown Source) at java.lang.Thread.run(Thread.java:619) Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.585 sec Running info.magnolia.module.exchangesimple.setup.for3_5.UpdateActivationConfigTaskTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.074 sec Running info.magnolia.module.exchangesimple.ReceiveFilterTest 2010-10-14 13:32:52,121 INFO info.magnolia.module.exchangesimple.ReceiveFilter : User testuser successfuly activated nodename on null. 2010-10-14 13:32:52,132 INFO info.magnolia.module.exchangesimple.ReceiveFilter : User testuser successfuly activated nodename on null. 2010-10-14 13:32:52,144 INFO info.magnolia.module.exchangesimple.ReceiveFilter : Moving content from /foo/bar/oldnodename to /foo/bar/nodename due to activation request. 2010-10-14 13:32:52,145 INFO info.magnolia.module.exchangesimple.ReceiveFilter : User testuser successfuly activated nodename on null. 2010-10-14 13:32:52,150 INFO info.magnolia.module.exchangesimple.ReceiveFilter : Moving content from /foo/barold/nodename to /foo/bar/nodename due to activation request. 2010-10-14 13:32:52,154 INFO info.magnolia.module.exchangesimple.ReceiveFilter : User testuser successfuly activated nodename on null. 2010-10-14 13:32:52,157 INFO info.magnolia.module.exchangesimple.ReceiveFilter : Content /foo/bar is locked. Will retry 1 more times. Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.098 sec Running info.magnolia.module.exchangesimple.LockTest 2010-10-14 13:32:56,607 INFO fo.magnolia.objectfactory.ObservedComponentFactory: /server/auditLogging does not exist, will return a new instance of class info.magnolia.logging.AuditLoggingManager. 2010-10-14 13:32:59,324 INFO fo.magnolia.objectfactory.ObservedComponentFactory: /server/auditLogging does not exist, will return a new instance of class info.magnolia.logging.AuditLoggingManager. 2010-10-14 13:32:59,344 INFO info.magnolia.module.exchangesimple.ReceiveFilter : Content /page is locked. Will retry 1 more times. Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.34 sec Results : Tests run: 14, Failures: 0, Errors: 0, Skipped: 0 [TASKS] Skipping maven reporter: there is already a result available. [HUDSON] Recording test results [INFO] [jar:jar] [INFO] Building jar: <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar> [TASKS] Skipping maven reporter: there is already a result available.[INFO] Preparing checkstyle:check [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/pom.xml> to /usr/local/hudson/data/jobs/magnolia_main-4.4-branch/modules/info.magnolia$magnolia-module-exchange-simple/builds/2010-10-14_13-30-07/archive/info.magnolia/magnolia-module-exchange-simple/4.4-SNAPSHOT/pom.xml [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-4.4-branch/modules/info.magnolia$magnolia-module-exchange-simple/builds/2010-10-14_13-30-07/archive/info.magnolia/magnolia-module-exchange-simple/4.4-SNAPSHOT/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar [INFO] [checkstyle:checkstyle] [WARNING] File encoding has not been set, using platform encoding UTF-8, i.e. build is platform dependent! [INFO] Starting audit... Audit done. [TASKS] Skipping maven reporter: there is already a result available. [CHECKSTYLE] Successfully parsed file <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/checkstyle-result.xml> of module magnolia-module-exchange-simple with 0 warnings. [CHECKSTYLE] File encoding has not been set in pom.xml, using platform encoding UTF-8, i.e. build is platform dependent (see <a href="http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding";>Maven FAQ</a>). [INFO] [checkstyle:check {execution: default}] [TASKS] Skipping maven reporter: there is already a result available. [CHECKSTYLE] Skipping maven reporter: there is already a result available. [INFO] [install:install] [INFO] Installing <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar> to /usr/local/hudson/maven-local-repo/info/magnolia/magnolia-module-exchange-simple/4.4-SNAPSHOT/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar [TASKS] Skipping maven reporter: there is already a result available.[INFO] [deploy:deploy] [INFO] Retrieving previous build number from magnolia.public.snapshots Uploading: http://nexus.magnolia-cms.com/content/repositories/magnolia.public.snapshots/info/magnolia/magnolia-module-exchange-simple/4.4-SNAPSHOT/magnolia-module-exchange-simple-4.4-20101014.113024-25.jar 50K uploaded [INFO] Uploading project information for magnolia-module-exchange-simple 4.4-20101014.113024-25 [INFO] Retrieving previous metadata from magnolia.public.snapshots [INFO] Uploading repository metadata for: 'snapshot info.magnolia:magnolia-module-exchange-simple:4.4-SNAPSHOT' [INFO] Retrieving previous metadata from magnolia.public.snapshots [INFO] Uploading repository metadata for: 'artifact info.magnolia:magnolia-module-exchange-simple' [TASKS] Skipping maven reporter: there is already a result available. [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-exchange-simple/target/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-4.4-branch/modules/info.magnolia$magnolia-module-exchange-simple/builds/2010-10-14_13-30-07/archive/info.magnolia/magnolia-module-exchange-simple/4.4-20101014.113024-25/magnolia-module-exchange-simple-4.4-SNAPSHOT.jar [INFO] ------------------------------------------------------------------------ [INFO] Building magnolia-module-templating [INFO] task-segment: [clean, deploy] [INFO] ------------------------------------------------------------------------ [INFO] [clean:clean] [INFO] Deleting directory <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target> [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/main/java'> for tasks ... [TASKS] Found 15. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/test/java'> for tasks ... [TASKS] Found 3. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/main/resources'> for tasks ... [TASKS] Found 0. [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/main/resources'> for tasks ... [TASKS] Found 0. [TASKS] Skipping non-existent folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/generated-resources/taglibs'...> [TASKS] Skipping non-existent folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/test/resources'...> [TASKS] Scanning folder '<http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/test/java'> for tasks ... [TASKS] Found 3. [TASKS] File encoding has not been set in pom.xml, using platform encoding UTF-8, i.e. build is platform dependent (see <a href="http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding";>Maven FAQ</a>). [INFO] [enforcer:enforce {execution: enforce}] [TASKS] Skipping maven reporter: there is already a result available. [INFO] [setproperty:set-property {execution: currentDate}] [INFO] Property magnoliaCurrentDate set to value 14. October 2010 (scope: project) [INFO] Property magnoliaReleaseDate set to value 14. October 2010 (scope: project) [INFO] Property magnoliaNiceVersion set to value 4.4 (Snapshot: 2010.10.14 13:33:11) (scope: project) [INFO] Property magnoliaNiceName set to value Magnolia Templating Module (scope: project) [TASKS] Skipping maven reporter: there is already a result available.[INFO] [remote-resources:process {execution: default}] [TASKS] Skipping maven reporter: there is already a result available.[INFO] [resources:resources] [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 43 resources [INFO] Copying 1 resource [INFO] skip non existing resourceDirectory <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/generated-resources/taglibs> [INFO] Copying 3 resources [TASKS] Skipping maven reporter: there is already a result available. [INFO] [compiler:compile] [INFO] Compiling 45 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/classes> [TASKS] Skipping maven reporter: there is already a result available. [INFO] [compiler:testCompile {execution: compile-tests}] [INFO] Compiling 11 source files to <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/test-classes> [TASKS] Skipping maven reporter: there is already a result available.[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-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/test/resources> [INFO] Copying 0 resource [INFO] Copying 3 resources [TASKS] Skipping maven reporter: there is already a result available. [INFO] [compiler:testCompile] [INFO] Nothing to compile - all classes are up to date [TASKS] Skipping maven reporter: there is already a result available. [INFO] [surefire:test] [INFO] Surefire report directory: <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/surefire-reports> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running info.magnolia.module.templating.freemarker.RenderableDefinitionModelTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.469 sec Running info.magnolia.module.templating.ParagraphManagerTest Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.586 sec Running info.magnolia.module.templating.paragraphs.PlainTextParagraphRendererTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec Running info.magnolia.module.templating.paragraphs.JspParagraphRendererTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.11 sec Running info.magnolia.module.templating.ParagraphRenderingFacadeTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.243 sec Running info.magnolia.module.templating.ParagraphRendererManagerTest Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec Running info.magnolia.module.templating.AbstractRenderableTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec Running info.magnolia.module.templating.renderers.ServletTemplateRendererTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec Running info.magnolia.module.templating.paragraphs.FreemarkerParagraphRendererTest Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.318 sec Running info.magnolia.module.templating.renderers.JspTemplateRendererTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec Running info.magnolia.module.templating.setup.TemplatingModuleVersionHandlerTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.233 sec Results : Tests run: 34, Failures: 0, Errors: 0, Skipped: 0 [TASKS] Skipping maven reporter: there is already a result available. [HUDSON] Recording test results [INFO] [jar:jar] [INFO] Building jar: <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/magnolia-module-templating-4.4-SNAPSHOT.jar> [TASKS] Skipping maven reporter: there is already a result available.[INFO] Preparing checkstyle:check [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/pom.xml> to /usr/local/hudson/data/jobs/magnolia_main-4.4-branch/modules/info.magnolia$magnolia-module-templating/builds/2010-10-14_13-30-07/archive/info.magnolia/magnolia-module-templating/4.4-SNAPSHOT/pom.xml [HUDSON] Archiving <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/magnolia-module-templating-4.4-SNAPSHOT.jar> to /usr/local/hudson/data/jobs/magnolia_main-4.4-branch/modules/info.magnolia$magnolia-module-templating/builds/2010-10-14_13-30-07/archive/info.magnolia/magnolia-module-templating/4.4-SNAPSHOT/magnolia-module-templating-4.4-SNAPSHOT.jar [INFO] [checkstyle:checkstyle] [WARNING] File encoding has not been set, using platform encoding UTF-8, i.e. build is platform dependent! [INFO] Starting audit... <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/main/java/info/magnolia/module/templating/setup/TemplatingModuleVersionHandler.java>:119:1: File contains tab characters (this is the first instance). <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/src/main/java/info/magnolia/module/templating/AbstractRenderer.java>:37:8: Unused import - java.lang.reflect.InvocationTargetException. Audit done. [INFO] There are 2 checkstyle errors. [TASKS] Skipping maven reporter: there is already a result available. [CHECKSTYLE] Successfully parsed file <http://hudson.magnolia-cms.com/job/magnolia_main-4.4-branch/ws/magnolia-4.4/magnolia-module-templating/target/checkstyle-result.xml> of module magnolia-module-templating with 2 warnings. [CHECKSTYLE] File encoding has not been set in pom.xml, using platform encoding UTF-8, i.e. build is platform dependent (see <a href="http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding";>Maven FAQ</a>). [INFO] [checkstyle:check {execution: default}] [TASKS] Skipping maven reporter: there is already a result available. [CHECKSTYLE] Skipping maven reporter: there is already a result available. [INFO] ------------------------------------------------------------------------ [ERROR] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] You have 2 Checkstyle violations. [INFO] ------------------------------------------------------------------------ [INFO] For more information, run Maven with the -e switch [INFO] ------------------------------------------------------------------------ [INFO] Total time: 3 minutes 15 seconds [INFO] Finished at: Thu Oct 14 13:33:26 CEST 2010 [INFO] Final Memory: 134M/476M [INFO] ------------------------------------------------------------------------ Sending e-mails to: [email protected] [email protected] channel stopped IRC notifier plugin: Sending notification to: #magnolia-dev ---------------------------------------------------------------- For list details see http://www.magnolia-cms.com/home/community/mailing-lists.html To unsubscribe, E-mail to: <[email protected]> ----------------------------------------------------------------
