홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
Committed by Gerrit Code Review
a450bd00 1 parent b11773e3

Simplifying Import-Package line in maven-bundle-plugin for REST bundles 

Change-Id: Ic29e3f205e18b7b63e33a8c65cbb30a8b56d2e74
Inline Side-by-side
Showing 17 changed files with 25 additions and 241 deletions
...@@ -138,17 +138,7 @@ ...@@ -138,17 +138,7 @@
138 ${project.groupId}.${project.artifactId} 138 ${project.groupId}.${project.artifactId}
139 </Bundle-SymbolicName> 139 </Bundle-SymbolicName>
140 <Import-Package> 140 <Import-Package>
141 - org.slf4j, 141 + *,org.glassfish.jersey.servlet
142 - org.osgi.framework,
143 - javax.ws.rs,javax.ws.rs.core,
144 - com.fasterxml.jackson*,
145 - org.glassfish.jersey,
146 - org.glassfish.jersey.servlet,
147 - org.onlab.packet.*,
148 - org.onlab.rest.*,
149 - org.onosproject.*,
150 - org.onlab.util.*,
151 - com.google.common.*;
152 </Import-Package> 142 </Import-Package>
153 <Web-ContextPath>${web.context}</Web-ContextPath> 143 <Web-ContextPath>${web.context}</Web-ContextPath>
154 </instructions> 144 </instructions>
......
...@@ -131,23 +131,7 @@ ...@@ -131,23 +131,7 @@
131 ${project.groupId}.${project.artifactId} 131 ${project.groupId}.${project.artifactId}
132 </Bundle-SymbolicName> 132 </Bundle-SymbolicName>
133 <Import-Package> 133 <Import-Package>
134 - org.slf4j, 134 + *,org.glassfish.jersey.servlet
135 - org.osgi.framework,
136 - javax.ws.rs,
137 - javax.ws.rs.core,
138 - org.glassfish.jersey,
139 - org.glassfish.jersey.servlet,
140 - com.fasterxml.jackson.databind,
141 - com.fasterxml.jackson.databind.node,
142 - com.fasterxml.jackson.core,
143 - com.jcraft.jsch,
144 - org.apache.karaf.shell.commands,
145 - org.apache.karaf.shell.console,
146 - com.google.common.*,
147 - org.onlab.packet.*,
148 - org.onlab.rest.*,
149 - org.onosproject.*,
150 - org.onlab.util.*,
151 </Import-Package> 135 </Import-Package>
152 <Web-ContextPath>${web.context}</Web-ContextPath> 136 <Web-ContextPath>${web.context}</Web-ContextPath>
153 </instructions> 137 </instructions>
......
...@@ -173,25 +173,7 @@ ...@@ -173,25 +173,7 @@
173 ${project.groupId}.${project.artifactId} 173 ${project.groupId}.${project.artifactId}
174 </Bundle-SymbolicName> 174 </Bundle-SymbolicName>
175 <Import-Package> 175 <Import-Package>
176 - org.slf4j, 176 + *,org.glassfish.jersey.servlet
177 - org.osgi.framework,
178 - javax.ws.rs,
179 - javax.ws.rs.core,
180 - org.glassfish.jersey,
181 - org.glassfish.jersey.servlet,
182 - com.fasterxml.jackson.databind,
183 - com.fasterxml.jackson.databind.node,
184 - com.fasterxml.jackson.core,
185 - org.apache.karaf.shell.commands,
186 - org.apache.karaf.shell.console,
187 - org.apache.karaf.shell.console.completer,
188 - com.google.common.*,
189 - org.onlab.packet.*,
190 - org.onlab.rest.*,
191 - org.onosproject.*,
192 - org.onlab.util.*,
193 - org.jboss.netty.util.*,
194 - org.rrd4j.*
195 </Import-Package> 177 </Import-Package>
196 <Web-ContextPath>${web.context}</Web-ContextPath> 178 <Web-ContextPath>${web.context}</Web-ContextPath>
197 </instructions> 179 </instructions>
......
...@@ -136,24 +136,7 @@ ...@@ -136,24 +136,7 @@
136 ${project.groupId}.${project.artifactId} 136 ${project.groupId}.${project.artifactId}
137 </Bundle-SymbolicName> 137 </Bundle-SymbolicName>
138 <Import-Package> 138 <Import-Package>
139 - org.slf4j, 139 + *,org.glassfish.jersey.servlet
140 - org.osgi.framework,
141 - javax.ws.rs,
142 - javax.ws.rs.core,
143 - org.glassfish.jersey,
144 - org.glassfish.jersey.servlet,
145 - com.fasterxml.jackson.databind,
146 - com.fasterxml.jackson.databind.node,
147 - com.fasterxml.jackson.core,
148 - org.apache.karaf.shell.commands,
149 - org.apache.karaf.shell.console,
150 - org.apache.karaf.shell.console.completer,
151 - com.google.common.*,
152 - org.onlab.packet.*,
153 - org.onlab.rest.*,
154 - org.onosproject.*,
155 - org.onlab.util.*,
156 - org.jboss.netty.util.*
157 </Import-Package> 140 </Import-Package>
158 <Web-ContextPath>${web.context}</Web-ContextPath> 141 <Web-ContextPath>${web.context}</Web-ContextPath>
159 </instructions> 142 </instructions>
......
...@@ -111,24 +111,7 @@ ...@@ -111,24 +111,7 @@
111 ${project.groupId}.${project.artifactId} 111 ${project.groupId}.${project.artifactId}
112 </Bundle-SymbolicName> 112 </Bundle-SymbolicName>
113 <Import-Package> 113 <Import-Package>
114 - org.slf4j, 114 + *,org.glassfish.jersey.servlet
115 - org.osgi.framework,
116 - javax.ws.rs,
117 - javax.ws.rs.core,
118 - org.glassfish.jersey,
119 - org.glassfish.jersey.servlet,
120 - com.fasterxml.jackson.databind,
121 - com.fasterxml.jackson.databind.node,
122 - com.fasterxml.jackson.core,
123 - org.apache.karaf.shell.commands,
124 - org.apache.commons.lang.math.*,
125 - org.apache.commons.lang.*,
126 - com.google.common.*,
127 - org.onlab.packet.*,
128 - org.onlab.rest.*,
129 - org.onosproject.*,
130 - org.onlab.util.*,
131 - org.jboss.netty.util.*
132 </Import-Package> 115 </Import-Package>
133 <Web-ContextPath>${web.context}</Web-ContextPath> 116 <Web-ContextPath>${web.context}</Web-ContextPath>
134 </instructions> 117 </instructions>
......
...@@ -117,18 +117,7 @@ ...@@ -117,18 +117,7 @@
117 ${project.groupId}.${project.artifactId} 117 ${project.groupId}.${project.artifactId}
118 </Bundle-SymbolicName> 118 </Bundle-SymbolicName>
119 <Import-Package> 119 <Import-Package>
120 - org.slf4j, 120 + *,org.glassfish.jersey.servlet
121 - org.osgi.framework,
122 - javax.ws.rs,javax.ws.rs.core,
123 - org.glassfish.jersey,
124 - org.glassfish.jersey.servlet,
125 - com.fasterxml.jackson.databind,
126 - com.fasterxml.jackson.databind.node,
127 - org.apache.karaf.shell.commands,
128 - org.apache.karaf.shell.console,
129 - com.google.common.*,
130 - org.onlab.packet.*,
131 - org.onosproject.*,
132 </Import-Package> 121 </Import-Package>
133 <Web-ContextPath>${web.context}</Web-ContextPath> 122 <Web-ContextPath>${web.context}</Web-ContextPath>
134 </instructions> 123 </instructions>
......
...@@ -113,20 +113,7 @@ ...@@ -113,20 +113,7 @@
113 ${project.groupId}.${project.artifactId} 113 ${project.groupId}.${project.artifactId}
114 </Bundle-SymbolicName> 114 </Bundle-SymbolicName>
115 <Import-Package> 115 <Import-Package>
116 - org.slf4j, 116 + *,org.glassfish.jersey.servlet
117 - org.osgi.framework,
118 - org.osgi.service.*,
119 - javax.ws.rs,
120 - javax.ws.rs.core,
121 - org.glassfish.jersey,
122 - org.glassfish.jersey.servlet,
123 - com.fasterxml.jackson.databind,
124 - com.fasterxml.jackson.databind.node,
125 - org.apache.karaf.shell.commands,
126 - com.google.common.*,
127 - org.onlab.packet.*,
128 - org.onosproject.*,
129 - org.onlab.util.*,
130 </Import-Package> 117 </Import-Package>
131 <Web-ContextPath>${web.context}</Web-ContextPath> 118 <Web-ContextPath>${web.context}</Web-ContextPath>
132 </instructions> 119 </instructions>
......
...@@ -125,20 +125,7 @@ ...@@ -125,20 +125,7 @@
125 ${project.groupId}.${project.artifactId} 125 ${project.groupId}.${project.artifactId}
126 </Bundle-SymbolicName> 126 </Bundle-SymbolicName>
127 <Import-Package> 127 <Import-Package>
128 - org.slf4j, 128 + *,org.glassfish.jersey.servlet
129 - org.osgi.framework,
130 - javax.ws.rs,
131 - javax.ws.rs.core,
132 - org.glassfish.jersey,
133 - org.glassfish.jersey.servlet,
134 - com.fasterxml.jackson.databind,
135 - com.fasterxml.jackson.databind.node,
136 - com.fasterxml.jackson.core,
137 - org.apache.karaf.shell.commands,
138 - com.google.common.*,
139 - org.onlab.packet.*,
140 - org.onosproject.*,
141 - org.onlab.util.*
142 </Import-Package> 129 </Import-Package>
143 <Web-ContextPath>${web.context}</Web-ContextPath> 130 <Web-ContextPath>${web.context}</Web-ContextPath>
144 </instructions> 131 </instructions>
......
...@@ -59,9 +59,11 @@ ...@@ -59,9 +59,11 @@
59 <version>${project.version}</version> 59 <version>${project.version}</version>
60 </dependency> 60 </dependency>
61 61
62 + <!-- FIXME: not OSGi-ready -->
62 <dependency> 63 <dependency>
63 - <groupId>org.onosproject</groupId> 64 + <groupId>com.googlecode.concurrent-trees</groupId>
64 - <artifactId>onlab-thirdparty</artifactId> 65 + <artifactId>concurrent-trees</artifactId>
66 + <scope>compile</scope>
65 </dependency> 67 </dependency>
66 68
67 <dependency> 69 <dependency>
......
...@@ -125,20 +125,7 @@ ...@@ -125,20 +125,7 @@
125 ${project.groupId}.${project.artifactId} 125 ${project.groupId}.${project.artifactId}
126 </Bundle-SymbolicName> 126 </Bundle-SymbolicName>
127 <Import-Package> 127 <Import-Package>
128 - org.slf4j, 128 + *,org.glassfish.jersey.servlet
129 - org.osgi.framework,
130 - javax.ws.rs,
131 - javax.ws.rs.core,
132 - org.glassfish.jersey,
133 - org.glassfish.jersey.servlet,
134 - com.fasterxml.jackson.databind,
135 - com.fasterxml.jackson.databind.node,
136 - com.fasterxml.jackson.core,
137 - org.apache.karaf.shell.commands,
138 - com.google.common.*,
139 - org.onlab.packet.*,
140 - org.onosproject.*,
141 - org.onlab.util.*,
142 </Import-Package> 129 </Import-Package>
143 <Web-ContextPath>${web.context}</Web-ContextPath> 130 <Web-ContextPath>${web.context}</Web-ContextPath>
144 </instructions> 131 </instructions>
......
...@@ -99,20 +99,7 @@ ...@@ -99,20 +99,7 @@
99 ${project.groupId}.${project.artifactId} 99 ${project.groupId}.${project.artifactId}
100 </Bundle-SymbolicName> 100 </Bundle-SymbolicName>
101 <Import-Package> 101 <Import-Package>
102 - org.slf4j, 102 + *,org.glassfish.jersey.servlet
103 - org.osgi.framework,
104 - javax.ws.rs,javax.ws.rs.core,
105 - org.glassfish.jersey,
106 - org.glassfish.jersey.servlet,
107 - com.fasterxml.jackson.databind,
108 - com.fasterxml.jackson.databind.node,
109 - org.apache.commons.lang.math.*,
110 - com.google.common.*,
111 - org.onlab.packet.*,
112 - org.onlab.rest.*,
113 - org.onosproject.*,
114 - org.onlab.util.*,
115 - org.jboss.netty.util.*
116 </Import-Package> 103 </Import-Package>
117 <Web-ContextPath>${web.context}</Web-ContextPath> 104 <Web-ContextPath>${web.context}</Web-ContextPath>
118 </instructions> 105 </instructions>
......
...@@ -89,18 +89,7 @@ ...@@ -89,18 +89,7 @@
89 ${project.groupId}.${project.artifactId} 89 ${project.groupId}.${project.artifactId}
90 </Bundle-SymbolicName> 90 </Bundle-SymbolicName>
91 <Import-Package> 91 <Import-Package>
92 - org.slf4j, 92 + *,org.glassfish.jersey.servlet
93 - javax.ws.rs,
94 - javax.ws.rs.core,
95 - org.glassfish.jersey,
96 - org.glassfish.jersey.servlet,
97 - com.sun.jersey.server.impl.container.servlet,
98 - com.fasterxml.jackson.databind,
99 - com.fasterxml.jackson.databind.node,
100 - org.apache.karaf.shell.commands,
101 - com.google.common.*,
102 - org.onlab.packet.*,
103 - org.onosproject.*
104 </Import-Package> 93 </Import-Package>
105 <Web-ContextPath>${web.context}</Web-ContextPath> 94 <Web-ContextPath>${web.context}</Web-ContextPath>
106 </instructions> 95 </instructions>
......
...@@ -58,21 +58,7 @@ ...@@ -58,21 +58,7 @@
58 ${project.groupId}.${project.artifactId} 58 ${project.groupId}.${project.artifactId}
59 </Bundle-SymbolicName> 59 </Bundle-SymbolicName>
60 <Import-Package> 60 <Import-Package>
61 - org.slf4j, 61 + *,org.glassfish.jersey.servlet
62 - org.osgi.framework,
63 - javax.ws.rs,
64 - javax.ws.rs.core,
65 - org.glassfish.jersey,
66 - org.glassfish.jersey.servlet,
67 - com.fasterxml.jackson.databind,
68 - com.fasterxml.jackson.databind.node,
69 - com.fasterxml.jackson.core,
70 - org.apache.karaf.shell.commands,
71 - com.google.common.*,
72 - org.onlab.packet.*,
73 - org.onlab.rest.*,
74 - org.onosproject.*,
75 - org.onlab.util.*,
76 </Import-Package> 62 </Import-Package>
77 <Web-ContextPath>${web.context}</Web-ContextPath> 63 <Web-ContextPath>${web.context}</Web-ContextPath>
78 </instructions> 64 </instructions>
......
...@@ -156,24 +156,7 @@ ...@@ -156,24 +156,7 @@
156 ${project.groupId}.${project.artifactId} 156 ${project.groupId}.${project.artifactId}
157 </Bundle-SymbolicName> 157 </Bundle-SymbolicName>
158 <Import-Package> 158 <Import-Package>
159 - org.slf4j, 159 + *,org.glassfish.jersey.servlet
160 - org.osgi.framework,
161 - javax.ws.rs,
162 - javax.ws.rs.core,
163 - org.glassfish.jersey,
164 - org.glassfish.jersey.servlet,
165 - com.fasterxml.jackson.databind,
166 - com.fasterxml.jackson.databind.node,
167 - com.fasterxml.jackson.core,
168 - org.apache.karaf.shell.commands,
169 - org.apache.karaf.shell.console,
170 - com.google.common.*,
171 - org.onlab.packet.*,
172 - org.onlab.rest.*,
173 - org.onlab.osgi.*,
174 - org.onlab.util.*,
175 - org.onosproject.*,
176 - org.jboss.netty.util.*
177 </Import-Package> 160 </Import-Package>
178 <Web-ContextPath>${web.context}</Web-ContextPath> 161 <Web-ContextPath>${web.context}</Web-ContextPath>
179 </instructions> 162 </instructions>
......
...@@ -87,23 +87,7 @@ ...@@ -87,23 +87,7 @@
87 ${project.groupId}.${project.artifactId} 87 ${project.groupId}.${project.artifactId}
88 </Bundle-SymbolicName> 88 </Bundle-SymbolicName>
89 <Import-Package> 89 <Import-Package>
90 - org.slf4j, 90 + *,org.glassfish.jersey.servlet
91 - org.osgi.framework,
92 - javax.ws.rs,javax.ws.rs.core,javax.ws.rs.ext,
93 - org.glassfish.jersey,
94 - org.glassfish.jersey.servlet,
95 - com.fasterxml.jackson.databind,
96 - com.fasterxml.jackson.databind.node,
97 - com.google.common.base.*,
98 - com.google.common.collect.*,
99 - com.google.common.io.*,
100 - org.onlab.util.*,
101 - org.onlab.osgi.*,
102 - org.onlab.packet.*,
103 - org.onlab.rest.*,
104 - org.onosproject.*,
105 - org.onlab.metrics.*,
106 - com.codahale.metrics.*
107 </Import-Package> 91 </Import-Package>
108 <Web-ContextPath>${web.context}</Web-ContextPath> 92 <Web-ContextPath>${web.context}</Web-ContextPath>
109 </instructions> 93 </instructions>
......
...@@ -91,38 +91,14 @@ ...@@ -91,38 +91,14 @@
91 ${project.groupId}.${project.artifactId} 91 ${project.groupId}.${project.artifactId}
92 </Bundle-SymbolicName> 92 </Bundle-SymbolicName>
93 <Import-Package> 93 <Import-Package>
94 - org.slf4j, 94 + *,
95 - org.osgi.framework,
96 - javax.imageio.*,
97 - javax.ws.rs,javax.ws.rs.core,javax.ws.rs.ext,
98 - javax.servlet.*,
99 - org.glassfish.jersey,
100 org.glassfish.jersey.servlet, 95 org.glassfish.jersey.servlet,
101 - org.glassfish.jersey.media.multipart, 96 + org.jvnet.mimepull
102 - org.jvnet.mimepull,
103 - com.fasterxml.jackson.databind,
104 - com.fasterxml.jackson.databind.node,
105 - com.google.common.base.*,
106 - com.google.common.collect.*,
107 - com.google.common.io.*,
108 - org.eclipse.jetty.websocket.*,
109 - org.onlab.util.*,
110 - org.onlab.osgi.*,
111 - org.onlab.packet.*,
112 - org.onlab.rest.*,
113 - org.onosproject.*,
114 - org.joda.time.*,
115 - org.apache.commons.*
116 </Import-Package> 97 </Import-Package>
117 <Web-ContextPath>${web.context}</Web-ContextPath> 98 <Web-ContextPath>${web.context}</Web-ContextPath>
118 </instructions> 99 </instructions>
119 </configuration> 100 </configuration>
120 </plugin> 101 </plugin>
121 -
122 </plugins> 102 </plugins>
123 </build> 103 </build>
124 - <!--
125 -
126 --->
127 -
128 </project> 104 </project>
......
...@@ -75,6 +75,11 @@ ...@@ -75,6 +75,11 @@
75 <scope>test</scope> 75 <scope>test</scope>
76 </dependency> 76 </dependency>
77 77
78 + <!-- TODO jersey-container-servlet and core may not be needed as dependencies
79 +
80 + They are definitely not needed at compile time, but need to be added
81 + as a bundle import for runtime; references are specified in web.xml
82 + -->
78 <dependency> 83 <dependency>
79 <groupId>org.glassfish.jersey.containers</groupId> 84 <groupId>org.glassfish.jersey.containers</groupId>
80 <artifactId>jersey-container-servlet</artifactId> 85 <artifactId>jersey-container-servlet</artifactId>
......