[jboss-cvs] JBossAS SVN: r66734 - in trunk/embedded/src/main/java/org/jboss: embedded/adapters and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Nov 5 09:59:33 EST 2007


Author: alesj
Date: 2007-11-05 09:59:33 -0500 (Mon, 05 Nov 2007)
New Revision: 66734

Modified:
   trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java
   trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
   trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
   trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java
   trunk/embedded/src/main/java/org/jboss/embedded/DeploymentScanner.java
   trunk/embedded/src/main/java/org/jboss/embedded/ServletContextResourceScanner.java
   trunk/embedded/src/main/java/org/jboss/embedded/WebInfLibScanner.java
   trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java
   trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java
   trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java
   trunk/embedded/src/main/java/org/jboss/embedded/jndi/BridgeContext.java
   trunk/embedded/src/main/java/org/jboss/embedded/jndi/KernelInitializingContextFactory.java
   trunk/embedded/src/main/java/org/jboss/embedded/jndi/WrappingContext.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/ENCFactory.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/KernelInitializingContextFactory.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/TomcatBridgeContextFactory.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/java/javaURLContextFactory.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecurityAssociationValve.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecuritySetupListener.java
   trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/TomcatLoginModule.java
   trunk/embedded/src/main/java/org/jboss/embedded/url/BridgeHandlerFactory.java
   trunk/embedded/src/main/java/org/jboss/embedded/url/HandlerFactoryHack.java
   trunk/embedded/src/main/java/org/jboss/embedded/url/JavaProtocolHandlerPkgs.java
   trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java
   trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java
   trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java
   trunk/embedded/src/main/java/org/jboss/naming/SecurityAssociationActions.java
Log:
Cosmetic changes + fixing some imports.

Modified: trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/BeanCompiler.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,20 +21,20 @@
 */
 package org.jboss.embedded;
 
-import org.jboss.xb.binding.Unmarshaller;
-import org.jboss.xb.binding.UnmarshallerFactory;
-import org.jboss.xb.binding.JBossXBException;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
 import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.net.MalformedURLException;
 
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.xb.binding.JBossXBException;
+import org.jboss.xb.binding.Unmarshaller;
+import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SingletonSchemaResolverFactory;
+
 /**
  * comment
  *
@@ -50,6 +50,7 @@
          compile(arg);
       }
    }
+
    public static void compile(String arg) throws Exception
    {
       System.out.println("compiling: " + arg);
@@ -73,9 +74,6 @@
       long end = System.currentTimeMillis() - start;
 
       System.out.println("object loading took: " + end);
-
-
-
    }
 
    public static KernelDeployment parse(File fp)

Modified: trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/BinaryBootstrap.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -51,7 +51,6 @@
 {
    private static Bootstrap instance;
 
-
    public BinaryBootstrap(Kernel kernel)
    {
       super(kernel);
@@ -64,18 +63,18 @@
     */
    public static synchronized Bootstrap getInstance()
    {
-      if (instance == null) instance = new BinaryBootstrap(createKernel());
+      if (instance == null)
+         instance = new BinaryBootstrap(createKernel());
+
       return instance;
    }
 
-   public static KernelDeployment parse(URL url)
-           throws JBossXBException, MalformedURLException
+   public static KernelDeployment parse(URL url) throws JBossXBException, MalformedURLException
    {
       SchemaBindingResolver resolver = SingletonSchemaResolverFactory.getInstance().getSchemaBindingResolver();
       UnmarshallerFactory factory = UnmarshallerFactory.newInstance();
       Unmarshaller unmarshaller = factory.newUnmarshaller();
-      KernelDeployment deployment = (KernelDeployment) unmarshaller.unmarshal(url.toString(), resolver);
-      return deployment;
+      return (KernelDeployment) unmarshaller.unmarshal(url.toString(), resolver);
    }
 
    public static void store(KernelDeployment deployment, File binFile) throws Exception
@@ -99,8 +98,7 @@
       ObjectInputStream ois = new ObjectInputStream(fis);
       try
       {
-         KernelDeployment deployment = (KernelDeployment)ois.readObject();
-         return deployment;
+         return (KernelDeployment)ois.readObject();
       }
       finally
       {
@@ -109,7 +107,6 @@
       }
    }
 
-
    @Override
    protected void deployBaseBootstrapUrl(URL url) throws DeploymentException
    {
@@ -121,7 +118,6 @@
          File binFile = new File(binUri);
          KernelDeployment deployment;
 
-
          if (!binFile.exists() && !textFile.exists())
          {
             throw new DeploymentException("Unable to locate bootstrap file: " + url);
@@ -149,7 +145,6 @@
             deployment = load(binFile);
          }
 
-
          AbstractKernelDeployer deployer = new AbstractKernelDeployer(kernel);
          deployer.deploy(deployment);
       }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/Bootstrap.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -57,8 +57,6 @@
    protected boolean started;
    protected boolean ignoreShutdownErrors;
 
-
-
    private static Bootstrap instance;
 
    /**
@@ -77,13 +75,11 @@
       this.kernel = createKernel();
    }
 
-
    public Bootstrap(Kernel kernel)
    {
       this.kernel = kernel;
    }
 
-
    public boolean isIgnoreShutdownErrors()
    {
       return ignoreShutdownErrors;
@@ -119,7 +115,6 @@
       this.loader = loader;
    }
 
-
    protected static Kernel createKernel()
    {
       BasicBootstrap bootstrap1 = new BasicBootstrap();
@@ -184,7 +179,6 @@
       bootstrapURL(url);
    }
 
-
    /**
     * Will obtain resource path from jboss.embedded.bootstrap.resource.path System Property.
     * Otherwise it just invoked bootstrap(String bootstrapResourcePath) with ""
@@ -251,7 +245,6 @@
       {
          undeploy(url);
       }
-
    }
 
    /**
@@ -314,7 +307,6 @@
       group.process();
    }
 
-
    public void deploy(URL url) throws DeploymentException
    {
       DeploymentGroup group = createDeploymentGroup();
@@ -376,7 +368,6 @@
       group.process();
    }
 
-
    /**
     * opposite of deployResourceBase()
     *
@@ -400,7 +391,7 @@
       String urlString = url.toString();
       int idx = urlString.lastIndexOf(baseResource);
       urlString = urlString.substring(0, idx);
-      URL deployUrl = null;
+      URL deployUrl;
       try
       {
          deployUrl = new URL(urlString);
@@ -427,7 +418,6 @@
       {
          throw new RuntimeException(e);
       }
-
    }
 
    /**

Modified: trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/DeploymentGroup.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -67,7 +67,6 @@
       this.kernel = kernel;
    }
 
-
    /**
     *
     * File filter that will be used when scanning a directory
@@ -397,8 +396,6 @@
       }
    }
 
-
-
    /**
     * Find the .class file resource of provided class
     * Return a URL pointing to the classpath the resource is located in.
@@ -495,7 +492,6 @@
       addVirtualFiles(getDeployerDirUrls(filter, directory, recurse));
    }
 
-
    /**
     * Get the deployment units
     * 
@@ -626,7 +622,6 @@
          {
             urlAsString += paths[i] + "/";
          }
-
       }
       try
       {

Modified: trunk/embedded/src/main/java/org/jboss/embedded/DeploymentScanner.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/DeploymentScanner.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/DeploymentScanner.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,13 +21,13 @@
 */
 package org.jboss.embedded;
 
-import org.jboss.deployers.spi.DeploymentException;
-import org.jboss.logging.Logger;
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.List;
 
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.logging.Logger;
+
 /**
  * Bean so that you can create a DeploymentGroup from the Microcontainer
  *
@@ -49,25 +49,21 @@
       this.urls = urls;
    }
 
-
    public void setResources(List<String> resources) throws DeploymentException, NullPointerException
    {
       this.resources = resources;
    }
 
-
    public void setMultipleResources(List<String> resources) throws DeploymentException, IOException
    {
       this.multiple = resources;
    }
 
-
    public void setDirectoriesByResource(List<String> resources) throws DeploymentException, IOException
    {
       dirs = resources;
    }
 
-
    public void setFilesByResource(List<String> filesByResource)
    {
       this.filesByResource = filesByResource;
@@ -119,5 +115,4 @@
    {
       undeploy();
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/ServletContextResourceScanner.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/ServletContextResourceScanner.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/ServletContextResourceScanner.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,16 +21,14 @@
 */
 package org.jboss.embedded;
 
-import org.jboss.logging.Logger;
-import org.jboss.deployers.spi.DeploymentException;
-
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContext;
-import java.util.Set;
-import java.util.StringTokenizer;
 import java.net.URL;
+import java.util.StringTokenizer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
 
+import org.jboss.deployers.spi.DeploymentException;
+
 /**
  * This listener takes in the init parameter "jboss.embedded.resources"
  * which is a comma delimited list of ServletContext resources that you want
@@ -45,8 +43,6 @@
  */
 public class ServletContextResourceScanner implements ServletContextListener
 {
-   private static final Logger log = Logger.getLogger(ServletContextResourceScanner.class);
-
    private DeploymentGroup group = Bootstrap.getInstance().createDeploymentGroup();
 
    public void contextInitialized(ServletContextEvent servletContextEvent)

Modified: trunk/embedded/src/main/java/org/jboss/embedded/WebInfLibScanner.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/WebInfLibScanner.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/WebInfLibScanner.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,17 +21,15 @@
 */
 package org.jboss.embedded;
 
-import org.jboss.logging.Logger;
-import org.jboss.deployers.spi.DeploymentException;
-
+import java.net.URL;
+import java.util.Set;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.net.URL;
-import java.util.Set;
-import java.util.ArrayList;
-import java.util.StringTokenizer;
 
+import org.jboss.deployers.spi.DeploymentException;
+import org.jboss.logging.Logger;
+
 /**
  * Deploy all jars in WEB-INF/lib.  These jars are undeployed at WAR destruction
  *

Modified: trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/JMXKernel.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,18 +21,8 @@
 */
 package org.jboss.embedded.adapters;
 
-import org.jboss.kernel.Kernel;
-import org.jboss.mx.server.MBeanServerBuilderImpl;
-import org.jboss.mx.util.JMXExceptionDecoder;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.system.ServiceController;
-import org.jboss.system.ServiceControllerMBean;
-import org.jboss.system.deployers.ServiceDeployer;
-import org.jboss.system.server.ServerConfigImpl;
-import org.jboss.system.server.ServerConfigImplMBean;
-import org.jboss.system.server.ServerImplMBean;
-import org.jboss.util.JBossObject;
-
+import java.util.Date;
+import java.util.Properties;
 import javax.management.JMRuntimeException;
 import javax.management.ListenerNotFoundException;
 import javax.management.MBeanNotificationInfo;
@@ -45,9 +35,19 @@
 import javax.management.NotificationFilter;
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
-import java.util.Date;
-import java.util.Properties;
 
+import org.jboss.kernel.Kernel;
+import org.jboss.mx.util.JMXExceptionDecoder;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.system.ServiceController;
+import org.jboss.system.ServiceControllerMBean;
+import org.jboss.system.deployers.ServiceDeployer;
+import org.jboss.system.server.ServerConfigImpl;
+import org.jboss.system.server.ServerConfigImplMBean;
+import org.jboss.system.server.ServerImplMBean;
+import org.jboss.system.server.jmx.MBeanServerBuilderImpl;
+import org.jboss.util.JBossObject;
+
 /**
  * A pojo that creates a legacy jmx kernel ala the jboss-4.x server bootstrap.
  * This is used to support the SARDeployer and mbean integration.
@@ -85,13 +85,11 @@
       this.kernel = kernel;
    }
 
-
    public void setBuilder(MBeanServerBuilder builder)
    {
       this.builder = builder;
    }
 
-
    public ServerConfig getServerConfig()
    {
       return serverConfig;
@@ -128,7 +126,6 @@
          throw new JMRuntimeException(msg);
       }
       return mbeanServer;
-
    }
 
    public static void setupUrlHandlers()
@@ -146,7 +143,6 @@
       }
       //Field field = URL.class.getDeclaredField("")
       //URL.setURLStreamHandlerFactory(new URLStreamHandlerFactory());
-
    }
 
    public void start() throws Exception
@@ -222,7 +218,6 @@
       }
    }
 
-
    public void addNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback)
    {
       broadcasterSupport.addNotificationListener(listener, filter, handback);
@@ -250,7 +245,6 @@
       broadcasterSupport.sendNotification(notification);
    }
 
-
    public void runGarbageCollector()
    {
       //To change body of implemented methods use File | Settings | File Templates.
@@ -356,13 +350,11 @@
       //To change body of implemented methods use File | Settings | File Templates.
    }
 
-
    public String getSpecificationVersion()
    {
       return serverConfig.getSpecificationVersion();
    }
 
-
    public String getVersionNumber()
    {
       return "";

Modified: trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/LocalOnlyUserTransaction.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,21 +21,21 @@
 */
 package org.jboss.embedded.adapters;
 
-import org.jboss.logging.Logger;
-import org.jboss.ejb3.tx.TxUtil;
-
-import javax.transaction.UserTransaction;
-import javax.transaction.TransactionManager;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import javax.transaction.HeuristicMixedException;
+import javax.transaction.HeuristicRollbackException;
 import javax.transaction.NotSupportedException;
+import javax.transaction.RollbackException;
 import javax.transaction.SystemException;
 import javax.transaction.Transaction;
-import javax.transaction.RollbackException;
-import javax.transaction.HeuristicMixedException;
-import javax.transaction.HeuristicRollbackException;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
+import javax.transaction.TransactionManager;
+import javax.transaction.UserTransaction;
 
+import org.jboss.ejb3.tx.TxUtil;
+import org.jboss.logging.Logger;
+
 /**
  * Simple, local-only UserTransaction adapter
  *
@@ -83,7 +83,6 @@
       Transaction tx = tm.getTransaction();
       if (trace)
          log.trace("UserTx begin: " + tx);
-
    }
 
    public void commit()
@@ -103,6 +102,7 @@
       Transaction tx = tm.getTransaction();
       if (trace)
          log.trace("UserTx rollback: " + tx);
+
       tm.rollback();
    }
 
@@ -134,12 +134,10 @@
 
    public void writeExternal(ObjectOutput out) throws IOException
    {
-      //To change body of implemented methods use File | Settings | File Templates.
    }
 
    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
    {
       this.tm = TxUtil.getTransactionManager();
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/adapters/ServerConfig.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,15 +21,15 @@
 */
 package org.jboss.embedded.adapters;
 
-import org.jboss.bootstrap.BaseServerConfig;
-import org.jboss.embedded.Bootstrap;
-import org.jboss.embedded.DeploymentScanner;
-
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Properties;
 
+import org.jboss.bootstrap.BaseServerConfig;
+import org.jboss.embedded.Bootstrap;
+import org.jboss.embedded.DeploymentScanner;
+
 /**
  * comment
  *
@@ -112,7 +112,6 @@
       props.put(SERVER_HOME_DIR, fp.toString());
    }
 
-
    public void initURLs()
            throws MalformedURLException
    {
@@ -254,7 +253,6 @@
       return config.getRootDeploymentFilename();
    }
 
-
    public String getSpecificationVersion()
    {
       return config.getSpecificationVersion();

Modified: trunk/embedded/src/main/java/org/jboss/embedded/jndi/BridgeContext.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/jndi/BridgeContext.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/jndi/BridgeContext.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,12 +21,12 @@
 */
 package org.jboss.embedded.jndi;
 
-import javax.naming.Context;
-import javax.naming.NameNotFoundException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import javax.naming.Context;
+import javax.naming.NameNotFoundException;
 
 /**
  * comment
@@ -60,7 +60,7 @@
    public Object invoke(Object proxy, Method method, Object[] args)
          throws Throwable
    {
-      Object value = null;
+      Object value;
       // First try the primary context
       try
       {

Modified: trunk/embedded/src/main/java/org/jboss/embedded/jndi/KernelInitializingContextFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/jndi/KernelInitializingContextFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/jndi/KernelInitializingContextFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,13 +21,13 @@
 */
 package org.jboss.embedded.jndi;
 
-import org.jboss.embedded.Bootstrap;
-import org.jboss.naming.JBossRemotingContextFactory;
-
+import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.NamingException;
-import java.util.Hashtable;
 
+import org.jboss.embedded.Bootstrap;
+import org.jboss.naming.JBossRemotingContextFactory;
+
 /**
  * InitialContextFactory that will bootstrap embedded jboss.
  *
@@ -84,5 +84,4 @@
       KernelInitializingContextFactory.bootstrapEmbeddedKernel(env);
       return super.getInitialContext(env);
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/jndi/WrappingContext.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/jndi/WrappingContext.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/jndi/WrappingContext.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,6 +21,7 @@
 */
 package org.jboss.embedded.jndi;
 
+import java.util.Hashtable;
 import javax.naming.Binding;
 import javax.naming.Context;
 import javax.naming.Name;
@@ -28,7 +29,6 @@
 import javax.naming.NameParser;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
-import java.util.Hashtable;
 
 /**
  * comment
@@ -40,7 +40,6 @@
 {
    private Context namingContext;
 
-
    public WrappingContext(Context namingContext)
    {
       this.namingContext = namingContext;
@@ -224,5 +223,4 @@
    {
       return namingContext;
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/EmbeddedJBossBootstrapListener.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,6 +21,10 @@
 */
 package org.jboss.embedded.tomcat;
 
+import java.net.URL;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
@@ -30,10 +34,6 @@
 import org.jboss.embedded.url.JavaProtocolHandlerPkgs;
 import org.jboss.net.protocol.URLStreamHandlerFactory;
 
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.net.URL;
-
 /**
  * Tomcat Listener that initializes embedded jboss.
  *
@@ -47,7 +47,6 @@
  */
 public class EmbeddedJBossBootstrapListener implements LifecycleListener
 {
-
    public void lifecycleEvent(LifecycleEvent event)
    {
       if (Lifecycle.START_EVENT.equals(event.getType()))
@@ -58,7 +57,6 @@
       {
          innerStop();
       }
-
    }
 
    protected void innerStart()

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/WebinfScanner.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -52,7 +52,8 @@
    {
       if (event.getType().equals(Lifecycle.START_EVENT))
       {
-         if (!(event.getSource() instanceof StandardContext)) return;
+         if (!(event.getSource() instanceof StandardContext))
+            return;
 
          StandardContext container = (StandardContext)event.getSource();
          container.getLoader().getClassLoader();
@@ -104,7 +105,6 @@
             throw new RuntimeException(e);
          }
       }
-
    }
 
    private static Method basePathMethod;

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/ENCFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/ENCFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/ENCFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,17 +21,16 @@
 */
 package org.jboss.embedded.tomcat.jndi;
 
-import org.apache.naming.SelectorContext;
-import org.apache.naming.java.javaURLContextFactory;
-
+import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.NamingException;
 import javax.naming.RefAddr;
 import javax.naming.Reference;
 import javax.naming.StringRefAddr;
-import java.util.Hashtable;
 
+import org.apache.naming.java.javaURLContextFactory;
+
 /**
  * We look to see if a threadlocal tag is set, if so, just use JBoss java:comp resolving.
  * If it is not set, then obtain a reference to "java:" and lookup "comp"
@@ -43,6 +42,8 @@
 {
    private static boolean initialized;
 
+   private javaURLContextFactory apache = new javaURLContextFactory();
+
    /**
     * Convience function.  Rebinds java:comp to this class just in case an existing
     * jboss configuration already bound java:comp.  This is so we don't have to have
@@ -53,7 +54,9 @@
     */
    public static synchronized void rebindComp(Context jbossContext) throws NamingException
    {
-      if (initialized)return;
+      if (initialized)
+         return;
+
       initialized = true;
       RefAddr refAddr = new StringRefAddr("nns", "ENC");
       Reference envRef = new Reference("javax.naming.Context", refAddr, ENCFactory.class.getName(), null);
@@ -61,8 +64,6 @@
       ctx.rebind("comp", envRef);
    }
 
-   private javaURLContextFactory apache = new javaURLContextFactory();
-
    @Override
    public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable environment) throws Exception
    {
@@ -72,5 +73,4 @@
       }
       return apache.getInitialContext(environment).lookup("java:comp");
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/KernelInitializingContextFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/KernelInitializingContextFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/KernelInitializingContextFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,9 +21,9 @@
 */
 package org.jboss.embedded.tomcat.jndi;
 
+import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.NamingException;
-import java.util.Hashtable;
 
 /**
  * comment
@@ -37,16 +37,14 @@
     * Get a new (writable) initial context.
     */
    @Override
-   public Context getInitialContext(Hashtable environment)
-           throws NamingException
+   public Context getInitialContext(Hashtable environment) throws NamingException
    {
       System.setProperty(Context.URL_PKG_PREFIXES, "org.jboss.embedded.tomcat.jndi");
       org.jboss.embedded.jndi.KernelInitializingContextFactory.bootstrapEmbeddedKernel(environment);
       Context jbossContext = super.getInitialContext(environment);
       // reinitialize java:comp so that we don't have to have two copies of embedded configuration
       ENCFactory.rebindComp(jbossContext);
-
+      
       return jbossContext;
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/TomcatBridgeContextFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/TomcatBridgeContextFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/TomcatBridgeContextFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,14 +21,14 @@
 */
 package org.jboss.embedded.tomcat.jndi;
 
+import java.util.Hashtable;
+import javax.naming.Context;
+import javax.naming.NamingException;
+
 import org.apache.naming.java.javaURLContextFactory;
 import org.jboss.embedded.jndi.BridgeContext;
 import org.jboss.embedded.jndi.DelegatingContextFactory;
 
-import javax.naming.Context;
-import javax.naming.NamingException;
-import java.util.Hashtable;
-
 /**
  * comment
  *
@@ -43,12 +43,10 @@
     * Get a new (writable) initial context.
     */
    @Override
-   public Context getInitialContext(Hashtable environment)
-           throws NamingException
+   public Context getInitialContext(Hashtable environment) throws NamingException
    {
       Context jbossContext = super.getInitialContext(environment);
       Context apacheContext = apache.getInitialContext(environment);
       return BridgeContext.createBridge(jbossContext, apacheContext);
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/java/javaURLContextFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/java/javaURLContextFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/jndi/java/javaURLContextFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,13 +21,13 @@
 */
 package org.jboss.embedded.tomcat.jndi.java;
 
-import org.jboss.embedded.jndi.BridgeContext;
-
+import java.util.Hashtable;
 import javax.naming.Context;
 import javax.naming.Name;
 import javax.naming.spi.ObjectFactory;
-import java.util.Hashtable;
 
+import org.jboss.embedded.jndi.BridgeContext;
+
 /**
  * comment
  *
@@ -45,8 +45,5 @@
       Context apacheContext = (Context)apache.getObjectInstance(obj, name, nameCtx, environment);
       return BridgeContext.createBridge(jbossContext, apacheContext);
    }
-
-
-
 }
 

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecurityAssociationValve.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecurityAssociationValve.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecurityAssociationValve.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,19 +21,19 @@
 */
 package org.jboss.embedded.tomcat.security;
 
-import org.apache.catalina.valves.ValveBase;
-import org.apache.catalina.connector.Request;
-import org.apache.catalina.connector.Response;
-import org.apache.catalina.Session;
-import org.apache.catalina.Manager;
-import org.apache.catalina.Wrapper;
-import org.apache.catalina.Container;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.security.Principal;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpSession;
 
+import org.apache.catalina.Container;
+import org.apache.catalina.Manager;
+import org.apache.catalina.Session;
+import org.apache.catalina.Wrapper;
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+
 /**
  * comment
  *
@@ -42,8 +42,6 @@
  */
 public class SecurityAssociationValve extends ValveBase
 {
-
-
    public SecurityAssociationValve()
    {
    }
@@ -87,11 +85,8 @@
       }
       Wrapper servlet = request.getWrapper();
       System.out.println("RUNAS: " + servlet.getRunAs());
-      if (servlet.getRealm() == null) System.out.println("Servlet realm was null");
+      if (servlet.getRealm() == null)
+         System.out.println("Servlet realm was null");
       getNext().invoke(request, response);
-
-      
-      
-
    }
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecuritySetupListener.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecuritySetupListener.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/SecuritySetupListener.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,11 +21,10 @@
 */
 package org.jboss.embedded.tomcat.security;
 
-import org.apache.catalina.LifecycleListener;
-import org.apache.catalina.Contained;
 import org.apache.catalina.Container;
+import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
-import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.Pipeline;
 
 /**
@@ -40,7 +39,8 @@
    {
       if (event.getType().equals(Lifecycle.AFTER_START_EVENT))
       {
-         if (!(event.getSource() instanceof Container)) return;
+         if (!(event.getSource() instanceof Container))
+            return;
 
          Container container = (Container)event.getSource();
          Pipeline pipe = container.getPipeline();
@@ -48,8 +48,8 @@
          {
             System.out.println("******** pipe was null");
          }
-         else container.getPipeline().addValve(new SecurityAssociationValve(container));      
+         else
+            container.getPipeline().addValve(new SecurityAssociationValve(container));
       }
-
    }
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/TomcatLoginModule.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/TomcatLoginModule.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/tomcat/security/TomcatLoginModule.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,13 +21,13 @@
 */
 package org.jboss.embedded.tomcat.security;
 
-import org.jboss.security.auth.spi.AbstractServerLoginModule;
-
+import java.security.Principal;
+import java.security.acl.Group;
 import javax.security.auth.login.LoginException;
 import javax.servlet.http.HttpServletRequest;
-import java.security.Principal;
-import java.security.acl.Group;
 
+import org.jboss.security.auth.spi.AbstractServerLoginModule;
+
 /**
  * comment
  *
@@ -37,6 +37,7 @@
 public class TomcatLoginModule extends AbstractServerLoginModule
 {
    static ThreadLocal<HttpServletRequest> request = new ThreadLocal<HttpServletRequest>();
+
    @Override
    public boolean login() throws LoginException
    {
@@ -52,5 +53,4 @@
    {
       return new Group[0];
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/url/BridgeHandlerFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/url/BridgeHandlerFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/url/BridgeHandlerFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -35,7 +35,6 @@
 {
    private List<URLStreamHandlerFactory> list;
 
-
    public BridgeHandlerFactory(List<URLStreamHandlerFactory> list)
    {
       this.list = list;

Modified: trunk/embedded/src/main/java/org/jboss/embedded/url/HandlerFactoryHack.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/url/HandlerFactoryHack.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/url/HandlerFactoryHack.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -80,9 +80,5 @@
       {
          throw e;
       }
-
-
    }
-
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/embedded/url/JavaProtocolHandlerPkgs.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/url/JavaProtocolHandlerPkgs.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/url/JavaProtocolHandlerPkgs.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -31,7 +31,6 @@
 {
    private String pkgs;
 
-
    public String getPkgs()
    {
       return pkgs;

Modified: trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperties.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -33,7 +33,6 @@
 {
    private Map<String, String> properties;
 
-
    public Map<String, String> getProperties()
    {
       return properties;

Modified: trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/embedded/util/SystemProperty.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,8 +21,6 @@
 */
 package org.jboss.embedded.util;
 
-import java.util.Map;
-
 /**
  * little class to set system properties
  *
@@ -34,7 +32,6 @@
    private String name;
    private String value;
 
-
    public String getName()
    {
       return name;

Modified: trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/naming/JBossRemotingContextFactory.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -68,13 +68,11 @@
  * @author adrian at jboss.org
  * @version $Revision: 37459 $
  */
-public class JBossRemotingContextFactory
-        implements InitialContextFactory, ObjectFactory
+public class JBossRemotingContextFactory implements InitialContextFactory, ObjectFactory
 {
-
    static void associateSecurityInformation(Object principal, Object credentials)
    {
-      Principal securityPrincipal = null;
+      Principal securityPrincipal;
       // See if the principal is a Principal or String
       if( principal instanceof Principal )
       {
@@ -120,13 +118,13 @@
       }
 
    }
-   // InitialContextFactory implementation --------------------------
-   public Context getInitialContext(Hashtable env)
-           throws NamingException
+
+   // InitialContextFactory implementation
+   public Context getInitialContext(Hashtable env) throws NamingException
    {
       Class[] interfaces = {Naming.class};
-      Interceptor[] interceptors = null;
-      Naming naming = null;
+      Interceptor[] interceptors;
+      Naming naming;
 
       // Get the login principal and credentials from the JNDI env
       Object credentials = env.get(Context.SECURITY_CREDENTIALS);
@@ -171,7 +169,6 @@
       return new NamingContext(env, null, naming);
    }
 
-
    // ObjectFactory implementation ----------------------------------
    public Object getObjectInstance(Object obj,
                                    Name name,
@@ -183,5 +180,4 @@
       Reference ref = (Reference) obj;
       return ctx.lookup((String) ref.get("URL").getContent());
    }
-
 }

Modified: trunk/embedded/src/main/java/org/jboss/naming/SecurityAssociationActions.java
===================================================================
--- trunk/embedded/src/main/java/org/jboss/naming/SecurityAssociationActions.java	2007-11-05 14:04:20 UTC (rev 66733)
+++ trunk/embedded/src/main/java/org/jboss/naming/SecurityAssociationActions.java	2007-11-05 14:59:33 UTC (rev 66734)
@@ -21,12 +21,12 @@
 */
 package org.jboss.naming;
 
-import org.jboss.security.SecurityAssociation;
-
-import java.security.PrivilegedAction;
-import java.security.Principal;
 import java.security.AccessController;
+import java.security.Principal;
+import java.security.PrivilegedAction;
 
+import org.jboss.security.SecurityAssociation;
+
 /** A PrivilegedAction implementation for setting the SecurityAssociation
  * principal and credential
  *
@@ -59,5 +59,4 @@
       SecurityAssociationActions.SetPrincipalInfoAction action = new SecurityAssociationActions.SetPrincipalInfoAction(principal, credential);
       AccessController.doPrivileged(action);
    }
-
 }




More information about the jboss-cvs-commits mailing list