You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by ar...@apache.org on 2003/08/29 11:35:43 UTC
cvs commit: db-ojb/src/java/org/apache/ojb/broker PersistenceBrokerFactory.java
arminw 2003/08/29 02:35:43
Modified: src/java/org/apache/ojb/broker/util/configuration/impl
ConfigurationAbstractImpl.java
OjbConfiguration.java
src/java/org/apache/ojb/broker PersistenceBrokerFactory.java
Log:
add more javadoc comments, by Jason Pyeron
Revision Changes Path
1.8 +6 -1 db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/ConfigurationAbstractImpl.java
Index: ConfigurationAbstractImpl.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/ConfigurationAbstractImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ConfigurationAbstractImpl.java 18 Jul 2003 17:21:48 -0000 1.7
+++ ConfigurationAbstractImpl.java 29 Aug 2003 09:35:43 -0000 1.8
@@ -432,6 +432,11 @@
/**
* Loads the Configuration from the properties file.
+ *
+ * Loads the properties file, or uses defaults on failure.
+ *
+ * @see org.apache.ojb.broker.util.configuration.impl.ConfigurationAbstractImpl#setFilename(java.lang.String)
+ *
*/
protected void load()
{
1.29 +4 -2 db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfiguration.java
Index: OjbConfiguration.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfiguration.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- OjbConfiguration.java 8 Jul 2003 20:32:20 -0000 1.28
+++ OjbConfiguration.java 29 Aug 2003 09:35:43 -0000 1.29
@@ -257,7 +257,9 @@
}
/**
- * loads the configuration
+ * loads the configuration from file "OBJ.properties". If the system
+ * property "OJB.properties" is set, then the configuration in that file is
+ * loaded.
*/
protected void load()
{
1.20 +3 -1 db-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerFactory.java
Index: PersistenceBrokerFactory.java
===================================================================
RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/PersistenceBrokerFactory.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- PersistenceBrokerFactory.java 19 May 2003 09:32:59 -0000 1.19
+++ PersistenceBrokerFactory.java 29 Aug 2003 09:35:43 -0000 1.20
@@ -97,6 +97,8 @@
/**
* Return a default broker instance, specified in configuration.
*
+ * Will cause the OJB.properties file to load via {@link org.apache.ojb.broker.util.configuration.impl.OjbConfiguration#load OjbConfiguration.load()}.
+ *
*/
public static PersistenceBroker defaultPersistenceBroker() throws PBFactoryException
{
---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org