Subversion Repositories aduna

Compare Revisions

Rev 10940 → Rev 10943

branches/2.3/core/http/workbench/src/main/java/org/openrdf/workbench/proxy/WorkbenchGateway.java
25,7 → 25,6
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
 
import org.openrdf.Sesame;
import org.openrdf.workbench.base.BaseServlet;
import org.openrdf.workbench.exceptions.MissingInitParameterException;
import org.openrdf.workbench.util.BasicServletConfig;
33,9 → 32,6
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
 
import info.aduna.app.AppConfiguration;
import info.aduna.app.AppVersion;
 
public class WorkbenchGateway extends BaseServlet {
 
private static final String COOKIE_AGE_PARAM = "cookie-max-age";
54,21 → 50,11
 
private final Map<String, WorkbenchServlet> servlets = new ConcurrentHashMap<String, WorkbenchServlet>();
 
private static final AppVersion VERSION = AppVersion.parse(Sesame.getVersion());
 
private final AppConfiguration appConfig = new AppConfiguration("OpenRDF Workbench", "OpenRDF Workbench", VERSION);
 
@Override
public void init(ServletConfig config)
throws ServletException
{
super.init(config);
try {
appConfig.init();
}
catch (IOException e) {
throw new ServletException(e);
}
if (getDefaultServerPath() == null)
throw new MissingInitParameterException(DEFAULT_SERVER_PARAM);
if (config.getInitParameter(TRANSFORMATIONS_PARAM) == null)
branches/2.3/core/http/workbench/src/main/webapp/WEB-INF/classes/logback.xml File deleted
branches/2.3/core/http/workbench/pom.xml
35,6 → 35,16
<groupId>org.openrdf.sesame</groupId>
<artifactId>sesame-console</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
<exclusion>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</exclusion>
</exclusions>
</dependency>
 
<dependency>
58,6 → 68,11
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
</dependency>