Project

General

Profile

« Previous | Next » 

Revision 8810

add support for v2 DataONE API.

View differences:

web.xml.tomcat6
159 159
    <load-on-startup>100</load-on-startup>
160 160
  </servlet>
161 161
    
162
	<!-- CN REST Servlet -->
162
	<!-- CN REST Servlet v1 -->
163 163
    <servlet>
164
      <servlet-name>CNRestServlet</servlet-name>
165
      <servlet-class>edu.ucsb.nceas.metacat.restservice.CNRestServlet</servlet-class>
164
      <servlet-name>CNRestServletV1</servlet-name>
165
      <servlet-class>edu.ucsb.nceas.metacat.restservice.v1.CNRestServlet</servlet-class>
166 166
      <init-param>
167 167
        <param-name>debug</param-name>
168 168
        <param-value>1</param-value>
......
174 174
      <load-on-startup>15</load-on-startup>
175 175
    </servlet>
176 176
    
177
    <!-- MN REST Servlet -->
177
    <!-- CN REST Servlet v2 -->
178 178
    <servlet>
179
      <servlet-name>MNRestServlet</servlet-name>
180
      <servlet-class>edu.ucsb.nceas.metacat.restservice.MNRestServlet</servlet-class>
179
      <servlet-name>CNRestServletV2</servlet-name>
180
      <servlet-class>edu.ucsb.nceas.metacat.restservice.v2.CNRestServlet</servlet-class>
181 181
      <init-param>
182 182
        <param-name>debug</param-name>
183 183
        <param-value>1</param-value>
......
186 186
        <param-name>listings</param-name>
187 187
        <param-value>true</param-value>
188 188
      </init-param>
189
      <load-on-startup>15</load-on-startup>
190
    </servlet>
191
    
192
    <!-- MN REST Servlet V1 -->
193
    <servlet>
194
      <servlet-name>MNRestServletV1</servlet-name>
195
      <servlet-class>edu.ucsb.nceas.metacat.restservice.v1.MNRestServlet</servlet-class>
196
      <init-param>
197
        <param-name>debug</param-name>
198
        <param-value>1</param-value>
199
      </init-param>
200
      <init-param>
201
        <param-name>listings</param-name>
202
        <param-value>true</param-value>
203
      </init-param>
189 204
      <load-on-startup>20</load-on-startup>
190 205
    </servlet>
206
    
207
    <!-- MN REST Servlet V2 -->
208
    <servlet>
209
      <servlet-name>MNRestServletV2</servlet-name>
210
      <servlet-class>edu.ucsb.nceas.metacat.restservice.v2.MNRestServlet</servlet-class>
211
      <init-param>
212
        <param-name>debug</param-name>
213
        <param-value>1</param-value>
214
      </init-param>
215
      <init-param>
216
        <param-name>listings</param-name>
217
        <param-value>true</param-value>
218
      </init-param>
219
      <load-on-startup>20</load-on-startup>
220
    </servlet>
191 221
  
192 222
    <servlet-mapping>
193 223
        <servlet-name>metacat</servlet-name>
......
256 286
  </servlet-mapping>
257 287

  
258 288

  
259
	<!-- CN REST services -->
289
	<!-- CN REST services v1-->
260 290
	<servlet-mapping>
261
		<servlet-name>CNRestServlet</servlet-name>
262
		<url-pattern>/d1/cn/*</url-pattern>
263
	</servlet-mapping>
264
	<servlet-mapping>
265
		<servlet-name>CNRestServlet</servlet-name>
291
		<servlet-name>CNRestServletV1</servlet-name>
266 292
		<url-pattern>/d1/cn/v1/*</url-pattern>
267 293
	</servlet-mapping>	
268 294
	
269
	<!-- MN REST services -->
295
	<!-- MN REST services v1 -->
270 296
	<servlet-mapping>
271
		<servlet-name>MNRestServlet</servlet-name>
272
		<url-pattern>/d1/mn/*</url-pattern>
297
		<servlet-name>MNRestServletV1</servlet-name>
298
		<url-pattern>/d1/mn/v1/*</url-pattern>
273 299
	</servlet-mapping>
300
	
301
	<!-- CN REST services v2-->
274 302
	<servlet-mapping>
275
		<servlet-name>MNRestServlet</servlet-name>
276
		<url-pattern>/d1/mn/v1/*</url-pattern>
303
		<servlet-name>CNRestServletV2</servlet-name>
304
		<url-pattern>/d1/cn/v2/*</url-pattern>
305
	</servlet-mapping>	
306
	
307
	<!-- MN REST services v2-->
308
	<servlet-mapping>
309
		<servlet-name>MNRestServletV2</servlet-name>
310
		<url-pattern>/d1/mn/v2/*</url-pattern>
277 311
	</servlet-mapping>
278 312
	
279 313
 <!-- uncomment this if you want the admin servlet -->

Also available in: Unified diff