[jboss-svn-commits] JBL Code SVN: r25111 - in labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners: gateway and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Feb 4 21:35:57 EST 2009
Author: jim.ma
Date: 2009-02-04 21:35:57 -0500 (Wed, 04 Feb 2009)
New Revision: 25111
Modified:
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java
labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java
Log:
Removed the config attribute from ListenerTagNames
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2009-02-05 01:36:15 UTC (rev 25110)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/ListenerTagNames.java 2009-02-05 02:35:57 UTC (rev 25111)
@@ -152,17 +152,7 @@
/** Reply Listener */
public static final String REPLY_LISTENER_TIMEOUT_TAG = "replyListenerTimeout";
-
- /** Tomcat Listener */
- public static final String HOST_TAG = "host";
- public static final String PORT_TAG = "port";
- public static final String CONTEXT_TAG = "context";
- public static final String ALLOW_HTTP_METHOD = "allowHttpMethod";
-
- public static final String AUTH_METHOD = "authMethod";
- public static final String SECURITY_DOMAIN = "securityDomain";
- public static final String SECURITY_ROLE = "securityRole";
-
+
/** Scheduled listeners */
public static final String SCHEDULE_ID_REF = "scheduleidref" ; // taken from ScheduleProviderFactory
public static final String SCHEDULE_FREQUENCY = "schedule-frequency" ; // taken from ScheduleProviderFactory
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java 2009-02-05 01:36:15 UTC (rev 25110)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpDispatchServlet.java 2009-02-05 02:35:57 UTC (rev 25111)
@@ -90,8 +90,8 @@
throw new ServletException(e);
}
- if (config.getAttribute(ListenerTagNames.ALLOW_HTTP_METHOD) != null) {
- allowHttpMethods = config.getAttribute(ListenerTagNames.ALLOW_HTTP_METHOD).toUpperCase();
+ if (config.getAttribute(HttpGatewayListener.ALLOW_HTTP_METHOD) != null) {
+ allowHttpMethods = config.getAttribute(HttpGatewayListener.ALLOW_HTTP_METHOD).toUpperCase();
}
}
Modified: labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java
===================================================================
--- labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java 2009-02-05 01:36:15 UTC (rev 25110)
+++ labs/jbossesb/workspace/mlittle/legstar/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/HttpGatewayListener.java 2009-02-05 02:35:57 UTC (rev 25111)
@@ -44,6 +44,7 @@
import org.apache.log4j.Logger;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.naming.Util;
+import org.jboss.remoting.ServerInvoker;
import org.jboss.soa.esb.ConfigurationException;
import org.jboss.soa.esb.addressing.EPR;
import org.jboss.soa.esb.addressing.eprs.HTTPEpr;
@@ -96,6 +97,18 @@
/**The tag used to read the dispatch servlet class name value from configuration */
public static String DISPATCH_SERVLET_CLASS = "dispatch_servlet";
+ /**Allow http method config attribute name*/
+ public static final String ALLOW_HTTP_METHOD = "allowHttpMethod";
+
+ /**Auth method config attribute name */
+ public static final String AUTH_METHOD = "authMethod";
+
+ /**Security domain config attribute name */
+ public static final String SECURITY_DOMAIN = "securityDomain";
+
+ /**Security role config attribute name */
+ public static final String SECURITY_ROLE = "securityRole";
+
/**Http host value*/
public String host = null;
@@ -155,8 +168,8 @@
}
//validate allow http method configuration
- if (config.getAttribute(ListenerTagNames.ALLOW_HTTP_METHOD) != null) {
- String allowMethods = config.getAttribute(ListenerTagNames.ALLOW_HTTP_METHOD);
+ if (config.getAttribute(ALLOW_HTTP_METHOD) != null) {
+ String allowMethods = config.getAttribute(ALLOW_HTTP_METHOD);
String[] methods = allowMethods.split(",");
List<String> standardMesthods = new ArrayList<String>();
standardMesthods.add("GET");
@@ -200,13 +213,13 @@
}
//Check the http security configuration
- if (config.getAttribute(ListenerTagNames.AUTH_METHOD) != null) {
- if (config.getAttribute(ListenerTagNames.SECURITY_DOMAIN) == null) {
- throw new ConfigurationException("Security domain configuration for this context not found for http authentication method " + config.getAttribute(ListenerTagNames.AUTH_METHOD));
+ if (config.getAttribute(AUTH_METHOD) != null) {
+ if (config.getAttribute(SECURITY_DOMAIN) == null) {
+ throw new ConfigurationException("Security domain configuration for this context not found for http authentication method " + config.getAttribute(AUTH_METHOD));
}
- if (config.getAttribute(ListenerTagNames.SECURITY_ROLE) == null) {
- throw new ConfigurationException("Security role configuration for this context not found for http authentication method " + config.getAttribute(ListenerTagNames.AUTH_METHOD));
+ if (config.getAttribute(SECURITY_ROLE) == null) {
+ throw new ConfigurationException("Security role configuration for this context not found for http authentication method " + config.getAttribute(AUTH_METHOD));
}
}
}
@@ -410,7 +423,7 @@
envCtx = envCtx.createSubcontext("env");
}
- String securityDomain = getConfig().getAttribute(ListenerTagNames.SECURITY_DOMAIN);
+ String securityDomain = getConfig().getAttribute(SECURITY_DOMAIN);
Util.bind(envCtx, "security/securityMgr", new LinkRef(securityDomain));
Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain));
Util.bind(envCtx, "security/security-domain", new LinkRef(securityDomain));
@@ -438,7 +451,7 @@
//Add security support
if (isHttpAuthConfiured()) {
- String securityRole = this.getConfig().getAttribute(ListenerTagNames.SECURITY_ROLE);
+ String securityRole = this.getConfig().getAttribute(SECURITY_ROLE);
SecurityConstraint constraint = new SecurityConstraint();
constraint.addAuthRole(securityRole);
SecurityCollection collection = new SecurityCollection("all");
@@ -448,7 +461,7 @@
ctx.addSecurityRole(securityRole);
- String authMethod = this.getConfig().getAttribute(ListenerTagNames.AUTH_METHOD);
+ String authMethod = this.getConfig().getAttribute(AUTH_METHOD);
LoginConfig config = new LoginConfig(authMethod, securityRole,
null, null);
ctx.setLoginConfig(config);
@@ -456,7 +469,7 @@
}
private boolean isHttpAuthConfiured() {
- if (getConfig().getAttribute(ListenerTagNames.AUTH_METHOD) != null) {
+ if (getConfig().getAttribute(AUTH_METHOD) != null) {
return true;
}
return false;
More information about the jboss-svn-commits
mailing list