You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/09/14 19:19:52 UTC
tomee git commit: Move constructor
Repository: tomee
Updated Branches:
refs/heads/tomee-1.7.x 54ca4829e -> d15a4421b
Move constructor
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d15a4421
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d15a4421
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d15a4421
Branch: refs/heads/tomee-1.7.x
Commit: d15a4421b3528287d69f9b6ce2bd1cf872f57a2b
Parents: 54ca482
Author: AndyGee <an...@gmx.de>
Authored: Mon Sep 14 19:19:30 2015 +0200
Committer: AndyGee <an...@gmx.de>
Committed: Mon Sep 14 19:19:30 2015 +0200
----------------------------------------------------------------------
.../openejb/assembler/classic/Assembler.java | 76 ++++++++++----------
1 file changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d15a4421/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
index ec1273f..cf36240 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
@@ -287,6 +287,44 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
//Used outside of this class
private final Logger logger;
+ protected SafeToolkit toolkit = SafeToolkit.getToolkit("Assembler");
+ protected OpenEjbConfiguration config;
+
+ public Assembler() {
+ this(new IvmJndiFactory());
+ }
+
+ public Assembler(final JndiFactory jndiFactory) {
+ logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, Assembler.class);
+ skipLoaderIfPossible = "true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.classloader.skip-app-loader-if-possible", "true"));
+ persistenceClassLoaderHandler = new PersistenceClassLoaderHandlerImpl();
+
+ installNaming();
+
+ final SystemInstance system = SystemInstance.get();
+
+ system.setComponent(org.apache.openejb.spi.Assembler.class, this);
+ system.setComponent(Assembler.class, this);
+
+ containerSystem = new CoreContainerSystem(jndiFactory);
+ system.setComponent(ContainerSystem.class, containerSystem);
+
+ jndiBuilder = new JndiBuilder(containerSystem.getJNDIContext());
+
+ setConfiguration(new OpenEjbConfiguration());
+
+ final ApplicationServer appServer = system.getComponent(ApplicationServer.class);
+ if (appServer == null) {
+ system.setComponent(ApplicationServer.class, new ServerFederation());
+ }
+
+ system.setComponent(EjbResolver.class, new EjbResolver(null, EjbResolver.Scope.GLOBAL));
+
+ installExtensions();
+
+ system.fireEvent(new AssemblerCreated());
+ }
+
@Override
public ContainerSystem getContainerSystem() {
return containerSystem;
@@ -328,44 +366,6 @@ public class Assembler extends AssemblerTool implements org.apache.openejb.spi.A
}
}
- protected SafeToolkit toolkit = SafeToolkit.getToolkit("Assembler");
- protected OpenEjbConfiguration config;
-
- public Assembler() {
- this(new IvmJndiFactory());
- }
-
- public Assembler(final JndiFactory jndiFactory) {
- logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP, Assembler.class);
- skipLoaderIfPossible = "true".equalsIgnoreCase(SystemInstance.get().getProperty("openejb.classloader.skip-app-loader-if-possible", "true"));
- persistenceClassLoaderHandler = new PersistenceClassLoaderHandlerImpl();
-
- installNaming();
-
- final SystemInstance system = SystemInstance.get();
-
- system.setComponent(org.apache.openejb.spi.Assembler.class, this);
- system.setComponent(Assembler.class, this);
-
- containerSystem = new CoreContainerSystem(jndiFactory);
- system.setComponent(ContainerSystem.class, containerSystem);
-
- jndiBuilder = new JndiBuilder(containerSystem.getJNDIContext());
-
- setConfiguration(new OpenEjbConfiguration());
-
- final ApplicationServer appServer = system.getComponent(ApplicationServer.class);
- if (appServer == null) {
- system.setComponent(ApplicationServer.class, new ServerFederation());
- }
-
- system.setComponent(EjbResolver.class, new EjbResolver(null, EjbResolver.Scope.GLOBAL));
-
- installExtensions();
-
- system.fireEvent(new AssemblerCreated());
- }
-
private void installExtensions() {
try {
final Collection<URL> urls = NewLoaderLogic.applyBuiltinExcludes(new UrlSet(Assembler.class.getClassLoader()).excludeJvm()).getUrls();