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/02/21 18:47:01 UTC
svn commit: r1570644 - in /jena/branches/jena-fuseki-new-ui: ./
src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/mgt/
src/main/java/org/apache/jena/fuseki/server/ src/main/resources/
Author: andy
Date: Fri Feb 21 17:47:01 2014
New Revision: 1570644
URL: http://svn.apache.org/r1570644
Log:
Adjust for WAR usage
Added:
jena/branches/jena-fuseki-new-ui/src/main/resources/log4j.properties
Modified:
jena/branches/jena-fuseki-new-ui/pom-war.xml
jena/branches/jena-fuseki-new-ui/pom.xml
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
Modified: jena/branches/jena-fuseki-new-ui/pom-war.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pom-war.xml?rev=1570644&r1=1570643&r2=1570644&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pom-war.xml (original)
+++ jena/branches/jena-fuseki-new-ui/pom-war.xml Fri Feb 21 17:47:01 2014
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.jena</groupId>
<artifactId>jena-parent</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>9-SNAPSHOT</version>
<relativePath>../jena-parent</relativePath>
</parent>
@@ -65,88 +65,30 @@
<properties>
<this.root>${project.artifactId}-${project.version}</this.root>
- <ver.fuseki>1.0.1-SNAPSHOT</ver.fuseki>
- <ver.jetty>8.1.11.v20130520</ver.jetty>
+
</properties>
<dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>2.11.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>2.11.1-SNAPSHOT</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-core</artifactId>
- <version>2.11.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-tdb</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <artifactId>jena-libs</artifactId>
+ <version>2.11.2-SNAPSHOT</version>
+ <classifier>pom</classifier>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-text</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-spatial</artifactId>
- <version>1.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- <version>4.11</version>
+ <version>1.0.2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${ver.httpclient}</version>
- <exclusions>
- <!-- Replace with slf4j adapter -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.2.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-webapp</artifactId>
- <version>${ver.jetty}</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${ver.jetty}</version>
- </dependency>
-
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${ver.slf4j}</version>
@@ -162,35 +104,14 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>${ver.slf4j}</version>
</dependency>
<!-- Needed because the Fuseki test suite resets logging levels -->
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>${ver.log4j}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
</dependency>
-
</dependencies>
<build>
@@ -199,46 +120,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <optimize>true</optimize>
- <debug>true</debug>
- <debuglevel>source,lines,vars</debuglevel>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <includes>
- <include>**/TS_*.java</include>
- </includes>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <configuration>
- <overWriteReleases>false</overWriteReleases>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.5</version>
<configuration>
@@ -252,30 +133,8 @@
<version>2.4</version>
<configuration>
<webXml>war-web.xml</webXml>
- <!--
- When using the Fuseki build of a standalone server,
- miss out the embedded jetty server, and the servlet API
- jar (2 names possible).
- Later - refactor the Fuseki build.
- -->
- <packagingExcludes>WEB-INF/lib/servlet-api*.jar,WEB-INF/lib/javax.servlet*.jar,WEB-INF/lib/jetty-*.jar</packagingExcludes>
- </configuration>
-
- </plugin>
-
- <!-- Run the application using "mvn jetty:run" -->
- <!-- org.eclipse at v9 -->
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>${ver.jetty}</version>
- <!--
- <configuration>
- <webApp>
- <contextPath>/FUSEKI</contextPath>
- </webApp>
+ <packagingExcludes>WEB-INF/lib/jetty-*,WEB-INF/lib/javax.servlet*</packagingExcludes>
</configuration>
- -->
</plugin>
</plugins>
Modified: jena/branches/jena-fuseki-new-ui/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pom.xml?rev=1570644&r1=1570643&r2=1570644&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pom.xml (original)
+++ jena/branches/jena-fuseki-new-ui/pom.xml Fri Feb 21 17:47:01 2014
@@ -275,6 +275,7 @@
</executions>
</plugin>
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -288,7 +289,8 @@
<bottom>Licenced under the Apache License, Version 2.0</bottom>
</configuration>
</plugin>
-
+ -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
@@ -301,7 +303,6 @@
</executions>
</plugin>
-
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -382,6 +383,8 @@
<!-- Exclude jetty! -->
+ <packagingExcludes>WEB-INF/lib/jetty-*,WEB-INF/lib/javax.servlet*</packagingExcludes>
+
<webResources>
<resource>
<directory>pages</directory>
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1570644&r1=1570643&r2=1570644&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Fri Feb 21 17:47:01 2014
@@ -19,12 +19,12 @@
package org.apache.jena.fuseki ;
import java.io.File ;
+import java.net.URL ;
import java.util.List ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.atlas.lib.StrUtils ;
-import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.fuseki.build.Template ;
import org.apache.jena.fuseki.server.FusekiServletContextListener ;
import org.apache.jena.fuseki.server.SPARQLServer ;
@@ -34,6 +34,8 @@ import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.SysRIOT ;
+import org.apache.log4j.PropertyConfigurator ;
+import org.apache.log4j.helpers.Loader ;
import org.slf4j.Logger ;
import arq.cmd.CmdException ;
import arq.cmdline.ArgDecl ;
@@ -90,7 +92,7 @@ public class FusekiCmd extends CmdARQ {
// 2/ Use file:log4j.properties
// 3/ Use Built in.
- static void setLogging() {
+ public static void setLogging() {
// No loggers have been created but configuration may have been set up.
String x = System.getProperty("log4j.configuration", null) ;
@@ -100,16 +102,34 @@ public class FusekiCmd extends CmdARQ {
return ;
}
- String fn = "log4j.properties" ;
- File f = new File(fn) ;
- if ( f.exists() ) {
- System.out.println("File") ;
- // Use file log4j.properties
- System.setProperty("log4j.configuration", "file:" + fn) ;
- return ;
- }
+ // Look for a log4j.properties in the current working directory for easy customization.
+ try {
+ String fn = "log4j.properties" ;
+ File f = new File(fn) ;
+ if ( f.exists() ) {
+ System.out.println("File") ;
+ // Use file log4j.properties
+ System.setProperty("log4j.configuration", "file:" + fn) ;
+ return ;
+ }
+ } catch (Throwable th) {}
+
+ // CmdMain will have set logging.
+
// Use built-in for Fuseki.
- LogCtl.resetLogging(log4Jsetup) ;
+
+ // The log4j general is initialization done in a class static in LogManager
+ // so it can't be called again in any sensible manner. Instead, we include
+ // the same mechanism ...
+ try {
+ URL url = Loader.getResource("log4j.properties") ;
+ PropertyConfigurator.configure(url);
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ }
+
+ // Alt: set wheer from the java-based string.
+ //LogCtl.resetLogging(log4Jsetup) ;
}
static {
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java?rev=1570644&r1=1570643&r2=1570644&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java Fri Feb 21 17:47:01 2014
@@ -82,17 +82,19 @@ public class ActionDescription extends A
if ( builtDateStr == null )
builtDateStr = "Unknown" ;
- builder
- .key(JsonConst.server)
- .startObject()
- .key(JsonConst.port).value(SPARQLServer.instance.getServerPort())
- .finishObject() ;
- builder
- .key(JsonConst.admin)
- .startObject()
- //.key(JsonConst.hostname).value(req.getLocalName())
- .key(JsonConst.port).value(SPARQLServer.instance.getMgtPort())
- .finishObject() ;
+ if ( SPARQLServer.instance != null ) {
+ builder
+ .key(JsonConst.server)
+ .startObject()
+ .key(JsonConst.port).value(SPARQLServer.instance.getServerPort())
+ .finishObject() ;
+ builder
+ .key(JsonConst.admin)
+ .startObject()
+ //.key(JsonConst.hostname).value(req.getLocalName())
+ .key(JsonConst.port).value(SPARQLServer.instance.getMgtPort())
+ .finishObject() ;
+ }
builder
.key(JsonConst.version).value(versionStr)
.key(JsonConst.built).value(builtDateStr) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java?rev=1570644&r1=1570643&r2=1570644&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java Fri Feb 21 17:47:01 2014
@@ -28,7 +28,6 @@ import org.apache.jena.atlas.lib.DS ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.FusekiConfigException ;
import org.apache.jena.fuseki.build.Builder ;
import org.apache.jena.fuseki.build.FusekiConfig ;
import org.apache.jena.fuseki.build.Template ;
Added: jena/branches/jena-fuseki-new-ui/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/resources/log4j.properties?rev=1570644&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/resources/log4j.properties (added)
+++ jena/branches/jena-fuseki-new-ui/src/main/resources/log4j.properties Fri Feb 21 17:47:01 2014
@@ -0,0 +1,28 @@
+## Plain output to stdout
+log4j.appender.jena.plainstdout=org.apache.log4j.ConsoleAppender
+log4j.appender.jena.plainstdout.target=System.out
+log4j.appender.jena.plainstdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.jena.plainstdout.layout.ConversionPattern=%d{HH:mm:ss} %-10c{1} %-5p %m%n
+## Plain output to stderr
+log4j.appender.jena.plainstderr=org.apache.log4j.ConsoleAppender
+log4j.appender.jena.plainstderr.target=System.err
+log4j.appender.jena.plainstderr.layout=org.apache.log4j.PatternLayout
+log4j.appender.jena.plainstderr.layout.ConversionPattern=%d{HH:mm:ss} %-10c{1} %-5p %m%n
+## Everything
+log4j.rootLogger=INFO, jena.plainstdout
+log4j.logger.com.hp.hpl.jena=WARN
+log4j.logger.org.openjena=WARN
+log4j.logger.org.apache.jena=WARN
+log4j.logger.org.apache.jena=WARN
+# System logs.
+log4j.logger.org.apache.jena.fuseki.Server=INFO
+log4j.logger.org.apache.jena.fuseki.Fuseki=INFO
+log4j.logger.org.apache.jena.fuseki.Admin=INFO
+log4j.logger.org.apache.jena.fuseki.Validate=INFO
+log4j.logger.org.apache.jena.fuseki.Config=INFO
+log4j.logger.org.apache.jena.tdb.loader=INFO
+log4j.logger.org.eclipse.jetty=WARN
+log4j.logger.org.apache.shiro=WARN
+## Parser output
+log4j.additivityorg.apache.jena.riot=false
+log4j.logger.org.apache.jena.riot=INFO, jena.plainstdout