홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
f297f39c 1 parent 93afebc5

Added a skeletal structure for forwarding app.

Inline Side-by-side
Showing 3 changed files with 81 additions and 60 deletions
...@@ -37,43 +37,6 @@ ...@@ -37,43 +37,6 @@
37 </dependency> 37 </dependency>
38 38
39 <dependency> 39 <dependency>
40 - <groupId>org.onlab.onos</groupId>
41 - <artifactId>onlab-rest</artifactId>
42 - <version>${project.version}</version>
43 - </dependency>
44 -
45 - <dependency>
46 - <groupId>com.sun.jersey</groupId>
47 - <artifactId>jersey-servlet</artifactId>
48 - </dependency>
49 - <dependency>
50 - <groupId>com.sun.jersey.jersey-test-framework</groupId>
51 - <artifactId>jersey-test-framework-core</artifactId>
52 - <version>1.18.1</version>
53 - <scope>test</scope>
54 - </dependency>
55 - <dependency>
56 - <groupId>com.sun.jersey.jersey-test-framework</groupId>
57 - <artifactId>jersey-test-framework-grizzly2</artifactId>
58 - <version>1.18.1</version>
59 - <scope>test</scope>
60 - </dependency>
61 -
62 - <dependency>
63 - <groupId>com.fasterxml.jackson.core</groupId>
64 - <artifactId>jackson-databind</artifactId>
65 - </dependency>
66 -
67 - <dependency>
68 - <groupId>com.fasterxml.jackson.core</groupId>
69 - <artifactId>jackson-annotations</artifactId>
70 - </dependency>
71 -
72 - <dependency>
73 - <groupId>org.osgi</groupId>
74 - <artifactId>org.osgi.core</artifactId>
75 - </dependency>
76 - <dependency>
77 <groupId>org.apache.felix</groupId> 40 <groupId>org.apache.felix</groupId>
78 <artifactId>org.apache.felix.scr.annotations</artifactId> 41 <artifactId>org.apache.felix.scr.annotations</artifactId>
79 </dependency> 42 </dependency>
...@@ -84,27 +47,11 @@ ...@@ -84,27 +47,11 @@
84 <plugin> 47 <plugin>
85 <groupId>org.apache.felix</groupId> 48 <groupId>org.apache.felix</groupId>
86 <artifactId>maven-bundle-plugin</artifactId> 49 <artifactId>maven-bundle-plugin</artifactId>
87 - <extensions>true</extensions> 50 + </plugin>
88 - <configuration> 51 +
89 - <instructions> 52 + <plugin>
90 - <_wab>src/main/webapp/</_wab> 53 + <groupId>org.apache.felix</groupId>
91 - <Bundle-SymbolicName> 54 + <artifactId>maven-scr-plugin</artifactId>
92 - ${project.groupId}.${project.artifactId}
93 - </Bundle-SymbolicName>
94 - <Import-Package>
95 - org.osgi.framework,
96 - javax.ws.rs,javax.ws.rs.core,
97 - com.sun.jersey.api.core,
98 - com.sun.jersey.spi.container.servlet,
99 - com.sun.jersey.server.impl.container.servlet,
100 - com.fasterxml.jackson.databind,
101 - com.fasterxml.jackson.databind.node,
102 - org.onlab.rest.*,
103 - org.onlab.onos.*
104 - </Import-Package>
105 - <Web-ContextPath>${web.context}</Web-ContextPath>
106 - </instructions>
107 - </configuration>
108 </plugin> 55 </plugin>
109 </plugins> 56 </plugins>
110 </build> 57 </build>
......
...@@ -20,4 +20,78 @@ ...@@ -20,4 +20,78 @@
20 <web.context>/onos/tvue</web.context> 20 <web.context>/onos/tvue</web.context>
21 </properties> 21 </properties>
22 22
23 + <dependencies>
24 + <dependency>
25 + <groupId>org.onlab.onos</groupId>
26 + <artifactId>onlab-rest</artifactId>
27 + <version>${project.version}</version>
28 + </dependency>
29 +
30 + <dependency>
31 + <groupId>com.sun.jersey</groupId>
32 + <artifactId>jersey-servlet</artifactId>
33 + </dependency>
34 + <dependency>
35 + <groupId>com.sun.jersey.jersey-test-framework</groupId>
36 + <artifactId>jersey-test-framework-core</artifactId>
37 + <version>1.18.1</version>
38 + <scope>test</scope>
39 + </dependency>
40 + <dependency>
41 + <groupId>com.sun.jersey.jersey-test-framework</groupId>
42 + <artifactId>jersey-test-framework-grizzly2</artifactId>
43 + <version>1.18.1</version>
44 + <scope>test</scope>
45 + </dependency>
46 +
47 + <dependency>
48 + <groupId>com.fasterxml.jackson.core</groupId>
49 + <artifactId>jackson-databind</artifactId>
50 + </dependency>
51 +
52 + <dependency>
53 + <groupId>com.fasterxml.jackson.core</groupId>
54 + <artifactId>jackson-annotations</artifactId>
55 + </dependency>
56 +
57 + <dependency>
58 + <groupId>org.osgi</groupId>
59 + <artifactId>org.osgi.core</artifactId>
60 + </dependency>
61 + <dependency>
62 + <groupId>org.apache.felix</groupId>
63 + <artifactId>org.apache.felix.scr.annotations</artifactId>
64 + </dependency>
65 + </dependencies>
66 +
67 + <build>
68 + <plugins>
69 + <plugin>
70 + <groupId>org.apache.felix</groupId>
71 + <artifactId>maven-bundle-plugin</artifactId>
72 + <extensions>true</extensions>
73 + <configuration>
74 + <instructions>
75 + <_wab>src/main/webapp/</_wab>
76 + <Bundle-SymbolicName>
77 + ${project.groupId}.${project.artifactId}
78 + </Bundle-SymbolicName>
79 + <Import-Package>
80 + org.osgi.framework,
81 + javax.ws.rs,javax.ws.rs.core,
82 + com.sun.jersey.api.core,
83 + com.sun.jersey.spi.container.servlet,
84 + com.sun.jersey.server.impl.container.servlet,
85 + com.fasterxml.jackson.databind,
86 + com.fasterxml.jackson.databind.node,
87 + org.onlab.rest.*,
88 + org.onlab.onos.*
89 + </Import-Package>
90 + <Web-ContextPath>${web.context}</Web-ContextPath>
91 + </instructions>
92 + </configuration>
93 + </plugin>
94 + </plugins>
95 + </build>
96 +
23 </project> 97 </project>
......
...@@ -140,7 +140,7 @@ public class SimpleHostManager ...@@ -140,7 +140,7 @@ public class SimpleHostManager
140 HostEvent event = store.createOrUpdateHost(provider().id(), hostId, 140 HostEvent event = store.createOrUpdateHost(provider().id(), hostId,
141 hostDescription); 141 hostDescription);
142 if (event != null) { 142 if (event != null) {
143 - log.info("Host {} detected", hostId); 143 + log.debug("Host {} detected", hostId);
144 post(event); 144 post(event);
145 } 145 }
146 } 146 }
...@@ -151,7 +151,7 @@ public class SimpleHostManager ...@@ -151,7 +151,7 @@ public class SimpleHostManager
151 checkValidity(); 151 checkValidity();
152 HostEvent event = store.removeHost(hostId); 152 HostEvent event = store.removeHost(hostId);
153 if (event != null) { 153 if (event != null) {
154 - log.info("Host {} vanished", hostId); 154 + log.debug("Host {} vanished", hostId);
155 post(event); 155 post(event);
156 } 156 }
157 } 157 }
......