Author: pcl
Date: Sat Oct 7 08:31:16 2006
New Revision: 453932
URL: http://svn.apache.org/viewvc?view=rev&rev=453932
Log:
added more details to error message; made OpenJPA startup banner configurable
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java?view=diff&rev=453932&r1=453931&r2=453932
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
Sat Oct 7 08:31:16 2006
@@ -31,10 +31,6 @@
public class OpenJPAVersion {
public static final String VERSION_NUMBER;
- private static final long RELEASE_SECONDS = 1147454303;
-
- public static final Date RELEASE_DATE = new Date(RELEASE_SECONDS * 1000);
-
public static final String VERSION_ID;
public static final String VENDOR_NAME = "OpenJPA";
public static final int MAJOR_RELEASE;
@@ -103,13 +99,8 @@
public String toString() {
StringBuffer buf = new StringBuffer(80 * 30);
- buf.append("OpenJPA ");
- buf.append(VERSION_NUMBER);
+ appendOpenJPABanner(buf);
buf.append("\n");
- buf.append("version id: ").append(VERSION_ID);
- buf.append("\n");
- buf.append("revision: ").append(REVISION_NUMBER);
- buf.append("\n\n");
getProperty("os.name", buf).append("\n");
getProperty("os.version", buf).append("\n");
@@ -130,6 +121,16 @@
getProperty("user.dir", buf);
return buf.toString();
+ }
+
+ public void appendOpenJPABanner(StringBuffer buf) {
+ buf.append(VENDOR_NAME).append(" ");
+ buf.append(VERSION_NUMBER);
+ buf.append("\n");
+ buf.append("version id: ").append(VERSION_ID);
+ buf.append("\n");
+ buf.append("Apache svn revision: ").append(REVISION_NUMBER);
+ buf.append("\n");
}
private StringBuffer getProperty(String prop, StringBuffer buf) {
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java?view=diff&rev=453932&r1=453931&r2=453932
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractBrokerFactory.java
Sat Oct 7 08:31:16 2006
@@ -501,8 +501,7 @@
Log log = _conf.getLog(OpenJPAConfiguration.LOG_RUNTIME);
if (log.isInfoEnabled())
- log.info(_loc.get("factory-init",
- OpenJPAVersion.VERSION_NUMBER));
+ log.info(getFactoryInitializationBanner());
if (log.isTraceEnabled()) {
Map props = _conf.toProperties(true);
String lineSep = System.getProperty("line.separator");
@@ -536,6 +535,14 @@
} finally {
unlock();
}
+ }
+
+ /**
+ * Return an object to be written to the log when this broker factory
+ * initializes. This happens after the configuration is fully loaded.
+ */
+ protected Object getFactoryInitializationBanner() {
+ return _loc.get("factory-init", OpenJPAVersion.VERSION_NUMBER);
}
/**
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
URL:
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties?view=diff&rev=453932&r1=453931&r2=453932
==============================================================================
---
incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
(original)
+++
incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties
Sat Oct 7 08:31:16 2006
@@ -273,4 +273,5 @@
no configuration properties were found. If you are \
using Ant, please see the <properties> or <propertiesFile> attributes \
of the task''s nested <config> element. This can also occur if your \
- OpenJPA distribution jars are corrupt.
+ OpenJPA distribution jars are corrupt, or if your security policy is \
+ overly strict.
\ No newline at end of file
