mcconnell 02/03/13 03:02:03
Modified: enterprise/pss/src/java/org/apache/pss Initializer.java
enterprise/pss/src/java/org/apache/pss/wrapper
DatabaseWrapper.java MemoryWrapper.java
enterprise/time/src/java/org/apache/time Initializer.java
Log:
no message
Revision Changes Path
1.3 +8 -4
jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Initializer.java
Index: Initializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/Initializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Initializer.java 12 Mar 2002 22:18:01 -0000 1.2
+++ Initializer.java 13 Mar 2002 11:02:02 -0000 1.3
@@ -291,7 +291,8 @@
try
{
- if( getLogger().isDebugEnabled() && Trace.isHigh() )
getLogger().debug("creating singleton file connector");
+ if( getLogger().isDebugEnabled() && Trace.isHigh() )
getLogger().debug(
+ "creating singleton file connector");
Configuration c =
getConfiguration().getChild("connector").getChild("file");
final FileConnector connector = new FileConnector( m_context, c,
orbinitinfo );
connector.enableLogging( getLogger().getChildLogger("file") );
@@ -300,7 +301,8 @@
}
catch ( Throwable e )
{
- final String error = "Unexpected exception while attempting to
register the file connector.";
+ final String error =
+ "Unexpected exception while registering the file connector.";
throw new CascadingRuntimeException( error, e );
}
@@ -320,7 +322,8 @@
}
catch ( Throwable e )
{
- final String error = "Unexpected exception while attempting to
register the database connector.";
+ final String error =
+ "Unexpected exception while registering the database
connector.";
throw new CascadingRuntimeException( error, e );
}
@@ -369,7 +372,8 @@
throw new CascadingRuntimeException( error, e );
}
- if( getLogger().isDebugEnabled() && Trace.isMedium() )
getLogger().debug("pre-init cycle completed");
+ if( getLogger().isDebugEnabled() && Trace.isMedium() )
getLogger().debug(
+ "pre-init cycle completed");
}
1.2 +1 -1
jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/wrapper/DatabaseWrapper.java
Index: DatabaseWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/wrapper/DatabaseWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DatabaseWrapper.java 28 Feb 2002 19:10:54 -0000 1.1
+++ DatabaseWrapper.java 13 Mar 2002 11:02:02 -0000 1.2
@@ -283,7 +283,7 @@
printwriter.println( tab2 + "{" );
printwriter.println( tab3 + "obj =
((org.apache.pss.connector.database.DatabaseCatalogBase)_catalog).incarnate(
this, short_pid, \"" + psdlstoragetype.idlID() + "\" );" );
printwriter.println( tab2 + "}" );
- printwriter.println( tab2 + "catch(
org.apache.pss.connector.database.NotFoundException ex )" );
+ printwriter.println( tab2 + "catch(
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( tab2 + "{" );
printwriter.println( tab3 + "throw new
org.omg.CosPersistentState.NotFound();" );
printwriter.println( tab2 + "}" );
1.2 +1 -1
jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/wrapper/MemoryWrapper.java
Index: MemoryWrapper.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/pss/src/java/org/apache/pss/wrapper/MemoryWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MemoryWrapper.java 28 Feb 2002 19:10:54 -0000 1.1
+++ MemoryWrapper.java 13 Mar 2002 11:02:02 -0000 1.2
@@ -79,7 +79,7 @@
printwriter.println( "\t\t{" );
printwriter.println(
"\t\t\t((org.apache.pss.connector.memory.PersistentObjectHome)_home_base).remove_storage_type(
_pid );" );
printwriter.println( "\t\t}" );
- printwriter.println( "\t\tcatch (
org.apache.pss.connector.memory.NotFoundException ex )" );
+ printwriter.println( "\t\tcatch (
org.apache.pss.connector.NotFoundException ex )" );
printwriter.println( "\t\t{ }" );
printwriter.println( "\t}" );
printwriter.println( "" );
1.3 +9 -9
jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/Initializer.java
Index: Initializer.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-apps/enterprise/time/src/java/org/apache/time/Initializer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Initializer.java 12 Mar 2002 22:18:02 -0000 1.2
+++ Initializer.java 13 Mar 2002 11:02:03 -0000 1.3
@@ -36,7 +36,7 @@
private Configuration m_config;
private Context m_context;
- private TimeProvider m_poa;
+ private TimeProvider m_target;
private boolean m_flag = false;
//=================================================================
@@ -92,11 +92,11 @@
try
{
if( getLogger().isDebugEnabled() ) getLogger().debug("creating
TimePOA" );
- m_poa = new TimeProvider();
- m_poa.enableLogging( getLogger().getChildLogger("provider") );
- m_poa.configure( m_config.getChild("provider") );
- m_poa.contextualize( m_context );
- m_poa.initialize();
+ m_target = new TimeProvider();
+ m_target.enableLogging( getLogger().getChildLogger("provider") );
+ m_target.configure( m_config.getChild("provider") );
+ m_target.contextualize( m_context );
+ m_target.initialize();
m_flag = true;
}
catch( Throwable e)
@@ -115,7 +115,7 @@
if( !m_flag ) return;
try
{
- m_poa.start();
+ m_target.start();
}
catch( Throwable e)
{
@@ -136,7 +136,7 @@
if( getLogger().isDebugEnabled() ) getLogger().debug("initializer
disposal" );
try
{
- m_poa.stop();
+ m_target.stop();
}
catch( Throwable e )
{
@@ -145,7 +145,7 @@
}
finally
{
- m_poa = null;
+ m_target = null;
m_config = null;
m_context = null;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
