Showing
5 changed files
with
10 additions
and
5 deletions
... | @@ -11,7 +11,7 @@ | ... | @@ -11,7 +11,7 @@ |
11 | <relativePath>../pom.xml</relativePath> | 11 | <relativePath>../pom.xml</relativePath> |
12 | </parent> | 12 | </parent> |
13 | 13 | ||
14 | - <artifactId>onos-tvue</artifactId> | 14 | + <artifactId>onos-app-tvue</artifactId> |
15 | <packaging>bundle</packaging> | 15 | <packaging>bundle</packaging> |
16 | 16 | ||
17 | <description>ONOS simple topology viewer</description> | 17 | <description>ONOS simple topology viewer</description> | ... | ... |
... | @@ -100,7 +100,7 @@ public class TopologyResource extends BaseResource { | ... | @@ -100,7 +100,7 @@ public class TopologyResource extends BaseResource { |
100 | private ObjectNode json(ObjectMapper mapper, ElementId id, int group, | 100 | private ObjectNode json(ObjectMapper mapper, ElementId id, int group, |
101 | boolean isOnline) { | 101 | boolean isOnline) { |
102 | return mapper.createObjectNode() | 102 | return mapper.createObjectNode() |
103 | - .put("name", id.uri().toString()) | 103 | + .put("name", id.uri().getSchemeSpecificPart()) |
104 | .put("group", group) | 104 | .put("group", group) |
105 | .put("online", isOnline); | 105 | .put("online", isOnline); |
106 | } | 106 | } |
... | @@ -147,7 +147,7 @@ public class TopologyResource extends BaseResource { | ... | @@ -147,7 +147,7 @@ public class TopologyResource extends BaseResource { |
147 | // Returns a formatted string for the element associated with the given | 147 | // Returns a formatted string for the element associated with the given |
148 | // connection point. | 148 | // connection point. |
149 | private static String id(ConnectPoint cp) { | 149 | private static String id(ConnectPoint cp) { |
150 | - return cp.elementId().uri().toString(); | 150 | + return cp.elementId().uri().getSchemeSpecificPart(); |
151 | } | 151 | } |
152 | 152 | ||
153 | } | 153 | } | ... | ... |
... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
14 | <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> | 14 | <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class> |
15 | <init-param> | 15 | <init-param> |
16 | <param-name>com.sun.jersey.config.property.packages</param-name> | 16 | <param-name>com.sun.jersey.config.property.packages</param-name> |
17 | - <param-value>org.onlab.onos.gui</param-value> | 17 | + <param-value>org.onlab.onos.tvue</param-value> |
18 | </init-param> | 18 | </init-param> |
19 | <load-on-startup>1</load-on-startup> | 19 | <load-on-startup>1</load-on-startup> |
20 | </servlet> | 20 | </servlet> | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -62,7 +62,6 @@ | ... | @@ -62,7 +62,6 @@ |
62 | <feature>onos-core</feature> | 62 | <feature>onos-core</feature> |
63 | <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> | 63 | <bundle>mvn:io.netty/netty/3.9.2.Final</bundle> |
64 | 64 | ||
65 | - <!--bundle>mvn:org.projectfloodlight/openflowj/0.3.8-SNAPSHOT</bundle--> | ||
66 | <bundle>mvn:org.onlab.onos/onos-of-api/1.0.0-SNAPSHOT</bundle> | 65 | <bundle>mvn:org.onlab.onos/onos-of-api/1.0.0-SNAPSHOT</bundle> |
67 | <bundle>mvn:org.onlab.onos/onos-of-ctl/1.0.0-SNAPSHOT</bundle> | 66 | <bundle>mvn:org.onlab.onos/onos-of-ctl/1.0.0-SNAPSHOT</bundle> |
68 | 67 | ||
... | @@ -71,4 +70,10 @@ | ... | @@ -71,4 +70,10 @@ |
71 | <bundle>mvn:org.onlab.onos/onos-of-provider-host/1.0.0-SNAPSHOT</bundle> | 70 | <bundle>mvn:org.onlab.onos/onos-of-provider-host/1.0.0-SNAPSHOT</bundle> |
72 | </feature> | 71 | </feature> |
73 | 72 | ||
73 | + <feature name="onos-app-tvue" version="1.0.0" | ||
74 | + description="ONOS sample topology viewer application"> | ||
75 | + <feature>onos-core</feature> | ||
76 | + <bundle>mvn:org.onlab.onos/onos-app-tvue/1.0.0-SNAPSHOT</bundle> | ||
77 | + </feature> | ||
78 | + | ||
74 | </features> | 79 | </features> | ... | ... |
-
Please register or login to post a comment