Promoting new GUI resources into place; still hidden behind legacy redirect though.
Change-Id: If1f25cd7297b93374f492474eb321da16e9995ec
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java
index 5f4158d..dd1ef9a 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MainIndexResource.java
@@ -34,10 +34,10 @@
/**
* Resource for serving the dynamically composed index.html.
*/
-@Path("/")
+@Path("/index.html")
public class MainIndexResource extends AbstractInjectionResource {
- private static final String INDEX = "templates/index-template.html";
+ private static final String INDEX = "index.html";
private static final String INJECT_CSS_START = "<!-- {INJECTED-STYLESHEETS-START} -->";
private static final String INJECT_CSS_END = "<!-- {INJECTED-STYLESHEETS-END} -->";
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MainModuleResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/MainModuleResource.java
new file mode 100644
index 0000000..efa8039
--- /dev/null
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MainModuleResource.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.ui.impl;
+
+import org.onosproject.ui.UiExtension;
+import org.onosproject.ui.UiExtensionService;
+import org.onosproject.ui.UiView;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Response;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+
+import static com.google.common.collect.ImmutableList.of;
+import static com.google.common.io.ByteStreams.toByteArray;
+import static org.onosproject.ui.impl.MainViewResource.SCRIPT;
+
+/**
+ * Resource for serving the dynamically composed onos.js.
+ */
+@Path("/onos.js")
+public class MainModuleResource extends AbstractInjectionResource {
+
+ private static final String MAIN_JS = "onos.js";
+
+ private static final String INJECT_VIEW_IDS_START = "// {INJECTED-VIEW-IDS-START}";
+ private static final String INJECT_VIEW_IDS_END = "// {INJECTED-VIEW-IDS-END}";
+
+ @GET
+ @Produces(SCRIPT)
+ public Response getMainModule() throws IOException {
+ UiExtensionService service = get(UiExtensionService.class);
+ InputStream jsTemplate = getClass().getClassLoader().getResourceAsStream(MAIN_JS);
+ String js = new String(toByteArray(jsTemplate));
+
+ int p1s = split(js, 0, INJECT_VIEW_IDS_START);
+ int p1e = split(js, 0, INJECT_VIEW_IDS_END);
+ int p2s = split(js, p1e, null);
+
+ StreamEnumeration streams =
+ new StreamEnumeration(of(stream(js, 0, p1s),
+ includeViewIds(service),
+ stream(js, p1e, p2s)));
+
+ return Response.ok(new SequenceInputStream(streams)).build();
+ }
+
+ // Produces an input stream including view id injections from all extensions.
+ private InputStream includeViewIds(UiExtensionService service) {
+ StringBuilder sb = new StringBuilder("\n");
+ for (UiExtension extension : service.getExtensions()) {
+ for (UiView view : extension.views()) {
+ sb.append(" '").append(view.id()).append("',");
+ }
+ }
+ return new ByteArrayInputStream(sb.toString().getBytes());
+ }
+
+}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/MainExtResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java
similarity index 60%
rename from web/gui/src/main/java/org/onosproject/ui/impl/MainExtResource.java
rename to web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java
index 1bf3d42..b18c728 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/MainExtResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/MainNavResource.java
@@ -31,19 +31,14 @@
import static com.google.common.collect.ImmutableList.of;
import static com.google.common.io.ByteStreams.toByteArray;
-import static org.onosproject.ui.impl.MainViewResource.SCRIPT;
/**
- * Resource for serving the dynamically composed onos.js.
+ * Resource for serving the dynamically composed nav.html.
*/
-@Path("/")
-public class MainExtResource extends AbstractInjectionResource {
+@Path("/nav/nav.html")
+public class MainNavResource extends AbstractInjectionResource {
- private static final String MAIN_JS = "templates/onos-template.js";
- private static final String NAV_HTML = "templates/nav-template.html";
-
- private static final String INJECT_VIEW_IDS_START = "// {INJECTED-VIEW-IDS-START}";
- private static final String INJECT_VIEW_IDS_END = "// {INJECTED-VIEW-IDS-END}";
+ private static final String NAV_HTML = "nav.html";
private static final String INJECT_VIEW_ITEMS_START = "<!-- {INJECTED-VIEW-NAV-START} -->";
private static final String INJECT_VIEW_ITEMS_END = "<!-- {INJECTED-VIEW-NAV-END} -->";
@@ -52,38 +47,6 @@
private static final String NAV_FORMAT =
" <li> <a ng-click=\"navCtrl.hideNav()\" href=\"#/%s\">%s</a></li>";
- @Path("/onos.js")
- @GET
- @Produces(SCRIPT)
- public Response getMainModule() throws IOException {
- UiExtensionService service = get(UiExtensionService.class);
- InputStream jsTemplate = getClass().getClassLoader().getResourceAsStream(MAIN_JS);
- String js = new String(toByteArray(jsTemplate));
-
- int p1s = split(js, 0, INJECT_VIEW_IDS_START);
- int p1e = split(js, 0, INJECT_VIEW_IDS_END);
- int p2s = split(js, p1e, null);
-
- StreamEnumeration streams =
- new StreamEnumeration(of(stream(js, 0, p1s),
- includeViewIds(service),
- stream(js, p1e, p2s)));
-
- return Response.ok(new SequenceInputStream(streams)).build();
- }
-
- // Produces an input stream including view id injections from all extensions.
- private InputStream includeViewIds(UiExtensionService service) {
- StringBuilder sb = new StringBuilder("\n");
- for (UiExtension extension : service.getExtensions()) {
- for (UiView view : extension.views()) {
- sb.append(" '").append(view.id()).append("',");
- }
- }
- return new ByteArrayInputStream(sb.toString().getBytes());
- }
-
- @Path("/nav/nav.html")
@GET
@Produces(MediaType.TEXT_HTML)
public Response getNavigation() throws IOException {