diff --git a/src/main/java/bdv/server/BigDataServer.java b/src/main/java/bdv/server/BigDataServer.java index 07e480bca0c847f479f0be368e88ed7c20b2f7ff..dd6dbd58c957fd8a841aae728f48021c83402d58 100644 --- a/src/main/java/bdv/server/BigDataServer.java +++ b/src/main/java/bdv/server/BigDataServer.java @@ -256,6 +256,9 @@ public class BigDataServer private static void tryAddDataset( final HashMap< String, String > datasetNameToXML, final String name, final String xmlpath ) throws IllegalArgumentException { + for ( final String reserved : Constants.RESERVED_CONTEXT_NAMES ) + if ( name.equals( reserved ) ) + throw new IllegalArgumentException( "Cannot use dataset name: \"" + name + "\" (reserved for internal use)." ); if ( datasetNameToXML.containsKey( name ) ) throw new IllegalArgumentException( "Duplicate dataset name: \"" + name + "\"" ); if ( Files.notExists( Paths.get( xmlpath ) ) ) diff --git a/src/main/java/bdv/server/Constants.java b/src/main/java/bdv/server/Constants.java new file mode 100644 index 0000000000000000000000000000000000000000..8b59187bc0ade5bf376cafcc61e957934bd789c9 --- /dev/null +++ b/src/main/java/bdv/server/Constants.java @@ -0,0 +1,14 @@ +package bdv.server; + +public class Constants +{ + public static final String DATASETLIST_CONTEXT_NAME = "json"; + + public static final String MANAGER_CONTEXT_NAME = "manager"; + + public static final String[] RESERVED_CONTEXT_NAMES = new String[] + { + DATASETLIST_CONTEXT_NAME, + MANAGER_CONTEXT_NAME + }; +} diff --git a/src/main/java/bdv/server/JsonHandler.java b/src/main/java/bdv/server/JsonHandler.java index d356ce2e35adfc9eae3ee4aeebf9a975610047d6..33f9c45cc32d896f6f9abc54101010b9b652a435 100644 --- a/src/main/java/bdv/server/JsonHandler.java +++ b/src/main/java/bdv/server/JsonHandler.java @@ -25,7 +25,7 @@ public class JsonHandler extends ContextHandler public JsonHandler( final Server server, final ContextHandlerCollection handlers ) throws IOException, URISyntaxException { this.server = server; - setContextPath( "/json" ); + setContextPath( "/" + Constants.DATASETLIST_CONTEXT_NAME ); } @Override diff --git a/src/main/java/bdv/server/ManagerHandler.java b/src/main/java/bdv/server/ManagerHandler.java index a50ecad5d00e95588005627eec84665f2972fcb6..ef23e507a0e1545577fbef48fb6bcefef4964747 100644 --- a/src/main/java/bdv/server/ManagerHandler.java +++ b/src/main/java/bdv/server/ManagerHandler.java @@ -1,6 +1,7 @@ package bdv.server; import mpicbg.spim.data.SpimDataException; + import org.antlr.stringtemplate.StringTemplate; import org.antlr.stringtemplate.StringTemplateGroup; import org.eclipse.jetty.server.ConnectorStatistics; @@ -15,6 +16,7 @@ import org.eclipse.jetty.util.log.Log; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + import java.io.File; import java.io.IOException; import java.io.PrintWriter; @@ -48,7 +50,7 @@ public class ManagerHandler extends ContextHandler this.handlers = handlers; this.statHandler = statHandler; this.connectorStats = connectorStats; - setContextPath( "/manager" ); + setContextPath( "/" + Constants.MANAGER_CONTEXT_NAME ); } @Override