[jboss-svn-commits] JBL Code SVN: r29566 - in labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss: soa/esb/http and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 8 15:36:21 EDT 2009
Author: dward
Date: 2009-10-08 15:36:21 -0400 (Thu, 08 Oct 2009)
New Revision: 29566
Modified:
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/http/HttpConfiguration.java
labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/message/ResponseStatus.java
Log:
Fix for CI build.
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java 2009-10-08 18:42:56 UTC (rev 29565)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/internal/soa/esb/listeners/war/HttpGatewayDeploymentFactory.java 2009-10-08 19:36:21 UTC (rev 29566)
@@ -78,13 +78,12 @@
private void addEndpointAddress(ConfigTree webEndpointConfig, Servlet servlet, String urlMapping) {
String transportGuarantee = webEndpointConfig.getAttribute(TRANSPORT_GUARANTEE);
boolean secure = ( "CONFIDENTIAL".equals(transportGuarantee) || "INTEGRAL".equals(transportGuarantee) );
- HttpConfiguration httpConfig = HttpConfiguration.getInstance();
String path = servlet.getWebModel().getEsbName();
path = path.substring(0, path.length() - 4) + urlMapping; // remove ".war" and add urlMapping
while (path.endsWith("*") || path.endsWith("/")) {
path = path.substring(0, path.length()-1);
}
- String address = ( secure ? httpConfig.getSecureAddress(path) : httpConfig.getAddress(path) );
+ String address = ( secure ? HttpConfiguration.getSecureAddress(path) : HttpConfiguration.getAddress(path) );
servlet.setEndpointAddress(address);
}
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/http/HttpConfiguration.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/http/HttpConfiguration.java 2009-10-08 18:42:56 UTC (rev 29565)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/http/HttpConfiguration.java 2009-10-08 19:36:21 UTC (rev 29566)
@@ -41,41 +41,36 @@
*
* @author dward at jboss.org
*/
-public class HttpConfiguration
+public final class HttpConfiguration
{
private static final Logger logger = Logger.getLogger(HttpConfiguration.class);
- private static HttpConfiguration INSTANCE = null;
+ private static MBeanServer mbeanServer = null;
- public static HttpConfiguration getInstance()
+ private HttpConfiguration() {}
+
+ private static MBeanServer getMBeanServer()
{
- if (INSTANCE == null)
+ if (mbeanServer == null)
{
synchronized(HttpConfiguration.class)
{
- if (INSTANCE == null)
+ if (mbeanServer == null)
{
- INSTANCE = new HttpConfiguration( MBeanServerLocator.locateJBoss() );
+ mbeanServer = MBeanServerLocator.locateJBoss();
}
}
}
- return INSTANCE;
+ return mbeanServer;
}
- private MBeanServer mbeanServer;
-
- private HttpConfiguration(MBeanServer mbeanServer)
+ public static String getHost()
{
- this.mbeanServer = mbeanServer;
- }
-
- public String getHost()
- {
return getHost(Environment.DEFAULT_HOST);
}
- public String getHost(String defaultValue)
+ public static String getHost(String defaultValue)
{
String global = Configuration.getHttpHost();
if (global != null)
@@ -90,12 +85,12 @@
return defaultValue;
}
- public int getPort()
+ public static int getPort()
{
return getPort(8080);
}
- public int getPort(int defaultValue)
+ public static int getPort(int defaultValue)
{
String global = Configuration.getHttpPort();
if (global != null)
@@ -110,12 +105,12 @@
return defaultValue;
}
- public int getSecurePort()
+ public static int getSecurePort()
{
return getSecurePort(8443);
}
- public int getSecurePort(int defaultValue)
+ public static int getSecurePort(int defaultValue)
{
String global = Configuration.getHttpSecurePort();
if (global != null)
@@ -130,20 +125,21 @@
return defaultValue;
}
- private int getConnectorPort(String protocol, boolean secure)
+ private static int getConnectorPort(String protocol, boolean secure)
{
int port = -1;
try
{
- Set<?> connectorNames = mbeanServer.queryNames(new ObjectName("jboss.web:type=Connector,*"), null);
+ MBeanServer mbs = getMBeanServer();
+ Set<?> connectorNames = mbs.queryNames(new ObjectName("jboss.web:type=Connector,*"), null);
for (Object current : connectorNames)
{
ObjectName currentName = (ObjectName)current;
try
{
- int connectorPort = (Integer)mbeanServer.getAttribute(currentName, "port");
- boolean connectorSecure = (Boolean)mbeanServer.getAttribute(currentName, "secure");
- String connectorProtocol = (String)mbeanServer.getAttribute(currentName, "protocol");
+ int connectorPort = (Integer)mbs.getAttribute(currentName, "port");
+ boolean connectorSecure = (Boolean)mbs.getAttribute(currentName, "secure");
+ String connectorProtocol = (String)mbs.getAttribute(currentName, "protocol");
if (protocol.equals(connectorProtocol) && secure == connectorSecure)
{
if (port > -1)
@@ -166,27 +162,27 @@
return port;
}
- public String getAddress()
+ public static String getAddress()
{
return buildAddress(null, false);
}
- public String getAddress(String path)
+ public static String getAddress(String path)
{
return buildAddress(path, false);
}
- public String getSecureAddress()
+ public static String getSecureAddress()
{
return buildAddress(null, true);
}
- public String getSecureAddress(String path)
+ public static String getSecureAddress(String path)
{
return buildAddress(path, true);
}
- private String buildAddress(String path, boolean secure)
+ private static String buildAddress(String path, boolean secure)
{
StringBuilder sb = new StringBuilder();
if (secure)
@@ -218,52 +214,52 @@
return sb.toString();
}
- public URL getURL() throws MalformedURLException
+ public static URL getURL() throws MalformedURLException
{
return new URL( getAddress() );
}
- public URL getURL(String path) throws MalformedURLException
+ public static URL getURL(String path) throws MalformedURLException
{
return new URL( getAddress(path) );
}
- public URL getSecureURL() throws MalformedURLException
+ public static URL getSecureURL() throws MalformedURLException
{
return new URL( getSecureAddress() );
}
- public URL getSecureURL(String path) throws MalformedURLException
+ public static URL getSecureURL(String path) throws MalformedURLException
{
return new URL( getSecureAddress(path) );
}
- public URI getURI() throws URISyntaxException
+ public static URI getURI() throws URISyntaxException
{
return new URI( getAddress() );
}
- public URI getURI(String path) throws URISyntaxException
+ public static URI getURI(String path) throws URISyntaxException
{
return new URI( getAddress(path) );
}
- public URI getSecureURI() throws URISyntaxException
+ public static URI getSecureURI() throws URISyntaxException
{
return new URI( getSecureAddress() );
}
- public URI getSecureURI(String path) throws URISyntaxException
+ public static URI getSecureURI(String path) throws URISyntaxException
{
return new URI( getSecureAddress(path) );
}
- public boolean isResponseStatusEnabled()
+ public static boolean isResponseStatusEnabled()
{
return isResponseStatusEnabled(true);
}
- public boolean isResponseStatusEnabled(boolean defaultValue)
+ public static boolean isResponseStatusEnabled(boolean defaultValue)
{
String global = Configuration.getHttpResponseStatusEnabled();
if (global != null)
Modified: labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/message/ResponseStatus.java
===================================================================
--- labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/message/ResponseStatus.java 2009-10-08 18:42:56 UTC (rev 29565)
+++ labs/jbossesb/workspace/dward/httpcontract/product/rosetta/src/org/jboss/soa/esb/message/ResponseStatus.java 2009-10-08 19:36:21 UTC (rev 29566)
@@ -53,8 +53,7 @@
// JBESB-2761
public static boolean isHttpEnabled(ConfigTree actionConfig) {
return actionConfig.getBooleanAttribute(
- "http.responseStatusEnabled",
- HttpConfiguration.getInstance().isResponseStatusEnabled() );
+ "http.responseStatusEnabled", HttpConfiguration.isResponseStatusEnabled() );
}
// JBESB-2761
More information about the jboss-svn-commits
mailing list