Project

General

Profile

« Previous | Next » 

Revision 4080

Added by daigle over 16 years ago

Merge 1.9 changes into Head

View differences:

web.xml.tomcat5
154 154
      <load-on-startup>2</load-on-startup>
155 155
    </servlet>
156 156
    
157
    <servlet>
158
      <servlet-name>MetaCatAdmin</servlet-name>
159
      <servlet-class>edu.ucsb.nceas.metacat.admin.MetaCatAdminServlet</servlet-class>
160
      <init-param>
161
        <param-name>debug</param-name>
162
        <param-value>1</param-value>
163
      </init-param>
164
      <init-param>
165
        <param-name>listings</param-name>
166
        <param-value>true</param-value>
167
      </init-param>
168
      <load-on-startup>3</load-on-startup>
169
    </servlet>
170
    
157 171
     <servlet>
158 172
      <servlet-name>replication</servlet-name>
159 173
      <servlet-class>edu.ucsb.nceas.metacat.MetacatReplication</servlet-class>
......
216 230
      </init-param>
217 231
      <load-on-startup>3</load-on-startup>
218 232
    </servlet>
219
    -->    
220

  
233
    -->
234
    
221 235
<servlet>
222 236
      <servlet-name>AxisServlet</servlet-name>
223 237
      <display-name>Apache-Axis Servlet</display-name>
......
268 282
        <servlet-name>metacat</servlet-name>
269 283
        <url-pattern>/servlet/metacat</url-pattern>
270 284
    </servlet-mapping>
285

  
286
        
287
    <servlet-mapping>
288
        <servlet-name>MetaCatAdmin</servlet-name>
289
        <url-pattern>/admin</url-pattern>
290
    </servlet-mapping>
291

  
292
 <!--   
293
    <servlet-mapping>
294
        <servlet-name>MetaCatAdmin</servlet-name>
295
        <url-pattern>/admin/*</url-pattern>
296
    </servlet-mapping>
297
-->
271 298
    
272 299
    <servlet-mapping>
273 300
        <servlet-name>replication</servlet-name>

Also available in: Unified diff