You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/02/16 16:43:48 UTC
svn commit: r1245047 - in /openejb/trunk/openejb:
arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/ja...
Author: rmannibucau
Date: Thu Feb 16 15:43:47 2012
New Revision: 1245047
URL: http://svn.apache.org/viewvc?rev=1245047&view=rev
Log:
OPENEJB-1776 more option class usage
Modified:
openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java
openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
Modified: openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian-tomee/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Thu Feb 16 15:43:47 2012
@@ -91,7 +91,7 @@ public class Setup {
}
public static File downloadFile(String artifactName, String altUrl) {
- final String cache = SystemInstance.get().getProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER);
+ final String cache = SystemInstance.get().getOptions().get(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER, (String) null);
System.setProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER, "target");
try {
final File artifact = new MavenCache().getArtifact(artifactName, altUrl);
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DelegatePermissionCollection.java Thu Feb 16 15:43:47 2012
@@ -35,7 +35,7 @@ public class DelegatePermissionCollectio
try {
return (PermissionCollection) DelegatePermissionCollection.class.getClassLoader()
.loadClass(
- SystemInstance.get().getProperty(PERMISSION_COLLECTION_CLASS,
+ SystemInstance.get().getOptions().get(PERMISSION_COLLECTION_CLASS,
FastPermissionCollection.class.getName()))
.newInstance();
} catch (Exception cnfe) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ValidatorBuilder.java Thu Feb 16 15:43:47 2012
@@ -97,7 +97,7 @@ public final class ValidatorBuilder {
String providerClassName = info.providerClassName;
if (providerClassName == null) {
- providerClassName = SystemInstance.get().getProperty(VALIDATION_PROVIDER_KEY);
+ providerClassName = SystemInstance.get().getOptions().get(VALIDATION_PROVIDER_KEY, (String) null);
}
if (providerClassName != null) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java Thu Feb 16 15:43:47 2012
@@ -2792,7 +2792,7 @@ public class AnnotationDeployer implemen
}
private String getProperty(String key, String defaultValue) {
- String value = SystemInstance.get().getProperty(key, defaultValue);
+ String value = SystemInstance.get().getOptions().get(key, defaultValue);
final DeploymentModule module = getModule();
if (module instanceof EjbModule) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java Thu Feb 16 15:43:47 2012
@@ -581,10 +581,10 @@ class AppInfoBuilder {
private static String nonJtaDataSourceEnv;
static {
- providerEnv = SystemInstance.get().getProperty(PROVIDER_PROP);
- transactionTypeEnv = SystemInstance.get().getProperty(TRANSACTIONTYPE_PROP);
- jtaDataSourceEnv = SystemInstance.get().getProperty(JTADATASOURCE_PROP);
- nonJtaDataSourceEnv = SystemInstance.get().getProperty(NON_JTADATASOURCE_PROP);
+ providerEnv = SystemInstance.get().getOptions().get(PROVIDER_PROP, (String) null);
+ transactionTypeEnv = SystemInstance.get().getOptions().get(TRANSACTIONTYPE_PROP, (String) null);
+ jtaDataSourceEnv = SystemInstance.get().getOptions().get(JTADATASOURCE_PROP, (String) null);
+ nonJtaDataSourceEnv = SystemInstance.get().getOptions().get(NON_JTADATASOURCE_PROP, (String) null);
}
private static void apply(PersistenceUnitInfo info) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java Thu Feb 16 15:43:47 2012
@@ -1447,7 +1447,7 @@ public class AutoConfig implements Dynam
// and finally setting JtaManaged=false
//
- final String deduceJtaFromNonJta = SystemInstance.get().getProperty(AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY);
+ final String deduceJtaFromNonJta = SystemInstance.get().getOptions().get(AUTOCREATE_JTA_DATASOURCE_FROM_NON_JTA_ONE_KEY, (String) null);
if (nonJtaDataSourceId != null && jtaDataSourceId == null
// hibernate uses the fact that this ds is missing to get a non jta em instead of a JTA one
&& (deduceJtaFromNonJta == null || (deduceJtaFromNonJta != null && Boolean.parseBoolean(deduceJtaFromNonJta)))) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigUtils.java Thu Feb 16 15:43:47 2012
@@ -42,7 +42,7 @@ public class ConfigUtils {
public static Logger logger = Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources");
public static String searchForConfiguration() throws OpenEJBException {
- return searchForConfiguration(SystemInstance.get().getProperty("openejb.configuration"));
+ return searchForConfiguration(SystemInstance.get().getOptions().get("openejb.configuration", (String) null));
}
public static String searchForConfiguration(String path) throws OpenEJBException {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Thu Feb 16 15:43:47 2012
@@ -267,7 +267,7 @@ public class DeploymentLoader implements
private String getModuleId(final File file) {
final String filename = file.getName();
- return SystemInstance.get().getProperty(filename + ".moduleId");
+ return SystemInstance.get().getOptions().get(filename + ".moduleId", (String) null);
}
protected AppModule createAppModule(final File jarFile, final String jarPath) throws OpenEJBException {
@@ -842,8 +842,8 @@ public class DeploymentLoader implements
}
private void addWebservices(final WsModule wsModule) throws OpenEJBException {
- final String webservicesEnabled = SystemInstance.get().getProperty(ConfigurationFactory.WEBSERVICES_ENABLED, "true");
- if (!Boolean.parseBoolean(webservicesEnabled)) {
+ final boolean webservicesEnabled = SystemInstance.get().getOptions().get(ConfigurationFactory.WEBSERVICES_ENABLED, true);
+ if (!webservicesEnabled) {
wsModule.getAltDDs().remove("webservices.xml");
wsModule.setWebservices(null); // should be null already, but just for good measure
return;
@@ -1319,7 +1319,7 @@ public class DeploymentLoader implements
* @return the same map instance updated with alt dds
*/
public static Map<String, URL> altDDSources(final Map<String, URL> map, final boolean log) {
- final String prefixes = SystemInstance.get().getProperty(OPENEJB_ALTDD_PREFIX);
+ final String prefixes = SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
if (prefixes == null || prefixes.length() <= 0) return map;
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentsResolver.java Thu Feb 16 15:43:47 2012
@@ -45,7 +45,7 @@ import static org.apache.openejb.util.UR
* @version $Rev$ $Date$
*/
public class DeploymentsResolver implements DeploymentFilterable {
- private static final String EXCLUDE_INCLUDE_ORDER = SystemInstance.get().getProperty("openejb.exclude-include.order", "include-exclude");
+ private static final String EXCLUDE_INCLUDE_ORDER = SystemInstance.get().getOptions().get("openejb.exclude-include.order", "include-exclude");
private static final Logger logger = DeploymentLoader.logger;
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/MBeanDeployer.java Thu Feb 16 15:43:47 2012
@@ -16,20 +16,6 @@
*/
package org.apache.openejb.config;
-import java.lang.management.ManagementFactory;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import javax.management.MBean;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.api.internal.Internal;
@@ -42,6 +28,20 @@ import org.apache.openejb.util.LogCatego
import org.apache.openejb.util.Logger;
import org.apache.xbean.finder.ClassFinder;
+import javax.management.MBean;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+
public class MBeanDeployer implements DynamicDeployer {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG, MBeanDeployer.class);
private static final MBeanServer server = LocalMBeanServer.get();
@@ -129,7 +129,7 @@ public class MBeanDeployer implements Dy
Map<Class<?>, ObjectName> mbeans = new HashMap<Class<?>, ObjectName>();
- String listProp = SystemInstance.get().getProperty(OPENEJB_MBEAN_CLASSES_PROPERTY);
+ String listProp = SystemInstance.get().getOptions().get(OPENEJB_MBEAN_CLASSES_PROPERTY, (String) null);
if (OPENEJB_MBEAN_FORCE_FINDER.equals(listProp)) { // the classfinder costs too much to be used by default
logger.debug("loading mbeans using an annotation finder, you should maybe adjust {} system property",
OPENEJB_MBEAN_CLASSES_PROPERTY);
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java Thu Feb 16 15:43:47 2012
@@ -57,8 +57,8 @@ import java.util.Set;
*/
public class NewLoaderLogic {
private static final Logger logger = DeploymentLoader.logger;
- public static final String ADDITIONAL_EXCLUDES = SystemInstance.get().getProperty("openejb.additional.exclude");
- public static final String ADDITIONAL_INCLUDE = SystemInstance.get().getProperty("openejb.additional.include");
+ public static final String ADDITIONAL_EXCLUDES = SystemInstance.get().getOptions().get("openejb.additional.exclude", (String) null);
+ public static final String ADDITIONAL_INCLUDE = SystemInstance.get().getOptions().get("openejb.additional.include", (String) null);
private static final String EXCLUSION_FILE = "exclusions.list";
private static String[] exclusions = null;
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/OutputGeneratedDescriptors.java Thu Feb 16 15:43:47 2012
@@ -105,8 +105,8 @@ public class OutputGeneratedDescriptors
}
private File tempFile(String start, String end) throws IOException {
- if (SystemInstance.get().getProperty(OUTPUT_DESCRIPTORS_FOLDER) != null) {
- File tmp = new File(SystemInstance.get().getProperty(OUTPUT_DESCRIPTORS_FOLDER));
+ if (SystemInstance.get().getOptions().get(OUTPUT_DESCRIPTORS_FOLDER, (String) null) != null) {
+ File tmp = new File(SystemInstance.get().getOptions().get(OUTPUT_DESCRIPTORS_FOLDER, ""));
if (!tmp.exists()) {
if (!tmp.mkdirs()) {
throw new IOException("can't create " + tmp.getAbsolutePath());
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/AbstractSecurityService.java Thu Feb 16 15:43:47 2012
@@ -299,7 +299,7 @@ public abstract class AbstractSecuritySe
}
- String policyProvider = SystemInstance.get().getProperty("javax.security.jacc.policy.provider", JaccProvider.Policy.class.getName());
+ String policyProvider = SystemInstance.get().getOptions().get("javax.security.jacc.policy.provider", JaccProvider.Policy.class.getName());
try {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
Class policyClass = Class.forName(policyProvider, true, classLoader);
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/security/SecurityServiceImpl.java Thu Feb 16 15:43:47 2012
@@ -57,7 +57,7 @@ public class SecurityServiceImpl extends
}
protected static void installJaas() {
- String path = SystemInstance.get().getProperty("java.security.auth.login.config");
+ String path = SystemInstance.get().getOptions().get("java.security.auth.login.config", (String) null);
if (path != null) {
return;
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/timer/EjbTimerServiceImpl.java Thu Feb 16 15:43:47 2012
@@ -88,7 +88,7 @@ public class EjbTimerServiceImpl impleme
Scheduler scheduler = SystemInstance.get().getComponent(Scheduler.class);
if (scheduler == null) {
Properties properties = new Properties();
- properties.put(StdSchedulerFactory.PROP_THREAD_POOL_CLASS, SystemInstance.get().hasProperty(QUARTZ_THREAD_POOL_ADAPTER) ? SystemInstance.get().getProperty(QUARTZ_THREAD_POOL_ADAPTER)
+ properties.put(StdSchedulerFactory.PROP_THREAD_POOL_CLASS, SystemInstance.get().hasProperty(QUARTZ_THREAD_POOL_ADAPTER) ? SystemInstance.get().getOptions().get(QUARTZ_THREAD_POOL_ADAPTER, "")
: DefaultTimerThreadPoolAdapter.class.getName());
properties.put(StdSchedulerFactory.PROP_SCHED_INSTANCE_NAME, "OpenEJB-TimerService-Scheduler");
try {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/monitoring/LocalMBeanServer.java Thu Feb 16 15:43:47 2012
@@ -39,7 +39,7 @@ public class LocalMBeanServer implements
}
private static boolean isJMXActive() {
- return "true".equalsIgnoreCase(SystemInstance.get().getProperty(OPENEJB_JMX_ACTIVE, "true"));
+ return SystemInstance.get().getOptions().get(OPENEJB_JMX_ACTIVE, true);
}
private static MBeanServer s() {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/JuliLogStreamFactory.java Thu Feb 16 15:43:47 2012
@@ -41,7 +41,7 @@ public class JuliLogStreamFactory implem
}
try {
- if (SystemInstance.get().getProperty("openjpa.Log") == null) {
+ if (SystemInstance.get().getOptions().get("openjpa.Log", (String) null) == null) {
JuliLogStreamFactory.class.getClassLoader().loadClass("org.apache.openjpa.lib.log.LogFactoryAdapter");
System.setProperty("openjpa.Log", "org.apache.openejb.openjpa.JULOpenJPALogFactory");
}
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Log4jLogStreamFactory.java Thu Feb 16 15:43:47 2012
@@ -49,9 +49,7 @@ public class Log4jLogStreamFactory imple
public Log4jLogStreamFactory() {
try {
- final String prop = SystemInstance.get().getProperty("openejb.logger.external", "false");
- final boolean externalLogging = Boolean.parseBoolean(prop);
-
+ final boolean externalLogging = SystemInstance.get().getOptions().get("openejb.logger.external", false);
if (!externalLogging) configureInternal();
} catch (Exception e) {
// The fall back here is that if log4j.configuration system property is set, then that configuration file will be used.
@@ -64,7 +62,7 @@ public class Log4jLogStreamFactory imple
System.setProperty("openjpa.Log", "log4j");
System.setProperty("org.apache.cxf.Logger", "org.apache.cxf.common.logging.Log4jLogger");
- final boolean embedded = SystemInstance.get().getProperty("openejb.logging.embedded", "false").equalsIgnoreCase("true");
+ final boolean embedded = SystemInstance.get().getOptions().get("openejb.logging.embedded", false);
final File confDir = SystemInstance.get().getBase().getDirectory("conf");
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/Logger.java Thu Feb 16 15:43:47 2012
@@ -42,7 +42,7 @@ public class Logger {
public static void configure() {
//See if user factory has been specified
- String factoryName = SystemInstance.get().getProperty("openejb.log.factory", JuliLogStreamFactory.class.getName());
+ String factoryName = SystemInstance.get().getOptions().get("openejb.log.factory", JuliLogStreamFactory.class.getName());
if ("jul".equalsIgnoreCase(factoryName) || "juli".equalsIgnoreCase(factoryName)) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UpdateChecker.java Thu Feb 16 15:43:47 2012
@@ -7,8 +7,8 @@ import java.net.URL;
public class UpdateChecker implements Runnable {
private static final String SKIP_CHECK = "openejb.version.check";
- private static final String REPO_URL = SystemInstance.get().getProperty("openejb.version.check.repo.url", "http://repo1.maven.org/maven2/org/apache/openejb/");
- private static final String URL = SystemInstance.get().getProperty("openejb.version.check.url", REPO_URL + "openejb/maven-metadata.xml");
+ private static final String REPO_URL = SystemInstance.get().getOptions().get("openejb.version.check.repo.url", "http://repo1.maven.org/maven2/org/apache/openejb/");
+ private static final String URL = SystemInstance.get().getOptions().get("openejb.version.check.url", REPO_URL + "openejb/maven-metadata.xml");
private static final String TAG = "latest";
private static final String UNDEFINED = "undefined";
private static String LATEST = "undefined";
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/UrlCache.java Thu Feb 16 15:43:47 2012
@@ -16,6 +16,9 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.SystemInstance;
+
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
@@ -35,9 +38,6 @@ import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.apache.openejb.loader.FileUtils;
-import org.apache.openejb.loader.SystemInstance;
-
public class UrlCache {
private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB, UrlCache.class);
@@ -58,7 +58,7 @@ public class UrlCache {
if (value != null) {
antiJarLocking = Boolean.valueOf(value);
} else {
- final boolean embedded = Boolean.parseBoolean( SystemInstance.get().getProperty("openejb.embedded", "false"));
+ final boolean embedded = SystemInstance.get().getOptions().get("openejb.embedded", false);
// antiJarLocking is on by default when we are not embedded and running on windows
antiJarLocking = !embedded && System.getProperty("os.name", "unknown").toLowerCase().startsWith("windows");
}
Modified: openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java (original)
+++ openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/Embedder.java Thu Feb 16 15:43:47 2012
@@ -26,7 +26,7 @@ import java.util.Properties;
* @version $Revision$ $Date$
*/
public class Embedder {
- public static final String ADDITIONAL_LIB_FOLDER = SystemInstance.get().getProperty("openejb.additional.lib.folder", "additionallib");
+ public static final String ADDITIONAL_LIB_FOLDER = SystemInstance.get().getOptions().get("openejb.additional.lib.folder", "additionallib");
/**
* Represents the name of the class which implements org.apache.openejb.loader.Loader
Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java Thu Feb 16 15:43:47 2012
@@ -63,7 +63,7 @@ public class Server implements Service {
OpenEJB.init(props, new ServerFederation());
- if (SystemInstance.get().getProperty("openejb.nobanner") == null) {
+ if (SystemInstance.get().getOptions().get("openejb.nobanner", (String) null) == null) {
System.out.println("[init] OpenEJB Remote Server");
}
Modified: openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java (original)
+++ openejb/trunk/openejb/server/openejb-server/src/main/java/org/apache/openejb/server/SimpleServiceManager.java Thu Feb 16 15:43:47 2012
@@ -149,7 +149,7 @@ public class SimpleServiceManager extend
@Override
public synchronized void start(boolean block) throws ServiceException {
- boolean display = SystemInstance.get().getProperty("openejb.nobanner") == null;
+ boolean display = SystemInstance.get().getOptions().get("openejb.nobanner", (String) null) == null;
if (display) {
LOGGER.info(" ** Starting Services **");
Modified: openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java (original)
+++ openejb/trunk/openejb/server/openejb-ssh/src/main/java/org/apache/openejb/server/ssh/SSHServer.java Thu Feb 16 15:43:47 2012
@@ -34,7 +34,7 @@ import java.net.Socket;
import java.util.Properties;
public class SSHServer implements ServerService, SelfManaging {
- private static final String KEY_NAME = SystemInstance.get().getProperty("openejb.server.ssh.key", "ssh-key");
+ private static final String KEY_NAME = SystemInstance.get().getOptions().get("openejb.server.ssh.key", "ssh-key");
private int port;
private String bind;
Modified: openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java (original)
+++ openejb/trunk/openejb/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java Thu Feb 16 15:43:47 2012
@@ -86,7 +86,7 @@ public abstract class WsService implemen
private final Map<String,String> servletAddresses = new TreeMap<String,String>();
public WsService() {
- String format = SystemInstance.get().getProperty(WS_ADDRESS_FORMAT, "/{ejbDeploymentId}");
+ String format = SystemInstance.get().getOptions().get(WS_ADDRESS_FORMAT, "/{ejbDeploymentId}");
this.wsAddressTemplate = new StringTemplate(format);
}
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatLoader.java Thu Feb 16 15:43:47 2012
@@ -271,7 +271,7 @@ public class TomcatLoader implements Loa
}
});
- if (SystemInstance.get().getProperty(TOMEE_NOSHUTDOWNHOOK_PROP) != null) {
+ if (SystemInstance.get().getOptions().get(TOMEE_NOSHUTDOWNHOOK_PROP, (String) null) != null) {
final Field daemonField = Bootstrap.class.getDeclaredField("daemon");
final boolean acc = daemonField.isAccessible();
try {
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java Thu Feb 16 15:43:47 2012
@@ -802,7 +802,7 @@ public class TomcatWebAppBuilder impleme
final Pipeline pipeline = standardContext.getPipeline();
pipeline.addValve(new OpenEJBValve());
- final String[] valves = SystemInstance.get().getProperty("tomee.valves", "").split(" *, *");
+ final String[] valves = SystemInstance.get().getOptions().get("tomee.valves", "").split(" *, *");
for (String className : valves) {
if ("".equals(className)) continue;
try {
Modified: openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (original)
+++ openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Thu Feb 16 15:43:47 2012
@@ -50,7 +50,7 @@ public class Installer {
static {
// is the OpenEJB listener installed
- listenerInstalled = "OpenEJBListener".equals(SystemInstance.get().getProperty("openejb.embedder.source"));
+ listenerInstalled = "OpenEJBListener".equals(SystemInstance.get().getOptions().get("openejb.embedder.source", ""));
// is the OpenEJB javaagent installed
agentInstalled = invokeStaticNoArgMethod("org.apache.openejb.javaagent.Agent", "getInstrumentation") != null;
Modified: openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java?rev=1245047&r1=1245046&r2=1245047&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java (original)
+++ openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java Thu Feb 16 15:43:47 2012
@@ -55,7 +55,7 @@ import static org.apache.tomee.catalina.
import static org.apache.tomee.catalina.TomcatWebAppBuilder.IGNORE_CONTEXT;
public class TomcatWsRegistry implements WsRegistry {
- private static final String WEBSERVICE_SUB_CONTEXT = forceSlash(SystemInstance.get().getProperty("tomee.jaxws.subcontext", "/webservices"));
+ private static final String WEBSERVICE_SUB_CONTEXT = forceSlash(SystemInstance.get().getOptions().get("tomee.jaxws.subcontext", "/webservices"));
private static final boolean WEBSERVICE_OLDCONTEXT_ACTIVE = SystemInstance.get().getOptions().get("tomee.jaxws.oldsubcontext", false);