LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CCM-Core 

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
master
quasi 2013-06-06 16:37:27 +00:00
parent b124d88518
commit a82c036d3c
8 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms-types-siteproxy/src/com/arsdigita/cms/contenttypes/SiteProxyUpgrade630to631.java
View File

@ -5,7 +5,7 @@ import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.persistence.Session; import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext; import com.arsdigita.persistence.TransactionContext;
import com.arsdigita.runtime.Startup; import com.arsdigita.runtime.Runtime;
import com.arsdigita.xml.XML; import com.arsdigita.xml.XML;
public class SiteProxyUpgrade630to631 { 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"; private final static String SITE_PROXY = "/WEB-INF/content-types/com/arsdigita/cms/contenttypes/SiteProxy.xml";
public static void main(String[] args) { public static void main(String[] args) {
new Startup().run(); new Runtime().startup();
final Session session = SessionManager.getSession(); final Session session = SessionManager.getSession();
final TransactionContext tc = session.getTransactionContext(); final TransactionContext tc = session.getTransactionContext();
try { try {

6
ccm-core/src/com/arsdigita/packaging/Load.java
View File

@ -30,7 +30,7 @@ import com.arsdigita.runtime.InteractiveParameterReader;
import com.arsdigita.runtime.ConfigRegistry; import com.arsdigita.runtime.ConfigRegistry;
import com.arsdigita.runtime.RegistryConfig; import com.arsdigita.runtime.RegistryConfig;
import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.runtime.Startup; import com.arsdigita.runtime.Runtime;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.util.JavaPropertyReader; import com.arsdigita.util.JavaPropertyReader;
import com.arsdigita.util.jdbc.Connections; import com.arsdigita.util.jdbc.Connections;
@ -457,7 +457,7 @@ class Load extends Command {
if (all || line.hasOption("data")) { if (all || line.hasOption("data")) {
if (ssn == null) { if (ssn == null) {
new Startup().run(); new Runtime().startup();
ssn = SessionManager.getSession(); ssn = SessionManager.getSession();
} }
@ -477,7 +477,7 @@ class Load extends Command {
} }
if (all || line.hasOption("init")) { if (all || line.hasOption("init")) {
if (ssn == null) { if (ssn == null) {
new Startup().run(); new Runtime().startup();
ssn = SessionManager.getSession(); ssn = SessionManager.getSession();
} }
for (int i = 0; i < sorted.length; i++) { for (int i = 0; i < sorted.length; i++) {

4
ccm-core/src/com/arsdigita/packaging/Loader.java
View File

@ -31,7 +31,7 @@ import com.arsdigita.runtime.CompoundInitializer;
import com.arsdigita.runtime.Initializer; import com.arsdigita.runtime.Initializer;
import com.arsdigita.runtime.Script; import com.arsdigita.runtime.Script;
import com.arsdigita.runtime.ScriptContext; import com.arsdigita.runtime.ScriptContext;
import com.arsdigita.runtime.Startup; import com.arsdigita.runtime.Runtime;
import com.arsdigita.util.Classes; import com.arsdigita.util.Classes;
import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.util.parameter.ParameterReader; import com.arsdigita.util.parameter.ParameterReader;
@ -141,7 +141,7 @@ class Loader {
s_log.info("Running initializer " + init); s_log.info("Running initializer " + init);
ini.add((Initializer) Classes.newInstance(init)); ini.add((Initializer) Classes.newInstance(init));
} }
Startup.run(ssn, ini); Runtime.startup(ssn, ini);
TransactionContext txn = ssn.getTransactionContext(); TransactionContext txn = ssn.getTransactionContext();
txn.beginTxn(); txn.beginTxn();

4
ccm-core/src/com/arsdigita/packaging/Status.java
View File

@ -22,7 +22,7 @@ import com.arsdigita.runtime.RegistryConfig;
import com.arsdigita.persistence.Session; import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.runtime.ScriptContext; import com.arsdigita.runtime.ScriptContext;
import com.arsdigita.runtime.Startup; import com.arsdigita.runtime.Runtime;
/** /**
* Status * Status
@ -69,7 +69,7 @@ class Status extends Command {
} }
if (!passed) { return false; } if (!passed) { return false; }
new Startup().run(); new Runtime().startup();
Session ssn = SessionManager.getSession(); Session ssn = SessionManager.getSession();
for (int i = 0; i < checks.length; i++) { for (int i = 0; i < checks.length; i++) {

5
ccm-core/src/com/arsdigita/util/cmd/Program.java
View File

@ -15,7 +15,7 @@
package com.arsdigita.util.cmd; 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.Options;
import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.HelpFormatter;
@ -263,8 +263,7 @@ public abstract class Program {
try { try {
if (m_startup) { if (m_startup) {
Startup startup = new Startup(); new Runtime().startup();
startup.run();
} }
doRun(cmdLine); doRun(cmdLine);

4
ccm-core/src/com/arsdigita/web/ApplicationTool.java
View File

@ -21,7 +21,7 @@ package com.arsdigita.web;
import com.arsdigita.persistence.Session; import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext; import com.arsdigita.persistence.TransactionContext;
import com.arsdigita.runtime.Startup; import com.arsdigita.runtime.Runtime;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
@ -41,7 +41,7 @@ public final class ApplicationTool {
System.exit(1); System.exit(1);
} }
new Startup().run(); new Runtime().startup();
final Session session = SessionManager.getSession(); final Session session = SessionManager.getSession();
final TransactionContext transaction = session.getTransactionContext(); final TransactionContext transaction = session.getTransactionContext();

4
ccm-core/src/com/arsdigita/web/HostLoader.java
View File

@ -28,7 +28,7 @@ import com.arsdigita.runtime.AbstractScript;
import com.arsdigita.runtime.InteractiveParameterReader; import com.arsdigita.runtime.InteractiveParameterReader;
import com.arsdigita.runtime.Script; import com.arsdigita.runtime.Script;
import com.arsdigita.runtime.ScriptContext; 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.ErrorList;
import com.arsdigita.util.parameter.IntegerParameter; import com.arsdigita.util.parameter.IntegerParameter;
import com.arsdigita.util.parameter.Parameter; import com.arsdigita.util.parameter.Parameter;
@ -70,7 +70,7 @@ public final class HostLoader extends AbstractScript {
} }
public static final void main(final String[] args) { public static final void main(final String[] args) {
new Startup().run(); new Runtime().startup();
final Session session = SessionManager.getSession(); final Session session = SessionManager.getSession();
// final ParameterLoader loader = new InteractiveParameterLoader // final ParameterLoader loader = new InteractiveParameterLoader

8
ccm-ldn-freeform/src/com/arsdigita/london/cms/freeform/Loader.java
View File

@ -27,7 +27,7 @@ import com.arsdigita.persistence.TransactionContext;
import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.runtime.Script; import com.arsdigita.runtime.Script;
import com.arsdigita.runtime.ScriptContext; import com.arsdigita.runtime.ScriptContext;
import com.arsdigita.runtime.Startup; import com.arsdigita.runtime.Runtime;
import com.arsdigita.util.JavaPropertyReader; import com.arsdigita.util.JavaPropertyReader;
import com.arsdigita.util.jdbc.Connections; import com.arsdigita.util.jdbc.Connections;
import java.sql.Connection; import java.sql.Connection;
@ -57,9 +57,9 @@ public class Loader extends PackageLoader {
load(conn, "ccm-ldn-freeform/" + dir + "-create.sql"); load(conn, "ccm-ldn-freeform/" + dir + "-create.sql");
final Startup startup = new Startup(); final Runtime runtime = new Runtime();
startup.add(new Initializer()); runtime.add(new Initializer());
startup.run(); runtime.startup();
final Session session = SessionManager.getSession(); final Session session = SessionManager.getSession();
final TransactionContext txn = session.getTransactionContext(); final TransactionContext txn = session.getTransactionContext();