Project

General

Profile

« Previous | Next » 

Revision 3104

Added by perry almost 18 years ago

Merged the spatial web.xml.combined into the default web.xml.tomcat5

View differences:

lib/spatial/WEB-INF/web.xml.combined
1
<!DOCTYPE web-app
2
    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
3
        "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
4

  
5
<web-app>
6

  
7
 <display-name>Metacat</display-name>
8

  
9
    <context-param>
10
      <param-name>jones</param-name>
11
      <param-value>jones@nceas.ucsb.edu</param-value>
12
      <description>
13
      </description>
14
    </context-param>
15
    
16
      
17
  <context-param>
18
    <param-name>serviceStratagy</param-name>
19
    <!-- Meaning of the different values :
20
    	 
21
    	 PARTIAL-BUFFER
22
    	 - Partially buffers the first xKb to disk. Once that has buffered, the the 
23
    	   result is streamed to the user. This will allow for most errors to be caught
24
    	   early.
25
    	   
26
         BUFFER
27
         - stores the entire response in memory first, before sending it off to
28
           the user (may run out of memory)
29

  
30
         SPEED
31
         - outputs directly to the response (and cannot recover in the case of an
32
           error)
33

  
34
         FILE
35
         - outputs to the local filesystem first, before sending it off to the user
36
      -->
37
    <param-value>PARTIAL-BUFFER</param-value>
38
  </context-param>
39
  <context-param>
40
	<param-name>PARTIAL_BUFFER_STRATEGY_SIZE</param-name>
41
	<param-value>50</param-value>
42
  </context-param>
43
  
44

  
45
        <!-- pick up all spring application contexts -->
46
        <context-param>
47
                <param-name>contextConfigLocation</param-name>
48
                <param-value>classpath*:/applicationContext.xml</param-value>
49
        </context-param>
50

  
51
   
52
 <filter>
53
    <filter-name>Set Character Encoding</filter-name>
54
    <filter-class>org.vfny.geoserver.filters.SetCharacterEncodingFilter</filter-class>
55
    <init-param>
56
      <param-name>encoding</param-name>
57
      <param-value>UTF-8</param-value>
58
    </init-param>
59
  </filter>
60

  
61
  <filter-mapping>
62
    <filter-name>Set Character Encoding</filter-name>
63
    <url-pattern>/*</url-pattern>
64
  </filter-mapping>
65
  
66

  
67
  <listener>
68
    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
69
  </listener>
70

  
71

  
72

  
73
  <!-- MPTODO testing  leave out for geoserver 1.4 and use a spring/geoserver plugin instead??
74
   
75
 <filter>
76
    <filter-name>WmsFilter</filter-name>
77
    <filter-class>edu.ucsb.nceas.metacat.spatial.WmsFilter</filter-class>
78
 </filter>
79

  
80
  <filter-mapping>
81
    <filter-name>WmsFilter</filter-name>
82
    <url-pattern>/metacatwms/*</url-pattern>
83
    <dispatcher>REQUEST</dispatcher>
84
  </filter-mapping>
85
  -->
86

  
87

  
88

  
89

  
90
  <!-- spring dispatcher servlet, dispatches incoming requests to controllers -->
91
  <servlet>
92
    <servlet-name>dispatcher</servlet-name>
93
    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
94
  </servlet>
95
     
96
   <!-- Struts config needs to load before all the other servlets... except spring-->
97
   <servlet>
98
    <servlet-name>action</servlet-name>
99
    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
100
    <init-param>
101
      <param-name>config</param-name>
102
      <param-value>/WEB-INF/struts-config.xml</param-value>
103
    </init-param>
104
    <init-param>
105
      <param-name>debug</param-name>
106
      <param-value>2</param-value>
107
    </init-param>
108
    <init-param>
109
      <param-name>detail</param-name>
110
      <param-value>2</param-value>
111
    </init-param>
112
    <load-on-startup>1</load-on-startup>
113
  </servlet> 
114
 
115
  <servlet>
116
   <servlet-name>TestWfsPost</servlet-name>
117
   <servlet-class>org.vfny.geoserver.wfs.servlets.TestWfsPost</servlet-class>
118
  </servlet>
119

  
120

  
121

  
122
  <!-- MPTODO testing -->
123
  <servlet>
124
    <servlet-name>SldFactory</servlet-name>
125
    <servlet-class>edu.ucsb.nceas.metacat.spatial.SldFactory</servlet-class>
126
  </servlet>
127

  
128

  
129

  
130
    <servlet>
131
      <servlet-name>metacat</servlet-name>
132
      <servlet-class>edu.ucsb.nceas.metacat.MetaCatServlet</servlet-class>
133
      <init-param>
134
        <param-name>debug</param-name>
135
        <param-value>1</param-value>
136
      </init-param>
137
      <init-param>
138
        <param-name>listings</param-name>
139
        <param-value>true</param-value>
140
      </init-param>
141
      <load-on-startup>2</load-on-startup>
142
    </servlet>
143
    
144
     <servlet>
145
      <servlet-name>replication</servlet-name>
146
      <servlet-class>edu.ucsb.nceas.metacat.MetacatReplication</servlet-class>
147
      <init-param>
148
        <param-name>debug</param-name>
149
        <param-value>1</param-value>
150
      </init-param>
151
      <init-param>
152
        <param-name>listings</param-name>
153
        <param-value>true</param-value>
154
      </init-param>
155
      <load-on-startup>3</load-on-startup>
156
    </servlet>
157

  
158
    <servlet>
159
      <servlet-name>HarvesterRegistrationLogin</servlet-name>
160
      <servlet-class>edu.ucsb.nceas.metacat.harvesterClient.HarvesterRegistrationLogin</servlet-class>
161
      <init-param>
162
        <param-name>debug</param-name>
163
        <param-value>1</param-value>
164
      </init-param>
165
      <init-param>
166
        <param-name>listings</param-name>
167
        <param-value>true</param-value>
168
      </init-param>
169
      <load-on-startup>3</load-on-startup>
170
    </servlet>
171

  
172
    <servlet>
173
      <servlet-name>HarvesterRegistration</servlet-name>
174
      <servlet-class>edu.ucsb.nceas.metacat.harvesterClient.HarvesterRegistration</servlet-class>
175
      <init-param>
176
        <param-name>debug</param-name>
177
        <param-value>1</param-value>
178
      </init-param>
179
      <init-param>
180
        <param-name>listings</param-name>
181
        <param-value>true</param-value>
182
      </init-param>
183
      <load-on-startup>3</load-on-startup>
184
    </servlet>
185

  
186
    <servlet>
187
        <servlet-name>AdvancedSearchServlet</servlet-name>
188
        <servlet-class>edu.ucsb.nceas.metacat.advancedsearch.AdvancedSearchServlet</servlet-class>
189
        <load-on-startup>3</load-on-startup>
190
    </servlet>
191

  
192
    <!--
193
    <servlet>
194
      <servlet-name>HarvesterServlet</servlet-name>
195
      <servlet-class>edu.ucsb.nceas.metacat.harvesterClient.HarvesterServlet</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>
204
      <load-on-startup>3</load-on-startup>
205
    </servlet>
206
    -->
207
    <servlet>
208
      <servlet-name>AxisServlet</servlet-name>
209
      <display-name>Apache-Axis Servlet</display-name>
210
      <servlet-class>
211
          org.apache.axis.transport.http.AxisServlet
212
      </servlet-class>
213
      <load-on-startup>3</load-on-startup>
214
    </servlet>
215

  
216
  <servlet>
217
    <servlet-name>AdminServlet</servlet-name>
218
    <display-name>Axis Admin Servlet</display-name>
219
    <servlet-class>
220
        org.apache.axis.transport.http.AdminServlet
221
    </servlet-class>
222
    <load-on-startup>100</load-on-startup>
223
  </servlet>
224

  
225
  <servlet>
226
    <servlet-name>SOAPMonitorService</servlet-name>
227
    <display-name>SOAPMonitorService</display-name>
228
    <servlet-class>
229
        org.apache.axis.monitor.SOAPMonitorService
230
    </servlet-class>
231
    <init-param>
232
      <param-name>SOAPMonitorPort</param-name>
233
      <param-value>5001</param-value>
234
    </init-param>
235
    <load-on-startup>100</load-on-startup>
236
  </servlet>
237

  
238
    <servlet-mapping>
239
        <servlet-name>metacat</servlet-name>
240
        <url-pattern>/metacat</url-pattern>
241
    </servlet-mapping>
242
    
243
    <servlet-mapping>
244
        <servlet-name>replication</servlet-name>
245
        <url-pattern>replication</url-pattern>
246
    </servlet-mapping> 
247
   
248
    <servlet-mapping>
249
        <servlet-name>replication</servlet-name>
250
        <url-pattern>/servlet/replication</url-pattern>
251
    </servlet-mapping>
252

  
253
    <servlet-mapping>
254
        <servlet-name>HarvesterRegistrationLogin</servlet-name>
255
        <url-pattern>/harvesterRegistrationLogin</url-pattern>
256
    </servlet-mapping>
257

  
258
    <servlet-mapping>
259
        <servlet-name>HarvesterRegistration</servlet-name>
260
        <url-pattern>/harvesterRegistration</url-pattern>
261
    </servlet-mapping>
262

  
263
    <servlet-mapping>
264
        <servlet-name>AdvancedSearchServlet</servlet-name>
265
        <url-pattern>/advancedSearchServlet</url-pattern>
266
    </servlet-mapping>
267
     
268
    <servlet-mapping>
269
    <servlet-name>AxisServlet</servlet-name>
270
    <url-pattern>/servlet/AxisServlet</url-pattern>
271
  </servlet-mapping>
272

  
273
  <servlet-mapping>
274
    <servlet-name>AxisServlet</servlet-name>
275
    <url-pattern>*.jws</url-pattern>
276
  </servlet-mapping>
277

  
278
  <servlet-mapping>
279
    <servlet-name>AxisServlet</servlet-name>
280
    <url-pattern>/services/*</url-pattern>
281
  </servlet-mapping>
282

  
283
  <servlet-mapping>
284
    <servlet-name>SOAPMonitorService</servlet-name>
285
    <url-pattern>/SOAPMonitor</url-pattern>
286
  </servlet-mapping>
287

  
288
 <!-- uncomment this if you want the admin servlet -->
289
  <servlet-mapping>
290
    <servlet-name>AdminServlet</servlet-name>
291
    <url-pattern>/servlet/AdminServlet</url-pattern>
292
  </servlet-mapping>
293

  
294

  
295

  
296
 <!-- MPTODO testing -->
297
  <servlet-mapping>
298
    <servlet-name>SldFactory</servlet-name>
299
    <url-pattern>/sldfactory</url-pattern>
300
  </servlet-mapping>
301

  
302

  
303
  <servlet-mapping>
304
    <servlet-name>action</servlet-name>
305
    <url-pattern>*.do</url-pattern>
306
   </servlet-mapping>
307
  <servlet-mapping>
308
        <servlet-name>dispatcher</servlet-name>
309
        <url-pattern>/wms/*</url-pattern>
310
  </servlet-mapping>
311
  <servlet-mapping>
312
        <servlet-name>dispatcher</servlet-name>
313
        <url-pattern>/wfs/*</url-pattern>
314
  </servlet-mapping>
315
  <servlet-mapping>
316
        <servlet-name>dispatcher</servlet-name>
317
        <url-pattern>/ows/*</url-pattern>
318
  </servlet-mapping>
319
  <servlet-mapping>
320
   <servlet-name>TestWfsPost</servlet-name>
321
   <url-pattern>/TestWfsPost/*</url-pattern>
322
  </servlet-mapping>
323

  
324
      
325
    <session-config>
326
      <session-timeout>30000</session-timeout>
327
    </session-config>
328

  
329
    
330
   <!-- currently the W3C havent settled on a media type for WSDL;
331
    http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
332
    for now we go with the basic 'it's XML' response -->
333
  <mime-mapping>
334
    <extension>wsdl</extension>
335
     <mime-type>text/xml</mime-type>
336
  </mime-mapping>
337
  
338
  <mime-mapping>
339
    <extension>xsd</extension>
340
    <mime-type>text/xml</mime-type>
341
  </mime-mapping>
342
  
343
  <mime-mapping>
344
   <extension>xsl</extension>
345
   <mime-type>text/xml</mime-type>
346
  </mime-mapping>
347

  
348
		      
349
  <welcome-file-list>
350
    <welcome-file>index.jsp</welcome-file>
351
  </welcome-file-list>
352
 
353
 
354
  <taglib>
355
     <taglib-uri>http://jakarta.apache.org/taglibs/xtags-1.0</taglib-uri>
356
     <taglib-location>/WEB-INF/xtags.tld</taglib-location>
357
  </taglib>   
358

  
359
  <taglib>
360
    <taglib-uri>/tags/struts-bean</taglib-uri>
361
    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
362
  </taglib>
363

  
364
  <taglib>
365
    <taglib-uri>/tags/struts-html</taglib-uri>
366
    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
367
  </taglib>
368

  
369
  <taglib>
370
    <taglib-uri>/tags/struts-logic</taglib-uri>
371
    <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
372
  </taglib>
373

  
374
  <taglib>
375
    <taglib-uri>/tags/struts-nested</taglib-uri>
376
    <taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
377
  </taglib>
378

  
379
  <taglib>
380
    <taglib-uri>/tags/struts-tiles</taglib-uri>
381
    <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
382
  </taglib>  
383
  
384
  <!-- spring taglib -->
385
  <taglib>
386
        <taglib-uri>/tags/spring</taglib-uri>
387
        <taglib-location>/WEB-INF/tld/spring.tld</taglib-location>
388
  </taglib>
389

  
390
<!-- 
391
  <error-page>
392
        <exception-type>java.lang.Exception</exception-type>
393
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
394
  </error-page>
395
  <error-page>
396
        <exception-type>javax.servlet.ServletException</exception-type>
397
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
398
  </error-page>
399
  <error-page>
400
        <exception-type>org.vfny.geoserver.global.ConfigurationException</exception-type>
401
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
402
  </error-page>
403
-->
404

  
405
</web-app>
406 0

  
lib/web.xml.tomcat5
3 3
        "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
4 4

  
5 5
<web-app>
6
    <display-name>Metacat</display-name>
7
    
6

  
7
 <display-name>Metacat</display-name>
8

  
8 9
    <context-param>
9 10
      <param-name>jones</param-name>
10 11
      <param-value>jones@nceas.ucsb.edu</param-value>
......
12 13
      </description>
13 14
    </context-param>
14 15
    
16
      
17
  <context-param>
18
    <param-name>serviceStratagy</param-name>
19
    <!-- Meaning of the different values :
20
    	 
21
    	 PARTIAL-BUFFER
22
    	 - Partially buffers the first xKb to disk. Once that has buffered, the the 
23
    	   result is streamed to the user. This will allow for most errors to be caught
24
    	   early.
25
    	   
26
         BUFFER
27
         - stores the entire response in memory first, before sending it off to
28
           the user (may run out of memory)
29

  
30
         SPEED
31
         - outputs directly to the response (and cannot recover in the case of an
32
           error)
33

  
34
         FILE
35
         - outputs to the local filesystem first, before sending it off to the user
36
      -->
37
    <param-value>PARTIAL-BUFFER</param-value>
38
  </context-param>
39
  <context-param>
40
	<param-name>PARTIAL_BUFFER_STRATEGY_SIZE</param-name>
41
	<param-value>50</param-value>
42
  </context-param>
43
  
44

  
45
        <!-- pick up all spring application contexts -->
46
        <context-param>
47
                <param-name>contextConfigLocation</param-name>
48
                <param-value>classpath*:/applicationContext.xml</param-value>
49
        </context-param>
50

  
51
   
52
 <filter>
53
    <filter-name>Set Character Encoding</filter-name>
54
    <filter-class>org.vfny.geoserver.filters.SetCharacterEncodingFilter</filter-class>
55
    <init-param>
56
      <param-name>encoding</param-name>
57
      <param-value>UTF-8</param-value>
58
    </init-param>
59
  </filter>
60

  
61
  <filter-mapping>
62
    <filter-name>Set Character Encoding</filter-name>
63
    <url-pattern>/*</url-pattern>
64
  </filter-mapping>
65
  
66

  
67
  <listener>
68
    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
69
  </listener>
70

  
71

  
72

  
73
  <!-- MPTODO testing  leave out for geoserver 1.4 and use a spring/geoserver plugin instead??
74
   
75
 <filter>
76
    <filter-name>WmsFilter</filter-name>
77
    <filter-class>edu.ucsb.nceas.metacat.spatial.WmsFilter</filter-class>
78
 </filter>
79

  
80
  <filter-mapping>
81
    <filter-name>WmsFilter</filter-name>
82
    <url-pattern>/metacatwms/*</url-pattern>
83
    <dispatcher>REQUEST</dispatcher>
84
  </filter-mapping>
85
  -->
86

  
87

  
88

  
89

  
90
  <!-- spring dispatcher servlet, dispatches incoming requests to controllers -->
91
  <servlet>
92
    <servlet-name>dispatcher</servlet-name>
93
    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
94
  </servlet>
95
     
96
   <!-- Struts config needs to load before all the other servlets... except spring-->
97
   <servlet>
98
    <servlet-name>action</servlet-name>
99
    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
100
    <init-param>
101
      <param-name>config</param-name>
102
      <param-value>/WEB-INF/struts-config.xml</param-value>
103
    </init-param>
104
    <init-param>
105
      <param-name>debug</param-name>
106
      <param-value>2</param-value>
107
    </init-param>
108
    <init-param>
109
      <param-name>detail</param-name>
110
      <param-value>2</param-value>
111
    </init-param>
112
    <load-on-startup>1</load-on-startup>
113
  </servlet> 
114
 
115
  <servlet>
116
   <servlet-name>TestWfsPost</servlet-name>
117
   <servlet-class>org.vfny.geoserver.wfs.servlets.TestWfsPost</servlet-class>
118
  </servlet>
119

  
120

  
121

  
122
  <!-- MPTODO testing -->
123
  <servlet>
124
    <servlet-name>SldFactory</servlet-name>
125
    <servlet-class>edu.ucsb.nceas.metacat.spatial.SldFactory</servlet-class>
126
  </servlet>
127

  
128

  
129

  
15 130
    <servlet>
16 131
      <servlet-name>metacat</servlet-name>
17 132
      <servlet-class>edu.ucsb.nceas.metacat.MetaCatServlet</servlet-class>
......
23 138
        <param-name>listings</param-name>
24 139
        <param-value>true</param-value>
25 140
      </init-param>
26
      <load-on-startup>1</load-on-startup>
141
      <load-on-startup>2</load-on-startup>
27 142
    </servlet>
28 143
    
29 144
     <servlet>
......
37 152
        <param-name>listings</param-name>
38 153
        <param-value>true</param-value>
39 154
      </init-param>
40
      <load-on-startup>1</load-on-startup>
155
      <load-on-startup>3</load-on-startup>
41 156
    </servlet>
42 157

  
43 158
    <servlet>
......
51 166
        <param-name>listings</param-name>
52 167
        <param-value>true</param-value>
53 168
      </init-param>
54
      <load-on-startup>1</load-on-startup>
169
      <load-on-startup>3</load-on-startup>
55 170
    </servlet>
56 171

  
57 172
    <servlet>
......
65 180
        <param-name>listings</param-name>
66 181
        <param-value>true</param-value>
67 182
      </init-param>
68
      <load-on-startup>1</load-on-startup>
183
      <load-on-startup>3</load-on-startup>
69 184
    </servlet>
70 185

  
71 186
    <servlet>
72 187
        <servlet-name>AdvancedSearchServlet</servlet-name>
73 188
        <servlet-class>edu.ucsb.nceas.metacat.advancedsearch.AdvancedSearchServlet</servlet-class>
74
        <load-on-startup>2</load-on-startup>
189
        <load-on-startup>3</load-on-startup>
75 190
    </servlet>
76 191

  
77 192
    <!--
......
86 201
        <param-name>listings</param-name>
87 202
        <param-value>true</param-value>
88 203
      </init-param>
89
      <load-on-startup>1</load-on-startup>
204
      <load-on-startup>3</load-on-startup>
90 205
    </servlet>
91 206
    -->
92 207
    <servlet>
93
    <servlet-name>AxisServlet</servlet-name>
94
    <display-name>Apache-Axis Servlet</display-name>
95
    <servlet-class>
96
        org.apache.axis.transport.http.AxisServlet
97
    </servlet-class>
98
  </servlet>
208
      <servlet-name>AxisServlet</servlet-name>
209
      <display-name>Apache-Axis Servlet</display-name>
210
      <servlet-class>
211
          org.apache.axis.transport.http.AxisServlet
212
      </servlet-class>
213
      <load-on-startup>3</load-on-startup>
214
    </servlet>
99 215

  
100 216
  <servlet>
101 217
    <servlet-name>AdminServlet</servlet-name>
......
119 235
    <load-on-startup>100</load-on-startup>
120 236
  </servlet>
121 237

  
122
    <!-- <servlet-mapping>
123
        <servlet-name>metacat</servlet-name>
124
        <url-pattern>/servlet/metacat/*</url-pattern>
125
    </servlet-mapping> -->
126

  
127 238
    <servlet-mapping>
128 239
        <servlet-name>metacat</servlet-name>
129 240
        <url-pattern>/metacat</url-pattern>
......
179 290
    <servlet-name>AdminServlet</servlet-name>
180 291
    <url-pattern>/servlet/AdminServlet</url-pattern>
181 292
  </servlet-mapping>
182
    
293

  
294

  
295

  
296
 <!-- MPTODO testing -->
297
  <servlet-mapping>
298
    <servlet-name>SldFactory</servlet-name>
299
    <url-pattern>/sldfactory</url-pattern>
300
  </servlet-mapping>
301

  
302

  
303
  <servlet-mapping>
304
    <servlet-name>action</servlet-name>
305
    <url-pattern>*.do</url-pattern>
306
   </servlet-mapping>
307
  <servlet-mapping>
308
        <servlet-name>dispatcher</servlet-name>
309
        <url-pattern>/wms/*</url-pattern>
310
  </servlet-mapping>
311
  <servlet-mapping>
312
        <servlet-name>dispatcher</servlet-name>
313
        <url-pattern>/wfs/*</url-pattern>
314
  </servlet-mapping>
315
  <servlet-mapping>
316
        <servlet-name>dispatcher</servlet-name>
317
        <url-pattern>/ows/*</url-pattern>
318
  </servlet-mapping>
319
  <servlet-mapping>
320
   <servlet-name>TestWfsPost</servlet-name>
321
   <url-pattern>/TestWfsPost/*</url-pattern>
322
  </servlet-mapping>
323

  
324
      
183 325
    <session-config>
184
      <session-timeout>30</session-timeout>
326
      <session-timeout>30000</session-timeout>
185 327
    </session-config>
328

  
186 329
    
187 330
   <!-- currently the W3C havent settled on a media type for WSDL;
188 331
    http://www.w3.org/TR/2003/WD-wsdl12-20030303/#ietf-draft
......
192 335
     <mime-type>text/xml</mime-type>
193 336
  </mime-mapping>
194 337
  
195

  
196 338
  <mime-mapping>
197 339
    <extension>xsd</extension>
198 340
    <mime-type>text/xml</mime-type>
199 341
  </mime-mapping>
342
  
343
  <mime-mapping>
344
   <extension>xsl</extension>
345
   <mime-type>text/xml</mime-type>
346
  </mime-mapping>
347

  
348
		      
349
  <welcome-file-list>
350
    <welcome-file>index.jsp</welcome-file>
351
  </welcome-file-list>
352
 
353
 
354
  <taglib>
355
     <taglib-uri>http://jakarta.apache.org/taglibs/xtags-1.0</taglib-uri>
356
     <taglib-location>/WEB-INF/xtags.tld</taglib-location>
357
  </taglib>   
358

  
359
  <taglib>
360
    <taglib-uri>/tags/struts-bean</taglib-uri>
361
    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
362
  </taglib>
363

  
364
  <taglib>
365
    <taglib-uri>/tags/struts-html</taglib-uri>
366
    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
367
  </taglib>
368

  
369
  <taglib>
370
    <taglib-uri>/tags/struts-logic</taglib-uri>
371
    <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
372
  </taglib>
373

  
374
  <taglib>
375
    <taglib-uri>/tags/struts-nested</taglib-uri>
376
    <taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
377
  </taglib>
378

  
379
  <taglib>
380
    <taglib-uri>/tags/struts-tiles</taglib-uri>
381
    <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
382
  </taglib>  
383
  
384
  <!-- spring taglib -->
385
  <taglib>
386
        <taglib-uri>/tags/spring</taglib-uri>
387
        <taglib-location>/WEB-INF/tld/spring.tld</taglib-location>
388
  </taglib>
389

  
390
<!-- 
391
  <error-page>
392
        <exception-type>java.lang.Exception</exception-type>
393
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
394
  </error-page>
395
  <error-page>
396
        <exception-type>javax.servlet.ServletException</exception-type>
397
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
398
  </error-page>
399
  <error-page>
400
        <exception-type>org.vfny.geoserver.global.ConfigurationException</exception-type>
401
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
402
  </error-page>
403
-->
404

  
200 405
</web-app>
src/edu/ucsb/nceas/metacat/DBQuery.java
447 447
      if ( this.docidOverride.size() == 0 ) {
448 448
          query = qspec.printSQL(useXMLIndex);
449 449
      } else {
450
          logMetacat.info("\n\n\n*** docid override " + this.docidOverride.size() + "\n\n\n");
450
          logMetacat.info("*** docid override " + this.docidOverride.size());
451 451
          StringBuffer queryBuffer = new StringBuffer( "SELECT docid,docname,doctype,date_created, date_updated, rev " );
452 452
          queryBuffer.append( " FROM xml_documents WHERE docid IN (" );
453 453
          for (int i = 0; i < docidOverride.size(); i++) {  
......
455 455
              queryBuffer.append( (String)docidOverride.elementAt(i) );
456 456
              queryBuffer.append("',");
457 457
          }
458
          //MPTODO remove trailing "," instead of this empty string hack 
458
          // empty string hack 
459 459
          queryBuffer.append( "'') " );
460 460
          query = queryBuffer.toString();
461 461
      } 
docs/user/spatial_option.html
106 106
       A <em> Spatial geometry </em> represented by one or more geometry primitives (points,lines and polygons). For example a single species census (the <em> spatial feature </em>) might have mutltiple sample sites and could be represented as a multi-point geometry.
107 107
      </td>
108 108
    </tr>
109
    <tr>
110
      <td>Styled Layer Descriptor (SLD)</td>
111
      <td>
112
       Styled Layer Descriptors are an OGC standard for defining the filtering, classification and styling of datasets. They are essentially the configuration file which describes how to convert your raw spatial dataset into a cartographic product.
113
      </td>
114
    </tr>
115
    <tr>
116
      <td>Web Map Context (WMC)</td>
117
      <td>
118
       Web Map Context documents are an OGC standard for combining various WMS layers into a coherent map. WMC describes which wms servers and layers comprise the map, the layer order, the initial map extent, the requested image formats, etc. This is used by the HTML web map client to construct the interactive map.
119
      </td>
120
    </tr>
109 121
  </table>
110 122

  
111 123
  <h4><a name="overview">Overview Of the Major Components<a/></h4>
......
254 266

  
255 267

  
256 268

  
269
   <table> <tr>
270
      <td align="right">
271
        <a href="./properties.html">Back</a> | 
272
        <a href="./metacattour.html">Home</a> | 
273
        <a href="./unimplem.html">Next</a>
274
      </td>
275
   </tr> </table>
257 276

  
258 277
</BODY>
259 278
</HTML>
build.xml
811 811
          overwrite="true"
812 812
          filtering="no"/>
813 813

  
814
      <!-- Copy the geoserver/metacat combined web.xml into ${build.war}/web.xml   -->
815
      <copy file="${spatial.webinf-mods}/web.xml.combined"
816
          tofile="${build.war}/web.xml"
817
          overwrite="true"
818
          filtering="no"/>
819

  
820 814
      <!-- Copy the rest of the modified geoserver web-inf files
821 815
      <copy todir="${war.webinf}" filtering="no">
822 816
        <fileset dir="${spatial.webinf-mods}">

Also available in: Unified diff