Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
diff --git a/appserver/jms/admin/pom.xml b/appserver/jms/admin/pom.xml
index e9eff37..f6d1ce4 100644
--- a/appserver/jms/admin/pom.xml
+++ b/appserver/jms/admin/pom.xml
@@ -24,10 +24,10 @@
<artifactId>jms</artifactId>
<version>6.1.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
- </parent>
+ </parent>
<artifactId>jms-admin</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<version>6.1.1-SNAPSHOT</version>
<name>JMS admin</name>
@@ -43,7 +43,7 @@
</developer>
</developers>
<build>
- <resources>
+ <resources>
<resource>
<directory>src/main/java</directory>
<includes>
@@ -59,7 +59,7 @@
</resource>
</resources>
</build>
-
+
<dependencies>
<dependency>
<groupId>org.glassfish.hk2</groupId>
@@ -87,15 +87,15 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.main.connectors</groupId>
- <artifactId>connectors-internal-api</artifactId>
- <version>${project.version}</version>
+ <groupId>org.glassfish.main.connectors</groupId>
+ <artifactId>connectors-internal-api</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.main.jms</groupId>
<artifactId>jms-core</artifactId>
<version>${project.version}</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.glassfish.main.connectors</groupId>
<artifactId>connectors-runtime</artifactId>
diff --git a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java
index f80bd4f..1c28404 100644
--- a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java
+++ b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/DefaultTrustManager.java
@@ -15,8 +15,8 @@
*/
/*
- * @(#)DefaultTrustManager.java 1.4 06/29/07
- */
+ * @(#)DefaultTrustManager.java 1.4 06/29/07
+ */
package com.sun.messaging.jmq.management;
@@ -31,7 +31,7 @@
*/
/**
- * The default trust manager.
+ * The default trust manager.
*
* TBD: Need to describe *when* this class is used i.e. what JMX configuration
* properties trigger it's use.
diff --git a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java
index e3fe814..b391e3f 100644
--- a/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java
+++ b/appserver/jms/admin/src/main/java/com/sun/messaging/jmq/management/MQRMIClientSocketFactory.java
@@ -15,7 +15,7 @@
*/
/*
- * @(#)MQRMIClientSocketFactory.java 1.5 06/29/07
+ * @(#)MQRMIClientSocketFactory.java 1.5 06/29/07
*/
/*
@@ -43,57 +43,57 @@
String hostname = null;
public MQRMIClientSocketFactory(String hostname, boolean isBrokerHostTrusted,
- boolean useSSL) {
- this.isBrokerHostTrusted = isBrokerHostTrusted;
- this.hostname = hostname;
- this.useSSL = useSSL;
+ boolean useSSL) {
+ this.isBrokerHostTrusted = isBrokerHostTrusted;
+ this.hostname = hostname;
+ this.useSSL = useSSL;
}
public Socket createSocket(String host, int port) throws IOException {
- Socket s = null;
- String socketHost = hostname;
+ Socket s = null;
+ String socketHost = hostname;
- /*
- * If the factory is not configured for any specific host, use whatever
- * is passed in to createSocket.
- *
- * The wildcard "*" here is something that could be set on the server
- * side. It is the constant jmsserver.Globals.HOSTNAME_ALL but we don't
- * want to introduce any server side compile time dependencies here.
- * Remember that this factory is created by the server.
- */
- if ((socketHost == null) || (socketHost.equals("*"))) {
- socketHost = host;
- }
+ /*
+ * If the factory is not configured for any specific host, use whatever
+ * is passed in to createSocket.
+ *
+ * The wildcard "*" here is something that could be set on the server
+ * side. It is the constant jmsserver.Globals.HOSTNAME_ALL but we don't
+ * want to introduce any server side compile time dependencies here.
+ * Remember that this factory is created by the server.
+ */
+ if ((socketHost == null) || (socketHost.equals("*"))) {
+ socketHost = host;
+ }
- try {
- if (useSSL) {
- s = (Socket)makeSSLSocket(socketHost, port);
- } else {
- s = RMISocketFactory.getDefaultSocketFactory().
- createSocket(socketHost, port);
- }
- } catch (Exception e) {
- throw new IOException(e.toString());
- }
+ try {
+ if (useSSL) {
+ s = (Socket)makeSSLSocket(socketHost, port);
+ } else {
+ s = RMISocketFactory.getDefaultSocketFactory().
+ createSocket(socketHost, port);
+ }
+ } catch (Exception e) {
+ throw new IOException(e.toString());
+ }
- return (s);
+ return (s);
}
public String toString() {
return ("hostname="
- + hostname
- + ",isBrokerHostTrusted="
- + isBrokerHostTrusted
- + ",useSSL="
- + useSSL);
+ + hostname
+ + ",isBrokerHostTrusted="
+ + isBrokerHostTrusted
+ + ",useSSL="
+ + useSSL);
}
public boolean equals(Object obj) {
if (!(obj instanceof MQRMIClientSocketFactory)) {
return (false);
}
-
+
MQRMIClientSocketFactory that = (MQRMIClientSocketFactory)obj;
if (this.hostname != null) {
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java
index f984e78..10dc721 100755
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ChangeMasterBrokerCommand.java
@@ -62,8 +62,8 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.POST,
- path="change-master-broker",
+ opType=RestEndpoint.OpType.POST,
+ path="change-master-broker",
description="change-master-broker")
})
public class ChangeMasterBrokerCommand extends JMSDestination implements AdminCommand {
@@ -160,8 +160,8 @@
String oldMasterBrokerPort = JmsRaUtil.getJMSPropertyValue(oldMBServer);
if(oldMasterBrokerPort == null) {
- SystemProperty sp = config.getSystemProperty("JMS_PROVIDER_PORT");
- if(sp != null) oldMasterBrokerPort = sp.getValue();
+ SystemProperty sp = config.getSystemProperty("JMS_PROVIDER_PORT");
+ if(sp != null) oldMasterBrokerPort = sp.getValue();
}
if(oldMasterBrokerPort == null) oldMasterBrokerPort = getDefaultJmsHost(jmsservice).getPort();
String oldMasterBrokerHost = nodes.getNode(oldMBServer.getNodeRef()).getNodeHost();
@@ -208,7 +208,7 @@
parameters.set(setCommandStr, newMB );
ActionReport subReport = report.addSubActionsReport();
- commandRunner.getCommandInvocation("set", subReport, context.getSubject()).parameters(parameters).execute();
+ commandRunner.getCommandInvocation("set", subReport, context.getSubject()).parameters(parameters).execute();
if (ActionReport.ExitCode.FAILURE.equals(subReport.getActionExitCode())){
report.setMessage(localStrings.getLocalString("create.jms.resource.cannotCreateConnectionPool",
@@ -238,7 +238,7 @@
private JmsHost getDefaultJmsHost(JmsService jmsService){
- JmsHost jmsHost = null;
+ JmsHost jmsHost = null;
String defaultJmsHostName = jmsService.getDefaultJmsHost();
List jmsHostsList = jmsService.getJmsHost();
@@ -248,7 +248,7 @@
if (tmpJmsHost != null && tmpJmsHost.getName().equals(defaultJmsHostName))
jmsHost = tmpJmsHost;
}
- return jmsHost;
+ return jmsHost;
}
private CompositeData updateMasterBroker(String serverName, String oldMasterBroker, String newMasterBroker) throws Exception {
@@ -263,7 +263,7 @@
} catch (Exception e) {
String[] param = new String[] { mqInfo.getASInstanceName() };
String emsg = localStrings.getLocalString(
- "change.master.broker.cannotConnectOldMasterBroker",
+ "change.master.broker.cannotConnectOldMasterBroker",
"Unable to connect to the current master broker {0}. Likely reasons: the cluster might not be running, the server instance {0} associated with the current master broker or the current master broker might not be running. Please check server logs.", param);
if (logger.isLoggable(Level.WARNING)) {
logger.log(Level.WARNING, emsg);
@@ -281,7 +281,7 @@
result = mbsc != null ? (CompositeData) mbsc.invoke(on, "changeMasterBroker", params, signature) : null;
} catch (Exception e) {
- logAndHandleException(e, e.getMessage());
+ logAndHandleException(e, e.getMessage());
} finally {
try {
if(mqInfo != null) {
@@ -296,7 +296,7 @@
/**
* This is a copy from the super method except that
- * it avoids a NPE in using e.getCause() and ensure
+ * it avoids a NPE in using e.getCause() and ensure
* the exception message is errorMsg not "" - these
* eventually should be incoporated to the super method
* post 5.0 release.
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java
index ae5f83a..6b21931 100755
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ConfigureJMSCluster.java
@@ -59,8 +59,8 @@
//@TargetType({CommandTarget.CLUSTER})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.POST,
- path="configure-jms-cluster",
+ opType=RestEndpoint.OpType.POST,
+ path="configure-jms-cluster",
description="configure-jms-cluster",
params={
@RestParam(name="id", value="$parent")
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java
index 1bf4248..9b652b9 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSDestination.java
@@ -55,15 +55,15 @@
@TargetType({CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.POST,
- path="create-jmsdest",
+ opType=RestEndpoint.OpType.POST,
+ path="create-jmsdest",
description="Create JMS Destination",
params={
@RestParam(name="target", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.POST,
- path="create-jmsdest",
+ opType=RestEndpoint.OpType.POST,
+ path="create-jmsdest",
description="Create JMS Destination",
params={
@RestParam(name="target", value="$parent")
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java
index bf0529f..5a83ce5 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSHost.java
@@ -108,7 +108,7 @@
Config targetConfig = domain.getConfigNamed(target);
if (targetConfig != null)
config = targetConfig;
-
+
Server targetServer = domain.getServerNamed(target);
//String configRef = targetServer.getConfigRef();
if (targetServer!=null) {
@@ -165,15 +165,15 @@
jmsHost.setName(jmsHostName);
jmsHost.setHost(mqhost);
jmsHost.setPort(mqport);
- if(props != null)
- {
- for (Map.Entry e: props.entrySet()){
- Property prop = jmsHost.createChild(Property.class);
- prop.setName((String)e.getKey());
- prop.setValue((String)e.getValue());
- jmsHost.getProperty().add(prop);
- }
- }
+ if(props != null)
+ {
+ for (Map.Entry e: props.entrySet()){
+ Property prop = jmsHost.createChild(Property.class);
+ prop.setName((String)e.getKey());
+ prop.setValue((String)e.getValue());
+ jmsHost.getProperty().add(prop);
+ }
+ }
param.getJmsHost().add(jmsHost);
return jmsHost;
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java
index e005b4a..284e016 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/CreateJMSResource.java
@@ -51,8 +51,8 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.DOMAIN})
@RestEndpoints({
@RestEndpoint(configBean=Resources.class,
- opType=RestEndpoint.OpType.POST,
- path="create-jms-resource",
+ opType=RestEndpoint.OpType.POST,
+ path="create-jms-resource",
description="create-jms-resource")
})
public class CreateJMSResource implements AdminCommand {
@@ -188,7 +188,7 @@
if (cpool == null || ! filterForTarget (jndiNameForConnectionPool)) {
// Add connector-connection-pool.
ParameterMap parameters = populateConnectionPoolParameters();
- commandRunner.getCommandInvocation("create-connector-connection-pool", subReport, context.getSubject()).parameters(parameters).execute();
+ commandRunner.getCommandInvocation("create-connector-connection-pool", subReport, context.getSubject()).parameters(parameters).execute();
createdPool= true;
if (ActionReport.ExitCode.FAILURE.equals(subReport.getActionExitCode())){
report.setMessage(localStrings.getLocalString("create.jms.resource.cannotCreateConnectionPool",
@@ -198,7 +198,7 @@
}
}
ParameterMap params = populateConnectionResourceParameters();
- commandRunner.getCommandInvocation("create-connector-resource", subReport, context.getSubject()).parameters(params).execute();
+ commandRunner.getCommandInvocation("create-connector-resource", subReport, context.getSubject()).parameters(params).execute();
if (ActionReport.ExitCode.FAILURE.equals(subReport.getActionExitCode())){
report.setMessage(localStrings.getLocalString("create.jms.resource.cannotCreateConnectorResource",
@@ -211,7 +211,7 @@
paramsForRollback.set(DEFAULT_OPERAND, jndiNameForConnectionPool);
commandRunner.getCommandInvocation("delete-connector-connection-pool", subReport, context.getSubject())
.parameters(paramsForRollback)
- .execute();
+ .execute();
}
return;
}
@@ -248,7 +248,7 @@
if(enabled!=null)
aoAttrList.set("enabled", Boolean.toString(enabled));
- commandRunner.getCommandInvocation("create-admin-object", subReport, context.getSubject()).parameters(aoAttrList).execute();
+ commandRunner.getCommandInvocation("create-admin-object", subReport, context.getSubject()).parameters(aoAttrList).execute();
if (ActionReport.ExitCode.FAILURE.equals(subReport.getActionExitCode())){
report.setMessage(localStrings.getLocalString("create.jms.resource.cannotCreateAdminObject",
@@ -313,8 +313,8 @@
String poolResizeQuantity = null;
String idleTimeoutInSecs = null;
String maxWaitTimeInMillis = null;
- String failAllConnections = null;
- String transactionSupport = null;
+ String failAllConnections = null;
+ String transactionSupport = null;
ParameterMap parameters = new ParameterMap();
if(props != null){
@@ -335,10 +335,10 @@
idleTimeoutInSecs = props.getProperty(propKey);
else if ("max-wait-time-in-millis".equals(propKey))
maxWaitTimeInMillis = props.getProperty(propKey);
- else if ("transaction-support".equals(propKey))
- transactionSupport = props.getProperty(propKey);
- else if("fail-all-connections".equals(propKey))
- failAllConnections = props.getProperty(propKey);
+ else if ("transaction-support".equals(propKey))
+ transactionSupport = props.getProperty(propKey);
+ else if("fail-all-connections".equals(propKey))
+ failAllConnections = props.getProperty(propKey);
else{
if ("AddressList".equals(propKey)){
String addressListProp = props.getProperty(propKey);
@@ -370,7 +370,7 @@
}
}
//parameters.set("restype", resourceType);
- parameters.set(DEFAULT_OPERAND, jndiNameForConnectionPool);
+ parameters.set(DEFAULT_OPERAND, jndiNameForConnectionPool);
parameters.set("poolname", jndiName);
if(description != null)
@@ -432,30 +432,30 @@
* the properties object is updated with a computed Name.
*/
private Properties validateDestinationResourceProps(Properties props,
- String jndiName) throws Exception {
+ String jndiName) throws Exception {
String providedDestinationName = null;
if(props != null)
providedDestinationName = getProvidedDestinationName(props);
else
props = new Properties();
- //sLogger.fine("provided destination name = " + providedDestinationName);
+ //sLogger.fine("provided destination name = " + providedDestinationName);
if (providedDestinationName != null) {
- //check validity of provided JMS destination name
+ //check validity of provided JMS destination name
if (!isSyntaxValid(providedDestinationName)) {
throw new Exception(localStrings.getLocalString(
"admin.mbeans.rmb.destination_name_invalid",
- "Destination Resource " + jndiName +
+ "Destination Resource " + jndiName +
" has an invalid destination name " + providedDestinationName,
jndiName, providedDestinationName));
}
- } else {
+ } else {
//compute a valid destination name from the JNDI name.
String newDestName = computeDestinationName(jndiName);
//sLogger.log(Level.WARNING, "admin.mbeans.rmb.destination_name_missing",new Object[]{jndiName, newDestName});
props.put(NAME, newDestName);
//sLogger.fine("Computed destination name" + newDestName + " and updated props");
}
- return props;
+ return props;
}
/**
@@ -508,11 +508,11 @@
* an 'underscore'.
*/
private String computeDestinationName(String providedJndiName) {
- char[] jndiName = providedJndiName.toCharArray();
+ char[] jndiName = providedJndiName.toCharArray();
char[] finalName = new char[jndiName.length];
finalName[0] = Character.isJavaIdentifierStart(jndiName[0]) ? jndiName[0] : '_';
for (int i = 1; i < jndiName.length; i++) {
- finalName[i] = Character.isJavaIdentifierPart(jndiName[i])? jndiName[i] : '_';
+ finalName[i] = Character.isJavaIdentifierPart(jndiName[i])? jndiName[i] : '_';
}
return new String(finalName);
}
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java
index f50cf62..c27734f 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSDestination.java
@@ -56,15 +56,15 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.DELETE,
- path="delete-jmsdest",
+ opType=RestEndpoint.OpType.DELETE,
+ path="delete-jmsdest",
description="Delete JMS Destination",
params={
@RestParam(name="target", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.DELETE,
- path="delete-jmsdest",
+ opType=RestEndpoint.OpType.DELETE,
+ path="delete-jmsdest",
description="Delete JMS Destination",
params={
@RestParam(name="target", value="$parent")
@@ -104,7 +104,7 @@
logger.entering(getClass().getName(), "deleteJMSDestination",
new Object[] {destName, destType});
- try{
+ try{
validateJMSDestName(destName);
validateJMSDestType(destType);
}catch (IllegalArgumentException e){
@@ -126,35 +126,35 @@
}
// delete-jmsdest
- private Object deleteJMSDestination(String destName, String destType,
- String tgtName)
- throws Exception {
+ private Object deleteJMSDestination(String destName, String destType,
+ String tgtName)
+ throws Exception {
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE, "deleteJMSDestination ...");
}
MQJMXConnectorInfo mqInfo = getMQJMXConnectorInfo(target, config, serverContext, domain, connectorRuntime);
- //MBeanServerConnection mbsc = getMBeanServerConnection(tgtName);
+ //MBeanServerConnection mbsc = getMBeanServerConnection(tgtName);
- try {
- MBeanServerConnection mbsc = mqInfo.getMQMBeanServerConnection();
- ObjectName on = new ObjectName(
- DESTINATION_MANAGER_CONFIG_MBEAN_NAME);
- String [] signature = null;
- Object [] params = null;
+ try {
+ MBeanServerConnection mbsc = mqInfo.getMQMBeanServerConnection();
+ ObjectName on = new ObjectName(
+ DESTINATION_MANAGER_CONFIG_MBEAN_NAME);
+ String [] signature = null;
+ Object [] params = null;
- signature = new String [] {
- "java.lang.String",
- "java.lang.String"};
+ signature = new String [] {
+ "java.lang.String",
+ "java.lang.String"};
- if (destType.equalsIgnoreCase("topic")) {
- destType = DESTINATION_TYPE_TOPIC;
- } else if (destType.equalsIgnoreCase("queue")) {
- destType = DESTINATION_TYPE_QUEUE;
- }
- params = new Object [] {destType, destName};
- return mbsc.invoke(on, "destroy", params, signature);
+ if (destType.equalsIgnoreCase("topic")) {
+ destType = DESTINATION_TYPE_TOPIC;
+ } else if (destType.equalsIgnoreCase("queue")) {
+ destType = DESTINATION_TYPE_QUEUE;
+ }
+ params = new Object [] {destType, destName};
+ return mbsc.invoke(on, "destroy", params, signature);
} catch (Exception e) {
//log JMX Exception trace as WARNING
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java
index 598cb9c..dc7143b 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSHost.java
@@ -50,8 +50,8 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=JmsHost.class,
- opType=RestEndpoint.OpType.DELETE,
- path="delete-jms-host",
+ opType=RestEndpoint.OpType.DELETE,
+ path="delete-jms-host",
description="Delete JMS Host",
params={
@RestParam(name="id", value="$parent")
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java
index a7750ed..8a1873d 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/DeleteJMSResource.java
@@ -91,7 +91,7 @@
report.setActionExitCode(ActionReport.ExitCode.FAILURE);
return;
}
-
+
jndiNameForConnectionPool = jndiName + JNDINAME_APPENDER;
ActionReport subReport = report.addSubActionsReport();
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java
index 7ea72e3..a40f44e 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/FlushJMSDestination.java
@@ -51,7 +51,7 @@
/**
* Flush JMS Destination
*
- *
+ *
*/
@Service(name="flush-jmsdest")
@PerLookup
@@ -60,15 +60,15 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.POST,
- path="flush-jmsdest",
+ opType=RestEndpoint.OpType.POST,
+ path="flush-jmsdest",
description="Flush",
params={
@RestParam(name="target", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.POST,
- path="flush-jmsdest",
+ opType=RestEndpoint.OpType.POST,
+ path="flush-jmsdest",
description="Flush",
params={
@RestParam(name="target", value="$parent")
@@ -79,9 +79,9 @@
private static final Logger logger = Logger.getLogger(LogUtils.JMS_ADMIN_LOGGER);
final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(FlushJMSDestination.class);
private static final String DESTINATION_CONFIG_DOMAIN_TYPE
- = MBEAN_DOMAIN_NAME
- + ":type=" + "Destination"
- + ",subtype=Config";
+ = MBEAN_DOMAIN_NAME
+ + ":type=" + "Destination"
+ + ",subtype=Config";
@Param(name="destType", shortName="T", optional=false)
String destType;
@@ -227,18 +227,18 @@
}
private ObjectName createDestinationConfig(String destinationType,
- String destinationName)
- throws MalformedObjectNameException,
- NullPointerException {
- String s = DESTINATION_CONFIG_DOMAIN_TYPE
- + ",desttype="
- + destinationType
- + ",name="
- + ObjectName.quote(destinationName);
+ String destinationName)
+ throws MalformedObjectNameException,
+ NullPointerException {
+ String s = DESTINATION_CONFIG_DOMAIN_TYPE
+ + ",desttype="
+ + destinationType
+ + ",name="
+ + ObjectName.quote(destinationName);
- ObjectName o = new ObjectName(s);
+ ObjectName o = new ObjectName(s);
- return (o);
+ return (o);
}
}
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java
index 7075fce..45310d8 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/GetJmsPhysicalDestinationCommand.java
@@ -53,15 +53,15 @@
@TargetType({CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.GET,
- path="__get-jmsdest",
+ opType=RestEndpoint.OpType.GET,
+ path="__get-jmsdest",
description="Get JMS Destinations",
params={
@RestParam(name="target", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.GET,
- path="__get-jmsdest",
+ opType=RestEndpoint.OpType.GET,
+ path="__get-jmsdest",
description="Get JMS Destinations",
params={
@RestParam(name="target", value="$parent")
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSAdminException.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSAdminException.java
index ee2b68e..ab96938 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSAdminException.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSAdminException.java
@@ -44,7 +44,7 @@
public JMSAdminException(String message)
{
super(message);
- _message = message;
+ _message = message;
linkedException = null;
}
@@ -71,24 +71,24 @@
*
**/
public String getMessage() {
- String retString = null;
+ String retString = null;
- // Return the message of this exception.
- if (_message != null) {
- retString = _message;
- }
+ // Return the message of this exception.
+ if (_message != null) {
+ retString = _message;
+ }
- // Append any message from the linked exception.
- Exception localLinkedException = linkedException;
- if (localLinkedException != null && localLinkedException.getMessage() != null) {
- if (retString != null) {
- retString += retString + "\n" + localLinkedException.getMessage();
- } else {
- retString = localLinkedException.getMessage();
- }
- }
+ // Append any message from the linked exception.
+ Exception localLinkedException = linkedException;
+ if (localLinkedException != null && localLinkedException.getMessage() != null) {
+ if (retString != null) {
+ retString += retString + "\n" + localLinkedException.getMessage();
+ } else {
+ retString = localLinkedException.getMessage();
+ }
+ }
- return retString;
+ return retString;
}
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java
index ee5418a..3b20d12 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestination.java
@@ -50,8 +50,8 @@
final private static LocalStringManagerImpl localStrings = new LocalStringManagerImpl(CreateJMSDestination.class);
// JMS destination types
- public static final String JMS_DEST_TYPE_TOPIC = "topic";
- public static final String JMS_DEST_TYPE_QUEUE = "queue";
+ public static final String JMS_DEST_TYPE_TOPIC = "topic";
+ public static final String JMS_DEST_TYPE_QUEUE = "queue";
public static final String DEFAULT_MAX_ACTIVE_CONSUMERS = "-1";
public static final String MAX_ACTIVE_CONSUMERS_ATTRIBUTE = "MaxNumActiveConsumers";
public static final String MAX_ACTIVE_CONSUMERS_PROPERTY = "maxNumActiveConsumers";
@@ -66,14 +66,14 @@
protected static final String MBEAN_DOMAIN_NAME = "com.sun.messaging.jms.server";
/* String representation of the ObjectName for the DestinationManager Config MBean. */
protected static final String DESTINATION_MANAGER_CONFIG_MBEAN_NAME
- = MBEAN_DOMAIN_NAME
- + ":type=" + "DestinationManager"
- + ",subtype=Config";
-
- protected static final String CLUSTER_CONFIG_MBEAN_NAME
- = MBEAN_DOMAIN_NAME
- + ":type=" + "Cluster"
- + ",subtype=Config";
+ = MBEAN_DOMAIN_NAME
+ + ":type=" + "DestinationManager"
+ + ",subtype=Config";
+
+ protected static final String CLUSTER_CONFIG_MBEAN_NAME
+ = MBEAN_DOMAIN_NAME
+ + ":type=" + "Cluster"
+ + ",subtype=Config";
// Queue destination type
protected static final String DESTINATION_TYPE_QUEUE= "q";
//Topic destination type
@@ -353,7 +353,7 @@
}
//final String myCluster = ClusterHelper.getClusterByName(domainCC, clusterName).getName();
- final Server[] buddies = this.getServersInCluster(cluster);//ServerHelper.getServersInCluster(domainCC, myCluster);
+ final Server[] buddies = this.getServersInCluster(cluster);//ServerHelper.getServersInCluster(domainCC, myCluster);
final Config cfg = getConfigForServer(buddies[0]);
final String myCluster = ClusterHelper.getClusterByName(domainCC, clusterName).getName();
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestinationInfo.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestinationInfo.java
index a74651b..9e35772 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestinationInfo.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSDestinationInfo.java
@@ -30,9 +30,9 @@
public class JMSDestinationInfo implements Serializable
{
- private String destName,
- destType;
- private Properties attrs;
+ private String destName,
+ destType;
+ private Properties attrs;
public JMSDestinationInfo (String destName, String destType)
{
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java
index 07dbdd7..05c289d 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/JMSPing.java
@@ -50,15 +50,15 @@
@I18n("jms-ping")
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.GET,
- path="jms-ping",
+ opType=RestEndpoint.OpType.GET,
+ path="jms-ping",
description="Ping JMS",
params={
@RestParam(name="id", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.GET,
- path="jms-ping",
+ opType=RestEndpoint.OpType.GET,
+ path="jms-ping",
description="Ping JMS",
params={
@RestParam(name="id", value="$parent")
@@ -126,7 +126,7 @@
}
try{
boolean value = pingConnectionPool(tmpJMSResource + JNDINAME_APPENDER);
-
+
if(!value){
report.setMessage(localStrings.getLocalString("jms-ping.pingConnectionPoolFailed",
@@ -218,7 +218,7 @@
PoolInfo poolInfo = new PoolInfo(tmpJMSResource);
return connectorRuntime.pingConnectionPool(poolInfo);
}
-
+
void deleteJMSResource(ActionReport subReport, String tmpJMSResource, final Subject subject)
{
ParameterMap aoAttrList = new ParameterMap();
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java
index e291314..9e1c340 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSDestinations.java
@@ -59,15 +59,15 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.GET,
- path="list-jmsdest",
+ opType=RestEndpoint.OpType.GET,
+ path="list-jmsdest",
description="List JMS Destinations",
params={
@RestParam(name="id", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.GET,
- path="list-jmsdest",
+ opType=RestEndpoint.OpType.GET,
+ path="list-jmsdest",
description="List JMS Destinations",
params={
@RestParam(name="id", value="$parent")
@@ -206,13 +206,13 @@
}
private String toStringLabel(String type) {
- if (type.equals(DESTINATION_TYPE_QUEUE)) {
- return("queue");
- } else if (type.equals(DESTINATION_TYPE_TOPIC)) {
- return("topic");
- } else {
- return("unknown");
- }
+ if (type.equals(DESTINATION_TYPE_QUEUE)) {
+ return("queue");
+ } else if (type.equals(DESTINATION_TYPE_TOPIC)) {
+ return("topic");
+ } else {
+ return("unknown");
+ }
}
}
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java
index d958ed8..4a2ba57 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSHosts.java
@@ -52,8 +52,8 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=JmsService.class,
- opType=RestEndpoint.OpType.GET,
- path="list-jms-hosts",
+ opType=RestEndpoint.OpType.GET,
+ path="list-jms-hosts",
description="list-jms-hosts")
})
public class ListJMSHosts implements AdminCommand {
@@ -79,7 +79,7 @@
Config targetConfig = domain.getConfigNamed(target);
if (targetConfig != null)
config = targetConfig;
-
+
Server targetServer = domain.getServerNamed(target);
//String configRef = targetServer.getConfigRef();
if (targetServer!=null) {
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java
index a21f7cd..8774675 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/ListJMSResources.java
@@ -53,8 +53,8 @@
@TargetType({CommandTarget.DAS,CommandTarget.STANDALONE_INSTANCE,CommandTarget.CLUSTER,CommandTarget.DOMAIN,CommandTarget.CLUSTERED_INSTANCE})
@RestEndpoints({
@RestEndpoint(configBean=Resources.class,
- opType=RestEndpoint.OpType.GET,
- path="list-jms-resources",
+ opType=RestEndpoint.OpType.GET,
+ path="list-jms-resources",
description="list-jms-resources")
})
public class ListJMSResources implements AdminCommand {
@@ -93,7 +93,7 @@
Properties extraProperties = new Properties();
Collection adminObjectResourceList = domain.getResources().getResources(AdminObjectResource.class);
- Collection connectorResourcesList = domain.getResources().getResources(ConnectorResource.class);
+ Collection connectorResourcesList = domain.getResources().getResources(ConnectorResource.class);
Object [] connectorResources = connectorResourcesList.toArray();
Object [] adminObjectResources = adminObjectResourceList.toArray();
@@ -158,11 +158,11 @@
}
}
if (!list.isEmpty()) {
- List<Map<String,String>> resourceList =
+ List<Map<String,String>> resourceList =
CommandTarget.DOMAIN.isValid(habitat, target) ? list : filterListForTarget(list);
List<DefaultResourceProxy> drps = habitat.getAllServices(DefaultResourceProxy.class);
-
+
for (Map<String,String> m : resourceList) {
String jndiName = m.get("name");
final ActionReport.MessagePart part = report.getTopMessagePart().addChild();
@@ -170,7 +170,7 @@
String logicalName = DefaultResourceProxy.Util.getLogicalName(drps, jndiName);
if (logicalName != null) {
m.put("logical-jndi-name", logicalName);
- }
+ }
}
extraProperties.put("jmsResources", resourceList);
}
@@ -193,7 +193,7 @@
}
if (resourceRefs != null && !resourceRefs.isEmpty()) {
for (Map<String,String> m : list) {
- String jndiName = m.get("name");
+ String jndiName = m.get("name");
for (ResourceRef resource : resourceRefs) {
if (jndiName.equals(resource.getRef())) {
resourceList.add(m);
diff --git a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java
index 7fdb159..a459195 100644
--- a/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java
+++ b/appserver/jms/admin/src/main/java/org/glassfish/jms/admin/cli/UpdateJmsPhysicalDestinationCommand.java
@@ -50,15 +50,15 @@
@TargetType({CommandTarget.DAS, CommandTarget.STANDALONE_INSTANCE, CommandTarget.CLUSTER, CommandTarget.CONFIG})
@RestEndpoints({
@RestEndpoint(configBean=Cluster.class,
- opType=RestEndpoint.OpType.POST,
- path="__update-jmsdest",
+ opType=RestEndpoint.OpType.POST,
+ path="__update-jmsdest",
description="Update JMS Destination",
params={
@RestParam(name="target", value="$parent")
}),
@RestEndpoint(configBean=Server.class,
- opType=RestEndpoint.OpType.POST,
- path="__update-jmsdest",
+ opType=RestEndpoint.OpType.POST,
+ path="__update-jmsdest",
description="Update JMS Destination",
params={
@RestParam(name="target", value="$parent")
diff --git a/appserver/jms/gf-jms-connector/pom.xml b/appserver/jms/gf-jms-connector/pom.xml
index 20ea300..43dd825 100644
--- a/appserver/jms/gf-jms-connector/pom.xml
+++ b/appserver/jms/gf-jms-connector/pom.xml
@@ -28,7 +28,7 @@
<artifactId>gf-jms-connector</artifactId>
<packaging>glassfish-jar</packaging>
<name>JMS Connector Module for Runtime</name>
-
+
<version>6.1.1-SNAPSHOT</version>
<developers>
<developer>
diff --git a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java
index 324cef6..e76ccfd 100644
--- a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java
+++ b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsAvailability.java
@@ -60,7 +60,7 @@
* If this attribute is missing, availability is turned off by default
* [i.e. the MQ cluster associated with the AS cluster would behave as a
* non-HA cluster]
- *
+ *
* @return possible object is
* {@link String }
*/
@@ -219,16 +219,16 @@
*/
@Attribute
String getMqStorePoolName();
-
+
/**
* Sets the value of the MQ store pool name property.
*
* @param value allowed object is
* {@link String }
*/
- void setMqStorePoolName(String value) throws PropertyVetoException;
+ void setMqStorePoolName(String value) throws PropertyVetoException;
/**
- Properties as per {@link PropertyBag}
+ Properties as per {@link PropertyBag}
*/
@ToDo(priority=ToDo.Priority.IMPORTANT, details="Provide PropertyDesc for legal props" )
@PropertiesDesc(props={})
diff --git a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java
index 13599cd..060eb39 100644
--- a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java
+++ b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsHost.java
@@ -90,7 +90,7 @@
* Sets the value of the host property.
*
* ip V6 or V4 address or hostname
- *
+ *
* @param value allowed object is
* {@link String }
*/
@@ -100,14 +100,14 @@
* Gets the value of the port property.
*
* Port number used by the JMS service
- *
+ *
* @return possible object is
* {@link String }
*/
@Attribute (defaultValue="7676")
@Pattern(regexp=PORT_PATTERN,
message="{port-pattern}",
- payload=JmsHost.class)
+ payload=JmsHost.class)
String getPort();
/**
@@ -141,7 +141,7 @@
* Gets the value of the adminUserName property.
*
* Specifies the admin username
- *
+ *
* @return possible object is
* {@link String }
*/
@@ -160,7 +160,7 @@
* Gets the value of the adminPassword property.
*
* Attribute specifies the admin password
- *
+ *
* @return possible object is
* {@link String }
*/
@@ -174,9 +174,9 @@
* {@link String }
*/
void setAdminPassword(String value) throws PropertyVetoException;
-
+
/**
- Properties as per {@link org.jvnet.hk2.config.types.PropertyBag}
+ Properties as per {@link org.jvnet.hk2.config.types.PropertyBag}
*/
@ToDo(priority=ToDo.Priority.IMPORTANT, details="Provide PropertyDesc for legal props" )
@PropertiesDesc(props={})
diff --git a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsService.java b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsService.java
index 83730e3..0db3f4f 100644
--- a/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsService.java
+++ b/appserver/jms/gf-jms-connector/src/main/java/com/sun/enterprise/connectors/jms/config/JmsService.java
@@ -208,9 +208,9 @@
*
* Determines broker selection from imqAddressList.
* random
- * causes selection to be performed randomly
+ * causes selection to be performed randomly
* priority
- * causes selection to be performed sequentially
+ * causes selection to be performed sequentially
*
* @return possible object is
* {@link String }
diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java
index a407d34..b623b03 100644
--- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java
+++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/AbstractJMSContextManager.java
@@ -59,8 +59,8 @@
context = connectionFactory.createContext(userName, password, sessionMode);
}
if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, localStrings.getLocalString("JMSContext.impl.create",
- "Created new JMSContext instance associated with id {0}: {1}.",
+ logger.log(Level.FINE, localStrings.getLocalString("JMSContext.impl.create",
+ "Created new JMSContext instance associated with id {0}: {1}.",
ipId, context.toString()));
}
return context;
@@ -105,13 +105,13 @@
try {
context.close();
if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, localStrings.getLocalString("JMSContext.impl.close",
- "Closed JMSContext instance associated with id {0}: {1}.",
+ logger.log(Level.FINE, localStrings.getLocalString("JMSContext.impl.close",
+ "Closed JMSContext instance associated with id {0}: {1}.",
ipId, context.toString()));
}
} catch (Exception e) {
- logger.log(Level.SEVERE, localStrings.getLocalString("JMSContext.impl.close.failure",
- "Failed to close JMSContext instance associated with id {0}: {1}.",
+ logger.log(Level.SEVERE, localStrings.getLocalString("JMSContext.impl.close.failure",
+ "Failed to close JMSContext instance associated with id {0}: {1}.",
ipId, context.toString()), e);
} finally {
if (inv != null && currentInv != inv) invMgr.postInvoke(inv);
diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java
index eabaa05..00f3a61 100644
--- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java
+++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/ForwardingJMSContext.java
@@ -237,7 +237,7 @@
}
private IllegalStateRuntimeException getUnsupportedException() {
- return new IllegalStateRuntimeException(localStrings.getLocalString("JMSContext.injection.not.supported",
+ return new IllegalStateRuntimeException(localStrings.getLocalString("JMSContext.injection.not.supported",
"This method is not permitted on a container-managed (injected) JMSContext."));
}
}
diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java
index 0879c49..f3dbaec 100644
--- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java
+++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/InjectableJMSContext.java
@@ -45,7 +45,7 @@
/**
* This bean is the JMSContext wrapper which user gets by injection.
* It can read metadata of injection point for it is dependent scoped.
- * It delegates all business methods of JMSContext interface to the
+ * It delegates all business methods of JMSContext interface to the
* JMSContext API via request scopd JMSContextManager bean.
*/
public class InjectableJMSContext extends ForwardingJMSContext implements Serializable {
@@ -74,7 +74,7 @@
/*
* We cache the ConnectionFactory here to avoid repeated JNDI lookup
- * If the bean is passivated/activated the field will be set to null
+ * If the bean is passivated/activated the field will be set to null
* and re-initialised lazily. (Though as a ConnectionFactory is required
* to be Serializable this may not be needed)
*/
@@ -97,7 +97,7 @@
metadata = new JMSContextMetadata(jmsConnectionFactoryAnnot, sessionModeAnnot, credentialAnnot);
id = metadata.getFingerPrint();
if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, localStrings.getLocalString("JMSContext.injection.initialization",
+ logger.log(Level.FINE, localStrings.getLocalString("JMSContext.injection.initialization",
"Injecting JMSContext wrapper with id {0} and metadata [{1}].", ipId, metadata));
}
}
@@ -116,7 +116,7 @@
manager = getTransactedManager();
if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, localStrings.getLocalString("JMSContext.delegation.type",
+ logger.log(Level.FINE, localStrings.getLocalString("JMSContext.delegation.type",
"JMSContext wrapper with id {0} is delegating to {1} instance.", ipId, manager.getType()));
}
try {
@@ -170,15 +170,15 @@
try {
manager.cleanup();
if (logger.isLoggable(Level.FINE)) {
- logger.log(Level.FINE, localStrings.getLocalString("JMSContext.injection.cleanup",
- "Cleaning up {0} JMSContext wrapper with id {1} and metadata [{2}].",
+ logger.log(Level.FINE, localStrings.getLocalString("JMSContext.injection.cleanup",
+ "Cleaning up {0} JMSContext wrapper with id {1} and metadata [{2}].",
manager.getType(), ipId, metadata.getLookup()));
}
} catch (ContextNotActiveException cnae) {
// ignore the ContextNotActiveException when the application is undeployed.
} catch (Throwable t) {
- logger.log(Level.SEVERE, localStrings.getLocalString("JMSContext.injection.cleanup.failure",
- "Failed to cleaning up {0} JMSContext wrapper with id {1} and metadata [{2}]. Reason: {3}.",
+ logger.log(Level.SEVERE, localStrings.getLocalString("JMSContext.injection.cleanup.failure",
+ "Failed to cleaning up {0} JMSContext wrapper with id {1} and metadata [{2}]. Reason: {3}.",
manager.getType(), ipId, metadata.getLookup(), t.toString()));
}
}
@@ -219,7 +219,7 @@
try {
initialContext = new InitialContext();
} catch (NamingException ne) {
- throw new RuntimeException(localStrings.getLocalString("initialContext.init.exception",
+ throw new RuntimeException(localStrings.getLocalString("initialContext.init.exception",
"Cannot create InitialContext."), ne);
}
@@ -240,8 +240,8 @@
usePMResource = true;
}
} catch (NamingException ne) {
- throw new RuntimeException(localStrings.getLocalString("connectionFactory.not.found",
- "ConnectionFactory not found with lookup {0}.",
+ throw new RuntimeException(localStrings.getLocalString("connectionFactory.not.found",
+ "ConnectionFactory not found with lookup {0}.",
jndiName), ne);
} finally {
if (initialContext != null) {
@@ -266,7 +266,7 @@
if (txn != null)
isInTransaction = true;
} catch (SystemException e) {
- throw new RuntimeException(localStrings.getLocalString("txn.detection.failure",
+ throw new RuntimeException(localStrings.getLocalString("txn.detection.failure",
"Failed to detect transaction status of current thread."), e);
}
return isInTransaction;
diff --git a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextMetadata.java b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextMetadata.java
index 3955fca..209a323 100644
--- a/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextMetadata.java
+++ b/appserver/jms/gf-jms-injection/src/main/java/org/glassfish/jms/injection/JMSContextMetadata.java
@@ -146,7 +146,7 @@
return unalisedPwd;
} catch (Exception e) {
if (logger.isLoggable(Level.WARNING)) {
- logger.log(Level.WARNING, localStrings.getLocalString("decrypt.password.fail",
+ logger.log(Level.WARNING, localStrings.getLocalString("decrypt.password.fail",
"Failed to unalias password for the reason: {0}."), e.toString());
}
}
diff --git a/appserver/jms/jms-core/pom.xml b/appserver/jms/jms-core/pom.xml
index 5f61700..6aef842 100644
--- a/appserver/jms/jms-core/pom.xml
+++ b/appserver/jms/jms-core/pom.xml
@@ -27,9 +27,9 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>jms-core</artifactId>
<packaging>glassfish-jar</packaging>
-
+
<name>JMS Module</name>
-
+
<developers>
<developer>
<id>sats</id>
@@ -102,7 +102,7 @@
<artifactId>gf-ejb-connector</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.glassfish.main.core</groupId>
<artifactId>kernel</artifactId>
<version>${project.version}</version>
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java
index 7773495..20c6e6c 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/JMSLoggerInfo.java
@@ -49,10 +49,10 @@
@LogMessageInfo(message = "Addresslist : {0}")
public static final String ADDRESSLIST = LOGMSG_PREFIX + "-00003";
-
+
@LogMessageInfo(message = "End point determines destination name, Res name: {0}, JNDI name: {1} descriptor name : {2}")
public static final String ENDPOINT_DEST_NAME = LOGMSG_PREFIX + "-00004";
-
+
@LogMessageInfo(message = "Successfully set Master broker on JMSRA to {0}")
public static final String MASTER_BROKER_SUCCESS = LOGMSG_PREFIX + "-00005";
@@ -69,7 +69,7 @@
action = "unknown"
)
public static final String CLUSTER_BROKER_FAILURE = LOGMSG_PREFIX + "-00008";
-
+
@LogMessageInfo(
message = "Failed to shut down Grizzly NetworkListener : {0}",
level = "WARNING",
@@ -109,7 +109,7 @@
action = "unknown"
)
public static final String CLOSE_CONNECTION_FAILED = LOGMSG_PREFIX + "-00013";
-
+
@LogMessageInfo(
message = "rardeployment.mcfcreation_error {0}",
level = "WARNING",
@@ -117,7 +117,7 @@
action = "unknown"
)
public static final String RARDEPLOYMENT_MCF_ERROR = LOGMSG_PREFIX + "-00014";
-
+
@LogMessageInfo(
message = "Exception while getting configured RMI port : {0}",
level = "WARNING",
@@ -181,7 +181,7 @@
action = "unknown"
)
public static final String LOAD_RESOURCES_ERROR = LOGMSG_PREFIX + "-00022";
-
+
@LogMessageInfo(
message = "Exception in reading mdb-container configuration : [{0}]",
level = "WARNING",
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java
index 5e361b5..e805edd 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionHandler.java
@@ -199,66 +199,66 @@
if (descriptor instanceof JMSConnectionFactoryDefinitionDescriptor) {
JMSConnectionFactoryDefinitionDescriptor desc = (JMSConnectionFactoryDefinitionDescriptor)descriptor;
if (desc.getName().equals(defn.name())) {
-
+
if (desc.getInterfaceName() == null) {
desc.setInterfaceName(defn.interfaceName());
}
-
+
if (desc.getClassName() == null) {
if (isValid(defn.className())) {
desc.setClassName(defn.className());
}
}
-
+
if (desc.getDescription() == null) {
if (isValid(defn.description())) {
desc.setDescription(defn.description());
}
}
-
+
if (desc.getResourceAdapter() == null) {
if (isValid(defn.resourceAdapter())) {
desc.setResourceAdapter(defn.resourceAdapter());
}
}
-
+
if (desc.getUser() == null) {
if (isValid(defn.user())) {
desc.setUser(defn.user());
}
}
-
+
if (desc.getPassword() == null) {
if (defn.password() != null /*ALLOW EMPTY PASSWORDS && !defn.password().equals("")*/) {
desc.setPassword(defn.password());
}
}
-
+
if (desc.getClientId() == null) {
if (isValid(defn.clientId())) {
desc.setClientId(defn.clientId());
}
}
-
+
if (!desc.isTransactionSet()) {
desc.setTransactional(defn.transactional());
}
-
+
if (desc.getMaxPoolSize() < 0) {
if (defn.maxPoolSize() >= 0) {
desc.setMaxPoolSize(defn.maxPoolSize());
}
}
-
+
if (desc.getMinPoolSize() < 0) {
if (defn.minPoolSize() >= 0) {
desc.setMinPoolSize(defn.minPoolSize());
}
}
-
+
Properties properties = desc.getProperties();
String[] defnProperties = defn.properties();
-
+
if (defnProperties.length > 0) {
for (String property : defnProperties) {
int index = property.indexOf("=");
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionsHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionsHandler.java
index 7a76559..2b56551 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionsHandler.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSConnectionFactoryDefinitionsHandler.java
@@ -48,8 +48,8 @@
@Override
protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts)
throws AnnotationProcessorException {
- JMSConnectionFactoryDefinitions defns = (JMSConnectionFactoryDefinitions) ainfo.getAnnotation();
- JMSConnectionFactoryDefinition values[] = defns.value();
+ JMSConnectionFactoryDefinitions defns = (JMSConnectionFactoryDefinitions) ainfo.getAnnotation();
+ JMSConnectionFactoryDefinition values[] = defns.value();
Set<String> duplicates = new HashSet<String>();
if (values != null && values.length > 0) {
for (JMSConnectionFactoryDefinition defn : values) {
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java
index 98177b9..bea89b3 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionHandler.java
@@ -187,38 +187,38 @@
if (descriptor instanceof JMSDestinationDefinitionDescriptor) {
JMSDestinationDefinitionDescriptor desc = (JMSDestinationDefinitionDescriptor)descriptor;
if (desc.getName().equals(defn.name())) {
-
+
if (desc.getInterfaceName() == null) {
desc.setInterfaceName(defn.interfaceName());
}
-
+
if (desc.getClassName() == null) {
if (isValid(defn.className())) {
desc.setClassName(defn.className());
}
}
-
+
if (desc.getDescription() == null) {
if (isValid(defn.description())) {
desc.setDescription(defn.description());
}
}
-
+
if (desc.getResourceAdapter() == null) {
if (isValid(defn.resourceAdapter())) {
desc.setResourceAdapter(defn.resourceAdapter());
}
}
-
+
if (desc.getDestinationName() == null) {
if (isValid(defn.destinationName())) {
desc.setDestinationName(defn.destinationName());
}
}
-
+
Properties properties = desc.getProperties();
String[] defnProperties = defn.properties();
-
+
if (defnProperties.length > 0) {
for (String property : defnProperties) {
int index = property.indexOf("=");
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionsHandler.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionsHandler.java
index 71b2600..3d4c4d2 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionsHandler.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/deployment/annotation/handlers/JMSDestinationDefinitionsHandler.java
@@ -48,8 +48,8 @@
@Override
protected HandlerProcessingResult processAnnotation(AnnotationInfo ainfo, ResourceContainerContext[] rcContexts)
throws AnnotationProcessorException {
- JMSDestinationDefinitions defns = (JMSDestinationDefinitions) ainfo.getAnnotation();
- JMSDestinationDefinition values[] = defns.value();
+ JMSDestinationDefinitions defns = (JMSDestinationDefinitions) ainfo.getAnnotation();
+ JMSDestinationDefinition values[] = defns.value();
Set<String> duplicates = new HashSet<String>();
if (values != null && values.length > 0) {
for (JMSDestinationDefinition defn : values) {
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
index 6bc4345..02bd2c9 100755
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/ActiveJmsResourceAdapter.java
@@ -279,27 +279,27 @@
@Inject
private Provider<JMSConfigListener> jmsConfigListenerProvider;
-
+
@Inject
private Provider<ServerEnvironmentImpl> serverEnvironmentImplProvider;
-
+
@Inject @Named(ServerEnvironment.DEFAULT_INSTANCE_NAME)
private Provider<AdminService> adminServiceProvider;
-
+
@Inject
private Provider<Servers> serversProvider;
-
+
private Provider<JmsService> jmsServiceProvider;
-
+
@Inject
private Provider<ServerContext> serverContextProvider;
-
+
@Inject
private Provider<ConnectorRuntime> connectorRuntimeProvider;
@Inject
private ServiceLocator habitat;
-
+
@Inject
private ApplicationRegistry appRegistry;
@@ -326,7 +326,7 @@
// Upgrade jms resource adapter, if necessary before starting
// the RA.
try {
- JMSConfigListener jmsConfigListener=jmsConfigListenerProvider.get();
+ JMSConfigListener jmsConfigListener=jmsConfigListenerProvider.get();
jmsConfigListener.setActiveResourceAdapter(this);
JmsRaUtil raUtil = new JmsRaUtil();
raUtil.upgradeIfNecessary();
@@ -417,7 +417,7 @@
/**
* Start Grizzly based JMS lazy listener, which is going to initialize
* JMS container on first request.
- */
+ */
public void initializeLazyListener(JmsService jmsService) {
if (jmsService != null) {
if (EMBEDDED.equalsIgnoreCase(jmsService.getType()) && !grizzlyListenerInit) {
@@ -462,7 +462,7 @@
JmsService jmsService = server.getConfig().getExtensionByType(JmsService.class);
initializeLazyListener(jmsService);
}
- //System.setProperty("imq.jmsra.direct.clustered", "true");
+ //System.setProperty("imq.jmsra.direct.clustered", "true");
AccessController.doPrivileged
(new java.security.PrivilegedExceptionAction() {
public Object run() throws
@@ -506,26 +506,26 @@
brokerType = element.getValue();
}
}
- boolean cluster = false;
- try {
- cluster = isClustered();
- } catch (Exception e) {
- e.printStackTrace();
- }
- // hack is required only for nonclustered nonremote brokers.
- if (!cluster) {
+ boolean cluster = false;
+ try {
+ cluster = isClustered();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ // hack is required only for nonclustered nonremote brokers.
+ if (!cluster) {
if (brokerType.equals(ActiveJmsResourceAdapter.LOCAL)
|| brokerType.equals(ActiveJmsResourceAdapter.EMBEDDED)
- || brokerType.equals(ActiveJmsResourceAdapter.DIRECT))
+ || brokerType.equals(ActiveJmsResourceAdapter.DIRECT))
{
- for (Iterator iter = mergedProps.iterator(); iter.hasNext();) {
+ for (Iterator iter = mergedProps.iterator(); iter.hasNext();) {
ConnectorConfigProperty element = (ConnectorConfigProperty ) iter.next();
if (element.getName().equals(ActiveJmsResourceAdapter.CONNECTION_URL)) {
iter.remove();
}
}
- }
- }
+ }
+ }
return mergedProps;
}
//Overriding ActiveResourceAdapterImpl.setup() as a work around for
@@ -552,7 +552,7 @@
*/
private void setAvailabilityProperties() throws ConnectorRuntimeException {
- if(!isClustered()) return;
+ if(!isClustered()) return;
try {
Domain domain = Globals.get(Domain.class);
ServerContext serverContext = Globals.get(ServerContext.class);
@@ -744,7 +744,7 @@
same values in all broker instances in the conventional cluster
*/
- String prefix = null;
+ String prefix = null;
if (ClusterMode.CONVENTIONAL_WITH_MASTER_BROKER == clusterMode) {
prefix = ENHANCED_CLUSTER_DB_PREFIX;
} else if (ClusterMode.CONVENTIONAL_OF_PEER_BROKERS == clusterMode) {
@@ -757,7 +757,7 @@
return;
}
if(dbProps == null) dbProps = new Properties();
- dbProps.setProperty("imq.cluster.clusterid", getMQClusterName());
+ dbProps.setProperty("imq.cluster.clusterid", getMQClusterName());
dbProps.setProperty("imq.persist.store", jmsAvailability.getMessageStoreType());
if(ClusterMode.CONVENTIONAL_WITH_MASTER_BROKER == clusterMode)
dbProps.setProperty("imq.cluster.nomasterbroker", "false");
@@ -781,14 +781,14 @@
String propertyPrefix = fullprefix + "property.";
if(dbJdbcUrl != null) {
- if ("derby".equals(dbVendor))
- dbProps.setProperty(fullprefix + "opendburl", dbJdbcUrl);
- else
- dbProps.setProperty(propertyPrefix + "url", dbJdbcUrl);
- }
+ if ("derby".equals(dbVendor))
+ dbProps.setProperty(fullprefix + "opendburl", dbJdbcUrl);
+ else
+ dbProps.setProperty(propertyPrefix + "url", dbJdbcUrl);
+ }
for (Object obj : dbprops){
- Property prop = (Property) obj;
+ Property prop = (Property) obj;
String key = prop.getName();
String value = prop.getValue();
//don't set a prefix if the property name is already prefixed with "imq."
@@ -961,27 +961,27 @@
//XX: Extract the information from the optional properties.
List jmsProperties = getJmsService().getProperty();
- List jmsHostProperties = jmsHost.getProperty();
- Properties jmsServiceProp = listToProperties(jmsProperties);
- Properties jmsHostProp = listToProperties (jmsHostProperties);
+ List jmsHostProperties = jmsHost.getProperty();
+ Properties jmsServiceProp = listToProperties(jmsProperties);
+ Properties jmsHostProp = listToProperties (jmsHostProperties);
- jmsServiceProp.putAll(jmsHostProp);
- if(jmsServiceProp.size() > 0) {
+ jmsServiceProp.putAll(jmsHostProp);
+ if(jmsServiceProp.size() > 0) {
if(dbProps == null)
dbProps = new Properties();
dbProps.putAll(jmsServiceProp);
}
/*
- String jmsPropertiesStr = null ;
- if(jmsServiceProp.size() > 0)
- {
- try{
- StringWriter writer = new StringWriter();
- jmsServiceProp.store(writer, "Properties defined in JMSService and JMSHost");
- jmsPropertiesStr = writer.toString();
- }catch(Exception e){}//todo: log error;
- } */
+ String jmsPropertiesStr = null ;
+ if(jmsServiceProp.size() > 0)
+ {
+ try{
+ StringWriter writer = new StringWriter();
+ jmsServiceProp.store(writer, "Properties defined in JMSService and JMSHost");
+ jmsPropertiesStr = writer.toString();
+ }catch(Exception e){}//todo: log error;
+ } */
String brokerHomeDir = getBrokerHomeDir();
String brokerLibDir = getBrokerLibDir();
if (brokerInstanceName == null) {
@@ -995,11 +995,11 @@
//BrokerArgs, BrokerHomeDir, BrokerVarDir, BrokerStartTimeout
//adminUserName, adminPassword
ConnectorDescriptor cd = getDescriptor();
- /*if(jmsPropertiesStr != null){
- ConnectorConfigProperty envProp = new ConnectorConfigProperty (
+ /*if(jmsPropertiesStr != null){
+ ConnectorConfigProperty envProp = new ConnectorConfigProperty (
"BrokerProps", jmsPropertiesStr, "Broker Props", "java.lang.String");
- setProperty(cd, envProp);
- } */
+ setProperty(cd, envProp);
+ } */
ConnectorConfigProperty envProp1 = new ConnectorConfigProperty (
BROKERTYPE, brokerType, "Broker Type", "java.lang.String");
setProperty(cd, envProp1);
@@ -1068,17 +1068,17 @@
}
private Properties listToProperties(List<Property> props){
- Properties properties = new Properties();
- if(props != null){
- for (Property prop : props){
- String key = prop.getName();
- String value = prop.getValue();
+ Properties properties = new Properties();
+ if(props != null){
+ for (Property prop : props){
+ String key = prop.getName();
+ String value = prop.getValue();
- properties.setProperty(key, value);
- }
- }
+ properties.setProperty(key, value);
+ }
+ }
- return properties;
+ return properties;
}
private String adjustForDirectMode(String brokerType) {
@@ -1292,7 +1292,7 @@
return;
} else {
if (! isDBEnabled()){
-
+
String masterbrkr = getMasterBroker();
ConnectorConfigProperty envProp2 = new ConnectorConfigProperty
(MASTERBROKER,masterbrkr , "Master Broker",
@@ -1319,11 +1319,11 @@
AvailabilityService as = server.getConfig().getAvailabilityService();
- if (as != null){
- JmsAvailability jmsAvailability = as.getExtensionByType(JmsAvailability.class);
- if (jmsAvailability.getAvailabilityEnabled() != null && Boolean.parseBoolean(jmsAvailability.getAvailabilityEnabled())){
- return true;
- } else
+ if (as != null){
+ JmsAvailability jmsAvailability = as.getExtensionByType(JmsAvailability.class);
+ if (jmsAvailability.getAvailabilityEnabled() != null && Boolean.parseBoolean(jmsAvailability.getAvailabilityEnabled())){
+ return true;
+ } else
if(jmsAvailability.getConfigStoreType() != null && ! "MASTERBROKER".equalsIgnoreCase(jmsAvailability.getConfigStoreType()))
return true;
}
@@ -1690,7 +1690,7 @@
configuredPort = getConfiguredRmiRegistryPort();
} catch (Exception ex) {
if (_logger.isLoggable(Level.WARNING)) {
- _logger.log(Level.WARNING, JMSLoggerInfo.GET_RMIPORT_FAIL,
+ _logger.log(Level.WARNING, JMSLoggerInfo.GET_RMIPORT_FAIL,
new Object[]{ex.getLocalizedMessage()});
}
if (_logger.isLoggable(Level.FINE)) {
@@ -2067,13 +2067,13 @@
} else {
destName = getPhysicalDestinationFromConfiguration(jndiName, appName, moduleName);
}
-
+
//1.3 jndi-name ==> 1.4 setDestination
descriptor_.putRuntimeActivationConfigProperty(
new EnvironmentProperty(DESTINATION,
destName, null));
-
-
+
+
//1.3 (standard) destination-type == 1.4 setDestinationType
//XXX Do we really need this???
if (descriptor_.getDestinationType() != null &&
@@ -2091,7 +2091,7 @@
new EnvironmentProperty(DESTINATION_TYPE,
destination.getInterfaceName(), null));
if (_logger.isLoggable(Level.INFO)) {
- _logger.log(Level.INFO, JMSLoggerInfo.ENDPOINT_DEST_NAME,
+ _logger.log(Level.INFO, JMSLoggerInfo.ENDPOINT_DEST_NAME,
new Object[]{destination.getInterfaceName(), destination.getName(), descriptor_.getName()});
}
} else {
@@ -2117,9 +2117,9 @@
new Object[]{aor.getResType(), aor.getJndiName(), descriptor_.getName()});
}
}
-
+
} catch (Exception e) {
-
+
}
}
}
@@ -2571,7 +2571,7 @@
Method m = c.getMethod("setClusterBrokerList", String.class);
m.invoke(resourceadapter_, brokerList);
if (_logger.isLoggable(Level.INFO)) {
- _logger.log(Level.INFO, JMSLoggerInfo.CLUSTER_BROKER_SUCCESS,
+ _logger.log(Level.INFO, JMSLoggerInfo.CLUSTER_BROKER_SUCCESS,
new Object[]{brokerList});
}
}catch (Exception ex){
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java
index f4e1705..9817364 100755
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JMSConfigListener.java
@@ -52,7 +52,7 @@
@Inject @Named(ServerEnvironment.DEFAULT_INSTANCE_NAME)
private Config serverConfig;
-
+
@Inject
private Servers servers;
@@ -242,7 +242,7 @@
try{
addressList.setup(true);
}catch(Exception ex){
- _logger.log(Level.WARNING, JMSLoggerInfo.ADDRESSLIST_SETUP_FAIL,
+ _logger.log(Level.WARNING, JMSLoggerInfo.ADDRESSLIST_SETUP_FAIL,
new Object[]{ex.getLocalizedMessage()});
ex.printStackTrace();
}
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
index 277e6ce..3f311fa 100644
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/JmsProviderLifecycle.java
@@ -120,7 +120,7 @@
if(defaultJmsHost == null && jmsHostList.size() >0) {
defaultJmsHost = jmsHostList.get(0);
}
- boolean lazyInit = false;
+ boolean lazyInit = false;
if (defaultJmsHost != null)
lazyInit = Boolean.parseBoolean(defaultJmsHost.getLazyInit());
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java
index 5559b37..51f97e4 100755
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/system/MQAddressList.java
@@ -258,7 +258,7 @@
final Server[] buddies = getServersInCluster(cluster);
final Config cfg = getConfigForServer(buddies[0]);
return cfg.getExtensionByType(JmsService.class);
- }
+ }
private Config getConfigForServer(Server server){
@@ -297,16 +297,16 @@
else{
Server[] buddies = getServersInCluster(cluster);
// return the first valid host
- // there may be hosts attached to an NA that is down
+ // there may be hosts attached to an NA that is down
if (buddies.length > 0){
masterBrokerInstance = buddies[0];
}
}
final JmsHost copy = getResolvedJmsHost(masterBrokerInstance);
- if (copy != null)
+ if (copy != null)
return copy;
else
- throw new RuntimeException("No JMS hosts available to select as Master");
+ throw new RuntimeException("No JMS hosts available to select as Master");
}
public Cluster getClusterByName(String clusterName)
@@ -612,7 +612,7 @@
logFine("getResolvedJmsHost " + as);
// final JmsService jmsService = Globals.get(JmsService.class);
// JmsHost jmsHost = null;
- // if (JMSServiceType.LOCAL.toString().equals(jmsService.getType()) || JMSServiceType.EMBEDDED.toString().equals(jmsService.getType())) {
+ // if (JMSServiceType.LOCAL.toString().equals(jmsService.getType()) || JMSServiceType.EMBEDDED.toString().equals(jmsService.getType())) {
// jmsHost = getDefaultJmsHost(jmsService);
//}
// return ( jmsHost );
@@ -673,7 +673,7 @@
{
JmsService jmsService = config.getExtensionByType(JmsService.class);
JmsHost jmsHost = null;
- if (JMSServiceType.LOCAL.toString().equals(jmsService.getType()) || JMSServiceType.EMBEDDED.toString().equals(jmsService.getType())) {
+ if (JMSServiceType.LOCAL.toString().equals(jmsService.getType()) || JMSServiceType.EMBEDDED.toString().equals(jmsService.getType())) {
jmsHost = getDefaultJmsHost(jmsService);
}
return ( jmsHost );
diff --git a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/util/JmsRaUtil.java b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/util/JmsRaUtil.java
index b4398c7..982a01b 100755
--- a/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/util/JmsRaUtil.java
+++ b/appserver/jms/jms-core/src/main/java/com/sun/enterprise/connectors/jms/util/JmsRaUtil.java
@@ -151,7 +151,7 @@
}
return null;
}
-
+
private static boolean enableClustering() {
try {
/* This flag disables the auto clustering functionality
@@ -233,7 +233,7 @@
reconnectDelayInSeconds =
Integer.parseInt(p.getValue());
} catch (Exception e) {
- _logger.log(Level.WARNING, JMSLoggerInfo.MDB_CONFIG_EXCEPTION,
+ _logger.log(Level.WARNING, JMSLoggerInfo.MDB_CONFIG_EXCEPTION,
new Object[]{e.getMessage()});
}
}
@@ -242,7 +242,7 @@
reconnectMaxRetries =
Integer.parseInt(p.getValue());
} catch (Exception e) {
- _logger.log(Level.WARNING, JMSLoggerInfo.MDB_CONFIG_EXCEPTION,
+ _logger.log(Level.WARNING, JMSLoggerInfo.MDB_CONFIG_EXCEPTION,
new Object[]{e.getMessage()});
}
}
@@ -257,7 +257,7 @@
}
}
} catch (Exception e) {
- _logger.log(Level.WARNING, JMSLoggerInfo.MDB_CONFIG_EXCEPTION,
+ _logger.log(Level.WARNING, JMSLoggerInfo.MDB_CONFIG_EXCEPTION,
new Object[]{e.getMessage()});
if (_logger.isLoggable(Level.FINE)) {
_logger.log(Level.FINE, e.getClass().getName(), e);
@@ -344,7 +344,7 @@
rarFile.explode();
_logger.log(Level.INFO, JMSLoggerInfo.JMSRA_UPGRADE_COMPLETED);
} catch(ZipFileException ze) {
- _logger.log(Level.SEVERE, JMSLoggerInfo.JMSRA_UPGRADE_FAILED,
+ _logger.log(Level.SEVERE, JMSLoggerInfo.JMSRA_UPGRADE_FAILED,
new Object[]{ze.getMessage()});
}
}
@@ -377,7 +377,7 @@
ver = mf.getMainAttributes().getValue(MANIFEST_TAG);
return ver;
} catch (Exception e) {
- _logger.log(Level.WARNING, JMSLoggerInfo.JMSRA_UPGRADE_CHECK_FAILED,
+ _logger.log(Level.WARNING, JMSLoggerInfo.JMSRA_UPGRADE_CHECK_FAILED,
new Object[]{e.getMessage() + ":" + jarFile});
throw e;
} finally {
@@ -401,7 +401,7 @@
ver = mf.getMainAttributes().getValue(MANIFEST_TAG);
return ver;
} catch (Exception e) {
- _logger.log(Level.WARNING, JMSLoggerInfo.JMSRA_UPGRADE_CHECK_FAILED,
+ _logger.log(Level.WARNING, JMSLoggerInfo.JMSRA_UPGRADE_CHECK_FAILED,
new Object[]{e.getMessage() + ":" + manifestFile});
throw e;
}
diff --git a/appserver/jms/jmsra/pom.xml b/appserver/jms/jmsra/pom.xml
index 42b7458..9bdfbd4 100644
--- a/appserver/jms/jmsra/pom.xml
+++ b/appserver/jms/jmsra/pom.xml
@@ -41,14 +41,14 @@
<configuration>
<tasks>
<resolveArtifact artifactId="mq-distribution" property="mq-distribution.zip" />
- <mkdir dir="target/tmp" />
- <mkdir dir="target/classes/glassfish/lib/install/applications/jmsra" />
- <unzip src="${mq-distribution.zip}" dest="target/tmp">
+ <mkdir dir="target/tmp" />
+ <mkdir dir="target/classes/glassfish/lib/install/applications/jmsra" />
+ <unzip src="${mq-distribution.zip}" dest="target/tmp">
<patternset>
- <include name="mq/lib/imqjmsra.rar" />
- </patternset>
- </unzip>
- <unzip src="target/tmp/mq/lib/imqjmsra.rar" dest="target/classes/glassfish/lib/install/applications/jmsra">
+ <include name="mq/lib/imqjmsra.rar" />
+ </patternset>
+ </unzip>
+ <unzip src="target/tmp/mq/lib/imqjmsra.rar" dest="target/classes/glassfish/lib/install/applications/jmsra">
</unzip>
</tasks>
</configuration>
@@ -73,7 +73,7 @@
<groupId>org.glassfish.mq</groupId>
<artifactId>mq-distribution</artifactId>
<version>${mq.version}</version>
- <type>zip</type>
+ <type>zip</type>
</dependency>
</dependencies>
</project>
