Project

General

Profile

« Previous | Next » 

Revision 5829

geoserver upgrade:
-remove embedded geoserver
-include geotools api and update spatial harvesting
-include simple template for using maps in skin (openlayers now, not mapbuilder)

View differences:

web.xml.tomcat5
18 18
      <param-value>metacat.properties</param-value>
19 19
      <description>The main configuration file for application</description>
20 20
    </context-param>
21
    
22
      
23
  <context-param>
24
    <param-name>serviceStratagy</param-name>
25
    <!-- Meaning of the different values :
26
    	 
27
    	 PARTIAL-BUFFER
28
    	 - Partially buffers the first xKb to disk. Once that has buffered, the the 
29
    	   result is streamed to the user. This will allow for most errors to be caught
30
    	   early.
31
    	   
32
         BUFFER
33
         - stores the entire response in memory first, before sending it off to
34
           the user (may run out of memory)
35 21

  
36
         SPEED
37
         - outputs directly to the response (and cannot recover in the case of an
38
           error)
39

  
40
         FILE
41
         - outputs to the local filesystem first, before sending it off to the user
42
      -->
43
    <param-value>PARTIAL-BUFFER</param-value>
44
  </context-param>
45
  <context-param>
46
	<param-name>PARTIAL_BUFFER_STRATEGY_SIZE</param-name>
47
	<param-value>50</param-value>
48
  </context-param>
49
  
50

  
51
        <!-- pick up all spring application contexts -->
52
        <context-param>
53
                <param-name>contextConfigLocation</param-name>
54
                <param-value>classpath*:/applicationContext.xml</param-value>
55
        </context-param>
56

  
57
   
58
 <filter>
59
    <filter-name>Set Character Encoding</filter-name>
60
    <filter-class>org.vfny.geoserver.filters.SetCharacterEncodingFilter</filter-class>
61
    <init-param>
62
      <param-name>encoding</param-name>
63
      <param-value>UTF-8</param-value>
64
    </init-param>
65
  </filter>
66

  
67
  <filter-mapping>
68
    <filter-name>Set Character Encoding</filter-name>
69
    <url-pattern>/*</url-pattern>
70
  </filter-mapping>
71
  
72

  
73
  <listener>
74
    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
75
  </listener>
76

  
77

  
78

  
79
  <!-- MPTODO testing  leave out for geoserver 1.4 and use a spring/geoserver plugin instead??
80
   
81
 <filter>
82
    <filter-name>WmsFilter</filter-name>
83
    <filter-class>edu.ucsb.nceas.metacat.spatial.WmsFilter</filter-class>
84
 </filter>
85

  
86
  <filter-mapping>
87
    <filter-name>WmsFilter</filter-name>
88
    <url-pattern>/metacatwms/*</url-pattern>
89
    <dispatcher>REQUEST</dispatcher>
90
  </filter-mapping>
91
  -->
92

  
93

  
94 22
  <!-- D1 filters -->
95 23
  <filter>
96 24
    <filter-name>D1URLFilter</filter-name>
......
103 31
    <dispatcher>REQUEST</dispatcher>
104 32
  </filter-mapping>
105 33

  
106

  
107
  <!-- spring dispatcher servlet, dispatches incoming requests to controllers -->
108
  <servlet>
109
    <servlet-name>dispatcher</servlet-name>
110
    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
111
  </servlet>
112
     
113
   <!-- Struts config needs to load before all the other servlets... except spring-->
114
   <servlet>
115
    <servlet-name>action</servlet-name>
116
    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
117
    <init-param>
118
      <param-name>config</param-name>
119
      <param-value>/WEB-INF/struts-config.xml</param-value>
120
    </init-param>
121
    <init-param>
122
      <param-name>debug</param-name>
123
      <param-value>2</param-value>
124
    </init-param>
125
    <init-param>
126
      <param-name>detail</param-name>
127
      <param-value>2</param-value>
128
    </init-param>
129
    <load-on-startup>1</load-on-startup>
130
  </servlet> 
131
 
132
  <servlet>
133
   <servlet-name>TestWfsPost</servlet-name>
134
   <servlet-class>org.vfny.geoserver.wfs.servlets.TestWfsPost</servlet-class>
135
  </servlet>
136

  
137

  
138

  
139
  <!-- MPTODO testing -->
140
  <servlet>
141
    <servlet-name>SldFactory</servlet-name>
142
    <servlet-class>edu.ucsb.nceas.metacat.spatial.SldFactory</servlet-class>
143
  </servlet>
144

  
145
   <!--<servlet>
146
      <servlet-name>gwt</servlet-name>
147
      <servlet-class>org.kepler.web.service.KeplerServiceServlet</servlet-class>
148
      <init-param>
149
        <param-name>debug</param-name>
150
        <param-value>1</param-value>
151
      </init-param>
152
      <init-param>
153
        <param-name>listings</param-name>
154
        <param-value>true</param-value>
155
      </init-param>
156
      <load-on-startup>2</load-on-startup>
157
    </servlet>-->
158

  
159

  
160 34
    <servlet>
161 35
      <servlet-name>metacat</servlet-name>
162 36
      <servlet-class>edu.ucsb.nceas.metacat.MetaCatServlet</servlet-class>
......
304 178
      </init-param>
305 179
      <load-on-startup>10</load-on-startup>
306 180
    </servlet>
307

  
308
  <!--<servlet-mapping>
309
        <servlet-name>gwt</servlet-name>
310
        <url-pattern>/gwt</url-pattern>
311
    </servlet-mapping>-->
312 181
  
313 182
    <servlet-mapping>
314 183
        <servlet-name>metacat</servlet-name>
......
433 302
    <url-pattern>/dataProvider</url-pattern>
434 303
  </servlet-mapping>
435 304
  -->
436

  
437

  
438
 <!-- MPTODO testing -->
439
  <servlet-mapping>
440
    <servlet-name>SldFactory</servlet-name>
441
    <url-pattern>/sldfactory</url-pattern>
442
  </servlet-mapping>
443

  
444

  
445
  <servlet-mapping>
446
    <servlet-name>action</servlet-name>
447
    <url-pattern>*.do</url-pattern>
448
   </servlet-mapping>
449
  <servlet-mapping>
450
        <servlet-name>dispatcher</servlet-name>
451
        <url-pattern>/wms/*</url-pattern>
452
  </servlet-mapping>
453
  <servlet-mapping>
454
        <servlet-name>dispatcher</servlet-name>
455
        <url-pattern>/wfs/*</url-pattern>
456
  </servlet-mapping>
457
  <servlet-mapping>
458
        <servlet-name>dispatcher</servlet-name>
459
        <url-pattern>/ows/*</url-pattern>
460
  </servlet-mapping>
461
  <servlet-mapping>
462
   <servlet-name>TestWfsPost</servlet-name>
463
   <url-pattern>/TestWfsPost/*</url-pattern>
464
  </servlet-mapping>
465

  
466 305
      
467 306
    <session-config>
468 307
      <session-timeout>30000</session-timeout>
......
486 325
   <extension>xsl</extension>
487 326
   <mime-type>text/xml</mime-type>
488 327
  </mime-mapping>
489

  
490 328
		      
491 329
  <welcome-file-list>
492 330
    <welcome-file>index.jsp</welcome-file>
493 331
    <welcome-file>index.html</welcome-file>
494 332
  </welcome-file-list>
495
 
496
 
497
  <taglib>
498
     <taglib-uri>http://jakarta.apache.org/taglibs/xtags-1.0</taglib-uri>
499
     <taglib-location>/WEB-INF/xtags.tld</taglib-location>
500
  </taglib>   
501 333

  
502
  <taglib>
503
    <taglib-uri>/tags/struts-bean</taglib-uri>
504
    <taglib-location>/WEB-INF/struts-bean.tld</taglib-location>
505
  </taglib>
506

  
507
  <taglib>
508
    <taglib-uri>/tags/struts-html</taglib-uri>
509
    <taglib-location>/WEB-INF/struts-html.tld</taglib-location>
510
  </taglib>
511

  
512
  <taglib>
513
    <taglib-uri>/tags/struts-logic</taglib-uri>
514
    <taglib-location>/WEB-INF/struts-logic.tld</taglib-location>
515
  </taglib>
516

  
517
  <taglib>
518
    <taglib-uri>/tags/struts-nested</taglib-uri>
519
    <taglib-location>/WEB-INF/struts-nested.tld</taglib-location>
520
  </taglib>
521

  
522
  <taglib>
523
    <taglib-uri>/tags/struts-tiles</taglib-uri>
524
    <taglib-location>/WEB-INF/struts-tiles.tld</taglib-location>
525
  </taglib>  
526
  
527
  <!-- spring taglib -->
528
  <taglib>
529
        <taglib-uri>/tags/spring</taglib-uri>
530
        <taglib-location>/WEB-INF/tld/spring.tld</taglib-location>
531
  </taglib>
532

  
533
<!-- 
534
  <error-page>
535
        <exception-type>java.lang.Exception</exception-type>
536
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
537
  </error-page>
538
  <error-page>
539
        <exception-type>javax.servlet.ServletException</exception-type>
540
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
541
  </error-page>
542
  <error-page>
543
        <exception-type>org.vfny.geoserver.global.ConfigurationException</exception-type>
544
                <location>/WEB-INF/pages/errors/Exception.jsp</location>
545
  </error-page>
546
-->
547

  
548 334
<security-constraint>
549 335
	<web-resource-collection>
550 336
		<web-resource-name>PROPERTIES</web-resource-name>

Also available in: Unified diff