You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/01/05 15:24:54 UTC
svn commit: r1227607 - in /incubator/jena/Experimental/JenaPerf/trunk: ./
.settings/ src/main/java/ src/main/scala/org/apache/jena/perf/ src/test/java/
Author: andy
Date: Thu Jan 5 14:24:53 2012
New Revision: 1227607
URL: http://svn.apache.org/viewvc?rev=1227607&view=rev
Log:
Convert to work under and with m2e.
Added:
incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.m2e.core.prefs
incubator/jena/Experimental/JenaPerf/trunk/log4j.properties
incubator/jena/Experimental/JenaPerf/trunk/make_cp_mvn (with props)
incubator/jena/Experimental/JenaPerf/trunk/run_cp (with props)
incubator/jena/Experimental/JenaPerf/trunk/src/main/java/
incubator/jena/Experimental/JenaPerf/trunk/src/test/java/
Modified:
incubator/jena/Experimental/JenaPerf/trunk/.classpath
incubator/jena/Experimental/JenaPerf/trunk/.project
incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jena/Experimental/JenaPerf/trunk/pom.xml
incubator/jena/Experimental/JenaPerf/trunk/run
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/Actions.scala
incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
Modified: incubator/jena/Experimental/JenaPerf/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.classpath?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.classpath (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/.classpath Thu Jan 5 14:24:53 2012
@@ -1,25 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/scala"/>
- <classpathentry kind="src" path="src/test/scala"/>
- <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating-SNAPSHOT/jena-iri-0.9.0-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating-SNAPSHOT/jena-iri-0.9.0-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.8.9-incubating-SNAPSHOT/jena-arq-2.8.9-incubating-SNAPSHOT-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.6.5-incubating-SNAPSHOT/jena-core-2.6.5-incubating-SNAPSHOT-test-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/scala"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: incubator/jena/Experimental/JenaPerf/trunk/.project
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.project?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.project (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/.project Thu Jan 5 14:24:53 2012
@@ -1,20 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>JenaPerf</name>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.scala-ide.sdt.core.scalabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <!--
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- -->
- </buildSpec>
- <natures>
- <nature>org.scala-ide.sdt.core.scalanature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
\ No newline at end of file
+ <name>JenaPerf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.scala-ide.sdt.core.scalabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.scala-ide.sdt.core.scalanature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Modified: incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.jdt.core.prefs Thu Jan 5 14:24:53 2012
@@ -1,16 +1,10 @@
-#Tue Sep 27 17:34:26 BST 2011
+#Thu Jan 05 11:32:04 GMT 2012
+eclipse.preferences.version=1
encoding//src/main/java=UTF-8
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
encoding//src/main/resources=UTF-8
-encoding//src/test/resources=UTF-8
encoding//src/test/java=UTF-8
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+encoding//src/test/resources=UTF-8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
Added: incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.m2e.core.prefs
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.m2e.core.prefs?rev=1227607&view=auto
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.m2e.core.prefs (added)
+++ incubator/jena/Experimental/JenaPerf/trunk/.settings/org.eclipse.m2e.core.prefs Thu Jan 5 14:24:53 2012
@@ -0,0 +1,5 @@
+#Thu Jan 05 11:12:58 GMT 2012
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
Added: incubator/jena/Experimental/JenaPerf/trunk/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/log4j.properties?rev=1227607&view=auto
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/log4j.properties (added)
+++ incubator/jena/Experimental/JenaPerf/trunk/log4j.properties Thu Jan 5 14:24:53 2012
@@ -0,0 +1,29 @@
+log4j.rootLogger=INFO, stdlog
+
+log4j.appender.stdlog=org.apache.log4j.ConsoleAppender
+## log4j.appender.stdlog.target=System.err
+log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n
+
+log4j.logger.structure.radix=ALL
+
+# Execution logging
+log4j.logger.com.hp.hpl.jena.arq.info=INFO
+log4j.logger.com.hp.hpl.jena.arq.exec=INFO
+
+# Everything else in Jena
+log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.openjena=WARN
+log4j.logger.org.openjena.riot=INFO
+
+# Joseki server
+log4j.logger.org.joseki=INFO
+
+# Fuseki
+# Server log.
+log4j.logger.org.openjena.fuseki.Fuseki=INFO
+# Internal logs
+log4j.logger.org.openjena.fuseki=INFO
+
+# Here
+log4j.logger.org.apache.jena.perf=ALL
\ No newline at end of file
Added: incubator/jena/Experimental/JenaPerf/trunk/make_cp_mvn
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/make_cp_mvn?rev=1227607&view=auto
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/make_cp_mvn (added)
+++ incubator/jena/Experimental/JenaPerf/trunk/make_cp_mvn Thu Jan 5 14:24:53 2012
@@ -0,0 +1,25 @@
+#!/usr/bin/perl
+# Write a run script.
+
+print "#!/bin/bash\n" ;
+print 'M2_REPO="${M2_REPO:-$HOME/.m2/repository}"' ;
+print "\n" ;
+print "\n" ;
+print 'CP="' ;
+$first = 1 ;
+
+open(X, "mvn dependency:list|") ;
+
+while(<X>)
+{
+ next unless /:compile/ ;
+ ($g,$a,$v) = m/(\S*):(.*):jar:(.*):compile/ ;
+ $g =~ s!\.!/!g ;
+ print ":" if ( ! $first ) ;
+ print "\$M2_REPO/$g/$a/$v/$a-$v.jar" ;
+ $first = 0 ;
+}
+print "\"\n" ;
+print "\n" ;
+print "echo \"\$CP\"\n"
+
Propchange: incubator/jena/Experimental/JenaPerf/trunk/make_cp_mvn
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jena/Experimental/JenaPerf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/pom.xml?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/pom.xml (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/pom.xml Thu Jan 5 14:24:53 2012
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.jena</groupId>
<artifactId>jena-perf</artifactId>
@@ -8,12 +10,6 @@
<name>Jena Benchmark Framework</name>
<version>0.0.0-SNAPSHOT</version>
- <parent>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-top</artifactId>
- <version>0-incubating-SNAPSHOT</version>
- </parent>
-
<description/>
<organization>
@@ -31,12 +27,12 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.jena>2.6.5-incubating-SNAPSHOT</ver.jena>
- <ver.arq>2.8.9-incubating-SNAPSHOT</ver.arq>
+ <ver.jena>2.7.0-incubating</ver.jena>
+ <ver.arq>2.9.0-incubating</ver.arq>
<ver.tdb>0.9.0-incubating-SNAPSHOT</ver.tdb>
<ver.httpclient>4.1.1</ver.httpclient>
<!-- <ver.httpfileupload>1.2.2</ver.httpfileupload> -->
- <ver.junit>4.9</ver.junit>
+ <ver.junit>[4.9,)</ver.junit>
<ver.commonscodec>1.5</ver.commonscodec>
<ver.slf4j>1.6.1</ver.slf4j>
<ver.log4j>1.2.16</ver.log4j>
@@ -45,12 +41,13 @@
<dependencies>
+ <!-- Remove to use in Eclipse.
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
<version>${ver.scala}</version>
</dependency>
-
+ -->
<dependency>
<groupId>org.apache.jena</groupId>
@@ -72,15 +69,6 @@
<version>${ver.tdb}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>sdb</artifactId>
- <version>${ver.sdb}</version>
- <optional>true</optional>
- </dependency>
- -->
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -134,6 +122,9 @@
<build>
+ <sourceDirectory>src/main/scala</sourceDirectory>
+ <testSourceDirectory>src/test/scala</testSourceDirectory>
+
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -144,38 +135,40 @@
</configuration>
</plugin>
+ <!--
<plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
+ <groupId>org.scala-tools</groupId>
+ <artifactId>maven-scala-plugin</artifactId>
- <configuration>
- <jvmArgs>
- <jvmArg>-Xmx1024m</jvmArg>
+ <configuration>
+ <jvmArgs>
+ <jvmArg>-Xmx1024m</jvmArg>
</jvmArgs>
- <args>
- <arg>-unchecked</arg>
- <arg>-deprecation</arg>
- </args>
+ <args>
+ <arg>-unchecked</arg>
+ <arg>-deprecation</arg>
+ </args>
</configuration>
- <executions>
- <execution>
- <id>scala-compile-first</id>
- <phase>process-resources</phase>
- <goals>
- <goal>add-source</goal>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>scala-test-compile</id>
- <phase>process-test-resources</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
+ <executions>
+ <execution>
+ <id>scala-compile-first</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>add-source</goal>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>scala-test-compile</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -213,7 +206,7 @@
<pluginRepository>
<id>scala-tools.org</id>
<name>Scala-tools Maven2 Repository</name>
- <url>http://scala-tools.org/repo-releases</url>
+ <url>http://scala-tools.org/repo-releases</url>
</pluginRepository>
</pluginRepositories>
Modified: incubator/jena/Experimental/JenaPerf/trunk/run
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/run?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/run (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/run Thu Jan 5 14:24:53 2012
@@ -1,5 +1,10 @@
#!/bin/bash
+M2_REPO="${M2_REPO:-$HOME/.m2/repository}"
-CP="$(make_classpath_mvn .)"
+CP=$(. ./run_cp)
-exec java -cp "$CP" org.apache.jena.perf.PerfMain "$@"
+SCALA="org/scala-lang/scala-library/2.9.1/scala-library-2.9.1.jar"
+CP="$M2_REPO/$SCALA:$CP"
+CP="target/classes:$CP"
+#echo $CP
+java -cp "$CP" org.apache.jena.perf.PerfMain "$@"
Added: incubator/jena/Experimental/JenaPerf/trunk/run_cp
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/run_cp?rev=1227607&view=auto
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/run_cp (added)
+++ incubator/jena/Experimental/JenaPerf/trunk/run_cp Thu Jan 5 14:24:53 2012
@@ -0,0 +1,6 @@
+#!/bin/bash
+M2_REPO="${M2_REPO:-$HOME/.m2/repository}"
+
+CP="$M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar:$M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:$M2_REPO/junit/junit/4.10/junit-4.10.jar:$M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar:$M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:$M2_REPO/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:$M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar:$M2_REPO/org/apache/jena/jena-core/tests:2.7.0-incubating/jena-core-tests:2.7.0-incubating.jar:$M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar:$M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar:$M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar:$M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar:$M2_REPO/org/slf4j/jcl-over-slf4j/1.6.1/jcl-over-slf4j-1.6.1.jar:$M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar:$M2_REPO/org/slf4j/slf4j
-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar:$M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:$M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"
+
+echo "$CP"
Propchange: incubator/jena/Experimental/JenaPerf/trunk/run_cp
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/Actions.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/Actions.scala?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/Actions.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/Actions.scala Thu Jan 5 14:24:53 2012
@@ -28,6 +28,7 @@ import com.hp.hpl.jena.query.QueryFactor
import com.hp.hpl.jena.query.Syntax
import com.hp.hpl.jena.query.QueryExecution
import com.hp.hpl.jena.sparql.ARQConstants
+import org.openjena.atlas.lib.FileOps
class Actions {}
@@ -89,7 +90,9 @@ abstract class ActionQuery extends Actio
protected def exec(qexec: QueryExecution) : Outcome = {
qexec.getQuery().getQueryType() match {
- case Query.QueryTypeSelect => ResultSetFormatter.consume(qexec.execSelect())
+ case Query.QueryTypeSelect =>
+ val x = ResultSetFormatter.consume(qexec.execSelect())
+ println("Results "+x)
case Query.QueryTypeConstruct => qexec.execConstruct()
case Query.QueryTypeDescribe => qexec.execDescribe()
case Query.QueryTypeAsk => qexec.execAsk()
@@ -112,6 +115,8 @@ class ActionQueryRemote(n:String, endpoi
class ActionQueryTDB(n:String, location:String, query:Query) extends ActionQuery {
val name = n+"["+location+"]"
def enact():Outcome = {
+ if ( ! FileOps.exists(location) )
+ throw new RuntimeException("No such location: "+location) ;
val ds = TDBFactory.createDataset(location)
return exec(ds, query)
}
Modified: incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala?rev=1227607&r1=1227606&r2=1227607&view=diff
==============================================================================
--- incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala (original)
+++ incubator/jena/Experimental/JenaPerf/trunk/src/main/scala/org/apache/jena/perf/PerfMain.scala Thu Jan 5 14:24:53 2012
@@ -23,19 +23,21 @@ import com.hp.hpl.jena.tdb.TDBFactory
import com.hp.hpl.jena.util.FileManager
import java.text.DateFormat
import java.text.SimpleDateFormat
+import org.openjena.atlas.logging.Log
// TODO:
// Not just SELECT queries
// Output to CSV file
// Test endpoint works.
+// Templating
//
object PerfMain {
def main(args: Array[String]): Unit = {
-
- var manifestFilename:String = "Benchmarks/SP2B/manifest.ttl"
+ Log.setLog4j()
+ var manifestFilename:String = "Benchmarks/SP2B/manifest-local.ttl"
if ( args.length == 1 )
manifestFilename = args(0)
else if ( args.length > 1 )