proyal 2002/07/15 09:16:50
Modified: src/java/org/apache/avalon/phoenix/frontends CLIMain.java
PhoenixServlet.java
src/java/org/apache/avalon/phoenix/launcher
DaemonLauncher.java
src/java/org/apache/avalon/phoenix/metainfo
ServiceDescriptor.java
src/java/org/apache/avalon/phoenix/components/logger
DefaultLogManager.java SimpleLogKitManager.java
src/java/org/apache/avalon/phoenix/components/embeddor
DefaultEmbeddor.java
Log:
Fixed checkstyle errors
Revision Changes Path
1.40 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java
Index: CLIMain.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/CLIMain.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- CLIMain.java 28 May 2002 11:52:21 -0000 1.39
+++ CLIMain.java 15 Jul 2002 16:16:49 -0000 1.40
@@ -48,8 +48,8 @@
File.separator + "conf" + File.separator + "kernel.xml";
private static final String DEFAULT_FORMAT =
- "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): " +
- "%{message}\n%{throwable}";
+ "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): "
+ + "%{message}\n%{throwable}";
///The embeddor attached to frontend
private Embeddor m_embeddor;
1.21 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java
Index: PhoenixServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/frontends/PhoenixServlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PhoenixServlet.java 20 Jun 2002 06:16:46 -0000 1.20
+++ PhoenixServlet.java 15 Jul 2002 16:16:49 -0000 1.21
@@ -45,8 +45,8 @@
private static final String DEFAULT_LOG_FILE = "/logs/phoenix.log";
private static final String DEFAULT_FORMAT =
- "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): " +
- "%{message}\n%{throwable}";
+ "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): "
+ + "%{message}\n%{throwable}";
private Parameters m_parameters;
private SingleAppEmbeddor m_embeddor;
1.11 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java
Index: DaemonLauncher.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/launcher/DaemonLauncher.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DaemonLauncher.java 12 Jul 2002 01:41:43 -0000 1.10
+++ DaemonLauncher.java 15 Jul 2002 16:16:49 -0000 1.11
@@ -120,8 +120,8 @@
// Ignore this update
if( WrapperManager.isDebugEnabled() )
{
- System.out.println( "DaemonLauncher: " + arg +
- " request ignored because stop already called." );
+ System.out.println( "DaemonLauncher: " + arg
+ + " request ignored because stop already
called." );
System.out.flush();
}
}
1.9 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java
Index: ServiceDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/metainfo/ServiceDescriptor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ServiceDescriptor.java 16 Mar 2002 00:11:56 -0000 1.8
+++ ServiceDescriptor.java 15 Jul 2002 16:16:49 -0000 1.9
@@ -64,8 +64,8 @@
public boolean matches( final ServiceDescriptor other )
{
return
- other.getName().equals( m_name ) &&
- other.getVersion().complies( m_version );
+ other.getName().equals( m_name )
+ && other.getVersion().complies( m_version );
}
/**
1.17 +0 -1
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java
Index: DefaultLogManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/DefaultLogManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultLogManager.java 14 Jul 2002 15:16:59 -0000 1.16
+++ DefaultLogManager.java 15 Jul 2002 16:16:49 -0000 1.17
@@ -13,7 +13,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.context.DefaultContext;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.logger.LogKitLogger;
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.phoenix.BlockContext;
import org.apache.avalon.phoenix.interfaces.LogManager;
1.13 +2 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java
Index: SimpleLogKitManager.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/logger/SimpleLogKitManager.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SimpleLogKitManager.java 14 Jul 2002 02:27:16 -0000 1.12
+++ SimpleLogKitManager.java 15 Jul 2002 16:16:49 -0000 1.13
@@ -43,8 +43,8 @@
ResourceManager.getPackageResources( SimpleLogKitManager.class );
private static final String DEFAULT_FORMAT =
- "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): " +
- "%{message}\n%{throwable}";
+ "%7.7{priority} %23.23{time:yyyy-MM-dd' 'HH:mm:ss.SSS}
[%8.8{category}] (%{context}): "
+ + "%{message}\n%{throwable}";
///Base directory of applications working directory
private File m_baseDirectory;
1.73 +3 -2
jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java
Index: DefaultEmbeddor.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- DefaultEmbeddor.java 14 Jul 2002 01:33:06 -0000 1.72
+++ DefaultEmbeddor.java 15 Jul 2002 16:16:50 -0000 1.73
@@ -237,8 +237,8 @@
while( true )
{
// wait() for shutdown() to take action...
- if( m_shutdown ||
- ( emptyKernel() && !m_persistent ) )
+ if( m_shutdown
+ || ( emptyKernel() && !m_persistent ) )
{
// The server will shut itself down when all
applications are disposed.
if( emptyKernel() )
@@ -281,6 +281,7 @@
}
catch( final InterruptedException e )
{
+ //NOOP
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
