jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1571040 - in /jena/branches/jena-fuseki-new-ui: ./ pages/ src/main/java/org/apache/jena/fuseki/build/ src/main/java/org/apache/jena/fuseki/jetty/ src/main/java/org/apache/jena/fuseki/server/ src/main/webapp/ src/main/webapp/WEB-INF/
Date Sun, 23 Feb 2014 18:02:27 GMT
Author: andy
Date: Sun Feb 23 18:02:27 2014
New Revision: 1571040

URL: http://svn.apache.org/r1571040
Log:
Convert webapp resources to std layout

Added:
    jena/branches/jena-fuseki-new-ui/src/main/webapp/
      - copied from r1570292, jena/branches/jena-fuseki-new-ui/pages/
    jena/branches/jena-fuseki-new-ui/src/main/webapp/WEB-INF/
    jena/branches/jena-fuseki-new-ui/src/main/webapp/WEB-INF/web.xml
      - copied unchanged from r1570292, jena/branches/jena-fuseki-new-ui/war-web.xml
Removed:
    jena/branches/jena-fuseki-new-ui/pages/
    jena/branches/jena-fuseki-new-ui/war-web.xml
Modified:
    jena/branches/jena-fuseki-new-ui/pom.xml
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/jetty/SPARQLServer.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java

Modified: jena/branches/jena-fuseki-new-ui/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pom.xml?rev=1571040&r1=1571039&r2=1571040&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pom.xml (original)
+++ jena/branches/jena-fuseki-new-ui/pom.xml Sun Feb 23 18:02:27 2014
@@ -390,17 +390,19 @@
 	    <nonFilteredFileExtension>jsp</nonFilteredFileExtension>
 	  </nonFilteredFileExtensions>
 
-	  <webXml>war-web.xml</webXml>
+	  <!--<webXml>war-web.xml</webXml>-->
 
 	  <!-- Exclude jetty! -->
 
           <packagingExcludes>WEB-INF/lib/jetty-*,WEB-INF/lib/javax.servlet*</packagingExcludes>
 
+	  <!--
 	  <webResources>
 	    <resource>
 	      <directory>pages</directory>
 	    </resource>
 	  </webResources>
+	  -->
 	</configuration>
       </plugin>
 

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java?rev=1571040&r1=1571039&r2=1571040&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
(original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
Sun Feb 23 18:02:27 2014
@@ -120,8 +120,10 @@ public class FusekiConfig {
         // Old style configuration file : server to services.
         // ---- Services
         ResultSet rs = FusekiLib.query("SELECT * { ?s fu:services [ list:member ?member ]
}", model) ;
-        if ( !rs.hasNext() )
-            log.warn("No services found") ;
+        // If the old config.ttl file becomes just the server configuration file,
+        // then don't warn here.
+//        if ( !rs.hasNext() )
+//            log.warn("No services found") ;
 
         List<DataAccessPoint> accessPoints = new ArrayList<>() ;
 

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/jetty/SPARQLServer.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/jetty/SPARQLServer.java?rev=1571040&r1=1571039&r2=1571040&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/jetty/SPARQLServer.java
(original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/jetty/SPARQLServer.java
Sun Feb 23 18:02:27 2014
@@ -62,16 +62,10 @@ public class SPARQLServer {
     // The jetty server.
     private Server              server         = null ;
     
-    // webapp setup.
-    public static final String descriptorFile = "war-web.xml" ;
-    public static final String resourceBase   = "pages" ;
+    // webapp setup - standard maven layout
     public static final String contextpath    = "/" ;
-    
-//    public static final String descriptorFile = "src/main/webapp/WEB-INF/web.xml" ;
-//    public static final String resourceBase   = "src/main/webapp" ;
-//    public static final String contextpath    = "/" ;
-    
-
+    public static final String descriptorFile = "src/main/webapp/WEB-INF/web.xml" ;
+    public static final String resourceBase   = "src/main/webapp" ;
 
     /**
      * Default setup which requires a {@link org.apache.jena.fuseki.jetty.JettyServerConfig}

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java?rev=1571040&r1=1571039&r2=1571040&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
(original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
Sun Feb 23 18:02:27 2014
@@ -18,6 +18,11 @@
 
 package org.apache.jena.fuseki.server;
 
+import java.io.File ;
+import java.io.IOException ;
+import java.nio.file.Path ;
+import java.nio.file.Paths ;
+
 import javax.servlet.ServletContext ;
 import javax.servlet.ServletContextEvent ;
 import javax.servlet.ServletContextListener ;
@@ -47,7 +52,16 @@ public class FusekiServletContextListene
     public void contextInitialized(ServletContextEvent sce) {
         confLog.info("contextInitialized");
         ServletContext servletContext = sce.getServletContext() ;
-        servletContext.log("") ;
+        String x = System.getProperty("user.dir") ;
+
+        Path currentRelativePath = Paths.get("");
+        String s = currentRelativePath.toAbsolutePath().toString();
+        //            File currentDirectory = new File(new File(".").getAbsolutePath());
+        //            System.out.println(currentDirectory.getCanonicalPath());
+        //            System.out.println(currentDirectory.getAbsolutePath());
+        servletContext.log("dir1 = "+x) ;
+        servletContext.log("dir2 = "+s) ;
+        confLog.info("dir1 = "+x+" : dir2 = "+s) ;
         init() ;
     }
 
@@ -78,5 +92,9 @@ public class FusekiServletContextListene
                 
         }
     }
+    
+    public static String chooseFusekiDirectory() {
+        return "" ;
+    }
 }
 



Mime
View raw message