[jbossws-commits] JBossWS SVN: r10538 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration: deployers/deployment and 4 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Aug 14 07:28:44 EDT 2009
Author: richard.opalka at jboss.com
Date: 2009-08-14 07:28:43 -0400 (Fri, 14 Aug 2009)
New Revision: 10538
Modified:
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandlerJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
Log:
[JBWS-2320] adding logging support
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSAspectizedDeployersFactory.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -26,6 +26,7 @@
import org.jboss.deployers.plugins.deployers.DeployersImpl;
import org.jboss.deployers.spi.deployer.Deployer;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.DeploymentAspect;
/**
@@ -36,6 +37,9 @@
public final class WSAspectizedDeployersFactory
{
+ /** Logger. */
+ private static final Logger LOGGER = Logger.getLogger(WSAspectizedDeployersFactory.class);
+
/** Real deployers registry. */
private final DeployersImpl delegee;
@@ -59,6 +63,7 @@
*/
public void addDeployer(final DeploymentAspect aspect)
{
+ WSAspectizedDeployersFactory.LOGGER.debug("Adding deployer for: " + aspect);
final Deployer wsAspectizedDeployer = new WSDeploymentAspectDeployer(aspect);
this.delegee.addDeployer(wsAspectizedDeployer);
@@ -72,6 +77,7 @@
*/
public void removeDeployer(final DeploymentAspect aspect)
{
+ WSAspectizedDeployersFactory.LOGGER.debug("Removing deployer for: " + aspect);
final Deployer wsAspectizedDeployer = this.deployersRegistry.get(aspect);
this.deployersRegistry.remove(aspect);
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -102,7 +102,7 @@
{
if (ASHelper.isWebServiceDeployment(unit))
{
- log.debug(this.aspect.getClass() + " deploy: " + unit.getName());
+ this.log.debug(this.aspect + " start: " + unit.getName());
final Deployment dep = ASHelper.getRequiredAttachment(unit, Deployment.class);
this.aspect.start(dep);
}
@@ -119,7 +119,7 @@
{
if (ASHelper.isWebServiceDeployment(unit))
{
- log.debug(this.aspect.getClass() + " undeploy: " + unit.getName());
+ this.log.debug(this.aspect + " stop: " + unit.getName());
final Deployment dep = ASHelper.getRequiredAttachment(unit, Deployment.class);
this.aspect.stop(dep);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentDeployer.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -62,6 +62,7 @@
@Override
protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException
{
+ this.log.debug("Building JBoss agnostic webservices meta data model");
WSDeploymentBuilder.getInstance().build(unit);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDescriptorDeployer.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -51,6 +51,7 @@
@Override
protected ObjectModelFactory getObjectModelFactory(final WebservicesMetaData root)
{
+ this.log.debug("Returning webservices descriptor factory");
return new WebservicesFactory(null);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSEJBAdapterDeployer.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -23,7 +23,6 @@
import java.lang.annotation.Annotation;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import javax.management.MalformedObjectNameException;
@@ -85,21 +84,21 @@
if (mergedMD != null)
{
final WebServiceDeploymentAdapter wsDeploymentAdapter = new WebServiceDeploymentAdapter();
- final Iterator<JBossEnterpriseBeanMetaData> ejbIterator = mergedMD.getEnterpriseBeans().iterator();
final List<WebServiceDeclaration> endpoints = wsDeploymentAdapter.getServiceEndpoints();
- while (ejbIterator.hasNext())
+ for (final JBossEnterpriseBeanMetaData ejbMD : mergedMD.getEnterpriseBeans())
{
- final JBossEnterpriseBeanMetaData ejbMD = ejbIterator.next();
- final EJBContainer ejbContainer = this.getContainer(ejb3Deployment, ejbMD);
+ final String ejbName = ejbMD.determineContainerName();
if (ejbMD.getEjbClass() != null)
{
+ this.log.debug("Creating webservice EJB adapter for: " + ejbName);
+ final EJBContainer ejbContainer = this.getContainer(ejb3Deployment, ejbMD);
endpoints.add(new WebServiceDeclarationAdapter(ejbMD, ejbContainer, unit.getClassLoader()));
}
else
{
- log.warn("Ingoring ejb deployment with null classname: " + ejbMD);
+ this.log.warn("Ingoring EJB deployment with null classname: " + ejbName);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSTypeDeployer.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -67,18 +67,22 @@
{
if (this.isJaxwsJseDeployment(unit))
{
+ this.log.debug("Detected JAXWS JSE deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_JSE);
}
else if (this.isJaxwsEjbDeployment(unit))
{
+ this.log.debug("Detected JAXWS EJB3 deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXWS_EJB3);
}
else if (this.isJaxrpcJseDeployment(unit))
{
+ this.log.debug("Detected JAXRPC JSE deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_JSE);
}
else if (this.isJaxrpcEjbDeployment(unit))
{
+ this.log.debug("Detected JAXRPC EJB21 deployment");
unit.addAttachment(DeploymentType.class, DeploymentType.JAXRPC_EJB21);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/AbstractDeploymentModelBuilder.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -8,6 +8,7 @@
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
+import org.jboss.logging.Logger;
import org.jboss.metadata.serviceref.VirtualFileAdaptor;
import org.jboss.virtual.VirtualFile;
import org.jboss.webservices.integration.util.ASHelper;
@@ -32,6 +33,9 @@
/** WSDL, XSD and XML files filter. */
private static final WSVirtualFileFilter WS_FILE_FILTER = new WSVirtualFileFilter();
+ /** Logger. */
+ protected final Logger log = Logger.getLogger(this.getClass());
+
/** Deployment model factory. */
private final DeploymentModelFactory deploymentModelFactory;
@@ -105,6 +109,7 @@
*/
private ArchiveDeployment newDeployment(final DeploymentUnit unit)
{
+ this.log.debug("Creating new WS deployment model for: " + unit);
final ArchiveDeployment dep = this.newDeployment(unit.getSimpleName(), unit.getClassLoader());
if (unit instanceof VFSDeploymentUnit)
@@ -132,6 +137,7 @@
final String parentDeploymentName = unit.getParent().getSimpleName();
final ClassLoader parentClassLoader = unit.getParent().getClassLoader();
+ this.log.debug("Creating new WS deployment model for parent: " + unit.getParent());
final ArchiveDeployment parentDep = this.newDeployment(parentDeploymentName, parentClassLoader);
dep.setParent(parentDep);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcEjbDeploymentModelBuilder.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -38,13 +38,16 @@
final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep);
this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep);
- for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
+ this.log.debug("Creating JAXRPC EJB21 endpoints meta data model");
+ for (final WebserviceDescriptionMetaData webserviceDescriptionMD : wsMetaData.getWebserviceDescriptions())
{
- for (PortComponentMetaData pcmd : wsd.getPortComponents())
+ for (final PortComponentMetaData portComponentMD : webserviceDescriptionMD.getPortComponents())
{
- final String ejbName = pcmd.getEjbLink();
+ final String ejbName = portComponentMD.getEjbLink();
+ this.log.debug("EJB21 name: " + ejbName);
final JBossEnterpriseBeanMetaData beanMetaData = jbmd.getEnterpriseBean(ejbName);
final String ejbClass = beanMetaData.getEjbClass();
+ this.log.debug("EJB21 class: " + ejbClass);
this.newEndpoint(ejbClass, ejbName, dep);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxrpcJseDeploymentModelBuilder.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -37,13 +37,16 @@
final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
final WebservicesMetaData wsMetaData = this.getAndPropagateAttachment(WebservicesMetaData.class, unit, dep);
+ this.log.debug("Creating JAXRPC JSE endpoints meta data model");
for (WebserviceDescriptionMetaData wsd : wsMetaData.getWebserviceDescriptions())
{
for (PortComponentMetaData pcmd : wsd.getPortComponents())
{
final String servletName = pcmd.getServletLink();
+ this.log.debug("JSE name: " + servletName);
final ServletMetaData servletMD = ASHelper.getServletForName(webMetaData, servletName);
final String servletClass = ASHelper.getEndpointName(servletMD);
+ this.log.debug("JSE class: " + servletClass);
this.newEndpoint(servletClass, servletName, dep);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsEjbDeploymentModelBuilder.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -1,7 +1,5 @@
package org.jboss.webservices.integration.deployers.deployment;
-import java.util.Iterator;
-
import org.jboss.deployers.structure.spi.DeploymentUnit;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.webservices.integration.util.ASHelper;
@@ -38,12 +36,13 @@
this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep);
this.getAndPropagateAttachment(JBossMetaData.class, unit, dep);
- final Iterator<WebServiceDeclaration> ejbIterator = ASHelper.getJaxwsEjbs(unit).iterator();
- while (ejbIterator.hasNext())
+ this.log.debug("Creating JAXWS EJB3 endpoints meta data model");
+ for (final WebServiceDeclaration container : ASHelper.getJaxwsEjbs(unit))
{
- final WebServiceDeclaration container = ejbIterator.next();
final String ejbName = container.getComponentName();
+ this.log.debug("EJB3 name: " + ejbName);
final String ejbClass = container.getComponentClassName();
+ this.log.debug("EJB3 class: " + ejbClass);
final Endpoint ep = this.newEndpoint(ejbClass, ejbName, dep);
ep.setProperty(ASHelper.CONTAINER_NAME, container.getContainerName());
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/deployment/JaxwsJseDeploymentModelBuilder.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -35,11 +35,14 @@
{
this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
+ this.log.debug("Creating JAXWS JSE endpoints meta data model");
final List<ServletMetaData> servlets = ASHelper.getJaxwsServlets(unit);
for (ServletMetaData servlet : servlets)
{
final String servletName = servlet.getName();
+ this.log.debug("JSE name: " + servletName);
final String servletClass = ASHelper.getEndpointName(servlet);
+ this.log.debug("JSE class: " + servletClass);
this.newEndpoint(servletClass, servletName, dep);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/InjectionMetaDataDeploymentAspect.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -118,6 +118,7 @@
if (WSHelper.isJaxwsJseDeployment(dep))
{
+ this.log.debug("Building injection meta data for JAXWS JSE webservice deployment: " + dep.getSimpleName());
final EnvironmentEntriesMetaData envEntriesMD = jbossWebMD.getEnvironmentEntries();
// iterate through all POJO endpoints
@@ -132,6 +133,7 @@
}
else if (WSHelper.isJaxwsEjbDeployment(dep))
{
+ this.log.debug("Building injection meta data for JAXWS EJB3 webservice deployment: " + dep.getSimpleName());
final WebServiceDeployment webServiceDeployment = ASHelper.getRequiredAttachment(unit,
WebServiceDeployment.class);
@@ -266,8 +268,10 @@
targetName = resourceInjectionTargetMD.getInjectionTargetName();
// build injection meta data for injection target
- retVal.add(new InjectionMetaData(targetClass, targetName, envEntryValueClass, envEntryName,
- envEntryValue != null));
+ final InjectionMetaData injectionMD = new InjectionMetaData(targetClass, targetName, envEntryValueClass,
+ envEntryName, envEntryValue != null);
+ this.log.debug(injectionMD);
+ retVal.add(injectionMD);
}
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -23,6 +23,7 @@
import java.lang.reflect.Method;
+import org.jboss.logging.Logger;
import org.jboss.wsf.spi.deployment.Endpoint;
import org.jboss.wsf.spi.invocation.Invocation;
import org.jboss.wsf.spi.invocation.InvocationHandler;
@@ -36,6 +37,9 @@
abstract class AbstractInvocationHandler extends InvocationHandler
{
+ /** Logger. */
+ protected final Logger log = Logger.getLogger(this.getClass());
+
/**
* Constructor.
*/
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandlerJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandlerJSE.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandlerJSE.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -133,6 +133,7 @@
}
catch (Exception e)
{
+ this.log.error("Method invocation failed with exception: " + e.getMessage(), e);
// propagate exception
this.handleInvocationException(e);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB21.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -36,7 +36,6 @@
import org.jboss.invocation.InvocationKey;
import org.jboss.invocation.InvocationType;
import org.jboss.invocation.PayloadKey;
-import org.jboss.logging.Logger;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.wsf.common.ObjectNameFactory;
import org.jboss.wsf.common.integration.WSHelper;
@@ -60,9 +59,6 @@
final class InvocationHandlerEJB21 extends AbstractInvocationHandler
{
- /** Logger. */
- private static final Logger LOG = Logger.getLogger(InvocationHandlerEJB21.class);
-
/** EJB21 JNDI name. */
private String jndiName;
@@ -160,6 +156,7 @@
}
catch (Exception e)
{
+ this.log.error("Method invocation failed with exception: " + e.getMessage(), e);
this.handleInvocationException(e);
}
}
@@ -231,7 +228,7 @@
final ServiceEndpointInterceptorEJB21 sepInterceptor = new ServiceEndpointInterceptorEJB21();
currentInterceptor.setNext(sepInterceptor);
sepInterceptor.setNext(nextInterceptor);
- InvocationHandlerEJB21.LOG.debug("Injecting EJB 21 service endpoint interceptor after: "
+ this.log.debug("Injecting EJB 21 service endpoint interceptor after: "
+ currentInterceptor.getClass().getName());
return;
@@ -239,11 +236,11 @@
currentInterceptor = nextInterceptor;
}
- InvocationHandlerEJB21.LOG.warn("Cannot find EJB 21 service endpoint interceptor insert point");
+ this.log.warn("Cannot find EJB 21 service endpoint interceptor insert point");
}
catch (Exception ex)
{
- InvocationHandlerEJB21.LOG.warn("Cannot register EJB 21 service endpoint interceptor: ", ex);
+ this.log.warn("Cannot register EJB 21 service endpoint interceptor: ", ex);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerEJB3.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -123,9 +123,10 @@
final Object retObj = ejbContainer.invokeEndpoint(implMethod, args, invocationCallback);
wsInvocation.setReturnValue(retObj);
}
- catch (Throwable th)
+ catch (Throwable t)
{
- this.handleInvocationException(th);
+ this.log.error("Method invocation failed with exception: " + t.getMessage(), t);
+ this.handleInvocationException(t);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -71,7 +71,9 @@
final InjectionsMetaData injectionsMD = endpoint.getAttachment(InjectionsMetaData.class);
final Object targetBean = this.getTargetBean(invocation);
+ this.log.debug("Injecting resources on JAXWS JSE endpoint: " + targetBean);
InjectionHelper.injectResources(targetBean, injectionsMD);
+ this.log.debug("Calling postConstruct method on JAXWS JSE endpoint: " + targetBean);
InjectionHelper.callPostConstructMethod(targetBean);
endpoint.addAttachment(PreDestroyHolder.class, new PreDestroyHolder(targetBean));
@@ -90,7 +92,6 @@
if (wsContext != null)
{
final Object targetBean = this.getTargetBean(invocation);
-
this.wsContextInjector.inject(targetBean, wsContext);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/AbstractMetaDataBuilderEJB.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -41,8 +41,7 @@
abstract class AbstractMetaDataBuilderEJB
{
- /** Logger. */
- private static final Logger LOGGER = Logger.getLogger(AbstractMetaDataBuilderEJB.class);
+ protected final Logger log = Logger.getLogger(this.getClass());
/**
* Builds universal EJB meta data model that is AS agnostic.
@@ -52,6 +51,8 @@
*/
final EJBArchiveMetaData create(final Deployment dep)
{
+ this.log.debug("Building JBoss agnostic meta data for EJB webservice deployment: " + dep.getSimpleName());
+
final EJBArchiveMetaData ejbArchiveMD = new EJBArchiveMetaData();
this.buildEnterpriseBeansMetaData(dep, ejbArchiveMD);
@@ -93,6 +94,7 @@
// set context root
final String contextRoot = webservicesMD.getContextRoot();
ejbArchiveMD.setWebServiceContextRoot(contextRoot);
+ this.log.debug("Setting context root: " + contextRoot);
final WebserviceDescriptionsMetaData wsDescriptionsMD = webservicesMD.getWebserviceDescriptions();
@@ -106,8 +108,15 @@
.getWebserviceDescriptionMetaData(wsDescriptionsMD);
if (wsDescriptionMD != null)
{
- // set config name and config file
+ final String configName = wsDescriptionMD.getConfigName();
+ final String configFile = wsDescriptionMD.getConfigFile();
+
+ // set config name
+ this.log.debug("Setting config name: " + configName);
ejbArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
+
+ // set config file
+ this.log.debug("Setting config file: " + configFile);
ejbArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/ContainerMetaDataDeploymentAspect.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -63,16 +63,19 @@
{
if (WSHelper.isJseDeployment(dep))
{
+ this.log.debug("Creating JBoss agnostic JSE meta data for deployment: " + dep.getSimpleName());
final JSEArchiveMetaData jseMetaData = this.metaDataBuilderJSE.create(dep);
dep.addAttachment(JSEArchiveMetaData.class, jseMetaData);
}
else if (WSHelper.isJaxwsEjbDeployment(dep))
{
+ this.log.debug("Creating JBoss agnostic EJB3 meta data for deployment: " + dep.getSimpleName());
final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB3.create(dep);
dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
}
else if (WSHelper.isJaxrpcEjbDeployment(dep))
{
+ this.log.debug("Creating JBoss agnostic EJB21 meta data for deployment: " + dep.getSimpleName());
final EJBArchiveMetaData ejbMetaData = this.metaDataBuilderEJB21.create(dep);
dep.addAttachment(EJBArchiveMetaData.class, ejbMetaData);
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB21.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -72,7 +72,10 @@
}
ejbArchiveMD.setEnterpriseBeans(wsEjbsMD);
- ejbArchiveMD.setSecurityDomain(jbossMetaData.getSecurityDomain());
+
+ final String securityDomain = jbossMetaData.getSecurityDomain();
+ this.log.debug("Setting security domain: " + securityDomain);
+ ejbArchiveMD.setSecurityDomain(securityDomain);
}
/**
@@ -135,10 +138,12 @@
{
if (jbossEjbMD.isSession())
{
+ this.log.debug("Creating JBoss agnostic EJB21 meta data for session bean: " + jbossEjbMD.getEjbClass());
return new SLSBMetaData();
}
else if (jbossEjbMD.isMessageDriven())
{
+ this.log.debug("Creating JBoss agnostic EJB21 meta data for message driven bean: " + jbossEjbMD.getEjbClass());
final MDBMetaData mdbMD = new MDBMetaData();
final JBossMessageDrivenBeanMetaData jbossMessageBean = (JBossMessageDrivenBeanMetaData) jbossEjbMD;
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderEJB3.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -123,10 +123,14 @@
if (mdbAnnotation == null)
{
+ this.log.debug("Creating JBoss agnostic EJB3 meta data for session bean: "
+ + jbossEjbMD.getComponentClassName());
return new SLSBMetaData();
}
else
{
+ this.log.debug("Creating JBoss agnostic EJB3 meta data for message driven bean: "
+ + jbossEjbMD.getComponentClassName());
final MDBMetaData mdbMD = new MDBMetaData();
final String destinationName = this.getActivationProperty("destination", mdbAnnotation.activationConfig());
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/metadata/MetaDataBuilderJSE.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -27,6 +27,7 @@
import java.util.Map;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
import org.jboss.metadata.common.jboss.WebserviceDescriptionMetaData;
import org.jboss.metadata.common.jboss.WebserviceDescriptionsMetaData;
import org.jboss.metadata.ear.jboss.JBossAppMetaData;
@@ -58,6 +59,9 @@
final class MetaDataBuilderJSE
{
+ /** Logger. */
+ private final Logger log = Logger.getLogger(MetaDataBuilderJSE.class);
+
/**
* Constructor.
*/
@@ -123,7 +127,7 @@
{
jseArchiveMD.setConfigName(wsDescriptionMD.getConfigName());
jseArchiveMD.setConfigFile(wsDescriptionMD.getConfigFile());
-
+
// ensure higher priority against web.xml context parameters
return;
}
@@ -240,6 +244,7 @@
continue;
}
+ this.log.debug("Creating JBoss agnostic JSE meta data for POJO bean: " + servlet.getServletClass());
mappings.put(servlet.getName(), servlet.getServletClass());
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -57,6 +57,7 @@
if (isEjbDeployment)
{
+ this.log.debug("Creating web meta data for EJB webservice deployment: " + dep.getSimpleName());
this.webMetaDataCreator.create(dep);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreator.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -24,6 +24,7 @@
import java.util.List;
import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.SecurityRolesMetaData;
import org.jboss.metadata.web.jboss.JBossServletsMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
@@ -53,6 +54,9 @@
/** EJB 3 security meta data builder. */
private final SecurityMetaDataAccessorEJB ejb3SecurityAccessor = new SecurityMetaDataAccessorEJB3();
+ /** Logger. */
+ private final Logger log = Logger.getLogger(WebMetaDataCreator.class);
+
/**
* Constructor.
*/
@@ -86,6 +90,7 @@
*/
private void createWebAppDescriptor(final Deployment dep, final JBossWebMetaData jbossWebMD)
{
+ this.log.debug("Creating web descriptor");
this.createServlets(dep, jbossWebMD);
this.createServletMappings(dep, jbossWebMD);
this.createSecurityConstraints(dep, jbossWebMD);
@@ -111,6 +116,7 @@
*/
private void createJBossWebAppDescriptor(final Deployment dep, final JBossWebMetaData jbossWebMD)
{
+ this.log.debug("Creating jboss web descriptor");
final SecurityMetaDataAccessorEJB ejbMDAccessor = this.getEjbSecurityMetaDataAccessor(dep);
// Set security domain
@@ -119,15 +125,18 @@
if (hasSecurityDomain)
{
+ this.log.debug("Setting security domain: " + securityDomain);
jbossWebMD.setSecurityDomain(securityDomain);
}
// Set context root
final String contextRoot = dep.getService().getContextRoot();
+ this.log.debug("Setting context root: " + contextRoot);
jbossWebMD.setContextRoot(contextRoot);
// Set virtual hosts
final List<String> virtualHosts = dep.getService().getVirtualHosts();
+ this.log.debug("Setting virtual hosts: " + virtualHosts);
jbossWebMD.setVirtualHosts(virtualHosts);
}
@@ -146,6 +155,7 @@
*/
private void createServlets(final Deployment dep, final JBossWebMetaData jbossWebMD)
{
+ this.log.debug("Creating servlets");
final JBossServletsMetaData servlets = WebMetaDataHelper.getServlets(jbossWebMD);
for (final Endpoint endpoint : dep.getService().getEndpoints())
@@ -153,6 +163,7 @@
final String endpointName = endpoint.getShortName();
final String endpointClassName = endpoint.getTargetBeanName();
+ this.log.debug("Servlet name: " + endpointName + ", servlet class: " + endpointClassName);
WebMetaDataHelper.newServlet(endpointName, endpointClassName, servlets);
}
}
@@ -172,6 +183,7 @@
*/
private void createServletMappings(final Deployment dep, final JBossWebMetaData jbossWebMD)
{
+ this.log.debug("Creating servlet mappings");
final List<ServletMappingMetaData> servletMappings = WebMetaDataHelper.getServletMappings(jbossWebMD);
for (final Endpoint ep : dep.getService().getEndpoints())
@@ -179,6 +191,7 @@
final String endpointName = ep.getShortName();
final List<String> urlPatterns = WebMetaDataHelper.getUrlPatterns(ep.getURLPattern());
+ this.log.debug("Servlet name: " + endpointName + ", URL patterns: " + urlPatterns);
WebMetaDataHelper.newServletMapping(endpointName, urlPatterns, servletMappings);
}
}
@@ -208,6 +221,7 @@
*/
private void createSecurityConstraints(final Deployment dep, final JBossWebMetaData jbossWebMD)
{
+ this.log.debug("Creating security constraints");
final SecurityMetaDataAccessorEJB ejbMDAccessor = this.getEjbSecurityMetaDataAccessor(dep);
for (final Endpoint ejbEndpoint : dep.getService().getEndpoints())
@@ -232,18 +246,23 @@
.getWebResourceCollections(securityConstraint);
final String endpointName = ejbEndpoint.getShortName();
final String urlPattern = ejbEndpoint.getURLPattern();
+ this.log.debug("Creating web resource collection for endpoint: " + endpointName + ", URL pattern: "
+ + urlPattern);
WebMetaDataHelper.newWebResourceCollection(endpointName, urlPattern, secureWsdlAccess,
webResourceCollections);
// auth-constraint
if (hasAuthMethod)
{
+ this.log.debug("Creating auth constraint for endpoint: " + endpointName);
WebMetaDataHelper.newAuthConstraint(WebMetaDataHelper.getAllRoles(), securityConstraint);
}
// user-data-constraint
if (hasTransportGuarantee)
{
+ this.log.debug("Creating new user data constraint for endpoint: " + endpointName
+ + ", transport guarantee: " + transportGuarantee);
WebMetaDataHelper.newUserDataConstraint(transportGuarantee, securityConstraint);
}
}
@@ -270,6 +289,8 @@
if (hasAuthMethod)
{
+ this.log.debug("Creating new login config: " + WebMetaDataCreator.EJB_WEBSERVICE_REALM + ", auth method: "
+ + authMethod);
final LoginConfigMetaData loginConfig = WebMetaDataHelper.getLoginConfig(jbossWebMD);
loginConfig.setRealmName(WebMetaDataCreator.EJB_WEBSERVICE_REALM);
loginConfig.setAuthMethod(authMethod);
@@ -303,6 +324,7 @@
if (hasSecurityRolesMD)
{
+ this.log.debug("Setting security roles: " + securityRolesMD);
jbossWebMD.setSecurityRoles(securityRolesMD);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifier.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -21,12 +21,11 @@
*/
package org.jboss.webservices.integration.tomcat;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.ParamValueMetaData;
-import org.jboss.metadata.web.jboss.JBossServletMetaData;
import org.jboss.metadata.web.jboss.JBossWebMetaData;
import org.jboss.metadata.web.spec.ServletMetaData;
import org.jboss.webservices.integration.util.ASHelper;
@@ -46,6 +45,9 @@
final class WebMetaDataModifier
{
+ /** Logger. */
+ private final Logger log = Logger.getLogger(WebMetaDataModifier.class);
+
/**
* Constructor.
*/
@@ -81,11 +83,16 @@
if (stackContextParams != null)
{
+ this.log.debug("Creating context parameters");
final List<ParamValueMetaData> contextParams = WebMetaDataHelper.getContextParams(jbossWebMD);
for (Map.Entry<String, String> entry : stackContextParams.entrySet())
{
- WebMetaDataHelper.newParamValue(entry.getKey(), entry.getValue(), contextParams);
+ final String paramName = entry.getKey();
+ final String paramValue = entry.getValue();
+
+ this.log.debug("Setting context parameter name: " + paramName + " value: " + paramValue);
+ WebMetaDataHelper.newParamValue(paramName, paramValue, contextParams);
}
}
}
@@ -98,23 +105,23 @@
*/
private void configureEndpoints(final Deployment dep, final JBossWebMetaData jbossWebMD)
{
- final Iterator<JBossServletMetaData> servlets = jbossWebMD.getServlets().iterator();
+ final String transportClassName = this.getTransportClassName(dep);
+ final ClassLoader loader = dep.getInitialClassLoader();
+ this.log.debug("Modifying servlets");
- while (servlets.hasNext())
+ for (final ServletMetaData servletMD : jbossWebMD.getServlets())
{
- final ServletMetaData servletMD = servlets.next();
- final ClassLoader loader = dep.getInitialClassLoader();
final boolean isWebserviceEndpoint = ASHelper.getEndpointClass(servletMD, loader) != null;
if (isWebserviceEndpoint)
{
// set transport servlet
- servletMD.setServletClass(this.getTransportClassName(dep));
+ servletMD.setServletClass(transportClassName);
// configure webservice endpoint
final String endpointClassName = servletMD.getServletClass();
+ this.log.debug("Setting transport class: " + transportClassName + " for servlet: " + endpointClassName);
final List<ParamValueMetaData> initParams = WebMetaDataHelper.getServletInitParams(servletMD);
-
WebMetaDataHelper.newParamValue(Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName, initParams);
}
}
Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-08-14 09:10:07 UTC (rev 10537)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java 2009-08-14 11:28:43 UTC (rev 10538)
@@ -52,6 +52,7 @@
@Override
public void start(final Deployment dep)
{
+ this.log.debug("Modifying web meta data for webservice deployment: " + dep.getSimpleName());
this.webMetaDataModifier.modify(dep);
}
More information about the jbossws-commits
mailing list