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 2016/02/18 17:43:45 UTC
tomee git commit: Avoid deprecated
Repository: tomee
Updated Branches:
refs/heads/master 2b736c4c4 -> 2403bcd9b
Avoid deprecated
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/2403bcd9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/2403bcd9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/2403bcd9
Branch: refs/heads/master
Commit: 2403bcd9b537abc5d602c3c55bb7d400c9941cfb
Parents: 2b736c4
Author: AndyGee <an...@gmx.de>
Authored: Thu Feb 18 17:42:07 2016 +0100
Committer: AndyGee <an...@gmx.de>
Committed: Thu Feb 18 17:43:10 2016 +0100
----------------------------------------------------------------------
.../openejb/config/ConfigurationFactory.java | 19 +++++++++++++------
.../openejb/config/DeploymentsResolver.java | 16 +++++++++++-----
2 files changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/2403bcd9/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
index c47873f..c3196f0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
@@ -427,8 +427,9 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
}
configLocation = ConfigUtils.searchForConfiguration(configLocation);
+
if (configLocation != null) {
- logger.info("openejb configuration file is '" + configLocation + "'");
+ logger.info("TomEE configuration file is '" + configLocation + "'");
props.setProperty(CONFIGURATION_PROPERTY, configLocation);
}
@@ -439,7 +440,11 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
sys.containerSystem.containers.add(serviceInfo);
} else if (!offline) {
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- assembler.createContainer(serviceInfo);
+ if (assembler != null) {
+ assembler.createContainer(serviceInfo);
+ }else{
+ throw new OpenEJBException("ContainerInfo: Assembler has not been defined");
+ }
}
}
@@ -448,7 +453,11 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
sys.facilities.resources.add(serviceInfo);
} else if (!offline) {
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- assembler.createResource(serviceInfo);
+ if (assembler != null) {
+ assembler.createResource(serviceInfo);
+ }else{
+ throw new OpenEJBException("ResourceInfo: Assembler has not been defined");
+ }
}
}
@@ -684,10 +693,8 @@ public class ConfigurationFactory implements OpenEjbConfigurationFactory {
}
public ArrayList<File> getModulesFromClassPath(final List<File> declaredApps, final ClassLoader classLoader) {
- final FileUtils base = SystemInstance.get().getBase();
- final List<URL> classpathAppsUrls = new ArrayList<URL>();
- DeploymentsResolver.loadFromClasspath(base, classpathAppsUrls, classLoader);
+ final List<URL> classpathAppsUrls = DeploymentsResolver.loadFromClasspath(classLoader);
final ArrayList<File> jarFiles = new ArrayList<File>();
for (final URL path : classpathAppsUrls) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/2403bcd9/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
index d045a23..95b052e 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
@@ -289,7 +289,7 @@ public class DeploymentsResolver implements DeploymentFilterable {
} else if (time < 10000) {
logger.warning("Searched " + urlSize + " classpath urls in " + time + " milliseconds. Average " + time / urlSize + " milliseconds per url.");
logger.warning("Consider adjusting your " +
- CLASSPATH_EXCLUDE + " and " + CLASSPATH_INCLUDE + " settings. Current settings: exclude='" +
+ CLASSPATH_EXCLUDE + " and " + CLASSPATH_INCLUDE + " settings. Current settings: exclude='" +
searchResult.exclude + "', include='" + searchResult.include + "'");
} else {
logger.fatal("Searched " + urlSize + " classpath urls in " + time + " milliseconds. Average " + time / urlSize + " milliseconds per url. TOO LONG!");
@@ -312,11 +312,17 @@ public class DeploymentsResolver implements DeploymentFilterable {
return new ArrayList<>();
}
+ /**
+ * Use {@link #loadFromClasspath(ClassLoader)}
+ */
@Deprecated
public static void loadFromClasspath(final FileUtils ignored, final List<URL> jarList, final ClassLoader classLoader) {
jarList.addAll(loadFromClasspath(classLoader));
}
+ /**
+ * Use {@link #processUrls(String, List, ClassLoader, Set, List)}
+ */
@Deprecated
public static void processUrls(final String caller,
final List<URL> urls,
@@ -352,10 +358,10 @@ public class DeploymentsResolver implements DeploymentFilterable {
final Class<? extends DeploymentModule> moduleType = deploymentLoader.discoverModuleType(url, classLoader, requireDescriptors);
if (AppModule.class.isAssignableFrom(moduleType) ||
- EjbModule.class.isAssignableFrom(moduleType) ||
- PersistenceModule.class.isAssignableFrom(moduleType) ||
- ConnectorModule.class.isAssignableFrom(moduleType) ||
- ClientModule.class.isAssignableFrom(moduleType)) {
+ EjbModule.class.isAssignableFrom(moduleType) ||
+ PersistenceModule.class.isAssignableFrom(moduleType) ||
+ ConnectorModule.class.isAssignableFrom(moduleType) ||
+ ClientModule.class.isAssignableFrom(moduleType)) {
final URL archive = toFileUrl(url);