You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pc...@apache.org on 2006/08/25 23:00:20 UTC
svn commit: r436945 - in /incubator/openjpa/trunk:
openjpa-kernel/src/main/java/org/apache/openjpa/conf/
openjpa-kernel/src/main/java/org/apache/openjpa/enhance/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-kernel/src/main/resources/...
Author: pcl
Date: Fri Aug 25 14:00:19 2006
New Revision: 436945
URL: http://svn.apache.org/viewvc?rev=436945&view=rev
Log:
moved POM to use ant task instead of java invocation; changed service invocations to use the classloader of the class being looked up to avoid issues with cyclic-static blocks; improved debug info
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java?rev=436945&r1=436944&r2=436945&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/ProductDerivations.java Fri Aug 25 14:00:19 2006
@@ -37,13 +37,14 @@
static {
Class[] pdcls = Services.getImplementorClasses(ProductDerivation.class,
- ProductDerivations.class.getClassLoader());
+ ProductDerivation.class.getClassLoader());
List derivations = new ArrayList(pdcls.length);
for (int i = 0; i < pdcls.length; i++) {
try {
derivations.add(pdcls[i].newInstance());
} catch (Throwable t) {
// invalid service
+ t.printStackTrace();
}
}
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java?rev=436945&r1=436944&r2=436945&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java Fri Aug 25 14:00:19 2006
@@ -2616,8 +2616,9 @@
public AuxiliaryEnhancer[] getAuxiliaryEnhancers() {
if (_auxEnhancers == null) {
try {
- Class[] classes = Services.getImplementorClasses
- (AuxiliaryEnhancer.class, getClass().getClassLoader());
+ Class[] classes = Services.getImplementorClasses(
+ AuxiliaryEnhancer.class,
+ AuxiliaryEnhancer.class.getClassLoader());
_auxEnhancers = new AuxiliaryEnhancer[classes.length];
for (int i = 0; i < _auxEnhancers.length; i++)
_auxEnhancers[i] = (AuxiliaryEnhancer) classes[i].
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java?rev=436945&r1=436944&r2=436945&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java Fri Aug 25 14:00:19 2006
@@ -34,7 +34,7 @@
static {
// Load and cache all the query languages available in the system.
Class[] classes = Services.getImplementorClasses(
- ExpressionParser.class, QueryLanguages.class.getClassLoader());
+ ExpressionParser.class, ExpressionParser.class.getClassLoader());
for (int i = 0; i < classes.length; i++) {
ExpressionParser ep;
try {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties?rev=436945&r1=436944&r2=436945&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties Fri Aug 25 14:00:19 2006
@@ -544,4 +544,5 @@
distribution. Have you unbundled it, or unbundled its listed classes? \
If you are using ant, a common solution to this problem is to place \
the jar libraries of the OpenJPA distribution in the \
- $'{user.home}/.ant/lib directory.
+ $'{user.home}/.ant/lib directory. Another common cause of this problem \
+ is an overly-restrictive security manager.
Modified: incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml?rev=436945&r1=436944&r2=436945&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-persistence-jdbc/pom.xml Fri Aug 25 14:00:19 2006
@@ -62,22 +62,24 @@
<phase>test-compile</phase>
<configuration>
<tasks>
- <path id="enhance.path.ref">
- <fileset dir="${project.build.testOutputDirectory}">
- <include name="**/*.class"/>
- </fileset>
- </path>
- <pathconvert property="enhance.files"
- refid="enhance.path.ref"
- pathsep=" "/>
- <java classname="org.apache.openjpa.enhance.PCEnhancer">
- <arg line="${enhance.files}"/>
- <classpath>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask">
+ <classpath>
+ <path refid="maven.dependency.classpath"/>
+ <path refid="maven.compile.classpath"/>
+ <path refid="maven.test.classpath"/>
+ </classpath>
+ </taskdef>
+ <fileset id="enhance.path.ref" dir="${project.build.testOutputDirectory}">
+ <include name="**/*.class"/>
+ </fileset>
+ <openjpac>
+ <classpath>
<path refid="maven.dependency.classpath"/>
<path refid="maven.compile.classpath"/>
<path refid="maven.test.classpath"/>
- </classpath>
- </java>
+ </classpath>
+ <fileset refid="enhance.path.ref"/>
+ </openjpac>
</tasks>
</configuration>
<goals>