[jboss-cvs] JBossAS SVN: r86170 - in branches/Branch_5_x: tomcat/src/main/org/jboss/web/tomcat/service/deployers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-03-21 07:40:44 -0400 (Sat, 21 Mar 2009)
New Revision: 86170

Modified:
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/AbstractRuntimeComponentDispatcher.java
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java
   branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
   branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
Log:
Remove some @Deprecated before CR.

Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/AbstractRuntimeComponentDispatcher.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/AbstractRuntimeComponentDispatcher.java	2009-03-20 18:19:18 UTC (rev 86169)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/AbstractRuntimeComponentDispatcher.java	2009-03-21 11:40:44 UTC (rev 86170)
@@ -42,6 +42,14 @@
    }
 
    /**
+    * Get the state of the component
+    *
+    * @param name the component name
+    * @return state enum value
+    */
+   public abstract String getState(Object name);
+
+   /**
     * Create meta value.
     *
     * @param value the value

Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java	2009-03-20 18:19:18 UTC (rev 86169)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/KernelBusRuntimeComponentDispatcher.java	2009-03-21 11:40:44 UTC (rev 86170)
@@ -42,23 +42,6 @@
    private KernelBus bus;
    private Kernel kernel;
 
-   @Deprecated
-   public KernelBusRuntimeComponentDispatcher(KernelBus bus)
-   {
-      this(bus, null);
-   }
-
-   @Deprecated
-   public KernelBusRuntimeComponentDispatcher(KernelBus bus, MetaValueFactory valueFactory)
-   {
-      super(valueFactory);
-      if (bus == null)
-         throw new IllegalArgumentException("Null kernel bus.");
-
-      this.bus = bus;
-      this.kernel = bus.getKernel();
-   }
-
    public KernelBusRuntimeComponentDispatcher(Kernel kernel)
    {
       this(kernel, null);
@@ -121,12 +104,6 @@
       }
    }
 
-   /**
-    * Get the state of a bean
-    * 
-    * @param name the bean name
-    * @return state enum value
-    */
    public String getState(Object name)
    {
       KernelController controller = kernel.getController();

Modified: branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java
===================================================================
--- branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2009-03-20 18:19:18 UTC (rev 86169)
+++ branches/Branch_5_x/profileservice/src/main/org/jboss/profileservice/management/ManagementViewImpl.java	2009-03-21 11:40:44 UTC (rev 86170)
@@ -608,7 +608,7 @@
       if (state == RunState.UNKNOWN && dispatcher != null)
       {
          //TODO, update RuntimeComponentDispatcher
-         KernelBusRuntimeComponentDispatcher xdispatcher = (KernelBusRuntimeComponentDispatcher) dispatcher;
+         AbstractRuntimeComponentDispatcher xdispatcher = (AbstractRuntimeComponentDispatcher) dispatcher;
          Object name = comp.getComponentName();
          if (name == null && runtimeMO != null)
             name = runtimeMO.getComponentName();

Modified: branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java
===================================================================
--- branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2009-03-20 18:19:18 UTC (rev 86169)
+++ branches/Branch_5_x/tomcat/src/main/org/jboss/web/tomcat/service/deployers/WarClassLoaderDeployer.java	2009-03-21 11:40:44 UTC (rev 86170)
@@ -35,7 +35,6 @@
 import org.jboss.metadata.common.jboss.LoaderRepositoryConfigMetaData;
 import org.jboss.metadata.common.jboss.LoaderRepositoryMetaData;
 import org.jboss.metadata.web.jboss.JBossWebMetaData;
-import org.jboss.virtual.VirtualFile;
 
 /**
  * The war deployment class loader deployer.
@@ -44,7 +43,7 @@
  * 
  * @author Scott.Stark at jboss.org
  * @author adrian at jboss.org
- * @version $Revision$
+ * @author ales.justin at jboss.org
  */
 public class WarClassLoaderDeployer extends AbstractSimpleVFSRealDeployer<JBossWebMetaData>
 {
@@ -84,17 +83,6 @@
       this.filteredPackages = pkgs;
    }
 
-   @Deprecated
-   public boolean isIncludeWebInfInClasspath()
-   {
-      throw new IllegalArgumentException("Not supported anymore, see WARStructure.");
-   }
-   @Deprecated
-   public void setIncludeWebInfInClasspath(boolean includeWebInfInClasspath)
-   {
-      log.warn("Not supported anymore, use WARStructure::setIncludeWebInfInClasspath(boolean).");
-   }
-
    @Override
    public void deploy(VFSDeploymentUnit unit, JBossWebMetaData metaData) throws DeploymentException
    {
@@ -157,7 +145,7 @@
                            // Check for previous mis-spelled property name
                            java2ParentDelegation = props.getProperty("java2ParentDelegaton", "false");
                         }
-                        j2seClassLoadingCompliance = Boolean.valueOf(java2ParentDelegation).booleanValue();
+                        j2seClassLoadingCompliance = Boolean.valueOf(java2ParentDelegation);
                      }
                   }
                }
@@ -178,10 +166,4 @@
       classLoadingMetaData.setExcludedPackages(filteredPackages);
       unit.addAttachment(ClassLoadingMetaData.class, classLoadingMetaData);
    }
-
-   @Deprecated
-   protected VirtualFile getWebInf(VFSDeploymentUnit unit)
-   {
-      return unit.getFile("WEB-INF");
-   }
 }