|
From: <car...@us...> - 2010-06-15 13:53:28
|
Revision: 121
http://polepos.svn.sourceforge.net/polepos/?rev=121&view=rev
Author: carlrosenberger
Date: 2010-06-15 13:53:21 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
cr + pr: Moved versant.properties to /settings
Turned off JviEnhancer when it's not needed.
Modified Paths:
--------------
trunk/polepos/.classpath
trunk/polepos/src/org/polepos/enhance/JviEnhance.java
trunk/polepos/src/org/polepos/teams/jdo/JdoEnhancer.java
trunk/polepos/src/org/polepos/teams/jpa/JpaEnhancer.java
trunk/polepos/src/org/polepos/teams/jvi/JviTeam.java
Added Paths:
-----------
trunk/polepos/settings/versant.properties
Removed Paths:
-------------
trunk/polepos/versant.properties
Modified: trunk/polepos/.classpath
===================================================================
--- trunk/polepos/.classpath 2010-06-15 13:51:53 UTC (rev 120)
+++ trunk/polepos/.classpath 2010-06-15 13:53:21 UTC (rev 121)
@@ -23,7 +23,6 @@
<classpathentry kind="lib" path="lib/db4o/db4o-8.0.145.14388-all-java5.jar"/>
<classpathentry kind="lib" path="lib/javadb/derby.jar"/>
<classpathentry kind="lib" path="lib/jms/geronimo-jms_1.1_spec-1.1.1.jar"/>
- <classpathentry kind="lib" path="lib/jorm/gna-jorm-runtime-05.07.jar"/>
<classpathentry kind="lib" path="lib/jta/geronimo-jta_1.1_spec-1.1.jar"/>
<classpathentry kind="lib" path="lib/log4j/log4j-1.2.15.jar"/>
<classpathentry kind="lib" path="lib/openjpa/openjpa-2.0.0-beta.jar"/>
Copied: trunk/polepos/settings/versant.properties (from rev 111, trunk/polepos/versant.properties)
===================================================================
--- trunk/polepos/settings/versant.properties (rev 0)
+++ trunk/polepos/settings/versant.properties 2010-06-15 13:53:21 UTC (rev 121)
@@ -0,0 +1,7 @@
+javax.jdo.PersistenceManagerFactoryClass=com.versant.core.jdo.BootstrapPMF
+javax.jdo.option.ConnectionURL=versant\:test@localhost
+javax.jdo.option.NontransactionalRead=true
+versant.allowPmfCloseWithPmHavingOpenTx=true
+versant.logging.logEvents=0
+versant.vdsSchemaEvolve=true
+versant.metadata.0=org/polepos/teams/jdo/data/package.jdo
Property changes on: trunk/polepos/settings/versant.properties
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/polepos/src/org/polepos/enhance/JviEnhance.java
===================================================================
--- trunk/polepos/src/org/polepos/enhance/JviEnhance.java 2010-06-15 13:51:53 UTC (rev 120)
+++ trunk/polepos/src/org/polepos/enhance/JviEnhance.java 2010-06-15 13:53:21 UTC (rev 121)
@@ -19,10 +19,16 @@
package org.polepos.enhance;
+import org.polepos.teams.jvi.*;
+
public class JviEnhance extends EvilSystemExitEnhancer {
protected void internalRunWithoutSystemExit() throws Throwable{
+ if(! JviTeam.enabled()){
+ return;
+ }
+
String[] args = new String[]{
"-config",
"src/config.jvi",
Modified: trunk/polepos/src/org/polepos/teams/jdo/JdoEnhancer.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jdo/JdoEnhancer.java 2010-06-15 13:51:53 UTC (rev 120)
+++ trunk/polepos/src/org/polepos/teams/jdo/JdoEnhancer.java 2010-06-15 13:53:21 UTC (rev 121)
@@ -103,7 +103,7 @@
Method mainMethod = enhancerClass.getMethod("main", new Class[]{String[].class});
- mainMethod.invoke(null,new Object[]{new String[]{"-p","versant.properties","-out","bin"}});
+ mainMethod.invoke(null,new Object[]{new String[]{"-p","settings/versant.properties","-out","bin"}});
} catch (ClassNotFoundException e) {
e.printStackTrace();
Modified: trunk/polepos/src/org/polepos/teams/jpa/JpaEnhancer.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jpa/JpaEnhancer.java 2010-06-15 13:51:53 UTC (rev 120)
+++ trunk/polepos/src/org/polepos/teams/jpa/JpaEnhancer.java 2010-06-15 13:53:21 UTC (rev 121)
@@ -95,39 +95,6 @@
Map<String, JpaEnhancer> map = new HashMap<String, JpaEnhancer>();
- JpaEnhancer vodEnhancer = new JpaEnhancer(){
-
- public boolean isRunnable(){
- return true;
- }
-
- public void run(){
-
- try {
- Class enhancerClass = Class.forName("com.versant.core.jdo.tools.enhancer.Enhancer");
-
- Method mainMethod = enhancerClass.getMethod("main", new Class[]{String[].class});
-
- mainMethod.invoke(null,new Object[]{new String[]{"-p","versant.properties","-out","bin"}});
-
- } catch (ClassNotFoundException e) {
- e.printStackTrace();
- } catch (SecurityException e) {
- e.printStackTrace();
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- } catch (IllegalArgumentException e) {
- e.printStackTrace();
- } catch (IllegalAccessException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
- }
- }
-
- };
- map.put("vod", vodEnhancer);
-
JpaEnhancer datanucleusEnhancer = new JpaEnhancer(){
public boolean isRunnable(){
Modified: trunk/polepos/src/org/polepos/teams/jvi/JviTeam.java
===================================================================
--- trunk/polepos/src/org/polepos/teams/jvi/JviTeam.java 2010-06-15 13:51:53 UTC (rev 120)
+++ trunk/polepos/src/org/polepos/teams/jvi/JviTeam.java 2010-06-15 13:53:21 UTC (rev 121)
@@ -47,10 +47,25 @@
* @author Christian Ernst
*/
public class JviTeam extends Team {
+
+
+ /**
+ * return true to enable the team
+ */
+ public static boolean enabled(){
+ return false;
+ }
private final Car[] mCars;
public JviTeam() {
+
+ if(! enabled()){
+ String msg = "JVI team is not enabled, to omit having to run the enhancer.";
+ msg += "\r\nSimply change by returning true from the static enabled method in JviTeam.";
+ System.err.println(msg);
+ throw new RuntimeException(msg);
+ }
String[] impls = Jvi.settings().getJviImplementations();
Deleted: trunk/polepos/versant.properties
===================================================================
--- trunk/polepos/versant.properties 2010-06-15 13:51:53 UTC (rev 120)
+++ trunk/polepos/versant.properties 2010-06-15 13:53:21 UTC (rev 121)
@@ -1,7 +0,0 @@
-javax.jdo.PersistenceManagerFactoryClass=com.versant.core.jdo.BootstrapPMF
-javax.jdo.option.ConnectionURL=versant\:test@localhost
-javax.jdo.option.NontransactionalRead=true
-versant.allowPmfCloseWithPmHavingOpenTx=true
-versant.logging.logEvents=0
-versant.vdsSchemaEvolve=true
-versant.metadata.0=org/polepos/teams/jdo/data/package.jdo
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
