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/11 21:02:54 UTC
svn commit: r1230214 [1/2] - in /incubator/jena/Jena2/Fuseki/trunk: ./
pages-publish/ pages-update/ src/main/java/org/apache/
src/main/java/org/apache/jena/ src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/conneg/ src/main/jav...
Author: andy
Date: Wed Jan 11 20:02:50 2012
New Revision: 1230214
URL: http://svn.apache.org/viewvc?rev=1230214&view=rev
Log:
Rename packages org.openjena.fuseki.* to org.apache.jena.fuseki.*
Added:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DEF.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessor.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessorFactory.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiConfigException.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiConfigException.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiException.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiException.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiLib.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiNotFoundException.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiRequestException.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/HttpNames.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/HttpNames.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Test.java
- copied, changed from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Test.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/
- copied from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/conneg/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/
- copied from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/http/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/
- copied from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/mgt/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/
- copied from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/migrate/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/
- copied from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/
- copied from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/servlets/
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/
- copied from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/validation/
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/BaseServerTest.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseServerTest.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/BaseTest.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseTest.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/ServerTest.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/TS_Fuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestContentNegotiation.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/TestContentNegotiation.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestProtocol.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/TestProtocol.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestQuery.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/TestQuery.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/TestUpdate.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/TestUpdate.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/WebTest.java
- copied, changed from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/WebTest.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/http/
- copied from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/migrate/
- copied from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/migrate/
Modified:
incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt
incubator/jena/Jena2/Fuseki/trunk/fuseki
incubator/jena/Jena2/Fuseki/trunk/log4j.properties
incubator/jena/Jena2/Fuseki/trunk/pages-publish/data-validator.html
incubator/jena/Jena2/Fuseki/trunk/pages-publish/fuseki.html
incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.jsp
incubator/jena/Jena2/Fuseki/trunk/pages-update/data-validator.html
incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html
incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.jsp
incubator/jena/Jena2/Fuseki/trunk/pom.xml
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaRange.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaType.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedInputStream.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedOutputStream.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedStream.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/HttpSC.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/UpdateRemote.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphErrorHandler.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingBulkUpdateHandler.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingGraph.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/Registry.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRegistry.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FileUpload.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ActionErrorException.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ConcurrencyPolicyMRSW.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/NullOutputStream.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_ServletBase.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ServerServlet.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/validation/ValidatorBase.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/http/TestDatasetAccessorHTTP.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorBase.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorHTTP.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorMem.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/http/TestDatasetGraphAccessorTDB.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/migrate/SimpleTestRunner.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/migrate/TestHttpBase.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/apache/jena/fuseki/migrate/TextListenerOneLine.java
Modified: incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt (original)
+++ incubator/jena/Jena2/Fuseki/trunk/ChangeLog.txt Wed Jan 11 20:02:50 2012
@@ -2,7 +2,9 @@
== Version 1.0
-== 0.2.2
+== 0.2.1
+
++ Rename packages to be org.apache.jena.fuseki.
+ --jetty-config= Use a file to configure the jetty server (connector type, parms of connector like "host").
Replaces --host. See Jetty configuration documentation.
@@ -11,8 +13,6 @@
+ XSLT style sheet for SPARQL XML results now puts clickable links in the results - query goes back to the server.
-== 0.2.1
-
+ JENA-74 (from Brian McBride): --host= to select the interface to listen on. Use with --host=localhost if using Apache as a front-end.
+ Add --timeout: adds a timeout to all query executions
Modified: incubator/jena/Jena2/Fuseki/trunk/fuseki
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/fuseki?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/fuseki (original)
+++ incubator/jena/Jena2/Fuseki/trunk/fuseki Wed Jan 11 20:02:50 2012
@@ -12,4 +12,4 @@ CP="classes$CP"
JVM_ARGS="-Xmx1200M"
JVM_ARGS="$JVM_ARGS -XX:MaxDirectMemorySize:1G"
-exec java -cp "$CP" -Xmx1200M org.openjena.fuseki.FusekiCmd "$@"
+exec java -cp "$CP" -Xmx1200M org.apache.jena.fuseki.FusekiCmd "$@"
Modified: incubator/jena/Jena2/Fuseki/trunk/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/log4j.properties?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/log4j.properties (original)
+++ incubator/jena/Jena2/Fuseki/trunk/log4j.properties Wed Jan 11 20:02:50 2012
@@ -22,6 +22,7 @@ log4j.logger.com.hp.hpl.jena.arq.exec=IN
# Everything else in Jena
log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.apache.jena=WARN
log4j.logger.org.openjena=WARN
log4j.logger.org.openjena.riot=INFO
@@ -30,8 +31,8 @@ log4j.logger.org.joseki=INFO
# Fuseki
# Server log.
-log4j.logger.org.openjena.fuseki.Server=INFO
+log4j.logger.org.apache.jena.fuseki.Server=INFO
# Request log.
-log4j.logger.org.openjena.fuseki.Fuseki=INFO
+log4j.logger.org.apache.jena.fuseki.Fuseki=INFO
# Internal logs
-log4j.logger.org.openjena.fuseki=INFO
+log4j.logger.org.apache.jena.fuseki=INFO
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-publish/data-validator.html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-publish/data-validator.html?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-publish/data-validator.html (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-publish/data-validator.html Wed Jan 11 20:02:50 2012
@@ -39,9 +39,9 @@ Output syntax:
<input type="submit" value="Validate RDF Data" />
</form>
<hr/>
-Parsing provided by <a href="http://openjena.org/wiki/RIOT">Jena/RIOT</a>.
+Parsing provided by <a href="http://incubator.apache.org/jena/documentation/io/riot.html">Jena/RIOT</a>.
Questions to
-<href="mailto:jena-dev@groups.yahoo.com?s=[Data Validator]: ">jena-dev</a>
+<href="mailto:jena-users@incubator.apache.org?s=[Data Validator]: ">jena-users</a>
(include full details of input).
</div>
</body>
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-publish/fuseki.html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-publish/fuseki.html?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-publish/fuseki.html (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-publish/fuseki.html Wed Jan 11 20:02:50 2012
@@ -8,7 +8,7 @@
<h1>Fuseki</h1>
<h2>Documentation</h2>
- <p><a href="http://openjena.org/wiki/Fuseki">Fuseki documentation</a></p>
+ <p><a href="http://incubator.apache.org/jena/documentation/serving_data/index.html">Fuseki documentation</a></p>
<h2>Validators</h2>
<ul>
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.jsp
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.jsp?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.jsp (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.jsp Wed Jan 11 20:02:50 2012
@@ -1,4 +1,4 @@
-<%@ page import="org.openjena.fuseki.mgt.*"%>
+<%@ page import="org.apache.jena.fuseki.mgt.*"%>
<%@ page contentType="text/html ; charset=UTF-8"%>
<%@ page isThreadSafe="true"%>
<html>
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-update/data-validator.html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/data-validator.html?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/data-validator.html (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/data-validator.html Wed Jan 11 20:02:50 2012
@@ -39,9 +39,9 @@ Output syntax:
<input type="submit" value="Validate RDF Data" />
</form>
<hr/>
-Parsing provided by <a href="http://openjena.org/wiki/RIOT">Jena/RIOT</a>.
+Parsing provided by <a href="http://incubator.apache.org/jena/documentation/io/riot.html">Jena/RIOT</a>.
Questions to
-<href="mailto:jena-dev@groups.yahoo.com?s=[Data Validator]: ">jena-dev</a>
+<href="mailto:jena-users@incubator.apache.org?s=[Data Validator]: ">jena-users</a>
(include full details of input).
</div>
</body>
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html Wed Jan 11 20:02:50 2012
@@ -11,7 +11,7 @@
<p><a href="control-panel.jsp">Control Panel</a></p>
<h2>Documentation</h2>
- <p><a href="http://openjena.org/wiki/Fuseki">Fuseki documentation</a></p>
+ <p><a href="http://incubator.apache.org/jena/documentation/serving_data/index.html">Fuseki documentation</a></p>
<h2>Validators</h2>
<ul>
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.jsp
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.jsp?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.jsp (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.jsp Wed Jan 11 20:02:50 2012
@@ -1,4 +1,4 @@
-<%@ page import="org.openjena.fuseki.mgt.*"%>
+<%@ page import="org.apache.jena.fuseki.mgt.*"%>
<%@ page import="java.util.*"%>
<%@ page contentType="text/html ; charset=UTF-8"%>
<%@ page isThreadSafe="true"%>
Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1230214&r1=1230213&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Wed Jan 11 20:02:50 2012
@@ -217,9 +217,6 @@
<build>
<resources>
<resource>
- <!--
- <targetPath>org/openjena/fuseki</targetPath>
- -->
<filtering>true</filtering>
<directory>src/main/resources</directory>
</resource>
@@ -325,7 +322,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.openjena.fuseki.FusekiCmd</mainClass>
+ <mainClass>org.apache.jena.fuseki.FusekiCmd</mainClass>
</manifest>
</archive>
<!--
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DEF.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DEF.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DEF.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DEF.java Wed Jan 11 20:02:50 2012
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
-import org.openjena.fuseki.conneg.AcceptList ;
-import org.openjena.fuseki.conneg.MediaType ;
+import org.apache.jena.fuseki.conneg.AcceptList ;
+import org.apache.jena.fuseki.conneg.MediaType ;
import org.openjena.riot.WebContent ;
public class DEF
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessor.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessor.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessor.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessor.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
import com.hp.hpl.jena.rdf.model.Model ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessorFactory.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessorFactory.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/DatasetAccessorFactory.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/DatasetAccessorFactory.java Wed Jan 11 20:02:50 2012
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
-import org.openjena.fuseki.http.DatasetAdapter ;
-import org.openjena.fuseki.http.DatasetGraphAccessor ;
-import org.openjena.fuseki.http.DatasetGraphAccessorBasic ;
-import org.openjena.fuseki.http.DatasetGraphAccessorHTTP ;
+import org.apache.jena.fuseki.http.DatasetAdapter ;
+import org.apache.jena.fuseki.http.DatasetGraphAccessor ;
+import org.apache.jena.fuseki.http.DatasetGraphAccessorBasic ;
+import org.apache.jena.fuseki.http.DatasetGraphAccessorHTTP ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java (from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java&r1=1230178&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Fuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Fuseki.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
-import org.openjena.fuseki.server.SPARQLServer ;
+import org.apache.jena.fuseki.server.SPARQLServer ;
import org.openjena.riot.RIOT ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java&r1=1230178&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
import java.io.InputStream ;
import java.net.InetAddress ;
@@ -24,12 +24,12 @@ import java.net.UnknownHostException ;
import java.util.Arrays ;
import java.util.List ;
+import org.apache.jena.fuseki.server.DatasetRef ;
+import org.apache.jena.fuseki.server.FusekiConfig ;
+import org.apache.jena.fuseki.server.SPARQLServer ;
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.lib.FileOps ;
import org.openjena.atlas.lib.Sink ;
-import org.openjena.fuseki.server.FusekiConfig ;
-import org.openjena.fuseki.server.SPARQLServer ;
-import org.openjena.fuseki.server.DatasetRef ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotLoader ;
import org.openjena.riot.lang.SinkQuadsToDataset ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiConfigException.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiConfigException.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiConfigException.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiConfigException.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiConfigException.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiConfigException.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiConfigException.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
public class FusekiConfigException extends FusekiException
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiException.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiException.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiException.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiException.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiException.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiException.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiException.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
import com.hp.hpl.jena.sparql.ARQException ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiLib.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiLib.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiLib.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiLib.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiLib.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
import java.util.HashMap ;
import java.util.Map ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiNotFoundException.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiNotFoundException.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiNotFoundException.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiNotFoundException.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
-import org.openjena.fuseki.http.HttpSC ;
+import org.apache.jena.fuseki.http.HttpSC ;
public class FusekiNotFoundException extends FusekiRequestException
{
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiRequestException.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiRequestException.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiRequestException.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiRequestException.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
-import org.openjena.fuseki.http.HttpSC ;
+import org.apache.jena.fuseki.http.HttpSC ;
public class FusekiRequestException extends FusekiException
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/HttpNames.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/HttpNames.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/HttpNames.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/HttpNames.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/HttpNames.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/HttpNames.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/HttpNames.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
public class HttpNames
{
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Test.java (from r1226937, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Test.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Test.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Test.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Test.java&r1=1226937&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/Test.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/Test.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki;
+package org.apache.jena.fuseki;
public class Test
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/AcceptList.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import java.util.ArrayList ;
import java.util.Arrays ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
-import static org.openjena.fuseki.HttpNames.hAcceptCharset ;
+import static org.apache.jena.fuseki.HttpNames.hAcceptCharset ;
import javax.servlet.http.HttpServletRequest ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaRange.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaRange.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaRange.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaRange.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import org.openjena.atlas.logging.Log ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaType.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaType.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaType.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/MediaType.java Wed Jan 11 20:02:50 2012
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import java.util.Iterator ;
import java.util.LinkedHashMap ;
import java.util.Map ;
import static org.openjena.atlas.lib.Lib.* ;
-import org.openjena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.HttpNames ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedInputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedInputStream.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedInputStream.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedInputStream.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import java.io.FilterInputStream ;
import java.io.InputStream;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedOutputStream.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedOutputStream.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedOutputStream.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import java.io.FilterOutputStream ;
import java.io.OutputStream ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedStream.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedStream.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/TypedStream.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import java.io.InputStream;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/conneg/WebLib.java Wed Jan 11 20:02:50 2012
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.openjena.fuseki.conneg;
+package org.apache.jena.fuseki.conneg;
import java.util.Enumeration ;
import javax.servlet.http.HttpServletRequest ;
-import org.openjena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.HttpNames ;
public class WebLib
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetAdapter.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki.http;
+package org.apache.jena.fuseki.http;
-import org.openjena.fuseki.DatasetAccessor ;
+import org.apache.jena.fuseki.DatasetAccessor ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessor.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.http;
+package org.apache.jena.fuseki.http;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorBasic.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.http;
+package org.apache.jena.fuseki.http;
import com.hp.hpl.jena.graph.Graph ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.http;
+package org.apache.jena.fuseki.http;
import java.io.ByteArrayInputStream ;
import java.io.ByteArrayOutputStream ;
@@ -36,12 +36,12 @@ import org.apache.http.params.HttpConnec
import org.apache.http.params.HttpParams ;
import org.apache.http.params.HttpProtocolParams ;
import org.apache.http.protocol.HTTP ;
+import org.apache.jena.fuseki.* ;
+import org.apache.jena.fuseki.conneg.TypedInputStream ;
+import org.apache.jena.fuseki.migrate.UnmodifiableGraph ;
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.lib.Sink ;
import org.openjena.atlas.logging.Log ;
-import org.openjena.fuseki.* ;
-import org.openjena.fuseki.conneg.TypedInputStream ;
-import org.openjena.fuseki.migrate.UnmodifiableGraph ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.WebContent ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/HttpSC.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/HttpSC.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/HttpSC.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/HttpSC.java Wed Jan 11 20:02:50 2012
@@ -34,7 +34,7 @@
* I found the naming which includes the number, more useful than the standard constants.
*/
-package org.openjena.fuseki.http;
+package org.apache.jena.fuseki.http;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/UpdateRemote.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/UpdateRemote.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/UpdateRemote.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/http/UpdateRemote.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.http;
+package org.apache.jena.fuseki.http;
import java.io.ByteArrayOutputStream ;
import java.io.IOException ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ActionDataset.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.mgt;
+package org.apache.jena.fuseki.mgt;
import java.io.IOException ;
import java.io.UnsupportedEncodingException ;
@@ -29,9 +29,9 @@ import javax.servlet.http.HttpServletRes
import javax.servlet.http.HttpSession ;
import org.apache.commons.codec.binary.Base64 ;
-import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.http.HttpSC ;
-import org.openjena.fuseki.server.DatasetRegistry ;
+import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.fuseki.server.DatasetRegistry ;
/** Log-in and choose dataset */
public class ActionDataset extends HttpServlet
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java Wed Jan 11 20:02:50 2012
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-package org.openjena.fuseki.mgt;
+package org.apache.jena.fuseki.mgt;
import java.util.Iterator ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpSession ;
+import org.apache.jena.fuseki.server.DatasetRef ;
+import org.apache.jena.fuseki.server.DatasetRegistry ;
import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.fuseki.server.DatasetRegistry ;
-import org.openjena.fuseki.server.DatasetRef ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.mgt;
+package org.apache.jena.fuseki.mgt;
public class PageNames
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphErrorHandler.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphErrorHandler.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphErrorHandler.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java Wed Jan 11 20:02:50 2012
@@ -17,12 +17,12 @@
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import java.io.InputStream ;
+import org.apache.jena.fuseki.Fuseki ;
import org.openjena.atlas.lib.Sink ;
-import org.openjena.fuseki.Fuseki ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.RiotReader ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingBulkUpdateHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingBulkUpdateHandler.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingBulkUpdateHandler.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingBulkUpdateHandler.java Wed Jan 11 20:02:50 2012
@@ -17,7 +17,7 @@
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import java.util.Iterator;
import java.util.List;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingGraph.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingGraph.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/LimitingGraph.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import com.hp.hpl.jena.graph.BulkUpdateHandler;
import com.hp.hpl.jena.graph.Graph;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/Registry.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/Registry.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/Registry.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/Registry.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import java.util.HashMap ;
import java.util.Iterator ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import org.openjena.atlas.lib.Sink ;
import org.openjena.atlas.lib.SinkWrapper ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/UnmodifiableGraph.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Triple ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.migrate;
+package org.apache.jena.fuseki.migrate;
import java.io.IOException ;
import java.io.InputStream ;
@@ -27,8 +27,8 @@ import org.apache.http.client.HttpClient
import org.apache.http.client.methods.HttpGet ;
import org.apache.http.client.methods.HttpUriRequest ;
import org.apache.http.impl.client.DefaultHttpClient ;
+import org.apache.jena.fuseki.FusekiRequestException ;
import org.openjena.atlas.io.IO ;
-import org.openjena.fuseki.FusekiRequestException ;
public class WebIO
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
import java.util.ArrayList ;
import java.util.List ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRegistry.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRegistry.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRegistry.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/DatasetRegistry.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
-import org.openjena.fuseki.migrate.Registry ;
+import org.apache.jena.fuseki.migrate.Registry ;
public class DatasetRegistry extends Registry<DatasetRef>
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FileUpload.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FileUpload.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FileUpload.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FileUpload.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
import java.io.IOException ;
import java.io.InputStream ;
@@ -29,8 +29,8 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.FileItemStream ;
import org.apache.commons.fileupload.servlet.ServletFileUpload ;
import org.apache.commons.fileupload.util.Streams ;
+import org.apache.jena.fuseki.http.HttpSC ;
import org.openjena.atlas.lib.Sink ;
-import org.openjena.fuseki.http.HttpSC ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.out.SinkTripleOutput ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java Wed Jan 11 20:02:50 2012
@@ -16,18 +16,18 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
import java.lang.reflect.Method ;
import java.util.ArrayList ;
import java.util.List ;
+import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiConfigException ;
+import org.apache.jena.fuseki.HttpNames ;
import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.lib.StrUtils ;
import org.openjena.atlas.logging.Log ;
-import org.openjena.fuseki.Fuseki ;
-import org.openjena.fuseki.FusekiConfigException ;
-import org.openjena.fuseki.HttpNames ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.assembler.Assembler ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiErrorHandler.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
import static java.lang.String.format ;
@@ -30,14 +30,14 @@ import java.io.Writer ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.http.HttpSC ;
import org.eclipse.jetty.http.HttpHeaders ;
import org.eclipse.jetty.http.HttpMethods ;
import org.eclipse.jetty.http.MimeTypes ;
import org.eclipse.jetty.server.HttpConnection ;
import org.eclipse.jetty.server.Request ;
import org.eclipse.jetty.server.handler.ErrorHandler ;
-import org.openjena.fuseki.Fuseki ;
-import org.openjena.fuseki.http.HttpSC ;
public class FusekiErrorHandler extends ErrorHandler
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java?rev=1230214&r1=1226937&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
-import org.openjena.fuseki.FusekiException ;
+import org.apache.jena.fuseki.FusekiException ;
import org.openjena.riot.system.IRIResolver ;
import com.hp.hpl.jena.iri.IRI ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (from r1230178, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java&r1=1230178&r2=1230214&rev=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Wed Jan 11 20:02:50 2012
@@ -16,16 +16,24 @@
* limitations under the License.
*/
-package org.openjena.fuseki.server;
+package org.apache.jena.fuseki.server;
import static java.lang.String.format ;
-import static org.openjena.fuseki.Fuseki.serverLog ;
+import static org.apache.jena.fuseki.Fuseki.serverLog ;
import java.io.FileInputStream ;
import java.util.List ;
import javax.servlet.http.HttpServlet ;
+import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.fuseki.mgt.ActionDataset ;
+import org.apache.jena.fuseki.servlets.* ;
+import org.apache.jena.fuseki.validation.DataValidator ;
+import org.apache.jena.fuseki.validation.IRIValidator ;
+import org.apache.jena.fuseki.validation.QueryValidator ;
+import org.apache.jena.fuseki.validation.UpdateValidator ;
import org.eclipse.jetty.http.MimeTypes ;
import org.eclipse.jetty.server.Connector ;
import org.eclipse.jetty.server.Server ;
@@ -34,21 +42,6 @@ import org.eclipse.jetty.servlet.Default
import org.eclipse.jetty.servlet.ServletContextHandler ;
import org.eclipse.jetty.servlet.ServletHolder ;
import org.eclipse.jetty.xml.XmlConfiguration ;
-import org.openjena.fuseki.Fuseki ;
-import org.openjena.fuseki.FusekiException ;
-import org.openjena.fuseki.mgt.ActionDataset ;
-import org.openjena.fuseki.servlets.DumpServlet ;
-import org.openjena.fuseki.servlets.SPARQL_QueryDataset ;
-import org.openjena.fuseki.servlets.SPARQL_QueryGeneral ;
-import org.openjena.fuseki.servlets.SPARQL_REST_R ;
-import org.openjena.fuseki.servlets.SPARQL_REST_RW ;
-import org.openjena.fuseki.servlets.SPARQL_Update ;
-import org.openjena.fuseki.servlets.SPARQL_Upload ;
-import org.openjena.fuseki.servlets.ServerServlet ;
-import org.openjena.fuseki.validation.DataValidator ;
-import org.openjena.fuseki.validation.IRIValidator ;
-import org.openjena.fuseki.validation.QueryValidator ;
-import org.openjena.fuseki.validation.UpdateValidator ;
import org.openjena.riot.WebContent ;
import com.hp.hpl.jena.sparql.util.Utils ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ActionErrorException.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ActionErrorException.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ActionErrorException.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ActionErrorException.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
class ActionErrorException extends RuntimeException
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ConcurrencyPolicyMRSW.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ConcurrencyPolicyMRSW.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ConcurrencyPolicyMRSW.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ConcurrencyPolicyMRSW.java Wed Jan 11 20:02:50 2012
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.util.ConcurrentModificationException ;
import java.util.concurrent.atomic.AtomicLong ;
-import org.openjena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.Fuseki ;
import org.slf4j.Logger ;
public final class ConcurrencyPolicyMRSW
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/DumpServlet.java Wed Jan 11 20:02:50 2012
@@ -20,7 +20,7 @@
*/
// Could be neater - much, much neater!
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.io.BufferedReader ;
import java.io.IOException ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.util.HashMap ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.io.IOException ;
import java.util.HashMap ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/NullOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/NullOutputStream.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/NullOutputStream.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/NullOutputStream.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.io.* ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseCallback.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets ;
+package org.apache.jena.fuseki.servlets ;
public interface ResponseCallback
{
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Wed Jan 11 20:02:50 2012
@@ -16,19 +16,19 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.openjena.fuseki.DEF ;
-import org.openjena.fuseki.Fuseki ;
-import org.openjena.fuseki.FusekiLib ;
-import org.openjena.fuseki.conneg.ConNeg ;
-import org.openjena.fuseki.conneg.MediaType ;
-import org.openjena.fuseki.conneg.TypedInputStream ;
-import org.openjena.fuseki.conneg.WebLib ;
-import org.openjena.fuseki.http.HttpSC ;
+import org.apache.jena.fuseki.DEF ;
+import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.fuseki.conneg.ConNeg ;
+import org.apache.jena.fuseki.conneg.MediaType ;
+import org.apache.jena.fuseki.conneg.TypedInputStream ;
+import org.apache.jena.fuseki.conneg.WebLib ;
+import org.apache.jena.fuseki.http.HttpSC ;
import org.openjena.riot.Lang ;
import org.openjena.riot.WebContent ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseOps.java Wed Jan 11 20:02:50 2012
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.io.IOException ;
import javax.servlet.http.HttpServletRequest ;
-import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.conneg.WebLib ;
+import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.conneg.WebLib ;
import org.openjena.riot.WebContent ;
public class ResponseOps
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import java.io.IOException ;
@@ -24,12 +24,12 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.openjena.fuseki.DEF ;
-import org.openjena.fuseki.FusekiException ;
-import org.openjena.fuseki.conneg.AcceptList ;
-import org.openjena.fuseki.conneg.ConNeg ;
-import org.openjena.fuseki.conneg.MediaType ;
-import org.openjena.fuseki.http.HttpSC ;
+import org.apache.jena.fuseki.DEF ;
+import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.fuseki.conneg.AcceptList ;
+import org.apache.jena.fuseki.conneg.ConNeg ;
+import org.apache.jena.fuseki.conneg.MediaType ;
+import org.apache.jena.fuseki.http.HttpSC ;
import org.openjena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java Wed Jan 11 20:02:50 2012
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
-import static org.openjena.fuseki.HttpNames.paramDefaultGraphURI ;
-import static org.openjena.fuseki.HttpNames.paramNamedGraphURI ;
+import static org.apache.jena.fuseki.HttpNames.paramDefaultGraphURI ;
+import static org.apache.jena.fuseki.HttpNames.paramNamedGraphURI ;
import java.util.Arrays ;
import java.util.Collections ;
@@ -28,10 +28,10 @@ import java.util.List ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.fuseki.servlets.SPARQL_Query.HttpActionQuery ;
import org.openjena.atlas.iterator.Filter ;
import org.openjena.atlas.iterator.Iter ;
import org.openjena.atlas.lib.Lib ;
-import org.openjena.fuseki.servlets.SPARQL_Query.HttpActionQuery ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryParseException ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Wed Jan 11 20:02:50 2012
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.HttpNames.* ;
+import static org.apache.jena.fuseki.HttpNames.* ;
import java.io.IOException ;
import java.io.InputStream ;
@@ -31,12 +31,12 @@ import java.util.Set ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.http.HttpSC ;
+import org.apache.jena.fuseki.migrate.WebIO ;
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.fuseki.FusekiLib ;
-import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.http.HttpSC ;
-import org.openjena.fuseki.migrate.WebIO ;
import org.openjena.riot.ContentType ;
import org.openjena.riot.WebContent ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryDataset.java Wed Jan 11 20:02:50 2012
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.openjena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.HttpNames ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import static java.lang.String.format ;
@@ -25,8 +25,8 @@ import java.util.List ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.fuseki.migrate.GraphLoadUtils ;
import org.openjena.atlas.lib.InternalErrorException ;
-import org.openjena.fuseki.migrate.GraphLoadUtils ;
import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.query.Dataset ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Wed Jan 11 20:02:50 2012
@@ -16,18 +16,18 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import static java.lang.String.format ;
-import static org.openjena.fuseki.HttpNames.HEADER_LASTMOD ;
-import static org.openjena.fuseki.HttpNames.METHOD_DELETE ;
-import static org.openjena.fuseki.HttpNames.METHOD_GET ;
-import static org.openjena.fuseki.HttpNames.METHOD_HEAD ;
-import static org.openjena.fuseki.HttpNames.METHOD_OPTIONS ;
-import static org.openjena.fuseki.HttpNames.METHOD_PATCH ;
-import static org.openjena.fuseki.HttpNames.METHOD_POST ;
-import static org.openjena.fuseki.HttpNames.METHOD_PUT ;
-import static org.openjena.fuseki.HttpNames.METHOD_TRACE ;
+import static org.apache.jena.fuseki.HttpNames.HEADER_LASTMOD ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_DELETE ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_GET ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_HEAD ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_OPTIONS ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_PATCH ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_POST ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_PUT ;
+import static org.apache.jena.fuseki.HttpNames.METHOD_TRACE ;
import java.io.ByteArrayInputStream ;
import java.io.IOException ;
@@ -38,12 +38,12 @@ import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.fuseki.DEF ;
+import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.conneg.ConNeg ;
+import org.apache.jena.fuseki.conneg.MediaType ;
import org.openjena.atlas.lib.Sink ;
-import org.openjena.fuseki.DEF ;
-import org.openjena.fuseki.FusekiLib ;
-import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.conneg.ConNeg ;
-import org.openjena.fuseki.conneg.MediaType ;
import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.lang.SinkTriplesToGraph ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Wed Jan 11 20:02:50 2012
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
import static java.lang.String.format ;
@@ -24,10 +24,10 @@ import java.io.IOException ;
import javax.servlet.ServletOutputStream ;
-import org.openjena.fuseki.FusekiLib ;
-import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.conneg.MediaType ;
-import org.openjena.fuseki.conneg.TypedOutputStream ;
+import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.conneg.MediaType ;
+import org.apache.jena.fuseki.conneg.TypedOutputStream ;
import org.openjena.riot.Lang ;
import com.hp.hpl.jena.rdf.model.Model ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java?rev=1230214&r1=1230178&r2=1230214&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_RW.java Wed Jan 11 20:02:50 2012
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.openjena.fuseki.servlets;
+package org.apache.jena.fuseki.servlets;
-import org.openjena.fuseki.HttpNames ;
+import org.apache.jena.fuseki.HttpNames ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;