From a82c036d3c66a037e63b8c451a7cca2460d1fcc9 Mon Sep 17 00:00:00 2001 From: quasi Date: Thu, 6 Jun 2013 16:37:27 +0000 Subject: [PATCH] CCM-Core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Entfernt: * Verwendung von Startup ist deprecated. Geändert zu Runtime git-svn-id: https://svn.libreccm.org/ccm/trunk@2179 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/SiteProxyUpgrade630to631.java | 4 ++-- ccm-core/src/com/arsdigita/packaging/Load.java | 6 +++--- ccm-core/src/com/arsdigita/packaging/Loader.java | 4 ++-- ccm-core/src/com/arsdigita/packaging/Status.java | 4 ++-- ccm-core/src/com/arsdigita/util/cmd/Program.java | 5 ++--- ccm-core/src/com/arsdigita/web/ApplicationTool.java | 4 ++-- ccm-core/src/com/arsdigita/web/HostLoader.java | 4 ++-- .../src/com/arsdigita/london/cms/freeform/Loader.java | 8 ++++---- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyUpgrade630to631.java b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyUpgrade630to631.java index fbb371744..0c40b4767 100755 --- a/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyUpgrade630to631.java +++ b/ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyUpgrade630to631.java @@ -5,7 +5,7 @@ import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TransactionContext; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import com.arsdigita.xml.XML; public class SiteProxyUpgrade630to631 { @@ -13,7 +13,7 @@ public class SiteProxyUpgrade630to631 { private final static String SITE_PROXY = "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml"; public static void main(String[] args) { - new Startup().run(); + new Runtime().startup(); final Session session = SessionManager.getSession(); final TransactionContext tc = session.getTransactionContext(); try { diff --git a/ccm-core/src/com/arsdigita/packaging/Load.java b/ccm-core/src/com/arsdigita/packaging/Load.java index 16bcc77e1..7ed1bea1c 100755 --- a/ccm-core/src/com/arsdigita/packaging/Load.java +++ b/ccm-core/src/com/arsdigita/packaging/Load.java @@ -30,7 +30,7 @@ import com.arsdigita.runtime.InteractiveParameterReader; import com.arsdigita.runtime.ConfigRegistry; import com.arsdigita.runtime.RegistryConfig; import com.arsdigita.runtime.RuntimeConfig; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.JavaPropertyReader; import com.arsdigita.util.jdbc.Connections; @@ -457,7 +457,7 @@ class Load extends Command { if (all || line.hasOption("data")) { if (ssn == null) { - new Startup().run(); + new Runtime().startup(); ssn = SessionManager.getSession(); } @@ -477,7 +477,7 @@ class Load extends Command { } if (all || line.hasOption("init")) { if (ssn == null) { - new Startup().run(); + new Runtime().startup(); ssn = SessionManager.getSession(); } for (int i = 0; i < sorted.length; i++) { diff --git a/ccm-core/src/com/arsdigita/packaging/Loader.java b/ccm-core/src/com/arsdigita/packaging/Loader.java index e8b146fdd..127aeb09e 100755 --- a/ccm-core/src/com/arsdigita/packaging/Loader.java +++ b/ccm-core/src/com/arsdigita/packaging/Loader.java @@ -31,7 +31,7 @@ import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.Initializer; import com.arsdigita.runtime.Script; import com.arsdigita.runtime.ScriptContext; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import com.arsdigita.util.Classes; import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.parameter.ParameterReader; @@ -141,7 +141,7 @@ class Loader { s_log.info("Running initializer " + init); ini.add((Initializer) Classes.newInstance(init)); } - Startup.run(ssn, ini); + Runtime.startup(ssn, ini); TransactionContext txn = ssn.getTransactionContext(); txn.beginTxn(); diff --git a/ccm-core/src/com/arsdigita/packaging/Status.java b/ccm-core/src/com/arsdigita/packaging/Status.java index c78d88dcc..a1327c22d 100755 --- a/ccm-core/src/com/arsdigita/packaging/Status.java +++ b/ccm-core/src/com/arsdigita/packaging/Status.java @@ -22,7 +22,7 @@ import com.arsdigita.runtime.RegistryConfig; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.runtime.ScriptContext; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; /** * Status @@ -69,7 +69,7 @@ class Status extends Command { } if (!passed) { return false; } - new Startup().run(); + new Runtime().startup(); Session ssn = SessionManager.getSession(); for (int i = 0; i < checks.length; i++) { diff --git a/ccm-core/src/com/arsdigita/util/cmd/Program.java b/ccm-core/src/com/arsdigita/util/cmd/Program.java index c9955ab9f..27758e165 100755 --- a/ccm-core/src/com/arsdigita/util/cmd/Program.java +++ b/ccm-core/src/com/arsdigita/util/cmd/Program.java @@ -15,7 +15,7 @@ package com.arsdigita.util.cmd; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import org.apache.commons.cli.Options; import org.apache.commons.cli.HelpFormatter; @@ -263,8 +263,7 @@ public abstract class Program { try { if (m_startup) { - Startup startup = new Startup(); - startup.run(); + new Runtime().startup(); } doRun(cmdLine); diff --git a/ccm-core/src/com/arsdigita/web/ApplicationTool.java b/ccm-core/src/com/arsdigita/web/ApplicationTool.java index 4e77256cd..685195c91 100755 --- a/ccm-core/src/com/arsdigita/web/ApplicationTool.java +++ b/ccm-core/src/com/arsdigita/web/ApplicationTool.java @@ -21,7 +21,7 @@ package com.arsdigita.web; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.TransactionContext; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import org.apache.log4j.Logger; /** @@ -41,7 +41,7 @@ public final class ApplicationTool { System.exit(1); } - new Startup().run(); + new Runtime().startup(); final Session session = SessionManager.getSession(); final TransactionContext transaction = session.getTransactionContext(); diff --git a/ccm-core/src/com/arsdigita/web/HostLoader.java b/ccm-core/src/com/arsdigita/web/HostLoader.java index 6c146aa0d..e984a9afb 100755 --- a/ccm-core/src/com/arsdigita/web/HostLoader.java +++ b/ccm-core/src/com/arsdigita/web/HostLoader.java @@ -28,7 +28,7 @@ import com.arsdigita.runtime.AbstractScript; import com.arsdigita.runtime.InteractiveParameterReader; import com.arsdigita.runtime.Script; import com.arsdigita.runtime.ScriptContext; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import com.arsdigita.util.parameter.ErrorList; import com.arsdigita.util.parameter.IntegerParameter; import com.arsdigita.util.parameter.Parameter; @@ -70,7 +70,7 @@ public final class HostLoader extends AbstractScript { } public static final void main(final String[] args) { - new Startup().run(); + new Runtime().startup(); final Session session = SessionManager.getSession(); // final ParameterLoader loader = new InteractiveParameterLoader diff --git a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java index d725db689..dce674e8d 100755 --- a/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java +++ b/ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java @@ -27,7 +27,7 @@ import com.arsdigita.persistence.TransactionContext; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.Script; import com.arsdigita.runtime.ScriptContext; -import com.arsdigita.runtime.Startup; +import com.arsdigita.runtime.Runtime; import com.arsdigita.util.JavaPropertyReader; import com.arsdigita.util.jdbc.Connections; import java.sql.Connection; @@ -57,9 +57,9 @@ public class Loader extends PackageLoader { load(conn, "ccm-ldn-freeform/" + dir + "-create.sql"); - final Startup startup = new Startup(); - startup.add(new Initializer()); - startup.run(); + final Runtime runtime = new Runtime(); + runtime.add(new Initializer()); + runtime.startup(); final Session session = SessionManager.getSession(); final TransactionContext txn = session.getTransactionContext();