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 15:58:37 UTC
svn commit: r1245008 - 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 14:58:36 2012
New Revision: 1245008
URL: http://svn.apache.org/viewvc?rev=1245008&view=rev
Log:
OPENEJB-1776 replacing System.getProperty by SystemInstance.get().getProperty
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/DeploymentExceptionManager.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/AppInfoBuilder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.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/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/config/ValidateModules.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.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/monitoring/LocalMBeanServer.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.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-loader/src/main/java/org/apache/openejb/loader/Embedder.java
openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.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/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.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-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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -17,6 +17,7 @@
package org.apache.openejb.arquillian.common;
import org.apache.openejb.loader.ProvisioningUtil;
+import org.apache.openejb.loader.SystemInstance;
import org.jboss.arquillian.container.spi.client.container.LifecycleException;
import java.io.BufferedReader;
@@ -90,7 +91,7 @@ public class Setup {
}
public static File downloadFile(String artifactName, String altUrl) {
- final String cache = System.getProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER);
+ final String cache = SystemInstance.get().getProperty(ProvisioningUtil.OPENEJB_DEPLOYER_CACHE_FOLDER);
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -1,5 +1,6 @@
package org.apache.openejb.assembler.classic;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.ArrayEnumeration;
import java.security.Permission;
@@ -34,7 +35,7 @@ public class DelegatePermissionCollectio
try {
return (PermissionCollection) DelegatePermissionCollection.class.getClassLoader()
.loadClass(
- System.getProperty(PERMISSION_COLLECTION_CLASS,
+ SystemInstance.get().getProperty(PERMISSION_COLLECTION_CLASS,
FastPermissionCollection.class.getName()))
.newInstance();
} catch (Exception cnfe) {
@@ -44,7 +45,7 @@ public class DelegatePermissionCollectio
}
public static class FastPermissionCollection extends PermissionCollection {
- private static final int MAX_CACHE_SIZE = Integer.getInteger("openejb.permission-collection.cache.size", 3000);
+ private static final int MAX_CACHE_SIZE = Integer.parseInt(SystemInstance.get().getProperty("openejb.permission-collection.cache.size", "3000"));
private final List<Permission> permissions = new ArrayList<Permission>();
private final Map<Permission, Boolean> alreadyEvaluatedPermissions = new ConcurrentHashMap<Permission, Boolean>();
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/DeploymentExceptionManager.java Thu Feb 16 14:58:36 2012
@@ -17,6 +17,8 @@
package org.apache.openejb.assembler.classic;
+import org.apache.openejb.loader.SystemInstance;
+
import java.util.LinkedHashMap;
import java.util.Map;
@@ -27,7 +29,7 @@ import java.util.Map;
*
*/
public class DeploymentExceptionManager {
- private static final int MAX_SIZE = Integer.getInteger("tomee.deployement-exception-max-size", 10);
+ private static final int MAX_SIZE = Integer.parseInt(SystemInstance.get().getProperty("tomee.deployement-exception-max-size", "10"));
private final Map<AppInfo, Exception> deploymentException = new LinkedHashMap<AppInfo, Exception>() {
@Override // just to avoid potential memory leak
protected boolean removeEldestEntry(Map.Entry<AppInfo, Exception> eldest) {
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.assembler.cla
import org.apache.openejb.jee.bval.PropertyType;
import org.apache.openejb.jee.bval.ValidationConfigType;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
@@ -96,7 +97,7 @@ public final class ValidatorBuilder {
String providerClassName = info.providerClassName;
if (providerClassName == null) {
- providerClassName = System.getProperty(VALIDATION_PROVIDER_KEY);
+ providerClassName = SystemInstance.get().getProperty(VALIDATION_PROVIDER_KEY);
}
if (providerClassName != null) {
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -581,10 +581,10 @@ class AppInfoBuilder {
private static String nonJtaDataSourceEnv;
static {
- providerEnv = System.getProperty(PROVIDER_PROP);
- transactionTypeEnv = System.getProperty(TRANSACTIONTYPE_PROP);
- jtaDataSourceEnv = System.getProperty(JTADATASOURCE_PROP);
- nonJtaDataSourceEnv = System.getProperty(NON_JTADATASOURCE_PROP);
+ 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);
}
private static void apply(PersistenceUnitInfo info) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Feb 16 14:58:36 2012
@@ -120,7 +120,7 @@ public class ConfigurationFactory implem
static final String OFFLINE_PROPERTY = "openejb.offline";
public ConfigurationFactory() {
- this(Boolean.getBoolean(ConfigurationFactory.OFFLINE_PROPERTY));
+ this(Boolean.parseBoolean(SystemInstance.get().getProperty(ConfigurationFactory.OFFLINE_PROPERTY, "false")));
}
public ConfigurationFactory(final boolean offline) {
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -267,7 +267,7 @@ public class DeploymentLoader implements
private String getModuleId(final File file) {
final String filename = file.getName();
- return System.getProperty(filename + ".moduleId");
+ return SystemInstance.get().getProperty(filename + ".moduleId");
}
protected AppModule createAppModule(final File jarFile, final String jarPath) throws OpenEJBException {
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=1245008&r1=1245007&r2=1245008&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 14:58:36 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 = System.getProperty("openejb.exclude-include.order", "include-exclude");
+ private static final String EXCLUDE_INCLUDE_ORDER = SystemInstance.get().getProperty("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/NewLoaderLogic.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1245008&r1=1245007&r2=1245008&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 14:58:36 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 = System.getProperty("openejb.additional.exclude");
- public static final String ADDITIONAL_INCLUDE = System.getProperty("openejb.additional.include");
+ public static final String ADDITIONAL_EXCLUDES = SystemInstance.get().getProperty("openejb.additional.exclude");
+ public static final String ADDITIONAL_INCLUDE = SystemInstance.get().getProperty("openejb.additional.include");
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -105,8 +105,8 @@ public class OutputGeneratedDescriptors
}
private File tempFile(String start, String end) throws IOException {
- if (System.getProperty(OUTPUT_DESCRIPTORS_FOLDER) != null) {
- File tmp = new File(System.getProperty(OUTPUT_DESCRIPTORS_FOLDER));
+ if (SystemInstance.get().getProperty(OUTPUT_DESCRIPTORS_FOLDER) != null) {
+ File tmp = new File(SystemInstance.get().getProperty(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/config/ValidateModules.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/ValidateModules.java Thu Feb 16 14:58:36 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.config;
import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.rules.CheckClassLoading;
+import org.apache.openejb.loader.SystemInstance;
/**
* @version $Rev$ $Date$
@@ -28,7 +29,7 @@ public class ValidateModules implements
public AppModule deploy(AppModule appModule) throws OpenEJBException {
final AppValidator validator;
- if (!Boolean.getBoolean(OPENEJB_CHECK_CLASSLOADER)) {
+ if (!Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_CHECK_CLASSLOADER, "false"))) {
validator = new AppValidator();
} else {
validator = new AppValidator(new CheckClassLoading());
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckClassLoading.java Thu Feb 16 14:58:36 2012
@@ -23,6 +23,7 @@ import org.apache.openejb.config.AppModu
import org.apache.openejb.config.ClientModule;
import org.apache.openejb.config.EjbModule;
import org.apache.openejb.config.WebModule;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.URLs;
import org.apache.xbean.finder.UrlSet;
@@ -206,7 +207,7 @@ public class CheckClassLoading extends V
public String toScreen() {
final String str = "both files " + file1 + '\''
+ " and " + file2 + '\'';
- if (Boolean.getBoolean(OPENEJB_CHECK_CLASSLOADER_VERBOSE)) {
+ if (Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_CHECK_CLASSLOADER_VERBOSE, "false"))) {
return str + " contains files=" + files;
}
return str;
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -299,7 +299,7 @@ public abstract class AbstractSecuritySe
}
- String policyProvider = System.getProperty("javax.security.jacc.policy.provider", JaccProvider.Policy.class.getName());
+ String policyProvider = SystemInstance.get().getProperty("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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -18,6 +18,7 @@ package org.apache.openejb.core.security
import org.apache.openejb.core.security.jaas.UsernamePasswordCallbackHandler;
import org.apache.openejb.core.security.jacc.BasicJaccProvider;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.ConfUtils;
import javax.security.auth.Subject;
@@ -56,7 +57,7 @@ public class SecurityServiceImpl extends
}
protected static void installJaas() {
- String path = System.getProperty("java.security.auth.login.config");
+ String path = SystemInstance.get().getProperty("java.security.auth.login.config");
if (path != null) {
return;
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -17,6 +17,8 @@
package org.apache.openejb.monitoring;
+import org.apache.openejb.loader.SystemInstance;
+
import javax.management. *;
import javax.management.loading.ClassLoaderRepository;
import java.io.ObjectInputStream;
@@ -37,7 +39,7 @@ public class LocalMBeanServer implements
}
private static boolean isJMXActive() {
- return "true".equalsIgnoreCase(System.getProperty(OPENEJB_JMX_ACTIVE, "true"));
+ return "true".equalsIgnoreCase(SystemInstance.get().getProperty(OPENEJB_JMX_ACTIVE, "true"));
}
private static MBeanServer s() {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/DataSourceFactory.java Thu Feb 16 14:58:36 2012
@@ -24,7 +24,6 @@ import org.apache.commons.dbcp.managed.T
import org.apache.commons.dbcp.managed.XAConnectionFactory;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.resource.XAResourceWrapper;
-import org.apache.openejb.util.LogCategory;
import org.apache.xbean.recipe.ObjectRecipe;
import org.apache.xbean.recipe.Option;
@@ -47,7 +46,7 @@ public class DataSourceFactory {
final org.apache.commons.dbcp.BasicDataSource ds;
- if (DataSource.class.isAssignableFrom(impl) && !Boolean.parseBoolean(System.getProperty("org.apache.openejb.resource.jdbc.hot.deploy", "false"))) {
+ if (DataSource.class.isAssignableFrom(impl) && !Boolean.parseBoolean(SystemInstance.get().getProperty("org.apache.openejb.resource.jdbc.hot.deploy", "false"))) {
final ObjectRecipe recipe = new ObjectRecipe(impl);
recipe.allow(Option.CASE_INSENSITIVE_PROPERTIES);
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -16,6 +16,8 @@
*/
package org.apache.openejb.util;
+import org.apache.openejb.loader.SystemInstance;
+
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.LogManager;
@@ -39,7 +41,7 @@ public class JuliLogStreamFactory implem
}
try {
- if (System.getProperty("openjpa.Log") == null) {
+ if (SystemInstance.get().getProperty("openjpa.Log") == 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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -49,7 +49,7 @@ public class Log4jLogStreamFactory imple
public Log4jLogStreamFactory() {
try {
- final String prop = System.getProperty("openejb.logger.external", "false");
+ final String prop = SystemInstance.get().getProperty("openejb.logger.external", "false");
final boolean externalLogging = Boolean.parseBoolean(prop);
if (!externalLogging) configureInternal();
@@ -64,7 +64,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 = System.getProperty("openejb.logging.embedded", "false").equalsIgnoreCase("true");
+ final boolean embedded = SystemInstance.get().getProperty("openejb.logging.embedded", "false").equalsIgnoreCase("true");
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -42,7 +42,7 @@ public class Logger {
public static void configure() {
//See if user factory has been specified
- String factoryName = System.getProperty("openejb.log.factory", JuliLogStreamFactory.class.getName());
+ String factoryName = SystemInstance.get().getProperty("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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -1,13 +1,14 @@
package org.apache.openejb.util;
import org.apache.openejb.loader.IO;
+import org.apache.openejb.loader.SystemInstance;
import java.net.URL;
public class UpdateChecker implements Runnable {
private static final String SKIP_CHECK = "openejb.version.check";
- private static final String REPO_URL = System.getProperty("openejb.version.check.repo.url", "http://repo1.maven.org/maven2/org/apache/openejb/");
- private static final String URL = System.getProperty("openejb.version.check.url", REPO_URL + "openejb/maven-metadata.xml");
+ 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 TAG = "latest";
private static final String UNDEFINED = "undefined";
private static String LATEST = "undefined";
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -26,7 +26,7 @@ import java.util.Properties;
* @version $Revision$ $Date$
*/
public class Embedder {
- public static final String ADDITIONAL_LIB_FOLDER = System.getProperty("openejb.additional.lib.folder", "additionallib");
+ public static final String ADDITIONAL_LIB_FOLDER = SystemInstance.get().getProperty("openejb.additional.lib.folder", "additionallib");
/**
* Represents the name of the class which implements org.apache.openejb.loader.Loader
Modified: openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java (original)
+++ openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java Thu Feb 16 14:58:36 2012
@@ -46,7 +46,7 @@ import java.util.zip.ZipOutputStream;
* @version $Revision$ $Date$
*/
public class IO {
- private static final int MAX_TIMEOUT = Integer.getInteger("openejb.io.util.timeout", 5000);
+ private static final int MAX_TIMEOUT = Integer.parseInt(SystemInstance.get().getProperty("openejb.io.util.timeout", "5000"));
public static String readFileAsString(final URI uri) throws IOException {
final StringBuilder builder = new StringBuilder("");
Modified: openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java Thu Feb 16 14:58:36 2012
@@ -36,7 +36,7 @@ import java.util.Properties;
public class Activator implements BundleActivator {
private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class);
private static final String SERVICE_MANAGER_NAME = "org.apache.openejb.server.ServiceManager";
- private static final long TRACKER_TIMEOUT = Integer.getInteger("openejb.osgi.tracker.timeout", 30);
+ private static final long TRACKER_TIMEOUT = Integer.parseInt(SystemInstance.get().getProperty("openejb.osgi.tracker.timeout", "30"));
private OpenEJBInstance openejb;
private Object serviceManager;
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -63,7 +63,7 @@ public class Server implements Service {
OpenEJB.init(props, new ServerFederation());
- if (System.getProperty("openejb.nobanner") == null) {
+ if (SystemInstance.get().getProperty("openejb.nobanner") == 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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -149,7 +149,7 @@ public class SimpleServiceManager extend
@Override
public synchronized void start(boolean block) throws ServiceException {
- boolean display = System.getProperty("openejb.nobanner") == null;
+ boolean display = SystemInstance.get().getProperty("openejb.nobanner") == 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=1245008&r1=1245007&r2=1245008&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 14:58:36 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 = System.getProperty("openejb.server.ssh.key", "ssh-key");
+ private static final String KEY_NAME = SystemInstance.get().getProperty("openejb.server.ssh.key", "ssh-key");
private int port;
private String bind;
Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java?rev=1245008&r1=1245007&r2=1245008&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/OpenEJBContextConfig.java Thu Feb 16 14:58:36 2012
@@ -20,6 +20,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.deploy.WebXml;
import org.apache.catalina.startup.ContextConfig;
import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.util.reflection.ReflectionUtil;
import javax.servlet.descriptor.JspPropertyGroupDescriptor;
@@ -56,8 +57,8 @@ public class OpenEJBContextConfig extend
}
@Override public int getMajorVersion() {
- return Integer.getInteger(prefix + "." + OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY,
- Integer.getInteger(OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY, super.getMajorVersion()));
+ return Integer.parseInt(SystemInstance.get().getProperty(prefix + "." + OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY),
+ Integer.parseInt(SystemInstance.get().getProperty(OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY, Integer.toString(super.getMajorVersion()))));
}
}
}
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -235,7 +235,7 @@ public class TomcatLoader implements Loa
// and modifies JNDI ENC references to OpenEJB managed objects such as EJBs.
processRunningApplications(tomcatWebAppBuilder, standardServer);
- if (Boolean.getBoolean("openejb.servicemanager.enabled")) {
+ if (Boolean.parseBoolean(SystemInstance.get().getProperty("openejb.servicemanager.enabled", "false"))) {
manager = ServiceManager.getManager();
manager.init();
manager.start(false);
@@ -271,7 +271,7 @@ public class TomcatLoader implements Loa
}
});
- if (System.getProperty(TOMEE_NOSHUTDOWNHOOK_PROP) != null) {
+ if (SystemInstance.get().getProperty(TOMEE_NOSHUTDOWNHOOK_PROP) != 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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -392,7 +392,7 @@ public class TomcatWebAppBuilder impleme
* @param context the servlet context to init.
*/
private static void addMyFacesDefaultParameters(ClassLoader classLoader, ServletContext context) {
- if (!Boolean.getBoolean(OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES)) {
+ if (!Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES, "false"))) {
if (classLoader != null) {
try { // if myfaces is not here we doesn't need any trick
classLoader.loadClass("org.apache.myfaces.shared.config.MyfacesConfig");
@@ -477,7 +477,7 @@ public class TomcatWebAppBuilder impleme
@Override
public void init(StandardContext standardContext) {
replaceHashSetForJspPropertyGroupsByLinkedHashSet(standardContext);
- standardContext.setCrossContext(Boolean.parseBoolean(System.getProperty(OPENEJB_CROSSCONTEXT_PROPERTY, "false")));
+ standardContext.setCrossContext(Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_CROSSCONTEXT_PROPERTY, "false")));
standardContext.setNamingResources(new OpenEJBNamingResource());
if (standardContext.getConfigFile() == null) {
@@ -526,7 +526,7 @@ public class TomcatWebAppBuilder impleme
@Override
public void beforeStart(StandardContext standardContext) {
ServletContext sc = standardContext.getServletContext();
- if (sc != null && !Boolean.parseBoolean(System.getProperty(OPENEJB_JSESSION_ID_SUPPORT, "true"))) {
+ if (sc != null && !Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_JSESSION_ID_SUPPORT, "true"))) {
Set<SessionTrackingMode> defaultTrackingModes = sc.getEffectiveSessionTrackingModes();
if (defaultTrackingModes.contains(SessionTrackingMode.URL)) {
Set<SessionTrackingMode> newModes = new HashSet<SessionTrackingMode>();
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=1245008&r1=1245007&r2=1245008&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 14:58:36 2012
@@ -36,6 +36,7 @@ import org.apache.catalina.core.Standard
import org.apache.catalina.deploy.LoginConfig;
import org.apache.catalina.deploy.SecurityCollection;
import org.apache.catalina.deploy.SecurityConstraint;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.httpd.HttpListener;
import org.apache.openejb.server.webservices.WsRegistry;
import org.apache.openejb.server.webservices.WsServlet;
@@ -54,8 +55,9 @@ 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 = System.getProperty("tomee.jaxws.subcontext", "/webservices");
- private static final boolean WEBSERVICE_OLDCONTEXT_ACTIVE = Boolean.getBoolean("tomee.jaxws.oldsubcontext");
+ private static final String WEBSERVICE_SUB_CONTEXT = forceSlash(SystemInstance.get().getProperty("tomee.jaxws.subcontext", "/webservices"));
+
+ private static final boolean WEBSERVICE_OLDCONTEXT_ACTIVE = Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.jaxws.oldsubcontext", "false"));
private final Map<String, Context> webserviceContexts = new TreeMap<String, Context>();
private Engine engine;
@@ -72,6 +74,16 @@ public class TomcatWsRegistry implements
}
}
+ private static String forceSlash(String property) {
+ if (property == null) {
+ return "/";
+ }
+ if (!property.startsWith("/")) {
+ return "/" + property;
+ }
+ return property;
+ }
+
public List<String> setWsContainer(String virtualHost, String contextRoot, String servletName, HttpListener wsContainer) throws Exception {
if (virtualHost == null) virtualHost = engine.getDefaultHost();
@@ -173,10 +185,8 @@ public class TomcatWsRegistry implements
addServlet(host, webAppContext, path, httpListener, path, addresses);
} else if (WEBSERVICE_SUB_CONTEXT.equals("/") && !path.startsWith("/")) {
addServlet(host, webAppContext, '/' + path, httpListener, path, addresses);
- } else if (WEBSERVICE_SUB_CONTEXT.startsWith("/")) {
- addServlet(host, webAppContext, WEBSERVICE_SUB_CONTEXT + path, httpListener, path, addresses);
} else {
- addServlet(host, webAppContext, '/' + WEBSERVICE_SUB_CONTEXT + path, httpListener, path, addresses);
+ addServlet(host, webAppContext, WEBSERVICE_SUB_CONTEXT + path, httpListener, path, addresses);
}
}
return addresses;