vitalif
/
openesb-components
mirror of https://github.com/vitalif/openesb-components
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove "Cluster Database JNDI Name" property

master
Vitaliy Filippov 2016-01-25 15:39:06 +03:00
parent 8007e53314
commit 3778ac16a2
5 changed files with 0 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfiguration.java
View File

@ -126,9 +126,6 @@ public class RuntimeConfiguration implements RuntimeConfigurationMBean,
// Default values in the absence of configuration settings // Default values in the absence of configuration settings
private static final String DEFAULT_THREADS = "10"; 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 // Configuration validation settings
long MIN_THREADS = 1; long MIN_THREADS = 1;
long MAX_THREADS = 10000; long MAX_THREADS = 10000;
@ -186,10 +183,6 @@ public class RuntimeConfiguration implements RuntimeConfigurationMBean,
return Integer.valueOf(val); 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 * @throws javax.management.InvalidAttributeValueException
@ -232,38 +225,6 @@ public class RuntimeConfiguration implements RuntimeConfigurationMBean,
newVal); newVal);
broadcasterSupport.sendNotification(notif); 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);
}
/** /**
* *

4
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/RuntimeConfigurationMBean.java
View File

@ -60,11 +60,7 @@ public interface RuntimeConfigurationMBean {
* @return a Map containing application variable information * @return a Map containing application variable information
*/ */
public Map<String, String[]> retrieveApplicationVariablesMap(); public Map<String, String[]> 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 * 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 * is a String representing a HTTP URL. This method is used to communicate application

21
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExt.java
View File

@ -48,9 +48,6 @@ public class InstallerExt implements InstallerExtMBean {
// Default values in the absence of configuration settings // Default values in the absence of configuration settings
private static final String DEFAULT_THREADS = "10"; 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 String mThreads;
private Logger mLogger; private Logger mLogger;
private String mClusterJNDIName; private String mClusterJNDIName;
@ -82,32 +79,14 @@ public class InstallerExt implements InstallerExtMBean {
mThreads = val; 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) { public void setInitialConfigurations(ComponentConfig props) {
this.mConfigProps = props; this.mConfigProps = props;
mThreads = props.getProperty(CONFIG_THREADS).getValue(); mThreads = props.getProperty(CONFIG_THREADS).getValue();
mClusterJNDIName = props.getProperty(CONFIG_CLUSTER_DATABASE_JNDINAME).getValue();
} }
public ComponentConfig getInstallationConfigurationProperties() { public ComponentConfig getInstallationConfigurationProperties() {
mConfigProps.getProperty(CONFIG_THREADS).setValue(mThreads); mConfigProps.getProperty(CONFIG_THREADS).setValue(mThreads);
mConfigProps.getProperty(CONFIG_CLUSTER_DATABASE_JNDINAME).setValue(mClusterJNDIName);
return mConfigProps; return mConfigProps;
} }

3
ojc-core/databasebc/databasebcimpl/src/org/glassfish/openesb/databasebc/bootstrap/InstallerExtMBean.java
View File

@ -43,7 +43,4 @@ public interface InstallerExtMBean {
public void setInitialConfigurations(ComponentConfig props); public void setInitialConfigurations(ComponentConfig props);
public ComponentConfig getInstallationConfigurationProperties(); public ComponentConfig getInstallationConfigurationProperties();
public String getClusterDatabaseJNDIName();
public void setClusterDatabaseJNDIName(String val);
} }

7
ojc-core/databasebc/packaging/src/jbi.xml
View File

@ -58,13 +58,6 @@
showDisplay="all"> showDisplay="all">
<config:Constraint facet="minInclusive" value="1"/> <config:Constraint facet="minInclusive" value="1"/>
<config:Constraint facet="maxInclusive" value="10000"/> <config:Constraint facet="maxInclusive" value="10000"/>
</config:Property>
<config:Property name="ClusterDatabaseJNDIName"
type="xsd:string"
displayName="Cluster Database JNDI Name"
displayDescription="JNDI name is to be used in cluster environment"
defaultValue="jdbc/__defaultDS"
showDisplay="all">
</config:Property> </config:Property>
<config:ApplicationConfiguration> <config:ApplicationConfiguration>
<config:Property name="configurationName" <config:Property name="configurationName"