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 2014/01/21 22:09:37 UTC
svn commit: r1560188 - in /jena/branches/jena-fuseki-new-ui:
src-dev/dev/PROJECT.java
src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
Author: andy
Date: Tue Jan 21 21:09:36 2014
New Revision: 1560188
URL: http://svn.apache.org/r1560188
Log:
Sync and tidy
Modified:
jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
Modified: jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java?rev=1560188&r1=1560187&r2=1560188&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java (original)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java Tue Jan 21 21:09:36 2014
@@ -19,6 +19,21 @@
package dev;
public class PROJECT {
+ // Backup
+
+ // Create dataset - check for existing.
+
+
+// Add DS1
+// Add DS2
+// Add symbolic link
+// Offline DS2
+//
+// ==>
+// check offlining works.
+// how do we manage assembler descriptions?
+// System database is only status + link to assembler?
+
// Naming
// fuseki:Service is the endpoints = dataset
// DataService :
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java?rev=1560188&r1=1560187&r2=1560188&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java Tue Jan 21 21:09:36 2014
@@ -285,9 +285,9 @@ public class ActionDatasets extends Acti
String template = null ;
try {
- if ( dbType.equals(tDatabasetTDB))
+ if ( dbType.equalsIgnoreCase(tDatabasetTDB))
template = FileUtils.readWholeFileAsUTF8(templateTDBFN) ;
- if ( dbType.equals(tDatabasetMem))
+ if ( dbType.equalsIgnoreCase(tDatabasetMem))
template = FileUtils.readWholeFileAsUTF8(templateMemFN) ;
} catch (IOException ex) { IO.exception(ex); }
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java?rev=1560188&r1=1560187&r2=1560188&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java Tue Jan 21 21:09:36 2014
@@ -37,7 +37,8 @@ public class DatasetRef implements Datas
public final String name ;
- // EITHER a link OR a dataset
+ // EITHER a link OR a dataset (if offline?)
+ // In-use?
private DatasetGraph dataset = null ;
private DatasetRef link = null ;
@@ -128,6 +129,11 @@ public class DatasetRef implements Datas
if ( getState() == UNINITIALIZED )
initServices() ;
setState(OFFLINE) ;
+
+ if ( dataset instanceof DatasetGraphTransaction )
+ StoreConnection.release( ((DatasetGraphTransaction)dataset).getLocation() ) ;
+ else
+ dataset.close() ;
}
@Override public String toString() { return "DatasetRef:'"+name+"'" ; }