|
From: <car...@us...> - 2012-07-15 12:08:30
|
Revision: 236
http://polepos.svn.sourceforge.net/polepos/?rev=236&view=rev
Author: carlrosenberger
Date: 2012-07-15 12:08:23 +0000 (Sun, 15 Jul 2012)
Log Message:
-----------
cr: Updated VOD to the latest version.
Modified Paths:
--------------
trunk/polepos/.classpath
trunk/polepos/build.xml
trunk/polepos/lib/vod/jpa-agent.jar
trunk/polepos/lib/vod/vodjdo.jar
trunk/polepos/lib/vod/vodjpa.jar
trunk/polepos/settings/Jdbc.properties
trunk/polepos/settings/Jdo.properties
trunk/polepos/src/org/polepos/RunSeason.java
trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java
Added Paths:
-----------
trunk/polepos/lib/vod/asm-all-4.0.jar
trunk/polepos/lib/vod/commons-cli-1.1.jar
Removed Paths:
-------------
trunk/polepos/lib/vod/asm-all-4.0_RC1.jar
Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/.classpath 2012-07-15 12:08:23 UTC (rev 236)
@@ -32,8 +32,9 @@
<classpathentry kind="lib" path="lib/vod/jpa-agent.jar"/>
<classpathentry kind="lib" path="lib/jpa/javax.persistence_2.0.0.jar"/>
<classpathentry kind="lib" path="lib/vod/antlr-3.3-complete.jar"/>
- <classpathentry kind="lib" path="lib/vod/asm-all-4.0_RC1.jar"/>
<classpathentry kind="lib" path="lib/common/ant.jar"/>
+ <classpathentry kind="lib" path="lib/vod/asm-all-4.0.jar"/>
+ <classpathentry kind="lib" path="lib/vod/commons-cli-1.1.jar"/>
<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="/ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.1.0/src/org.junit_3.8.1/junitsrc.zip"/>
<classpathentry kind="lib" path="lib/graph/gnujaxp.jar"/>
<classpathentry kind="lib" path="lib/graph/itext-1.2.jar"/>
Modified: trunk/polepos/build.xml
===================================================================
--- trunk/polepos/build.xml 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/build.xml 2012-07-15 12:08:23 UTC (rev 236)
@@ -1,6 +1,8 @@
<project name="poleposition" default="race" basedir=".">
- <property name="polepositionversion" value="0.50"/>
+ <property name="polepositionversion" value="0.60"/>
+
+ <property name="polepos.debug" value="false"/>
<property name="polepos.concurrency" value="true"/>
<property name="jdo" value="jdo"/>
@@ -9,6 +11,31 @@
<property name="jpa" value="jpa"/>
<property name="jvi" value="jvi"/>
-->
+
+ <path id="jdo_compilation_classpath">
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ <exclude name="**/vodjdo.jar" />
+ <exclude name="**/asm-all-4.0.jar" />
+ </fileset>
+ <fileset dir="../polepos.monitoring/dist">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="bin"/>
+ </path>
+
+ <path id="vod_jpa_compilation_classpath">
+ <fileset dir="lib">
+ <include name="**/*.jar"/>
+ <exclude name="**/vodjdo.jar" />
+ <exclude name="**/asm-3.3.jar" />
+ </fileset>
+ <fileset dir="../polepos.monitoring/dist">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="bin"/>
+ </path>
+
<path id="compilation_classpath">
<fileset dir="lib">
@@ -25,6 +52,7 @@
<fileset dir="lib">
<include name="**/*.jar"/>
<exclude name="**/vodjdo.jar" />
+ <exclude name="**/vodjpa.jar" />
</fileset>
<fileset dir="../polepos.monitoring/dist">
<include name="**/*.jar"/>
@@ -32,11 +60,9 @@
<pathelement location="bin"/>
</path>
-
-
<target name="jdoenhance" description="runs the JDO enhancer" if="jdo">
<java classname="org.polepos.enhance.JdoEnhance">
- <classpath refid="compilation_classpath"/>
+ <classpath refid="jdo_compilation_classpath"/>
</java>
</target>
@@ -48,7 +74,7 @@
<target name="vodjpaenhance" description="runs the VOD JPA enhancer" if="vodjpa">
<java classname="org.polepos.enhance.VodJpaEnhance">
- <classpath refid="compilation_classpath"/>
+ <classpath refid="vod_jpa_compilation_classpath"/>
</java>
</target>
@@ -61,12 +87,11 @@
<target name="race" depends="clean,compile,jdoenhance, vodjpaenhance"
description="runs with all circuits and all teams ">
- <echo message="${polepos.debug}"/>
+ <echo message="polepos.debug is set to ${polepos.debug}"/>
<java classname="org.polepos.RunSeason" fork="true">
<classpath refid="runtime_classpath">
</classpath>
<jvmarg value="-Xmx1400m"/>
- <jvmarg value="-javaagent:lib/vod/jpa-agent.jar"/>
<sysproperty key="polepos.debug" value="${polepos.debug}"/>
<sysproperty key="polepos.concurrency" value="${polepos.concurrency}"/>
Added: trunk/polepos/lib/vod/asm-all-4.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/polepos/lib/vod/asm-all-4.0.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: trunk/polepos/lib/vod/asm-all-4.0_RC1.jar
===================================================================
(Binary files differ)
Added: trunk/polepos/lib/vod/commons-cli-1.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/polepos/lib/vod/commons-cli-1.1.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/polepos/lib/vod/jpa-agent.jar
===================================================================
(Binary files differ)
Modified: trunk/polepos/lib/vod/vodjdo.jar
===================================================================
(Binary files differ)
Modified: trunk/polepos/lib/vod/vodjpa.jar
===================================================================
(Binary files differ)
Modified: trunk/polepos/settings/Jdbc.properties
===================================================================
--- trunk/polepos/settings/Jdbc.properties 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/settings/Jdbc.properties 2012-07-15 12:08:23 UTC (rev 236)
@@ -10,10 +10,10 @@
# jdbc=sqlite,javadb,hsqldb
#
# Client/Server
-# jdbc=mysql,postgresql
+jdbc=mysql,postgresql
#
# All
-jdbc=mysql,postgresql,sqlite,javadb,hsqldb
+# jdbc=mysql,postgresql,sqlite,javadb,hsqldb
#
@@ -24,7 +24,7 @@
#
# Client/Server
# hibernate=mysql,postgresql
-hibernate=hsqldb,mysql
+hibernate=mysql
Modified: trunk/polepos/settings/Jdo.properties
===================================================================
--- trunk/polepos/settings/Jdo.properties 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/settings/Jdo.properties 2012-07-15 12:08:23 UTC (rev 236)
@@ -13,6 +13,7 @@
enhance=true
enhancer=datanucleus
+# enhancer=vod
#
# datanucleus
Modified: trunk/polepos/src/org/polepos/RunSeason.java
===================================================================
--- trunk/polepos/src/org/polepos/RunSeason.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/RunSeason.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -94,16 +94,17 @@
return new Team[] {
VodJdoTeamFactory.newVodJdoTeam(),
VodJpaTeamFactory.newVodJpaTeam(),
+
// new JdoTeam(),
// new JpaTeam(true),
-// new Db4oTeam(),
+// new Db4oTeam(),
new Db4oClientServerTeam(),
+
new JdbcTeam(),
new HibernateTeam(),
+ new MongoDBTeam(),
-// new JpaTeam(),
-// new MongoDBTeam(),
// new JviTeam(),
};
}
Modified: trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/enhance/VodJpaEnhance.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -20,27 +20,44 @@
package org.polepos.enhance;
-import java.io.*;
+import java.net.*;
-import org.apache.tools.ant.*;
-import org.apache.tools.ant.types.*;
+import com.versant.jpa.enhancer.main.*;
-import com.versant.jpa.enhancer.ant.*;
-
public class VodJpaEnhance {
public static void main(String[] args) {
- Project project = new Project();
- EnhancerTask enhancerTask = new EnhancerTask();
- enhancerTask.setProject(project);
- enhancerTask.setInheritsClasspath(true);
- enhancerTask.setDestdir("bin");
- FileSet fs = new FileSet();
- fs.setProject(project);
- fs.setDir(new File("bin"));
- fs.createInclude().setName("**/*.class");
- enhancerTask.addFileSet(fs);
- enhancerTask.execute();
+
+ args = new String[]{
+ "-b",
+ "bin",
+ "-d",
+ "bin",
+ "-l"
+ };
+ try {
+ EnhancerMain.main(args);
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ }
+
+ // The following is the Ant task way. Specifying a persistence unit doesn't seem to work.
+
+// Project project = new Project();
+// EnhancerTask enhancerTask = new EnhancerTask();
+// enhancerTask.setProject(project);
+// enhancerTask.setInheritsClasspath(true);
+// // enhancerTask.setPersistenceUnit("vodjpa");
+// File destdir = new File("bin");
+// System.out.println(destdir.getAbsolutePath());
+// enhancerTask.setDestdir(destdir);
+// FileSet fs = new FileSet();
+// fs.setProject(project);
+// fs.setDir(destdir);
+// fs.createInclude().setName("**/*.class");
+// fs.createInclude().setName("**/*.xml");
+// enhancerTask.addFileSet(fs);
+// enhancerTask.execute();
}
}
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoCar.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -200,14 +200,19 @@
((JdoTeam)team()).deleteAll(pm);
pm.close();
_persistenceManagerFactory.close();
+ _persistenceManagerFactory = null;
properties.setProperty("datanucleus.autoCreateSchema", "false");
- _persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, Thread.currentThread().getContextClassLoader());
+
}
public PersistenceManager getPersistenceManager() {
+ if(_persistenceManagerFactory == null){
+ _persistenceManagerFactory = JDOHelper.getPersistenceManagerFactory(properties, Thread.currentThread().getContextClassLoader());
+ }
+
PersistenceManager pm = _persistenceManagerFactory.getPersistenceManager();
if(! "hsqldb".equals(_dbName)){
return pm;
@@ -240,5 +245,12 @@
return _name;
}
+
+ public void tearDown(){
+ if(_persistenceManagerFactory != null){
+ _persistenceManagerFactory.close();
+ _persistenceManagerFactory = null;
+ }
+ }
}
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoTeam.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -155,6 +155,14 @@
pm.close();
}
}
+
+ @Override
+ protected void tearDown() {
+ for(int i = 0; i < mCars.length;i++){
+ JdoCar jdoCar = (JdoCar)mCars[i];
+ jdoCar.tearDown();
+ }
+ }
public void deleteAll(PersistenceManager pm) {
Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaCar.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -35,7 +35,7 @@
*/
public class JpaCar extends Car {
- private transient EntityManagerFactory mFactory;
+ protected transient EntityManagerFactory _emf;
private final String _dbName;
private final String _name;
@@ -60,15 +60,15 @@
private void initialize() throws IOException {
Properties props = new Properties();
try {
- mFactory = Persistence.createEntityManagerFactory(persistenceUnitName(),props);
+ _emf = Persistence.createEntityManagerFactory(persistenceUnitName(),props);
} catch (PersistenceException e) {
e.printStackTrace();
}
}
protected void reinitialize() throws IOException{
- if(mFactory != null){
- mFactory.close();
+ if(_emf != null){
+ _emf.close();
}
initialize();
}
@@ -84,7 +84,7 @@
*
*/
public EntityManager getEntityManager() {
- return mFactory.createEntityManager();
+ return _emf.createEntityManager();
}
@Override
Modified: trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/jpa/VodJpaCar.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -42,6 +42,10 @@
@Override
public void recreateDatabase() {
+ if(_emf != null){
+ _emf.close();
+ _emf = null;
+ }
ServerAdministration.removeDatabase(_connectUrl);
ServerAdministration.createDatabase(_connectUrl);
try {
Modified: trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java 2012-01-25 16:42:57 UTC (rev 235)
+++ trunk/polepos/src/org/polepos/teams/mongodb/MongoDBCar.java 2012-07-15 12:08:23 UTC (rev 236)
@@ -35,7 +35,7 @@
@Override
public String name() {
- return "1.8.2";
+ return "2.0.6";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
