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:04:50 UTC
svn commit: r1245013 - in /openejb/trunk/openejb:
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-core/src/main/java/org/apache/openejb/config/
container/openejb-core/src/main/java/org/apache/openejb/config/...
Author: rmannibucau
Date: Thu Feb 16 15:04:49 2012
New Revision: 1245013
URL: http://svn.apache.org/viewvc?rev=1245013&view=rev
Log:
OPENEJB-1776 using option class for int and bool
Modified:
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/config/ConfigurationFactory.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.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/resource/jdbc/DataSourceFactory.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/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/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=1245013&r1=1245012&r2=1245013&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:04:49 2012
@@ -45,7 +45,7 @@ public class DelegatePermissionCollectio
}
public static class FastPermissionCollection extends PermissionCollection {
- private static final int MAX_CACHE_SIZE = Integer.parseInt(SystemInstance.get().getProperty("openejb.permission-collection.cache.size", "3000"));
+ private static final int MAX_CACHE_SIZE = SystemInstance.get().getOptions().get("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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -29,7 +29,7 @@ import java.util.Map;
*
*/
public class DeploymentExceptionManager {
- private static final int MAX_SIZE = Integer.parseInt(SystemInstance.get().getProperty("tomee.deployement-exception-max-size", "10"));
+ private static final int MAX_SIZE = SystemInstance.get().getOptions().get("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/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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -120,7 +120,7 @@ public class ConfigurationFactory implem
static final String OFFLINE_PROPERTY = "openejb.offline";
public ConfigurationFactory() {
- this(Boolean.parseBoolean(SystemInstance.get().getProperty(ConfigurationFactory.OFFLINE_PROPERTY, "false")));
+ this(SystemInstance.get().getOptions().get(ConfigurationFactory.OFFLINE_PROPERTY, false));
}
public ConfigurationFactory(final boolean offline) {
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java?rev=1245013&r1=1245012&r2=1245013&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/JPAPropertyConverter.java Thu Feb 16 15:04:49 2012
@@ -49,7 +49,7 @@ public final class JPAPropertyConverter
// TODO: manage more properties
public static Pair toOpenJPAValue(String key, String value, Properties properties) {
- if (!Boolean.parseBoolean(SystemInstance.get().getProperty("openejb.convert-jpa-properties", "false"))) {
+ if (!SystemInstance.get().getOptions().get("openejb.convert-jpa-properties", false)) {
return null;
}
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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -29,7 +29,7 @@ public class ValidateModules implements
public AppModule deploy(AppModule appModule) throws OpenEJBException {
final AppValidator validator;
- if (!Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_CHECK_CLASSLOADER, "false"))) {
+ if (!SystemInstance.get().getOptions().get(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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -207,7 +207,7 @@ public class CheckClassLoading extends V
public String toScreen() {
final String str = "both files " + file1 + '\''
+ " and " + file2 + '\'';
- if (Boolean.parseBoolean(SystemInstance.get().getProperty(OPENEJB_CHECK_CLASSLOADER_VERBOSE, "false"))) {
+ if (SystemInstance.get().getOptions().get(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/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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -46,7 +46,7 @@ public class DataSourceFactory {
final org.apache.commons.dbcp.BasicDataSource ds;
- if (DataSource.class.isAssignableFrom(impl) && !Boolean.parseBoolean(SystemInstance.get().getProperty("org.apache.openejb.resource.jdbc.hot.deploy", "false"))) {
+ if (DataSource.class.isAssignableFrom(impl) && !SystemInstance.get().getOptions().get("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-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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -46,7 +46,7 @@ import java.util.zip.ZipOutputStream;
* @version $Revision$ $Date$
*/
public class IO {
- private static final int MAX_TIMEOUT = Integer.parseInt(SystemInstance.get().getProperty("openejb.io.util.timeout", "5000"));
+ private static final int MAX_TIMEOUT = SystemInstance.get().getOptions().get("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=1245013&r1=1245012&r2=1245013&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 15:04:49 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.parseInt(SystemInstance.get().getProperty("openejb.osgi.tracker.timeout", "30"));
+ private static final long TRACKER_TIMEOUT = SystemInstance.get().getOptions().get("openejb.osgi.tracker.timeout", 30);
private OpenEJBInstance openejb;
private Object serviceManager;
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=1245013&r1=1245012&r2=1245013&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 15:04:49 2012
@@ -57,8 +57,8 @@ public class OpenEJBContextConfig extend
}
@Override public int 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()))));
+ return SystemInstance.get().getOptions().get(prefix + "." + OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY,
+ SystemInstance.get().getOptions().get(OPENEJB_WEB_XML_MAJOR_VERSION_PROPERTY, 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=1245013&r1=1245012&r2=1245013&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:04:49 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.parseBoolean(SystemInstance.get().getProperty("openejb.servicemanager.enabled", "false"))) {
+ if (SystemInstance.get().getOptions().get("openejb.servicemanager.enabled", false)) {
manager = ServiceManager.getManager();
manager.init();
manager.start(false);
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=1245013&r1=1245012&r2=1245013&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:04:49 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.parseBoolean(SystemInstance.get().getProperty(OPENEJB_MYFACES_DISABLE_DEFAULT_VALUES, "false"))) {
+ if (!SystemInstance.get().getOptions().get(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(SystemInstance.get().getProperty(OPENEJB_CROSSCONTEXT_PROPERTY, "false")));
+ standardContext.setCrossContext(SystemInstance.get().getOptions().get(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(SystemInstance.get().getProperty(OPENEJB_JSESSION_ID_SUPPORT, "true"))) {
+ if (sc != null && !SystemInstance.get().getOptions().get(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=1245013&r1=1245012&r2=1245013&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:04:49 2012
@@ -57,7 +57,7 @@ import static org.apache.tomee.catalina.
public class TomcatWsRegistry implements WsRegistry {
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 static final boolean WEBSERVICE_OLDCONTEXT_ACTIVE = SystemInstance.get().getOptions().get("tomee.jaxws.oldsubcontext", false);
private final Map<String, Context> webserviceContexts = new TreeMap<String, Context>();
private Engine engine;