diff --git a/html/relnotes.html b/html/relnotes.html index 295989af12411622dcfbfe02fb602408bb492a8b..16ed1367c96eb412f66ab1c0d660e47db66d5f15 100644 --- a/html/relnotes.html +++ b/html/relnotes.html @@ -82,6 +82,7 @@ with a warning: <li>Enabled query translation in interface (serv)</li> <li>Added a command-line utility for query translation (cli)</li> <li>Added a guard forbiding to create a <tt>BasicCell</tt> with null objects (impl)</li> +<li>Added httpcore library necessary for tutorial4 (tutorial/lib)</li> <li>Genericised storage <tt>Cache</tt> (serv)</li> </ul></p> diff --git a/html/tutorial/tutorial4/MyApp.java b/html/tutorial/tutorial4/MyApp.java index 86122233718e783701834aae20e8b08cd634c0a6..781b183e1242583d1024b08747dfa687c7bd8414 100644 --- a/html/tutorial/tutorial4/MyApp.java +++ b/html/tutorial/tutorial4/MyApp.java @@ -1,7 +1,7 @@ /* * $Id$ * - * Copyright (C) INRIA, 2009-2010, 2013 + * Copyright (C) INRIA, 2009-2010, 2013-2014 * * Modifications to the initial code base are copyright of their * respective authors, or their employers as appropriate. Authorship @@ -250,7 +250,7 @@ public class MyApp { try { in = new FileInputStream( merged ); //OntModelSpec.OWL_MEM_RDFS_INF or no arguments to see the difference... - Model model = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM_RULE_INF,null); + Model model = ModelFactory.createOntologyModel( OntModelSpec.OWL_DL_MEM_RULE_INF, null ); model.read( in, "file:"+merged.getPath() ); in.close(); @@ -285,7 +285,7 @@ public class MyApp { } finally { // Important - free up resources used running the query if ( qe != null ) qe.close(); - } + } // (Sol2) Use the OWLReasoner to answer queries (at the ontology level) OWLOntologyManager manager = OWLManager.createOWLOntologyManager(); diff --git a/html/tutorial/tutorial4/index.html b/html/tutorial/tutorial4/index.html index 15ce35c43c0cc98c67a2506e64137ae4e3f022d4..905277457e2fa37bca85c746af66667831a12812 100644 --- a/html/tutorial/tutorial4/index.html +++ b/html/tutorial/tutorial4/index.html @@ -96,7 +96,7 @@ how this could be achieved. <p>For that purpose, you have to develop a program in Java. We first define the CLASSPATH because a lot of external software is required <div class="terminal"> -$ setenv CLASSPATH ../../../lib/align.jar:../../../lib/procalign.jar:../../../lib/jena/jena.jar:../../../lib/jena/arq.jar:../../../lib/iddl/iddl.jar:../../../lib/hermit/hermit.jar:../../../lib/ontosim/ontosim.jar:../../../lib/log4j/commons-logging.jar:../../../lib/log4j/log4j.jar:../../../lib/xerces/xercesImpl.jar:../../../lib/jena/iri.jar:../../../lib/jena/icu4j_3_4.jar:../../../lib/jena/concurrent.jar:../../../lib/xsdlib/relaxngDatatype.jar:../../../lib/xsdlib/xsdlib.jar:results +$ setenv CLASSPATH ../../../lib/align.jar:../../../lib/procalign.jar:../../../lib/jena/jena.jar:../../../lib/jena/arq.jar:../../../lib/iddl/iddl.jar:../../../lib/hermit/hermit.jar:../../../lib/ontosim/ontosim.jar:../../../lib/slf4j/slf4j-api.jar:../../../lib/slf4j/jcl-over-slf4j.jar:../../../lib/slf4j/log4j-over-slf4j.jar:../../../lib/xerces/xercesImpl.jar:../../../lib/jena/iri.jar:../../../lib/jena/httpcore.jar:results </div> The list of jars is long, but at least it is explicit and you should be safe with this one. diff --git a/lib/jena/httpcore.jar b/lib/jena/httpcore.jar new file mode 100644 index 0000000000000000000000000000000000000000..a64cd2f5e3eff5ea0ff91a545ba2da4dc3fd612b Binary files /dev/null and b/lib/jena/httpcore.jar differ diff --git a/lib/jena/httpcore.pom b/lib/jena/httpcore.pom new file mode 100644 index 0000000000000000000000000000000000000000..cbb5239215d07c3a5f574db7a449b3684bb2a34d --- /dev/null +++ b/lib/jena/httpcore.pom @@ -0,0 +1,144 @@ +<project> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>4.2.2</version> + <name>HttpCore</name> + <inceptionYear>2005</inceptionYear> + <description> + HttpComponents Core (blocking I/O) + </description> + <url>http://hc.apache.org/httpcomponents-core-ga</url> + <packaging>jar</packaging> + <licenses> + <license> + <name>Apache License Version 2.0, January 2004</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + </license> + </licenses> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + <maven.compile.optimize>true</maven.compile.optimize> + <maven.compile.deprecation>true</maven.compile.deprecation> + <!-- default compiler and surefire plugin settings for "java" profiles --> + <httpcore.compiler.fork>false</httpcore.compiler.fork> + <httpcore.compiler.compilerVersion /> + <httpcore.compiler.javac /> + <httpcore.surefire.java /> + </properties> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${maven.compile.source}</source> + <target>${maven.compile.target}</target> + <optimize>${maven.compile.optimize}</optimize> + <showDeprecations>${maven.compile.deprecation}</showDeprecations> + <fork>${httpcore.compiler.fork}</fork> + <compilerVersion>${httpcore.compiler.compilerVersion}</compilerVersion> + <executable>${httpcore.compiler.javac}</executable> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <jvm>${httpcore.surefire.java}</jvm> + </configuration> + </plugin> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <flushPolicy>threaded</flushPolicy> + <flushInterval>100</flushInterval> + <targetPercentage>50%</targetPercentage> + </configuration> + <executions> + <execution> + <id>site</id> + <phase>pre-site</phase> + <goals> + <goal>instrument</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${hc.javadoc.version}</version> + <configuration> + <!-- reduce console output. Can override with -Dquiet=false --> + <quiet>true</quiet> + <source>1.5</source> + <links> + <link>http://download.oracle.com/javase/1.5.0/docs/api/</link> + </links> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>${clover.version}</version> + <configuration> + <jdk>1.5</jdk> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + <version>${hc.jxr.version}</version> + </plugin> + + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>${hc.surefire-report.version}</version> + </plugin> + + </plugins> + </reporting> + +</project>