Author: chris.laprun(a)jboss.com Date: 2007-01-02 16:58:14 -0500 (Tue, 02 Jan 2007) New Revision: 5942 Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java Log: Improved logging. Modified: trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-01-02 19:16:05 UTC (rev 5941) +++ trunk/core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 2007-01-02 21:58:14 UTC (rev 5942) @@ -28,11 +28,11 @@ import org.jboss.portal.common.net.URLVisitor; import org.jboss.portal.common.util.Tools; import org.jboss.portal.common.util.XML; -import org.jboss.portal.common.value.Value; import org.jboss.portal.common.value.StringValue; +import org.jboss.portal.common.value.Value; import org.jboss.portal.core.metadata.InstanceMetaData; -import org.jboss.portal.core.metadata.ServiceMetaData; import org.jboss.portal.core.metadata.PreferencesMetaData; +import org.jboss.portal.core.metadata.ServiceMetaData; import org.jboss.portal.core.metadata.portlet.JBossApplicationMetaData; import org.jboss.portal.core.model.instance.DuplicateInstanceException; import org.jboss.portal.core.model.instance.Instance; @@ -41,12 +41,12 @@ import org.jboss.portal.portlet.PortletInvokerException; import org.jboss.portal.portlet.impl.jsr168.metadata.PreferenceMetaData; import org.jboss.portal.portlet.state.PropertyChange; -import org.jboss.portal.security.spi.provider.SecurityConfigurationException; -import org.jboss.portal.security.spi.provider.AuthorizationDomain; -import org.jboss.portal.security.spi.provider.DomainConfigurator; -import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; import org.jboss.portal.security.RoleSecurityBinding; import org.jboss.portal.security.SecurityConstants; +import org.jboss.portal.security.metadata.SecurityConstraintsMetaData; +import org.jboss.portal.security.spi.provider.AuthorizationDomain; +import org.jboss.portal.security.spi.provider.DomainConfigurator; +import org.jboss.portal.security.spi.provider.SecurityConfigurationException; import org.jboss.portal.server.deployment.PortalWebApp; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -109,12 +109,11 @@ ServiceMetaData serviceMD = (ServiceMetaData)i.next(); // - log.debug("About to inject a service in the servlet context of " + pwa.getURL()); - - // String serviceName = serviceMD.getName(); String serviceClass = serviceMD.getClassName(); String serviceRef = serviceMD.getRef(); + log.debug("Trying to inject service '" + serviceName + "' (ref: '" + serviceRef + "' class: " + serviceClass + + ") in the servlet context of " + pwa.getURL()); // if (serviceRef.startsWith(":")) @@ -129,8 +128,6 @@ Class proxyClass = pwa.getClassLoader().loadClass(serviceClass); ObjectName objectName = ObjectName.getInstance(serviceRef); Object proxy = MBeanProxyExt.create(proxyClass, objectName, factory.getServer(), true); - // - log.debug("Want to inject " + serviceRef + " with class " + proxy + " and name " + serviceName); pwa.getServletContext().setAttribute(serviceName, proxy); } catch (Exception e) @@ -351,9 +348,7 @@ } } - /** - * Requires a transaction to execute, setup in aop configuration. - */ + /** Requires a transaction to execute, setup in aop configuration. */ private void handleInstance(InstanceMetaDataContext metaDataCtx) throws PortletInvokerException, SecurityConfigurationException, DuplicateInstanceException { InstanceMetaData metaData = metaDataCtx.metaData;