User: starksm
Date: 01/05/22 19:41:10
Added: src/main/org/jboss/web Tag: Branch_2_2
AbstractWebContainer.java
AbstractWebContainerMBean.java WebApplication.java
Log:
Bring the web container integration classes to the 2.2 branch
Revision Changes Path
No revision
No revision
1.3.2.1 +15 -14 jboss/src/main/org/jboss/web/AbstractWebContainer.java
Index: AbstractWebContainer.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainer.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- AbstractWebContainer.java 2001/05/10 04:09:36 1.3
+++ AbstractWebContainer.java 2001/05/23 02:41:10 1.3.2.1
@@ -16,6 +16,7 @@
import org.apache.log4j.Category;
import org.jboss.ejb.DeploymentException;
+import org.jboss.logging.Logger;
import org.jboss.metadata.EjbRefMetaData;
import org.jboss.metadata.EnvEntryMetaData;
import org.jboss.metadata.ResourceRefMetaData;
@@ -113,14 +114,14 @@
@see org.jboss.security.SecurityAssociation;
@author [EMAIL PROTECTED]
-@version $Revision: 1.3 $
+@version $Revision: 1.3.2.1 $
*/
public abstract class AbstractWebContainer extends ServiceMBeanSupport implements
AbstractWebContainerMBean
{
/** The "WebContainer" log4j category instance available for logging related
to WebContainer events.
*/
- public static final Category category = Category.getInstance("WebContainer");
+ //public static final Category category = Category.getInstance("WebContainer");
/** A mapping of deployed warUrl strings to the WebApplication object */
protected HashMap deploymentMap = new HashMap();
@@ -251,7 +252,7 @@
*/
private void parseWebAppDescriptors(ClassLoader loader, Element webApp, Element
jbossWeb) throws Exception
{
- category.debug("AbstractWebContainer.parseWebAppDescriptors, Begin");
+ Logger.debug("AbstractWebContainer.parseWebAppDescriptors, Begin");
WebMetaData metaData = new WebMetaData();
metaData.importXml(webApp);
if( jbossWeb != null )
@@ -273,18 +274,18 @@
}
Iterator envEntries = metaData.getEnvironmentEntries();
- category.debug("addEnvEntries");
+ Logger.debug("addEnvEntries");
addEnvEntries(envEntries, envCtx);
Iterator resourceRefs = metaData.getResourceReferences();
- category.debug("linkResourceRefs");
+ Logger.debug("linkResourceRefs");
linkResourceRefs(resourceRefs, envCtx);
Iterator ejbRefs = metaData.getEjbReferences();
- category.debug("linkEjbRefs");
+ Logger.debug("linkEjbRefs");
linkEjbRefs(ejbRefs, envCtx);
String securityDomain = metaData.getSecurityDomain();
- category.debug("linkSecurityDomain");
+ Logger.debug("linkSecurityDomain");
linkSecurityDomain(securityDomain, envCtx);
- category.debug("AbstractWebContainer.parseWebAppDescriptors, End");
+ Logger.debug("AbstractWebContainer.parseWebAppDescriptors, End");
}
protected void addEnvEntries(Iterator envEntries, Context envCtx)
@@ -293,7 +294,7 @@
while( envEntries.hasNext() )
{
EnvEntryMetaData entry = (EnvEntryMetaData) envEntries.next();
- category.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
+ Logger.debug("Binding env-entry: "+entry.getName()+" of type:
"+entry.getType()+" to value:"+entry.getValue());
EnvEntryMetaData.bindEnvEntry(envCtx, entry);
}
}
@@ -310,7 +311,7 @@
{
try
{
- category.debug("Binding '"+refName+"' to URL: "+resourceName);
+ Logger.debug("Binding '"+refName+"' to URL: "+resourceName);
URL url = new URL(resourceName);
Util.bind(envCtx, refName, url);
}
@@ -321,7 +322,7 @@
}
else
{
- category.debug("Linking '"+refName+"' to JNDI name: "+resourceName);
+ Logger.debug("Linking '"+refName+"' to JNDI name: "+resourceName);
Util.bind(envCtx, refName, new LinkRef(resourceName));
}
}
@@ -338,7 +339,7 @@
String linkName = ejb.getLink();
if( jndiName == null )
jndiName = linkName;
- category.debug("Linking ejb-ref: "+name+" to JNDI name: "+jndiName);
+ Logger.debug("Linking ejb-ref: "+name+" to JNDI name: "+jndiName);
if( jndiName == null )
throw new NamingException("ejb-ref: "+name+", expected jndi-name
in jboss-web.xml");
Util.bind(envCtx, name, new LinkRef(jndiName));
@@ -359,14 +360,14 @@
{
if( securityDomain == null )
{
- category.debug("Binding security/securityMgr to NullSecurityManager");
+ Logger.debug("Binding security/securityMgr to NullSecurityManager");
Object securityMgr = new NullSecurityManager(securityDomain);
Util.bind(envCtx, "security/securityMgr", securityMgr);
Util.bind(envCtx, "security/realmMapping", securityMgr);
}
else
{
- category.debug("Linking security/securityMgr to JNDI name:
"+securityDomain);
+ Logger.debug("Linking security/securityMgr to JNDI name:
"+securityDomain);
Util.bind(envCtx, "security/securityMgr", new LinkRef(securityDomain));
Util.bind(envCtx, "security/realmMapping", new LinkRef(securityDomain));
}
1.1.2.1 +1 -1 jboss/src/main/org/jboss/web/AbstractWebContainerMBean.java
Index: AbstractWebContainerMBean.java
===================================================================
RCS file:
/cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebContainerMBean.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- AbstractWebContainerMBean.java 2001/05/09 07:11:16 1.1
+++ AbstractWebContainerMBean.java 2001/05/23 02:41:10 1.1.2.1
@@ -7,7 +7,7 @@
/** A template pattern for web container integration into JBoss.
@author [EMAIL PROTECTED]
-@version $Revision: 1.1 $
+@version $Revision: 1.1.2.1 $
*/
public interface AbstractWebContainerMBean extends org.jboss.util.ServiceMBean
{
1.2.2.1 +1 -1 jboss/src/main/org/jboss/web/WebApplication.java
Index: WebApplication.java
===================================================================
RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/WebApplication.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- WebApplication.java 2001/05/10 04:09:36 1.2
+++ WebApplication.java 2001/05/23 02:41:10 1.2.2.1
@@ -16,7 +16,7 @@
@see AbstractWebContainer
@author [EMAIL PROTECTED]
-@version $Revision: 1.2 $
+@version $Revision: 1.2.2.1 $
*/
public class WebApplication
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
