From 3778ac16a2473b559fda49ce811e8847fd0eef36 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 25 Jan 2016 15:39:06 +0300 Subject: [PATCH] Remove "Cluster Database JNDI Name" property --- .../databasebc/RuntimeConfiguration.java | 39 ------------------- .../databasebc/RuntimeConfigurationMBean.java | 4 -- .../databasebc/bootstrap/InstallerExt.java | 21 ---------- .../bootstrap/InstallerExtMBean.java | 3 -- ojc-core/databasebc/packaging/src/jbi.xml | 7 ---- 5 files changed, 74 deletions(-) diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfiguration.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfiguration.java index 2236b7215..cf6347db4 100644 --- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfiguration.java +++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfiguration.java @@ -126,9 +126,6 @@ public class RuntimeConfiguration implements RuntimeConfigurationMBean, // Default values in the absence of configuration settings private static final String DEFAULT_THREADS = "10"; - public static final String CONFIG_CLUSTER_DATABASE_JNDINAME = "ClusterDatabaseJNDIName"; - - private static final String DEFAULT_CLUSTER_DATABASE_JNDINAME = "jdbc/__defaultDS"; // Configuration validation settings long MIN_THREADS = 1; long MAX_THREADS = 10000; @@ -186,10 +183,6 @@ public class RuntimeConfiguration implements RuntimeConfigurationMBean, return Integer.valueOf(val); } - public String getClusterDatabaseJNDIName() { - final String val = mConfig.getProperty(RuntimeConfiguration.CONFIG_CLUSTER_DATABASE_JNDINAME, RuntimeConfiguration.DEFAULT_CLUSTER_DATABASE_JNDINAME); - return val; - } /** * * @throws javax.management.InvalidAttributeValueException @@ -232,38 +225,6 @@ public class RuntimeConfiguration implements RuntimeConfigurationMBean, newVal); broadcasterSupport.sendNotification(notif); } - - - /** - * - * *@throws javax.management.MBeanException - */ - // @Override - public void setClusterDatabaseJNDIName(String val) throws MBeanException { - final String attrName = RuntimeConfiguration.CONFIG_CLUSTER_DATABASE_JNDINAME; - if(val == null){ - - val = DEFAULT_CLUSTER_DATABASE_JNDINAME; - } - - // Validate the attribute value - String newVal = val; - - - // Apply and save the changes - mConfig.put(RuntimeConfiguration.CONFIG_CLUSTER_DATABASE_JNDINAME, val.toString()); - persistConfiguration(); - - // Notify listeners of this change - final long seqNo = 0; - final String msg = "Attribute changed"; - final String attrType = String.class.getName(); - final String oldVal = getClusterDatabaseJNDIName(); - final Notification notif = new AttributeChangeNotification(this, seqNo, - System.currentTimeMillis(), msg, attrName, attrType, oldVal, - newVal); - broadcasterSupport.sendNotification(notif); - } /** * diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfigurationMBean.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfigurationMBean.java index b1358c97b..dc1c3b186 100644 --- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfigurationMBean.java +++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfigurationMBean.java @@ -60,11 +60,7 @@ public interface RuntimeConfigurationMBean { * @return a Map containing application variable information */ public Map retrieveApplicationVariablesMap(); - public String getClusterDatabaseJNDIName(); - public void setClusterDatabaseJNDIName(String val) throws MBeanException; - - /** * Retrieves the application configuration map. The map key is the configuration name, the value * is a String representing a HTTP URL. This method is used to communicate application diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExt.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExt.java index 5de211d6e..1c6b49d5f 100644 --- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExt.java +++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExt.java @@ -48,9 +48,6 @@ public class InstallerExt implements InstallerExtMBean { // Default values in the absence of configuration settings private static final String DEFAULT_THREADS = "10"; - public static final String CONFIG_CLUSTER_DATABASE_JNDINAME = "ClusterDatabaseJNDIName"; - - private static final String DEFAULT_CLUSTER_DATABASE_JNDINAME = "jdbc/__defaultDS"; private String mThreads; private Logger mLogger; private String mClusterJNDIName; @@ -82,32 +79,14 @@ public class InstallerExt implements InstallerExtMBean { mThreads = val; } - /* - * @return - */ - public String getClusterDatabaseJNDIName() { - return mClusterJNDIName; - } - - /* - * @param val - */ - public void setClusterDatabaseJNDIName(String val) { - if (val == null) { - val = DEFAULT_CLUSTER_DATABASE_JNDINAME; - } - mClusterJNDIName = val; - } public void setInitialConfigurations(ComponentConfig props) { this.mConfigProps = props; mThreads = props.getProperty(CONFIG_THREADS).getValue(); - mClusterJNDIName = props.getProperty(CONFIG_CLUSTER_DATABASE_JNDINAME).getValue(); } public ComponentConfig getInstallationConfigurationProperties() { mConfigProps.getProperty(CONFIG_THREADS).setValue(mThreads); - mConfigProps.getProperty(CONFIG_CLUSTER_DATABASE_JNDINAME).setValue(mClusterJNDIName); return mConfigProps; } diff --git a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExtMBean.java b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExtMBean.java index 6fa477c10..22b56f06c 100644 --- a/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExtMBean.java +++ b/ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExtMBean.java @@ -43,7 +43,4 @@ public interface InstallerExtMBean { public void setInitialConfigurations(ComponentConfig props); public ComponentConfig getInstallationConfigurationProperties(); - public String getClusterDatabaseJNDIName(); - - public void setClusterDatabaseJNDIName(String val); } diff --git a/ojc-core/databasebc/packaging/src/jbi.xml b/ojc-core/databasebc/packaging/src/jbi.xml index fd18fe7c9..4553df2b4 100755 --- a/ojc-core/databasebc/packaging/src/jbi.xml +++ b/ojc-core/databasebc/packaging/src/jbi.xml @@ -58,13 +58,6 @@ showDisplay="all"> - -