You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by le...@apache.org on 2003/04/16 16:28:47 UTC
cvs commit: avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple-servlet/src/java/org/apache/bank SimpleServlet.java
leosimons 2003/04/16 07:28:47
Modified: merlin/merlin-smp/src/examples/afs/simple/src/java/org/apache/bank/impl
ActionSimulator.java BankProvider.java
merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache
AbstractTestCase.java
merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank
BankTestCase.java
merlin/merlin-smp/src/examples/afs/simple-servlet/src/java/org/apache/bank
SimpleServlet.java
Log:
optimize imports, remove unused stuff.
Revision Changes Path
1.2 +1 -12 avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/java/org/apache/bank/impl/ActionSimulator.java
Index: ActionSimulator.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/java/org/apache/bank/impl/ActionSimulator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ActionSimulator.java 10 Apr 2003 04:38:08 -0000 1.1
+++ ActionSimulator.java 16 Apr 2003 14:28:46 -0000 1.2
@@ -50,15 +50,6 @@
package org.apache.bank.impl;
-import java.io.File;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.service.ServiceManager;
@@ -68,11 +59,9 @@
import org.apache.bank.Bank;
import org.apache.bank.Account;
-import org.apache.bank.PolicyException;
-import org.apache.bank.NoSuchAccountException;
-public class ActionSimulator extends AbstractLogEnabled
+public class ActionSimulator extends AbstractLogEnabled
implements Serviceable, Initializable, Disposable
{
private ServiceManager m_manager;
1.4 +8 -9 avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/java/org/apache/bank/impl/BankProvider.java
Index: BankProvider.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/java/org/apache/bank/impl/BankProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BankProvider.java 10 Apr 2003 04:36:14 -0000 1.3
+++ BankProvider.java 16 Apr 2003 14:28:46 -0000 1.4
@@ -56,7 +56,6 @@
import java.io.FileOutputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.OutputStream;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.context.Contextualizable;
@@ -74,7 +73,7 @@
import org.apache.bank.NoSuchAccountException;
-public class BankProvider extends AbstractLogEnabled
+public class BankProvider extends AbstractLogEnabled
implements Contextualizable, Configurable, Initializable, Disposable, Bank
{
private File m_home = null;
@@ -93,10 +92,10 @@
}
/**
- * Supply of the runtime context to the component by the container. The
+ * Supply of the runtime context to the component by the container. The
* component uses the supplied home directory to store accounts.
* @param context the runtime context
- * @exception ContextException if the container does not supply the
+ * @exception ContextException if the container does not supply the
* home directory under the "urn:avalon:home" key.
*/
public void contextualize( Context context ) throws ContextException
@@ -148,7 +147,7 @@
}
catch( Throwable e )
{
- final String error =
+ final String error =
"Unable to write accounts to file.";
getLogger().error( error, e );
}
@@ -181,8 +180,8 @@
public Account createAccount( String name )
{
Account account = m_accounts.createAccount( name );
- getLogger().info(
- "created new account for: " + name
+ getLogger().info(
+ "created new account for: " + name
+ " with id: " + account.getID() );
return account;
}
@@ -205,8 +204,8 @@
public Account getAccount( int id ) throws NoSuchAccountException
{
Account account = m_accounts.getAccount( id );
- getLogger().info(
- "retrieving account: " + id
+ getLogger().info(
+ "retrieving account: " + id
+ " for " + account.getName() );
return account;
}
1.4 +0 -10 avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/AbstractTestCase.java
Index: AbstractTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/AbstractTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractTestCase.java 15 Apr 2003 14:33:42 -0000 1.3
+++ AbstractTestCase.java 16 Apr 2003 14:28:46 -0000 1.4
@@ -53,19 +53,9 @@
import java.io.File;
import junit.framework.TestCase;
import org.apache.avalon.assembly.locator.DefaultLocator;
-import org.apache.avalon.assembly.logging.LoggingManager;
-import org.apache.avalon.assembly.logging.TargetDescriptor;
-import org.apache.avalon.assembly.logging.LoggingDescriptor;
-import org.apache.avalon.assembly.logging.DefaultLoggingManager;
import org.apache.avalon.assembly.locator.DefaultLocator;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.meta.model.Category;
import org.apache.avalon.merlin.block.Block;
import org.apache.avalon.merlin.kernel.impl.DefaultKernel;
-import org.apache.avalon.merlin.kernel.KernelException;
import org.apache.avalon.merlin.kernel.Kernel;
/**
1.7 +3 -33 avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank/BankTestCase.java
Index: BankTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple/src/test/org/apache/bank/BankTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BankTestCase.java 15 Apr 2003 14:33:42 -0000 1.6
+++ BankTestCase.java 16 Apr 2003 14:28:46 -0000 1.7
@@ -2,43 +2,13 @@
package org.apache.bank;
-import java.io.File;
-import java.io.IOException;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.io.FileNotFoundException;
-import java.util.StringTokenizer;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Iterator;
-import java.util.jar.JarFile;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
-import java.net.URLClassLoader;
import java.net.URL;
-import java.util.zip.ZipEntry;
-import java.net.MalformedURLException;
-import java.net.JarURLConnection;
import org.apache.AbstractTestCase;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.context.DefaultContext;
-import org.apache.avalon.framework.context.Contextualizable;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
import org.apache.avalon.merlin.block.Block;
-import org.apache.avalon.merlin.kernel.KernelException;
import org.apache.avalon.assembly.util.ExceptionHelper;
-import org.apache.avalon.assembly.locator.DefaultLocator;
import org.apache.avalon.assembly.appliance.Appliance;
import org.apache.avalon.assembly.util.ExceptionHelper;
-import junit.framework.TestCase;
public class BankTestCase extends AbstractTestCase
{
@@ -84,7 +54,7 @@
{
try
{
- URL root = (URL) super.getRootBlock().getURL();
+ URL root = super.getRootBlock().getURL();
URL url = new URL( root, "/");
assertTrue( url.getContent() != null );
assertTrue( url.getContent() instanceof Block );
@@ -105,7 +75,7 @@
try
{
- URL root = (URL) super.getRootBlock().getURL();
+ URL root = super.getRootBlock().getURL();
URL url = new URL( root, "/banking/bank");
URL service = new URL( url, "#org.apache.bank.Bank" );
System.out.println( "URL: " + service );
@@ -123,7 +93,7 @@
//
// create an account and deposit some funds
//
-
+
try
{
Account account = bank.createAccount( "test" );
1.3 +3 -9 avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple-servlet/src/java/org/apache/bank/SimpleServlet.java
Index: SimpleServlet.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-smp/src/examples/afs/simple-servlet/src/java/org/apache/bank/SimpleServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleServlet.java 10 Apr 2003 04:36:14 -0000 1.2
+++ SimpleServlet.java 16 Apr 2003 14:28:46 -0000 1.3
@@ -49,20 +49,14 @@
*/
package org.apache.bank;
-import java.io.File;
import java.net.URL;
import java.io.IOException;
import java.io.PrintWriter;
import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.avalon.assembly.appliance.Appliance;
-import org.apache.avalon.merlin.block.Block;
import org.apache.avalon.merlin.servlet.MerlinServlet;
import org.apache.bank.Bank;
@@ -94,8 +88,8 @@
log( "Bank established: " + m_bank );
//
- // ok - we have bank so we can now create and destroy
- // accounts - need to think about the best way to move on
+ // ok - we have bank so we can now create and destroy
+ // accounts - need to think about the best way to move on
// from here
//
}
@@ -106,7 +100,7 @@
}
/**
- * Printout some information about the bank.
+ * Printout some information about the bank.
*
* @param request The servlet request we are processing
* @param response The servlet response we are producing
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org