jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1234082 - in /incubator/jena/Jena2/Fuseki/trunk: config_tdb.ttl src/main/java/org/apache/jena/fuseki/FusekiCmd.java src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
Date Fri, 20 Jan 2012 19:14:17 GMT
Author: andy
Date: Fri Jan 20 19:14:17 2012
New Revision: 1234082

URL: http://svn.apache.org/viewvc?rev=1234082&view=rev
Log:
Tidy up ; log some details on startup.

Modified:
    incubator/jena/Jena2/Fuseki/trunk/config_tdb.ttl
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
    incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java

Modified: incubator/jena/Jena2/Fuseki/trunk/config_tdb.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/config_tdb.ttl?rev=1234082&r1=1234081&r2=1234082&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/config_tdb.ttl (original)
+++ incubator/jena/Jena2/Fuseki/trunk/config_tdb.ttl Fri Jan 20 19:14:17 2012
@@ -45,5 +45,5 @@ tdb:GraphTDB    rdfs:subClassOf  ja:Mode
 ##     # Query timeout on this dataset (milliseconds)
 ##     ja:context [ ja:cxtName "arq:queryTimeout" ;  ja:cxtValue "1000" ] ;
 ##     # Default graph for query is the (read-only) union of all named graphs.
-##     tdb:unionDefaultGraph true ;
-     .
\ No newline at end of file
+    tdb:unionDefaultGraph true ;
+     .

Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1234082&r1=1234081&r2=1234082&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
(original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
Fri Jan 20 19:14:17 2012
@@ -278,8 +278,13 @@ public class FusekiCmd extends CmdARQ
     protected void exec()
     {
         SPARQLServer server ;
+        
+        if ( jettyConfigFile != null )
+            Fuseki.configLog.info("Jetty configuration: "+jettyConfigFile) ;
+        
         if ( fusekiConfigFile != null )
         {
+            Fuseki.configLog.info("Configuration file: "+fusekiConfigFile) ;
             List<DatasetRef> services = FusekiConfig.configure(fusekiConfigFile) ;
             server =  new SPARQLServer(jettyConfigFile, port, services) ;
         }

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=1234082&r1=1234081&r2=1234082&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
Fri Jan 20 19:14:17 2012
@@ -38,7 +38,6 @@ public class HttpAction
     private final Transactional transactional ;
     private DatasetGraph activeDSG ;
     
-    public final Lock lock ;
     public final HttpServletRequest request;
     public final HttpServletResponse response ;
     public final boolean verbose ;
@@ -63,11 +62,13 @@ public class HttpAction
     {
         this.id = id ;
         this.dsg = dsg ;
-        this.lock = ( dsg != null ) ? dsg.getLock() : null ;
+
         if ( dsg instanceof Transactional )
             transactional = (Transactional)dsg ;
         else
         {
+            // Non-trsanctional - wrap in something that does locking to give the same 
+            // functionality in the absense of errors, with less concurrency.
             DatasetGraphWithLock dsglock = new DatasetGraphWithLock(dsg) ; 
             transactional = dsglock ;
             dsg = dsglock ;
@@ -117,54 +118,6 @@ public class HttpAction
         activeDSG = null ;
     }
 
-//    public boolean isInTransaction()
-//    { return transactional.isInTransaction() ; }
-
-//    public final void beginRead()
-//    {
-//        transactional.begin(ReadWrite.READ) ;
-//        
-//        enter(dsg, lock, Lock.READ) ;               // ????
-//        getConcurrencyPolicy(lock).startRead() ;    // ????
-//        activeDSG = dsg ;
-//    }
-//
-//    public final void endRead()
-//    {
-//        transactional.end() ;
-//        leave(dsg, lock, Lock.READ) ;               // ????
-//        getConcurrencyPolicy(lock).finishRead() ;   // ????
-//        activeDSG = null ;
-//    }
-//
-//    public final void beginWrite()
-//    {
-//        if ( transactional != null )
-//            transactional.begin(ReadWrite.WRITE) ;
-//        else
-//        {
-//            enter(dsg, lock, Lock.WRITE) ;
-//            getConcurrencyPolicy(lock).startUpdate() ;
-//        }
-//        activeDSG = dsg ;
-//    }
-//
-//    public final void endWrite()
-//    {
-//        if ( transactional != null )
-//        {
-//            //XXX Wrong - what about abort?
-//            transactional.commit() ;
-//        }
-//        else
-//        {
-//            sync() ;
-//            getConcurrencyPolicy(lock).finishUpdate() ;
-//            leave(dsg, lock, Lock.WRITE) ;
-//        }
-//        activeDSG = null ;
-//    }
-
     public final DatasetGraph getActiveDSG()
     {
         return activeDSG ;



Mime
View raw message