Permalink
Browse files

General updating.

  • Loading branch information...
1 parent 077caed commit 1e132b2ec64cb3eb47ce4cf7529f4298dbec6389 Andy Seaborne committed Apr 29, 2012
View
71 .classpath
@@ -1,64 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src-test" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src" including="**/*.java"/>
- <classpathentry kind="src" path="resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <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"/>
- <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar" sourcepath="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-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/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-tests.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"/>
- <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"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-tests.jar"/>
- <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"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar" sourcepath="M2_REPO/junit/junit/4.10/junit-4.10-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/net/sf/opencsv/opencsv/2.0/opencsv-2.0.jar" sourcepath="M2_REPO/net/sf/opencsv/opencsv/2.0/opencsv-2.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-http-client/2.6.2/sesame-http-client-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-http-client/2.6.2/sesame-http-client-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-http-protocol/2.6.2/sesame-http-protocol-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-http-protocol/2.6.2/sesame-http-protocol-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-model/2.6.2/sesame-model-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-model/2.6.2/sesame-model-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-query/2.6.2/sesame-query-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-query/2.6.2/sesame-query-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.6.2/sesame-queryalgebra-evaluation-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.6.2/sesame-queryalgebra-evaluation-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-model/2.6.2/sesame-queryalgebra-model-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-model/2.6.2/sesame-queryalgebra-model-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-api/2.6.2/sesame-queryparser-api-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryparser-api/2.6.2/sesame-queryparser-api-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-serql/2.6.2/sesame-queryparser-serql-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryparser-serql/2.6.2/sesame-queryparser-serql-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-sparql/2.6.2/sesame-queryparser-sparql-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryparser-sparql/2.6.2/sesame-queryparser-sparql-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-api/2.6.2/sesame-queryresultio-api-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryresultio-api/2.6.2/sesame-queryresultio-api-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-binary/2.6.2/sesame-queryresultio-binary-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryresultio-binary/2.6.2/sesame-queryresultio-binary-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.6.2/sesame-queryresultio-sparqljson-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.6.2/sesame-queryresultio-sparqljson-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.6.2/sesame-queryresultio-sparqlxml-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.6.2/sesame-queryresultio-sparqlxml-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-text/2.6.2/sesame-queryresultio-text-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-queryresultio-text/2.6.2/sesame-queryresultio-text-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-api/2.6.2/sesame-repository-api-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-api/2.6.2/sesame-repository-api-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-contextaware/2.6.2/sesame-repository-contextaware-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-contextaware/2.6.2/sesame-repository-contextaware-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-dataset/2.6.2/sesame-repository-dataset-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-dataset/2.6.2/sesame-repository-dataset-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-event/2.6.2/sesame-repository-event-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-event/2.6.2/sesame-repository-event-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-http/2.6.2/sesame-repository-http-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-http/2.6.2/sesame-repository-http-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-manager/2.6.2/sesame-repository-manager-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-manager/2.6.2/sesame-repository-manager-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-sail/2.6.2/sesame-repository-sail-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-sail/2.6.2/sesame-repository-sail-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-sparql/2.6.2/sesame-repository-sparql-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-repository-sparql/2.6.2/sesame-repository-sparql-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-api/2.6.2/sesame-rio-api-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-api/2.6.2/sesame-rio-api-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-binary/2.6.2/sesame-rio-binary-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-binary/2.6.2/sesame-rio-binary-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-n3/2.6.2/sesame-rio-n3-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-n3/2.6.2/sesame-rio-n3-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-ntriples/2.6.2/sesame-rio-ntriples-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-ntriples/2.6.2/sesame-rio-ntriples-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-rdfxml/2.6.2/sesame-rio-rdfxml-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-rdfxml/2.6.2/sesame-rio-rdfxml-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trig/2.6.2/sesame-rio-trig-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-trig/2.6.2/sesame-rio-trig-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trix/2.6.2/sesame-rio-trix-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-trix/2.6.2/sesame-rio-trix-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-turtle/2.6.2/sesame-rio-turtle-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-rio-turtle/2.6.2/sesame-rio-turtle-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-runtime/2.6.2/sesame-runtime-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-runtime/2.6.2/sesame-runtime-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-api/2.6.2/sesame-sail-api-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-sail-api/2.6.2/sesame-sail-api-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-inferencer/2.6.2/sesame-sail-inferencer-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-sail-inferencer/2.6.2/sesame-sail-inferencer-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-memory/2.6.2/sesame-sail-memory-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-sail-memory/2.6.2/sesame-sail-memory-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-nativerdf/2.6.2/sesame-sail-nativerdf-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-sail-nativerdf/2.6.2/sesame-sail-nativerdf-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-rdbms/2.6.2/sesame-sail-rdbms-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-sail-rdbms/2.6.2/sesame-sail-rdbms-2.6.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-util/2.6.2/sesame-util-2.6.2.jar" sourcepath="M2_REPO/org/openrdf/sesame/sesame-util/2.6.2/sesame-util-2.6.2-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" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar"/>
- <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"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</classpath>
+ <classpathentry kind="src" output="target/classes" path="src"/>
+ <classpathentry excluding="**" kind="src" output="target/classes" path="resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src-test"/>
+ <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="output" path="target/classes"/>
+</classpath>
View
52 .project
@@ -1,22 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jena-sesame</name>
- <comment>Jena API over a Sesame reposiroty. 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>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value>&lt;project&gt;/.externalToolBuilders/Maven_Ant_Builder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>jena-sesame</name>
+ <comment>Jena API over a Sesame reposiroty. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value>&lt;project&gt;/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
View
2 .settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/resources=UTF-8
View
24 .settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
-#Sat Dec 19 18:01:50 GMT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
View
4 .settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
View
0 ChangeLog.txt 100755 → 100644
File mode changed.
View
0 Copyright.txt 100755 → 100644
File mode changed.
View
11 NOTICE
@@ -0,0 +1,11 @@
+Apache Jena - ARQ module
+Copyright 2011, 2012 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+Portions of this software were originally based on the following:
+ - Copyright 2004, 2005, 2006, 2007, 2008, 2009 Hewlett-Packard Development Company, LP
+ - Copyright 2010, 2011 Epimorphics Ltd.
+ - Copyright 2010 Talis Systems Ltd.
+These have been licensed to the Apache Software Foundation under a software grant.
View
46 README.txt 100755 → 100644
@@ -1,23 +1,23 @@
-==== JenaSesame
-
-This package aims to provide a stable, long-term bridge bwteen the two systems.
-
-== Documentation
-
-http://openjena.org/wiki/JenaSesame
-
-== Repository
-
-http://openjena.org/repo-dev
-
-Group: org.openjena
-Artifact: jena-sesame
-
-== Source Code
-
-http://github.com/afs/JenaSesame.git
-
-== Other
-
-http://sourceforge.net/projects/jenasesamemodel/ (Jena API over Sesame repository)
-http://sjadapter.sourceforge.net/ (Sesame API over Jena storage)
+==== JenaSesame
+
+This package aims to provide a stable, long-term bridge bwteen the two systems.
+
+== Documentation
+
+http://openjena.org/wiki/JenaSesame
+
+== Repository
+
+http://openjena.org/repo-dev
+
+Group: org.openjena
+Artifact: jena-sesame
+
+== Source Code
+
+http://github.com/afs/JenaSesame.git
+
+== Other
+
+http://sourceforge.net/projects/jenasesamemodel/ (Jena API over Sesame repository)
+http://sjadapter.sourceforge.net/ (Sesame API over Jena storage)
View
86 assembly.xml 100755 → 100644
@@ -1,43 +1,43 @@
-<!-- The ARQ distibution -->
-
-<assembly>
- <baseDirectory>JenaSesame-${project.version}</baseDirectory>
- <formats>
- <!--
- <format>tar.gz</format>
- <format>tar.bz2</format>
- -->
- <format>zip</format>
- </formats>
-
-
- <fileSets>
- <fileSet>
- <includes>
- <include>Copyright.txt</include>
- <include>README*</include>
- <include>ChangeLog.txt</include>
- <include>pom.xml</include>
- <include>assembly.xml</include>
- </includes>
- </fileSet>
-
- <!-- The jar file + sources + javadoc -->
- <fileSet>
- <directory>${project.build.directory}</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>${this.root}.jar</include>
- <include>${this.root}-javadoc.jar</include>
- <include>${this.root}-sources.jar</include>
- <!--<include>${this.root}-test-sources.jar</include>-->
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>src-examples</directory>
- </fileSet>
-
- </fileSets>
-
-</assembly>
+<!-- The ARQ distibution -->
+
+<assembly>
+ <baseDirectory>JenaSesame-${project.version}</baseDirectory>
+ <formats>
+ <!--
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ -->
+ <format>zip</format>
+ </formats>
+
+
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>Copyright.txt</include>
+ <include>README*</include>
+ <include>ChangeLog.txt</include>
+ <include>pom.xml</include>
+ <include>assembly.xml</include>
+ </includes>
+ </fileSet>
+
+ <!-- The jar file + sources + javadoc -->
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>${this.root}.jar</include>
+ <include>${this.root}-javadoc.jar</include>
+ <include>${this.root}-sources.jar</include>
+ <!--<include>${this.root}-test-sources.jar</include>-->
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>src-examples</directory>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
View
57 ivy.xml
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:mvn="http://ant.apache.org/ivy/maven"
- xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
-
- <info module="graph-sail"
- organisation="com.talis"
- revision="0.0.0">
- <license name="BSD"/>
- <ivyauthor name="Talis Information Ltd" url="http://talis.com/"/>
- <description>graph-sail</description>
- </info>
-
- <configurations defaultconfmapping="main->*">
- <conf name="main" description="graph-sail" />
- </configurations>
-
- <publications>
- <artifact name="jena-sesame" type="jar"/>
- </publications>
-
- <dependencies>
-
- <dependency org="org.openrdf.sesame" name="sesame-runtime" rev="2.3.0"/>
-
- <!-- No idea why but these are needed explicitly -->
- <dependency org="info.aduna.commons" name="aduna-commons-lang" rev="2.7.0"/>
- <dependency org="info.aduna.commons" name="aduna-commons-net" rev="2.5.0"/>
- <dependency org="info.aduna.commons" name="aduna-commons-io" rev="2.7.0"/>
- <dependency org="info.aduna.commons" name="aduna-commons-text" rev="2.5.0"/>
- <dependency org="info.aduna.commons" name="aduna-commons-xml" rev="2.5.0"/>
-
- <!-- Works with TDB 0.8.4 but 0.8.5-SNAPSHOT has some testing fixes -->
- <dependency org="com.hp.hpl.jena" name="tdb" rev="0.8.5-SNAPSHOT"/>
-
- <!-- We need the "tests" classifier but we then need to name all the bits we want. -->
- <dependency org="com.hp.hpl.jena" name="arq" rev="2.8.2">
- <artifact name="arq"/>
- <artifact name="arq" mvn:classifier="tests"/>
- <artifact name="arq" mvn:classifier="javadoc"/>
- <artifact name="arq" mvn:classifier="sources"/>
- <artifact name="arq" mvn:classifier="test-sources"/>
- </dependency>
-
- <!-- Explicit - gets the javadoc, sources and test materials -->
- <dependency org="com.hp.hpl.jena" name="jena" rev="2.6.2">
- <artifact name="jena"/>
- <artifact name="jena" mvn:classifier="tests"/>
- <artifact name="jena" mvn:classifier="javadoc"/>
- <artifact name="jena" mvn:classifier="sources"/>
- <artifact name="jena" mvn:classifier="test-sources"/>
- </dependency>
-
- </dependencies>
-
-</ivy-module>
View
30 ivysettings.xml
@@ -1,30 +0,0 @@
-<ivysettings>
- <!-- Resolvers for dependences -->
- <resolvers>
- <chain name="resolver-chain">
-
- <ibiblio name="jena-dev" root="http://openjena.org/repo-dev" m2compatible="true" useMavenMetadata="false"/>
-
- <!-- Jena publish repository, sync'ed to maven central
- <ibiblio name="jena" root="http://openjena.org/repo" m2compatible="true"/>
- -->
-
- <ibiblio name="openrdf"
- root="http://repo.aduna-software.org/maven2/releases"
- m2compatible="true"/>
-
- <ibiblio name="maven2" m2compatible="true" />
-
- </chain>
- </resolvers>
-
- <!-- Resolvers used for getting our dependencies from
- Defines "resolver-chain"
- -->
-
- <settings defaultResolver="resolver-chain"/>
- <!--
- <caches defaultCacheDir="c:/home/afs/.ivy2/cache"/>
- -->
-
-</ivysettings>
View
75 pom.xml
@@ -1,6 +1,7 @@
<?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.openjena</groupId>
@@ -10,17 +11,21 @@
<version>0.1.0-SNAPSHOT</version>
<description>Jena API over a Sesame reposiroty</description>
- <url>http://openjena.org/ARQ</url>
+ <url>http://github.com/afs/JenaSesame</url>
<organization>
- <name>Hewlett-Packard</name>
- <url>http://www.hp.com/</url>
+ <name>Jena</name>
+ <url>http://jena.apache.org/</url>
</organization>
<licenses>
<license>
<name>BSD-style license</name>
<url>http://openjena.org/license.html</url>
+ <!-- To become ...
+ <name>Apache Software License</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+ -->
</license>
</licenses>
@@ -34,8 +39,10 @@
<ver.jena>2.7.0-incubating</ver.jena>
<ver.arq>2.9.0-incubating</ver.arq>
<ver.sesame>2.6.2</ver.sesame>
+ <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssZ</maven.build.timestamp.format>
+ <build.time.xsd>${maven.build.timestamp}</build.time.xsd>
</properties>
-
+
<dependencies>
<!-- Jena and ARQ - including testing support -->
@@ -108,11 +115,6 @@
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>src-test</testSourceDirectory>
- <!-- The filter file is written by antrun -->
- <filters>
- <filter>${project.basedir}/target/filter.properties</filter>
- </filters>
-
<resources>
<resource>
<targetPath>org.openjena.jenasesame</targetPath>
@@ -213,38 +215,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>ant-timestamp</id>
- <phase>generate-resources</phase>
- <configuration>
- <tasks>
- <mkdir dir="${project.basedir}/target"/>
- <tstamp>
- <format property="build.time.xsd" pattern="yyyy-MM-dd'T'HH:mm:ssZ"/>
- <format property="build.time.txt" pattern="yyyy-MM-dd HH:mm z"/>
- </tstamp>
- <echo file="${project.basedir}/target/filter.properties">
-#begin
-build.time.xsd=${build.time.xsd}
-build.time.txt=${build.time.txt}
-#end
- </echo>
- <echo message="version=${project.version}"/>
- <echo message="build.time=${build.time.txt}"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <!-- Another task, another execution -->
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
<outputDirectory>lib2</outputDirectory>
@@ -260,19 +230,26 @@ build.time.txt=${build.time.txt}
<repositories>
<repository>
- <id>apache-repo.releases</id>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+
+ <repository>
+ <id>apache.releases</id>
<name>Apache Release Repository</name>
- <url>https://repository.apache.org/content/repositories/releases/</url>
+ <url>https://repository.apache.org/content/repositories/releases</url>
<releases>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</releases>
<snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
+ <enabled>false</enabled>
</snapshots>
</repository>
-
+
<repository>
<id>repo-openrdf</id>
<name>OpenRDF releases</name>

0 comments on commit 1e132b2

Please sign in to comment.