[jbossws-commits] JBossWS SVN: r10530 - in container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration: deployers and 4 other directories.

jbossws-commits at lists.jboss.org jbossws-commits at lists.jboss.org
Thu Aug 13 03:38:12 EDT 2009


Author: richard.opalka at jboss.com
Date: 2009-08-13 03:38:12 -0400 (Thu, 13 Aug 2009)
New Revision: 10530

Modified:
   container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.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/WSDeploymentBuilder.java
   container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.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/InvocationHandlerJAXRPC.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/invocation/ServiceEndpointInterceptorEJB21.java
   container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
   container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java
   container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java
   container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.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/WebMetaDataModifyingDeploymentAspect.java
Log:
[JBWS-2320] reviewed accessors and annotations

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/config/ServerConfigImpl.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -30,38 +30,60 @@
 import org.jboss.wsf.common.management.AbstractServerConfigMBean;
 
 /**
- * A ServerConfig for AS <= 5.1.0
+ * AS specific ServerConfig.
  *
  * @author <a href="mailto:asoldano at redhat.com">Alessio Soldano</a>
  * @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
  * @author <a href="mailto:tdiesler at redhat.com">Thomas Diesler</a>
  */
-public class ServerConfigImpl extends AbstractServerConfig implements AbstractServerConfigMBean
+public final class ServerConfigImpl extends AbstractServerConfig implements AbstractServerConfigMBean
 {
 
+   /**
+    * Constructor.
+    */
+   public ServerConfigImpl()
+   {
+      super();
+   }
+   
+   /**
+    * Gets server temp directory.
+    * 
+    * @return temp directory
+    */
    public File getServerTempDir()
    {
       return this.getDirFromServerConfig("ServerTempDir");
    }
 
+   /**
+    * Gets server home directory.
+    * 
+    * @return home directory
+    */
    public File getHomeDir()
    {
       return this.getDirFromServerConfig("HomeDir");
    }
 
+   /**
+    * Gets server data directory.
+    * 
+    * @return data directory
+    */
    public File getServerDataDir()
    {
       return this.getDirFromServerConfig("ServerDataDir");
    }
 
    /**
-    * Obtains the specified attribute from the server configuration,
-    * represented as a {@link File}.
+    * Obtains the requested directory from the server configuration.
     *
-    * @param attributeName
-    * @return
+    * @param attributeName directory attribute name
+    * @return requested directory
     */
-   protected File getDirFromServerConfig(final String attributeName)
+   private File getDirFromServerConfig(final String attributeName)
    {
       // Define the ON to invoke upon
       final ObjectName on = OBJECT_NAME_SERVER_CONFIG;
@@ -70,7 +92,7 @@
       File location = null;
       try
       {
-         location = (File)getMbeanServer().getAttribute(on, attributeName);
+         location = (File)this.getMbeanServer().getAttribute(on, attributeName);
       }
       catch (final JMException e)
       {

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-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentAspectDeployer.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -36,7 +36,7 @@
  * 
  * @author <a href="mailto:ropalka at redhat.com">Richard Opalka</a>
  */
-public final class WSDeploymentAspectDeployer extends AbstractRealDeployer
+final class WSDeploymentAspectDeployer extends AbstractRealDeployer
 {
 
    /** JBossWS specific inputs/outputs prefix. */
@@ -44,6 +44,7 @@
 
    /** JBossWS specific metadata. */
    private static final String JBOSSWS_METADATA = WSDeploymentAspectDeployer.JBOSSWS_ATTACHMENT_PREFIX + "metadata";
+
    /** Delegee. */
    private final DeploymentAspect aspect;
 
@@ -52,7 +53,7 @@
     * 
     * @param aspect deployment aspect
     */
-   public WSDeploymentAspectDeployer(final DeploymentAspect aspect)
+   WSDeploymentAspectDeployer(final DeploymentAspect aspect)
    {
       super();
 
@@ -97,7 +98,7 @@
     * @throws DeploymentException on deployment failure
     */
    @Override
-   public void internalDeploy(final DeploymentUnit unit) throws DeploymentException
+   protected void internalDeploy(final DeploymentUnit unit) throws DeploymentException
    {
       if (ASHelper.isWebServiceDeployment(unit))
       {
@@ -114,7 +115,7 @@
     * @param unit deployment unit
     */
    @Override
-   public void internalUndeploy(final DeploymentUnit unit)
+   protected void internalUndeploy(final DeploymentUnit unit)
    {
       if (ASHelper.isWebServiceDeployment(unit))
       {

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentBuilder.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentBuilder.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/deployers/WSDeploymentBuilder.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -147,7 +147,7 @@
       /**
        * Constructor.
        */
-      AbstractDeploymentModelBuilder()
+      protected AbstractDeploymentModelBuilder()
       {
          super();
 
@@ -352,6 +352,7 @@
        * @param dep webservice deployment
        * @param unit deployment unit
        */
+      @Override
       public void build(final Deployment dep, final DeploymentUnit unit)
       {
          final JBossWebMetaData webMetaData = this.getAndPropagateAttachment(JBossWebMetaData.class, unit, dep);
@@ -394,6 +395,7 @@
        * @param dep webservice deployment
        * @param unit deployment unit
        */
+      @Override
       public void build(final Deployment dep, final DeploymentUnit unit)
       {
          this.getAndPropagateAttachment(WebServiceDeployment.class, unit, dep);
@@ -434,6 +436,7 @@
        * @param dep webservice deployment
        * @param unit deployment unit
        */
+      @Override
       public void build(final Deployment dep, final DeploymentUnit unit)
       {
          final JBossMetaData jbmd = this.getAndPropagateAttachment(JBossMetaData.class, unit, dep);

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/injection/EJBBeanReferenceResolver.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -54,7 +54,7 @@
     * @param unit deployment unit
     * @param delegate EJB reference resolver
     */
-   public EJBBeanReferenceResolver(final DeploymentUnit unit, final EjbReferenceResolver delegate)
+   EJBBeanReferenceResolver(final DeploymentUnit unit, final EjbReferenceResolver delegate)
    {
       super(EJB.class);
 

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-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandler.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -37,6 +37,14 @@
 {
 
    /**
+    * Constructor.
+    */
+   protected AbstractInvocationHandler()
+   {
+      super();
+   }
+   
+   /**
     * Creates invocation.
     * 
     * @return invocation instance

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-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/AbstractInvocationHandlerJSE.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -39,7 +39,7 @@
    /**
     * Constructor.
     */
-   AbstractInvocationHandlerJSE()
+   protected AbstractInvocationHandlerJSE()
    {
       super();
    }
@@ -63,7 +63,7 @@
     * @return endpoint implementation
     * @throws Exception if any error occurs
     */
-   protected Object getTargetBean(final Endpoint endpoint, final Invocation invocation) throws Exception
+   protected final Object getTargetBean(final Endpoint endpoint, final Invocation invocation) throws Exception
    {
       final InvocationContext invocationContext = invocation.getInvocationContext();
       Object targetBean = invocationContext.getTargetBean();
@@ -111,7 +111,7 @@
     * @param invocation current invocation
     * @throws Exception if any error occurs
     */
-   public void invoke(final Endpoint endpoint, final Invocation invocation) throws Exception
+   public final void invoke(final Endpoint endpoint, final Invocation invocation) throws Exception
    {
       try
       {

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXRPC.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -52,6 +52,7 @@
     * @param invocation current invocation
     * @throws Exception if any error occurs
     */
+   @Override
    protected void onBeforeInvocation(final Invocation invocation) throws Exception
    {
       final InvocationContext invocationContext = invocation.getInvocationContext();
@@ -73,6 +74,7 @@
     * @param invocation current invocation
     * @throws Exception if any error occurs
     */
+   @Override
    protected void onAfterInvocation(final Invocation invocation) throws Exception
    {
       final InvocationContext invocationContext = invocation.getInvocationContext();

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-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/InvocationHandlerJAXWS.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -65,6 +65,7 @@
     * @param endpoint used for predestroy phase registration process
     * @param invocation current invocation
     */
+   @Override
    protected void onEndpointInstantiated(final Endpoint endpoint, final Invocation invocation)
    {
       final InjectionsMetaData injectionsMD = endpoint.getAttachment(InjectionsMetaData.class);
@@ -81,6 +82,7 @@
     * 
     *  @param invocation current invocation
     */
+   @Override
    protected void onBeforeInvocation(final Invocation invocation)
    {
       final WebServiceContext wsContext = this.getWebServiceContext(invocation);
@@ -98,6 +100,7 @@
     * 
     * @param invocation current invocation
     */
+   @Override
    protected void onAfterInvocation(final Invocation invocation)
    {
       final WebServiceContext wsContext = this.getWebServiceContext(invocation);

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/invocation/ServiceEndpointInterceptorEJB21.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -56,6 +56,7 @@
     * @return ws invocation return value
     * @throws Exception if any error occurs
     */
+   @Override
    public Object invoke(final org.jboss.invocation.Invocation jbossInvocation) throws Exception
    {
       final SOAPMessageContext msgContext = (SOAPMessageContext)jbossInvocation.getPayloadValue(InvocationKey.SOAP_MESSAGE_CONTEXT);

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/security/JACCPermissionsDeploymentAspect.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -58,6 +58,7 @@
     * 
     * @param dep webservice deployment
     */
+   @Override
    public void start(final Deployment dep)
    {
       final JBossWebMetaData jbossWebMD = WSHelper.getRequiredAttachment(dep, JBossWebMetaData.class);

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/AbstractSecurityMetaDataAccessorEJB.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -54,7 +54,7 @@
     * @param securityDomain security domain to be prefixed
     * @return security domain prefixed with jaas JNDI prefix
     */
-   protected String appendJaasPrefix(final String securityDomain)
+   protected final String appendJaasPrefix(final String securityDomain)
    {
       if (securityDomain != null)
       {

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB21.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -40,7 +40,7 @@
    /**
     * Constructor.
     */
-   public SecurityMetaDataAccessorEJB21()
+   SecurityMetaDataAccessorEJB21()
    {
       super();
    }

Modified: container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java
===================================================================
--- container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java	2009-08-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/SecurityMetaDataAccessorEJB3.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -47,7 +47,7 @@
    /**
     * Constructor.
     */
-   public SecurityMetaDataAccessorEJB3()
+   SecurityMetaDataAccessorEJB3()
    {
       super();
    }

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-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataCreatingDeploymentAspect.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -50,6 +50,7 @@
     *
     * @param dep webservice deployment
     */
+   @Override
    public void start(final Deployment dep)
    {
       final boolean isEjbDeployment = WSHelper.isEjbDeployment(dep);

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-13 07:00:39 UTC (rev 10529)
+++ container/jboss50/branches/ropalka-jboss510/src/main/java/org/jboss/webservices/integration/tomcat/WebMetaDataModifyingDeploymentAspect.java	2009-08-13 07:38:12 UTC (rev 10530)
@@ -49,6 +49,7 @@
     *
     * @param dep webservice deployment
     */
+   @Override
    public void start(final Deployment dep)
    {
       this.webMetaDataModifier.modify(dep);



More information about the jbossws-commits mailing list