You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ch...@apache.org on 2012/10/10 14:40:38 UTC
svn commit: r1396566 - in /jena/Scratch/Eyeball/trunk: ./ lib/ src-test/com/
src/com/ src/jena/ src/main/ src/main/java/ src/main/java/com/
src/main/java/com/hp/hpl/jena/eyeball/
src/main/java/com/hp/hpl/jena/eyeball/assemblers/ src/main/java/com/hp/hp...
Author: chrisdollin
Date: Wed Oct 10 12:40:36 2012
New Revision: 1396566
URL: http://svn.apache.org/viewvc?rev=1396566&view=rev
Log:
Stripped out repair and foreign libs, added pom, suppressed jdbc.
Added:
jena/Scratch/Eyeball/trunk/pom.xml (with props)
jena/Scratch/Eyeball/trunk/src/main/
jena/Scratch/Eyeball/trunk/src/main/java/
jena/Scratch/Eyeball/trunk/src/main/java/com/
- copied from r1396560, jena/Scratch/Eyeball/trunk/src/com/
jena/Scratch/Eyeball/trunk/src/main/java/jena/
- copied from r1396560, jena/Scratch/Eyeball/trunk/src/jena/
jena/Scratch/Eyeball/trunk/src/test/
jena/Scratch/Eyeball/trunk/src/test/java/
jena/Scratch/Eyeball/trunk/src/test/java/com/
- copied from r1396560, jena/Scratch/Eyeball/trunk/src-test/com/
Removed:
jena/Scratch/Eyeball/trunk/lib/antlr-2.7.5.jar
jena/Scratch/Eyeball/trunk/lib/arq-extra.jar
jena/Scratch/Eyeball/trunk/lib/arq.jar
jena/Scratch/Eyeball/trunk/lib/commons-logging-1.1.1.jar
jena/Scratch/Eyeball/trunk/lib/commons-logging.jar
jena/Scratch/Eyeball/trunk/lib/concurrent.jar
jena/Scratch/Eyeball/trunk/lib/eyeball.jar
jena/Scratch/Eyeball/trunk/lib/icu4j_3_4.jar
jena/Scratch/Eyeball/trunk/lib/iri.jar
jena/Scratch/Eyeball/trunk/lib/jazzy-core.jar
jena/Scratch/Eyeball/trunk/lib/jena.jar
jena/Scratch/Eyeball/trunk/lib/jenatest.jar
jena/Scratch/Eyeball/trunk/lib/json.jar
jena/Scratch/Eyeball/trunk/lib/junit4.jar
jena/Scratch/Eyeball/trunk/lib/log4j-1.2.12.jar
jena/Scratch/Eyeball/trunk/lib/mysql-connector-java-5.0.0-beta-bin.jar
jena/Scratch/Eyeball/trunk/lib/napkinlaf.jar
jena/Scratch/Eyeball/trunk/lib/relaxngDatatype.jar
jena/Scratch/Eyeball/trunk/lib/slf4j-api-1.5.6.jar
jena/Scratch/Eyeball/trunk/lib/slf4j-log4j12-1.5.6.jar
jena/Scratch/Eyeball/trunk/lib/stax-api-1.0.jar
jena/Scratch/Eyeball/trunk/lib/wstx-asl-3.0.0.jar
jena/Scratch/Eyeball/trunk/lib/xercesImpl.jar
jena/Scratch/Eyeball/trunk/lib/xml-apis.jar
jena/Scratch/Eyeball/trunk/lib/xsdlib.jar
jena/Scratch/Eyeball/trunk/src-test/com/
jena/Scratch/Eyeball/trunk/src/com/
jena/Scratch/Eyeball/trunk/src/jena/
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Analysis.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Doctor.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/EyeballRepair.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/AnalysisAssembler.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/DoctorAssembler.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/StatisticianAssembler.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/gui/InteractiveDoctor.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/repairtools/
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/web/statistics/
jena/Scratch/Eyeball/trunk/src/main/java/jena/dumpStatistics.java
jena/Scratch/Eyeball/trunk/src/main/java/jena/runReports.java
jena/Scratch/Eyeball/trunk/src/test/java/com/hp/hpl/jena/eyeball/repairtools/
jena/Scratch/Eyeball/trunk/src/test/java/com/hp/hpl/jena/eyeball/web/
Modified:
jena/Scratch/Eyeball/trunk/.classpath
jena/Scratch/Eyeball/trunk/.project
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Eyeball.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/EyeballAssembler.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/gui/Eyeballer.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/loaders/JDBCLoader.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/util/Setup.java
jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/web/WebEyeballer.java
jena/Scratch/Eyeball/trunk/src/main/java/jena/eyeball.java
Modified: jena/Scratch/Eyeball/trunk/.classpath
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/.classpath?rev=1396566&r1=1396565&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/.classpath (original)
+++ jena/Scratch/Eyeball/trunk/.classpath Wed Oct 10 12:40:36 2012
@@ -1,30 +1,66 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="src-test"/>
- <classpathentry kind="src" path="tinker"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/antlr-2.7.5.jar"/>
- <classpathentry kind="lib" path="lib/arq.jar"/>
- <classpathentry kind="lib" path="lib/commons-logging.jar"/>
- <classpathentry kind="lib" path="lib/concurrent.jar"/>
- <classpathentry kind="lib" path="lib/icu4j_3_4.jar"/>
- <classpathentry kind="lib" path="lib/iri.jar"/>
- <classpathentry kind="lib" path="lib/jazzy-core.jar"/>
- <classpathentry kind="lib" path="lib/json.jar"/>
- <classpathentry kind="lib" path="lib/log4j-1.2.12.jar"/>
- <classpathentry kind="lib" path="lib/mysql-connector-java-5.0.0-beta-bin.jar"/>
- <classpathentry kind="lib" path="lib/napkinlaf.jar"/>
- <classpathentry kind="lib" path="lib/stax-api-1.0.jar"/>
- <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
- <classpathentry kind="lib" path="lib/xml-apis.jar"/>
- <classpathentry kind="lib" path="lib/wstx-asl-3.0.0.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="lib" path="lib/slf4j-log4j12-1.5.6.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry combineaccessrules="false" kind="src" path="/JenaCore"/>
- <classpathentry kind="lib" path="lib/jena.jar"/>
- <classpathentry kind="lib" path="lib/jenatest.jar"/>
- <classpathentry kind="lib" path="lib/junit4.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0.jar" sourcepath="M2_REPO/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.8.2/junit-4.8.2.jar" sourcepath="M2_REPO/junit/junit/4.8.2/junit-4.8.2-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/junit/junit/4.8.2/junit-4.8.2-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <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/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <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">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/log4j/log4j/1.2.16/log4j-1.2.16-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-tests.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-test-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.5/commons-codec-1.5-sources.jar">
+ <attributes>
+ <attribute value="jar:file:/home/christopher/M2/repository/commons-codec/commons-codec/1.5/commons-codec-1.5-javadoc.jar!/" name="javadoc_location"/>
+ </attributes>
+ </classpathentry>
+ <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"/>
+</classpath>
\ No newline at end of file
Modified: jena/Scratch/Eyeball/trunk/.project
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/.project?rev=1396566&r1=1396565&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/.project (original)
+++ jena/Scratch/Eyeball/trunk/.project Wed Oct 10 12:40:36 2012
@@ -1,17 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>Eyeball</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>eyeball</name>
+ <comment>Eyeball -- an RDF lint. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Added: jena/Scratch/Eyeball/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/pom.xml?rev=1396566&view=auto
==============================================================================
--- jena/Scratch/Eyeball/trunk/pom.xml (added)
+++ jena/Scratch/Eyeball/trunk/pom.xml Wed Oct 10 12:40:36 2012
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.epimorphics.eyeball</groupId>
+ <artifactId>eyeball</artifactId>
+ <version>2.4.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>eyeball</name>
+ <description>Eyeball -- an RDF lint</description>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration> <encoding>UTF-8</encoding> </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-executable-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+ <mainClass>jena.eyeball</mainClass>
+ <packageName>jena.eyeball</packageName>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ftp</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8</version>
+ <configuration>
+ <!-- Default configuration for all reports -->
+ </configuration>
+ <executions>
+ <execution>
+ <id>aggregate</id>
+ <goals>
+ <goal>aggregate</goal>
+ </goals>
+ <configuration>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>3.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.7.0-incubating</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>2.7.0-incubating</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>2.9.0-incubating</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ <type>jar</type>
+ <scope>compile</scope>
+
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: jena/Scratch/Eyeball/trunk/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Modified: jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Eyeball.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Eyeball.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Eyeball.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/Eyeball.java Wed Oct 10 12:40:36 2012
@@ -31,8 +31,6 @@ public class Eyeball
protected final Inspector inspector;
protected final OntModel assume;
protected final Renderer renderer;
- protected final Analysis analysis;
- protected final Doctor doctor;
private static final FileManager fileManager = FileManager.get();
/**
@@ -54,21 +52,16 @@ public class Eyeball
public static final Property ANY = null;
public Eyeball( Inspector inspector, OntModel assume, Renderer renderer )
- { this( inspector, assume, renderer, null, null ); }
-
- public Eyeball( Inspector inspector, OntModel assume, Renderer renderer, Analysis analysis, Doctor doctor )
{
this.inspector = inspector;
this.assume = assume;
this.renderer = renderer;
- this.analysis = analysis;
- this.doctor = doctor;
}
public static Model getRepairConfig()
{
Model configFile = ModelFactory.createDefaultModel()
- .read( "file:etc/eyeball-config.n3", "N3" );
+ .read( "file:etc/eyeball-config.ttl", "TTL" );
Model config = ModelFactory.createDefaultModel()
.add( configFile.listStatements( EYE.repairConfig, null, (RDFNode)null ) );
return config;
@@ -92,16 +85,6 @@ public class Eyeball
inspector.end( r );
return r;
}
-
- public void analyse( Report r, OntModel m )
- { analysis.analyse( r, m, getRepairConfig() ); }
-
- public void doctorModel( Report r, OntModel m )
- {
- Model report = r.model();
- doctor.doctorModel( report, m, getRepairConfig() );
- r.setMitems( report );
- }
public void render( Report r, PrintStream out )
{ renderer.render( r, out ); }
Modified: jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/EyeballAssembler.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/EyeballAssembler.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/EyeballAssembler.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/assemblers/EyeballAssembler.java Wed Oct 10 12:40:36 2012
@@ -51,9 +51,7 @@ public class EyeballAssembler extends As
Inspector i = getInspector( sub, root );
OntModel a = getAssumptions( sub, root );
Renderer r = getRenderer( sub, root );
- Analysis an = getAnalysis( sub, root );
- Doctor d = getDoctor( sub, root );
- return new Eyeball( i, a, r, an, d );
+ return new Eyeball( i, a, r );
}
private OntModel getAssumptions( final Assembler sub, Resource root )
@@ -122,41 +120,4 @@ public class EyeballAssembler extends As
Set<Inspector> inspectors = root.listProperties( EYE.inspector ).mapWith( asInspector ).toSet();
return Inspector.Operations.create( inspectors );
}
-
- private Analysis getAnalysis( final Assembler a, Resource root )
- {
- OpenObject<Analysis> asAnalysis = new OpenObject<Analysis>( a, Analysis.class );
- List<Analysis> analyses = root.listProperties( EYE.analysis ).mapWith( asAnalysis ).toList();
- return Analysis.Operations.create( analyses );
- }
-
- private Doctor getDoctor( final Assembler a, Resource root )
- {
- OpenObject<Doctor> asDoctor = new OpenObject<Doctor>( a, Doctor.class );
- // System.err.println( ">> EyeballAssembler::getDoctor" );
- List<Doctor> chosen = root.listProperties( EYE.doctor ).mapWith( asDoctor ).toList();
- List<Doctor> newDoc = new ArrayList<Doctor>();
- Model config = root.getModel();
- int index = 1;
- while (newDoc.size() < chosen.size())
- {
- try
- {
- NodeIterator it = config.listObjectsOfProperty( config.listSubjectsWithProperty( EYE.runPosition, config.createTypedLiteral( index ) ).nextResource(), EYE.className );
- while ( it.hasNext() )
- {
- String find = it.nextNode().asNode().getLiteral().getLexicalForm();
- for(Doctor d: chosen) // for ( int i = 0; i < chosen.length; i++)
- if ( d.getClass().getCanonicalName().equals( find ) )
- {
- newDoc.add( d );
- break;
- }
- }
- index += 1;
- }
- catch ( NoSuchElementException e) { break; } // Finished iteration over config
- }
- return Doctor.Operations.create( newDoc );
- }
}
Modified: jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/gui/Eyeballer.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/gui/Eyeballer.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/gui/Eyeballer.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/gui/Eyeballer.java Wed Oct 10 12:40:36 2012
@@ -147,8 +147,6 @@ public class Eyeballer implements Contro
{
Assembler.general
.implementWith( EYE.Inspector, new InspectorAssembler() )
- .implementWith( EYE.Analysis, new AnalysisAssembler() )
- .implementWith( EYE.Doctor, new DoctorAssembler() )
.implementWith( EYE.Eyeball, new EyeballAssembler() )
.implementWith( EYE.Renderer, new RendererAssembler() );
eye = new eyeball( args.toArray( new String[args.size()] ) );
@@ -160,23 +158,7 @@ public class Eyeballer implements Contro
if ( checked.showModel() )
outputModel( m, "Input model display", "This is the input model", checked.writerLanguage() );
Report r = eye.getEyeball().inspect( new Report(), m );
- if ( checked.analyse() || checked.repair() )
- {
- eye.getEyeball().analyse( r, m );
- outputReport( r, "Eyeball Report", "This is the analysed report" );
- if ( checked.repair() )
- {
- if ( checked.interactive() )
- new InteractiveDoctor( r, m, checked.writerLanguage(), eye.getEyeball() );
- else
- {
- eye.getEyeball().doctorModel( r, m );
- outputModel( m, "Eyeball Repair model display", "This is the repaired model", checked.writerLanguage() );
- }
- }
- }
- else
- outputReport( r, "Eyeball Report", "This is the report" );
+ outputReport( r, "Eyeball Report", "This is the report" );
}
}
catch (Exception e) { displayProblem( e ); }
Modified: jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/loaders/JDBCLoader.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/loaders/JDBCLoader.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/loaders/JDBCLoader.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/loaders/JDBCLoader.java Wed Oct 10 12:40:36 2012
@@ -20,8 +20,9 @@ package com.hp.hpl.jena.eyeball.loaders;
import java.util.regex.*;
-import com.hp.hpl.jena.db.IDBConnection;
+// import com.hp.hpl.jena.db.IDBConnection;
import com.hp.hpl.jena.rdf.model.*;
+import com.hp.hpl.jena.shared.BrokenException;
/**
Answer the RDB model which has the given name in the given database
@@ -50,8 +51,9 @@ public class JDBCLoader implements Loade
String modelName = m.group(3);
String user = System.getProperty( "jena.db.user" );
String password = System.getProperty( "jena.db.password" );
- IDBConnection con = ModelFactory.createSimpleRDBConnection( dbServer, user, password, type );
- return ModelFactory.createModelRDBMaker( con ).createModel( modelName );
+// IDBConnection con = ModelFactory.createSimpleRDBConnection( dbServer, user, password, type );
+// return ModelFactory.createModelRDBMaker( con ).createModel( modelName );
+ throw new BrokenException( "JDBC loader no longer exists." );
}
}
Modified: jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/util/Setup.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/util/Setup.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/util/Setup.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/util/Setup.java Wed Oct 10 12:40:36 2012
@@ -37,8 +37,6 @@ public class Setup
{
Assembler.general
.implementWith( EYE.Inspector, new InspectorAssembler() )
- .implementWith( EYE.Analysis, new AnalysisAssembler() )
- .implementWith( EYE.Doctor, new DoctorAssembler() )
.implementWith( EYE.Eyeball, new EyeballAssembler() )
.implementWith( EYE.Renderer, new RendererAssembler() )
;
Modified: jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/web/WebEyeballer.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/web/WebEyeballer.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/web/WebEyeballer.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/com/hp/hpl/jena/eyeball/web/WebEyeballer.java Wed Oct 10 12:40:36 2012
@@ -29,7 +29,6 @@ import com.hp.hpl.jena.assembler.Assembl
import com.hp.hpl.jena.eyeball.*;
import com.hp.hpl.jena.eyeball.assemblers.*;
import com.hp.hpl.jena.eyeball.vocabulary.EYE;
-import com.hp.hpl.jena.eyeball.web.statistics.StatisticalAnalyser;
/**
* @author peter
@@ -43,7 +42,7 @@ public class WebEyeballer implements Ser
private String rdfModel = "";
- private String modelType = "N3";
+ private String modelType = "TTL";
private String reportFormat = "text";
@@ -192,7 +191,7 @@ public class WebEyeballer implements Ser
{
try
{
- modelType = "N3";
+ modelType = "TTL";
m.read( reader, baseURL, modelType );
}
catch (Exception e1)
@@ -215,10 +214,6 @@ public class WebEyeballer implements Ser
m.read( reader, baseURL, modelType );
if (eye == null) createEyeball();
Report r = eye.inspect( new Report(), m );
- if (repair || analyse) eye.analyse( r, m );
- if (repair) eye.doctorModel( r, m );
- if (collectStatistics) // analyse this request for statistical purposes
- new StatisticalAnalyser( this, r ).gatherStatistics();
return r;
}
@@ -251,8 +246,8 @@ public class WebEyeballer implements Ser
e.printStackTrace();
}
System.out.println( ">> eyeball config seems to be:" );
- ModelFactory.createDefaultModel().read( "file:etc/eyeball-config.n3",
- "N3" ).write( System.out, "N3" );
+ ModelFactory.createDefaultModel().read( "file:etc/eyeball-config.ttl",
+ "TTL" ).write( System.out, "TTL" );
System.out
.println( "==========================================================================================" );
}
@@ -261,8 +256,6 @@ public class WebEyeballer implements Ser
{
Assembler.general
.implementWith( EYE.Inspector, new InspectorAssembler() )
- .implementWith( EYE.Analysis, new AnalysisAssembler() )
- .implementWith( EYE.Doctor, new DoctorAssembler() )
.implementWith( EYE.Eyeball, new EyeballAssembler() )
.implementWith( EYE.Renderer, new RendererAssembler() )
;
Modified: jena/Scratch/Eyeball/trunk/src/main/java/jena/eyeball.java
URL: http://svn.apache.org/viewvc/jena/Scratch/Eyeball/trunk/src/main/java/jena/eyeball.java?rev=1396566&r1=1396560&r2=1396566&view=diff
==============================================================================
--- jena/Scratch/Eyeball/trunk/src/main/java/jena/eyeball.java (original)
+++ jena/Scratch/Eyeball/trunk/src/main/java/jena/eyeball.java Wed Oct 10 12:40:36 2012
@@ -22,7 +22,6 @@ import java.io.*;
import java.util.*;
import com.hp.hpl.jena.assembler.*;
-import com.hp.hpl.jena.db.ModelRDB;
import com.hp.hpl.jena.extras.tools.query.*;
import com.hp.hpl.jena.eyeball.*;
import com.hp.hpl.jena.eyeball.loaders.*;
@@ -202,7 +201,7 @@ public class eyeball
Model toAdd = ModelFactory.createDefaultModel();
Model sub = ResourceUtils.reachableClosure( root.inModel( result ) );
// System.err.println( ">> include.sub" );
- // sub.write( System.err, "N3" );
+ // sub.write( System.err, "TTL" );
ModelQuery q = ModelQuery.create();
QueryVariable iv = q.createVariable();
q.add( q.createVariable(), EYE.inspector, iv );
@@ -250,14 +249,14 @@ public class eyeball
/**
Answer a configuration model which is the union of all of the -config
- models, or etc/eyeball-config.n3 if there are no -config options.
+ models, or etc/eyeball-config.ttl if there are no -config options.
*/
protected Model loadBaseConfig()
{
Model config = ModelFactory.createDefaultModel();
config.add( EYE.Eyeball, RDFS.subClassOf, JA.Object );
config.setNsPrefix( "eye", EYE.getURI() );
- List<String> configFileNames = args.listFor( "config", "etc/eyeball-config.n3" );
+ List<String> configFileNames = args.listFor( "config", "etc/eyeball-config.ttl" );
for (Iterator<String> it = configFileNames.iterator(); it.hasNext();)
FileManager.get().readModel( config, it.next() );
return config;
@@ -300,7 +299,7 @@ public class eyeball
Copy.addStringProperties( toStamp, EYE.checked, singleton( dataName ) );
toStamp.addProperty( EYE.version, "Eyeball 2.1" );
toStamp.addProperty( EYE.comment, "Eventually, you will be able to provide a comment" );
- new SignMaster.Signer( "SignMaster 0.1", toStamp ).sign( input ).write( out, "N3" );
+ new SignMaster.Signer( "SignMaster 0.1", toStamp ).sign( input ).write( out, "TTL" );
}
private List<String> singleton( String dataName )
@@ -317,10 +316,6 @@ public class eyeball
input.remove( SignMaster.Signer.getSignatures( input ) );
em.export( m );
Report r = inspectAndReport( m );
- if ( args.has( "repair" ) )
- analyseAndRepairModel( out, dataName, m, r );
- else if ( args.has( "analyse" ) || args.has( "analyze" ) )
- eyeball.analyse( r, m );
eyeball.render( r, out );
}
@@ -331,57 +326,6 @@ public class eyeball
if (!r.valid()) allChecksPassed = false;
return r;
}
-
- private void analyseAndRepairModel( PrintStream out, String dataName, OntModel m, Report r )
- {
- eyeball.analyse( r, m );
- // Move m to a static OntModel - we don't want the doctor to perform work directly on the database!
- m = (OntModel) ModelFactory.createOntologyModel().add( m.getBaseModel().listStatements() );
- eyeball.doctorModel( r, m );
- Model repaired = m.getBaseModel();
- String outPath = args.valueFor( "repair", "" );
- String vocab = getVocabulary();
-
- if ( outPath.equals( "" ) ) // Default to eyeball-specified 'out' if the user didn't specify a location
- {
- if ( out != null )
- {
- repaired.write( out, vocab );
- out.println();
- }
- }
- else // Output to the medium the user specified
- try
- {
- String bkpPath = outPath + ".old" + "-" + System.currentTimeMillis();
- if ( outPath.startsWith( "jdbc:" ) )
- {
- if ( dataName.startsWith( "jdbc:" ) )// We need to backup the old data
- new JDBCLoader().load( bkpPath ).add( input );
- ModelRDB dbm = (ModelRDB) new JDBCLoader().load( outPath );
- dbm.begin().remove( input ).add( repaired ).commit();
- }
- else
- {
- File outFile = new File( outPath );
- if ( outFile.exists() ) // Don't overwrite the old file if we can help it!
- outFile.renameTo( new File( bkpPath ) );
- BufferedWriter modelOut = new BufferedWriter( new FileWriter( outPath ) );
- repaired.write( modelOut, vocab );
- modelOut.close();
- }
- }
- catch (IOException e)
- { e.printStackTrace(); }
- }
-
- private String getVocabulary()
- {
- String vocab = "RDF/XML-ABBREV"; // Use this renderer if the user didn't specify an N3 preference
- if ( eyeball.getRenderer().getClass().toString().equals( "class com.hp.hpl.jena.eyeball.renderers.N3Renderer" ) )
- vocab = "N3";
- return vocab;
- }
public Eyeball getEyeball()
{ return eyeball; }