You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by vm...@apache.org on 2002/07/20 14:48:14 UTC

cvs commit: jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16 application.xml default-web-site.xml global-web-application.xml mime.types principals.xml rmi.xml server.xml

vmassol     2002/07/20 05:48:14

  Modified:    .        build.properties.sample
               documentation/docs/xdocs changes.xml features.xml
                        testedon.xml
               sample-servlet build.properties.sample build.xml
               sample-servlet/conf/sample/build/j2ee12
                        build.properties.sample build.xml
               sample-servlet/conf/sample/build/j2ee13
                        build.properties.sample build.xml
  Added:       sample-servlet/conf/sample/build/share
                        build-tests-orion-16.xml
               sample-servlet/conf/sample/conf/test/share/orion16
                        application.xml default-web-site.xml
                        global-web-application.xml mime.types
                        principals.xml rmi.xml server.xml
  Log:
  added automated Ant scripts for Orion 1.6
  
  Revision  Changes    Path
  1.19      +2 -1      jakarta-cactus/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build.properties.sample,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.properties.sample	20 Jul 2002 11:26:06 -0000	1.18
  +++ build.properties.sample	20 Jul 2002 12:48:13 -0000	1.19
  @@ -73,6 +73,7 @@
   #tomcat.home.32 = c:/Apps/jakarta-tomcat-3.2.4
   #weblogic.home.51 = xxx
   #orion.home.15 = c:/Apps/orion-1.5.4
  +#orion.home.16 = c:/Apps/orion-1.6.0
   #resin.home.20 = c:/Apps/resin-2.1.0
   #tomcat.home.40 = c:/Apps/jakarta-tomcat-4.1.3
   #resin.home.13 = xxx
  
  
  
  1.26      +3 -0      jakarta-cactus/documentation/docs/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/changes.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- changes.xml	20 Jul 2002 12:26:25 -0000	1.25
  +++ changes.xml	20 Jul 2002 12:48:13 -0000	1.26
  @@ -48,6 +48,9 @@
       </devs>
   
       <release version="1.4 in CVS">
  +      <action dev="VMA" type="add">
  +        Added automatic script support for Orion 1.6.
  +      </action>
         <action dev="VMA" type="fix">
           Ant scripts for Resin and Orion now correctly configures them for
           Cactus BASIC authentication tests.
  
  
  
  1.4       +10 -7     jakarta-cactus/documentation/docs/xdocs/features.xml
  
  Index: features.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/features.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- features.xml	21 Apr 2002 12:53:46 -0000	1.3
  +++ features.xml	20 Jul 2002 12:48:13 -0000	1.4
  @@ -147,13 +147,10 @@
             containers) :
             <ul>
               <li>
  -              Tomcat 3.2 (Servlet API 2.2)
  +              Tomcat 3.x (Servlet API 2.2)
               </li>
               <li>
  -              Tomcat 3.3 (Servlet API 2.2)
  -            </li>
  -            <li>
  -              Tomcat 4.0 (Servlet API 2.2 and 2.3)
  +              Tomcat 4.x (Servlet API 2.2 and 2.3)
               </li>
               <li>
                 Resin 1.2 (Servlet API 2.2)
  @@ -162,19 +159,25 @@
                 Resin 1.3 (Servlet API 2.3)
               </li>
               <li>
  -              Resin 2.0 (Servlet API 2.2 and 2.3)
  +              Resin 2.x (Servlet API 2.2 and 2.3)
               </li>
               <li>
                 WebLogic 5.1 (Servlet API 2.2)
               </li>
               <li>
  -              WebLogic 6.1 (Servlet API 2.3)
  +              WebLogic 6.1 (Servlet API 2.2 and 2.3)
  +            </li>
  +            <li>
  +              WebLogic 7.0 (Servlet API 2.2 and 2.3)
               </li>
               <li>
                 Orion 1.4 (Servlet API 2.2 and 2.3)
               </li>
               <li>
                 Orion 1.5 (Servlet API 2.2 and 2.3)
  +            </li>
  +            <li>
  +              Orion 1.6 (Servlet API 2.2 and 2.3)
               </li>
               <li>
                 Enhydra 3.1 (Servlet API 2.2)
  
  
  
  1.15      +16 -0     jakarta-cactus/documentation/docs/xdocs/testedon.xml
  
  Index: testedon.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/documentation/docs/xdocs/testedon.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- testedon.xml	20 Jul 2002 12:26:42 -0000	1.14
  +++ testedon.xml	20 Jul 2002 12:48:13 -0000	1.15
  @@ -181,6 +181,22 @@
               <td>
               </td>
             </tr>
  +          <tr>
  +            <td>
  +              Orion
  +            </td>
  +            <td>
  +              1.6.0
  +            </td>
  +            <td>
  +              1.2
  +            </td>
  +            <td>
  +              <link href="mailto:vmassol@apache.org">Vincent Massol</link>
  +            </td>
  +            <td>
  +            </td>
  +          </tr>
   
           </table>
   
  
  
  
  1.17      +2 -1      jakarta-cactus/sample-servlet/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.properties.sample,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.properties.sample	20 Jul 2002 11:26:06 -0000	1.16
  +++ build.properties.sample	20 Jul 2002 12:48:13 -0000	1.17
  @@ -65,6 +65,7 @@
   #tomcat.home.32 = c:/Apps/jakarta-tomcat-3.2.4
   #weblogic.home.51 = xxx
   #orion.home.15 = c:/Apps/orion-1.5.4
  +#orion.home.16 = c:/Apps/orion-1.6.0
   #resin.home.20 = c:/Apps/resin-2.1.0
   #tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.3
   #resin.home.13 = xxx
  
  
  
  1.7       +1 -0      jakarta-cactus/sample-servlet/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	19 Jun 2002 22:02:53 -0000	1.6
  +++ build.xml	20 Jul 2002 12:48:13 -0000	1.7
  @@ -357,6 +357,7 @@
               <property name="tomcat.home.40"/>
               <property name="orion.home.14"/>
               <property name="orion.home.15"/>
  +            <property name="orion.home.16"/>
               <property name="weblogic.home.51"/>
               <property name="weblogic.home.61"/>
               <property name="weblogic.home.70"/>
  
  
  
  1.15      +2 -1      jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.properties.sample,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- build.properties.sample	20 Jul 2002 12:19:27 -0000	1.14
  +++ build.properties.sample	20 Jul 2002 12:48:13 -0000	1.15
  @@ -60,6 +60,7 @@
   #tomcat.home.32 = c:/Apps/jakarta-tomcat-3.2.4
   #tomcat.home.33 = c:/Apps/jakarta-tomcat-3.3.1
   #orion.home.15 = c:/Apps/orion-1.5.4
  +#orion.home.16 = c:/Apps/orion-1.6.0
   #weblogic.home.51 = xxx
   #tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.3
   
  
  
  
  1.5       +3 -1      jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee12/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	19 Jun 2002 22:02:53 -0000	1.4
  +++ build.xml	20 Jul 2002 12:48:13 -0000	1.5
  @@ -6,6 +6,7 @@
       <!ENTITY build-tests-resin-12 SYSTEM "file:./build-tests-resin-12.xml">
       <!ENTITY build-tests-orion-14 SYSTEM "file:./build-tests-orion-14.xml">
       <!ENTITY build-tests-orion-15 SYSTEM "file:./build-tests-orion-15.xml">
  +    <!ENTITY build-tests-orion-16 SYSTEM "file:./build-tests-orion-16.xml">
       <!ENTITY build-tests-tomcat-32 SYSTEM "file:./build-tests-tomcat-32.xml">
       <!ENTITY build-tests-tomcat-33 SYSTEM "file:./build-tests-tomcat-33.xml">
       <!ENTITY build-tests-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
  @@ -85,7 +86,7 @@
          ========================================================================
       -->
       <target name="test.all"
  -        depends="test.resin.20,test.resin.12,test.tomcat.32,test.tomcat.33,test.tomcat.40,test.orion.14,test.orion.15,test.weblogic.51,test.enhydra.31,test.weblogic.61,test.weblogic.70"
  +        depends="test.resin.20,test.resin.12,test.tomcat.32,test.tomcat.33,test.tomcat.40,test.orion.14,test.orion.15,test.orion.16,test.weblogic.51,test.enhydra.31,test.weblogic.61,test.weblogic.70"
           description="Run tests on all defined containers">
       </target>
   
  @@ -93,6 +94,7 @@
       &build-tests-resin-12;
       &build-tests-orion-14;
       &build-tests-orion-15;
  +    &build-tests-orion-16;
       &build-tests-tomcat-32;
       &build-tests-tomcat-33;
       &build-tests-tomcat-40;
  
  
  
  1.13      +2 -1      jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.properties.sample,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.properties.sample	20 Jul 2002 12:19:27 -0000	1.12
  +++ build.properties.sample	20 Jul 2002 12:48:14 -0000	1.13
  @@ -59,6 +59,7 @@
   #resin.home.13 = xxx
   #tomcat.home.40 = c:/Apps/jakarta-tomcat-4.0.3
   #orion.home.15 = c:/Apps/orion-1.5.4
  +#orion.home.16 = c:/Apps/orion-1.6.0
   
   # Note: weblogic.home.61 is the location of BEA Home and NOT the location of
   # wlserver6.1, inside the bea home directory.
  
  
  
  1.3       +3 -1      jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/sample-servlet/conf/sample/build/j2ee13/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	19 Jun 2002 22:02:53 -0000	1.2
  +++ build.xml	20 Jul 2002 12:48:14 -0000	1.3
  @@ -6,6 +6,7 @@
       <!ENTITY build-tests-resin-13 SYSTEM "file:./build-tests-resin-13.xml">
       <!ENTITY build-tests-orion-14 SYSTEM "file:./build-tests-orion-14.xml">
       <!ENTITY build-tests-orion-15 SYSTEM "file:./build-tests-orion-15.xml">
  +    <!ENTITY build-tests-orion-16 SYSTEM "file:./build-tests-orion-16.xml">
       <!ENTITY build-tests-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
       <!ENTITY build-tests-weblogic-61 SYSTEM "file:./build-tests-weblogic-61.xml">
       <!ENTITY build-tests-weblogic-70 SYSTEM "file:./build-tests-weblogic-70.xml">
  @@ -81,7 +82,7 @@
          ========================================================================
       -->
       <target name="test.all"
  -        depends="test.resin.20,test.resin.13,test.tomcat.40,test.orion.14,test.orion.15,test.weblogic.61,test.weblogic.70"
  +        depends="test.resin.20,test.resin.13,test.tomcat.40,test.orion.14,test.orion.15,test.orion.16,test.weblogic.61,test.weblogic.70"
           description="Run tests on all defined containers">
       </target>
   
  @@ -89,6 +90,7 @@
       &build-tests-resin-13;
       &build-tests-orion-14;
       &build-tests-orion-15;
  +    &build-tests-orion-16;
       &build-tests-tomcat-40;
       &build-tests-weblogic-61;
       &build-tests-weblogic-70;
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/build/share/build-tests-orion-16.xml
  
  Index: build-tests-orion-16.xml
  ===================================================================
      <!--
         ========================================================================
           Run Orion 1.6 tests
         ========================================================================
      -->
      <target name="test.orion.16" depends="prepare.test.orion.16"
          if="orion.home.16" description="Run tests on Orion 1.6">
  
          <!-- Start the servlet engine, wait for it to be started, run the
               unit tests, stop the servlet engine, wait for it to be stopped.
               The servlet engine is stopped if the tests fail for any reason -->
  
          <runservertests
              testURL="http://localhost:${test.port}/test/ServletRedirector?Cactus_Service=RUN_TEST"
              startTarget="start.orion.16"
              stopTarget="stop.orion.16"
              testTarget="test"/>
  
      </target>
  
      <!--
         ========================================================================
           Start Orion 1.6
         ========================================================================
      -->
      <target name="start.orion.16">
  
          <java classname="com.evermind.server.ApplicationServer" fork="yes">
              <arg value="-config"/>
              <arg value="${target.orion16.dir}/conf/server.xml"/>
              <classpath>
                <fileset dir="${orion.home.16}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Stop Orion 1.6
         ========================================================================
      -->
      <target name="stop.orion.16">
  
          <java classname="com.evermind.client.orion.OrionConsoleAdmin"
              fork="yes">
              <arg value="ormi://localhost:23791/"/>
              <arg value="admin"/>
              <arg value="password"/>
              <arg value="-shutdown"/>
              <classpath>
                <fileset dir="${orion.home.16}">
                    <include name="*.jar"/>
                </fileset>
              </classpath>
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check.test.orion.16" unless="orion.home.16">
  
          <echo message=""/>
          <echo message="******************************************************"/>
          <echo message="WARNING : The 'orion.home.16' property has not been"/>
          <echo message="set. No test will be run on that servlet engine."/>
          <echo message="******************************************************"/>
          <echo message=""/>
  
      </target>
  
      <!--
         ========================================================================
           Prepare directories and variables for running the tests
         ========================================================================
      -->
      <target name="prepare.test.orion.16"
          depends="check.test.orion.16,testwar" if="orion.home.16">
  
          <echo message="orion.home.16 = ${orion.home.16}"/>
  
          <property name="target.orion16.dir" value="${target.test.dir}/orion16"/>
          <property name="conf.orion16.dir" value="${conf.test.dir}/orion16"/>
  
          <!-- Create work and conf directories and copy configuration files -->
          <mkdir dir="${target.orion16.dir}"/>
          <mkdir dir="${target.orion16.dir}/conf"/>
  
          <!-- Orion need to have a /persistence directory created, otherwise
               it throws an error -->
          <mkdir dir="${target.orion16.dir}/persistence"/>
  
          <copy todir="${target.orion16.dir}/conf" filtering="on">
              <fileset dir="${conf.orion16.dir}"/>
          </copy>
  
          <!-- Copy the war file -->
          <copy file="${target.test.dir}/test.war"
              tofile="${target.orion16.dir}/test.war"/>
  
      </target>
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/application.xml
  
  Index: application.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE orion-application PUBLIC "-//Evermind//DTD J2EE Application runtime 1.2//EN" "http://www.orionserver.com/dtds/orion-application.dtd">
  
  <orion-application>
  
      <web-module id="test" path="../test.war"/>
  
      <security-role-mapping name="test">
          <user name="testuser"/>
      </security-role-mapping>
  
  	<namespace-access>
  		<read-access>
  			<namespace-resource root="">
  				<security-role-mapping>
  					<group name="administrators" />
  				</security-role-mapping>
  			</namespace-resource>
  		</read-access>
  		<write-access>
  			<namespace-resource root="">
  				<security-role-mapping>
  					<group name="administrators" />
  				</security-role-mapping>
  			</namespace-resource>
  		</write-access>
  	</namespace-access>
  
  	<principals path="./principals.xml" />
  
  </orion-application>
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/default-web-site.xml
  
  Index: default-web-site.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE web-site PUBLIC "Orion Web-site" "http://www.orionserver.com/dtds/web-site.dtd">
  
  <web-site host="[ALL]" port="@test.port@" display-name="Default Orion WebSite">
  
      <!-- The default web-app for this site, bound to the root -->
      <default-web-app application="default" name="test"/>
  
      <web-app application="default" name="test" root="/test"/>
  
  </web-site>
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/global-web-application.xml
  
  Index: global-web-application.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE orion-web-app PUBLIC '//Evermind//Orion web-application' 'http://www.orionserver.com/dtds/orion-web.dtd'>
  
  <!-- Set development="true" to enabvle development, enable this if you
  want to debug JSP sources etc -->
  
  <orion-web-app
  	jsp-cache-directory="./persistence"
  	servlet-webdir="/servlet"
  	development="false"
	persistence-path="./persistence/state.ser"
  >
  
  	<!-- The mime-mappings for this server -->
  	<mime-mappings path="./mime.types" />
  	<servlet-chaining servlet-name="xsl" mime-type="text/xml" />
  
  	<web-app>
  		<servlet>
  			<servlet-name>xsl</servlet-name>
  			<servlet-class>com.evermind.servlet.XSLServlet</servlet-class>
  			<init-param>
  				<param-name>defaultContentType</param-name>
  				<param-value>text/html</param-value>
  			</init-param>
  		</servlet>
  	
  		<servlet>
  			<servlet-name>jsp</servlet-name>
  			<servlet-class>com.evermind.server.http.JSPServlet</servlet-class>
  		</servlet>
  
  		<servlet>
  			<servlet-name>ssi</servlet-name>
  			<servlet-class>com.evermind.server.http.SSIServlet</servlet-class>
  		</servlet>
  
  		<servlet>
  			<servlet-name>cgi</servlet-name>
  			<servlet-class>com.evermind.server.http.CGIServlet</servlet-class>
  		</servlet>
  
  		<servlet>
  			<servlet-name>perl</servlet-name>
  			<servlet-class>com.evermind.server.http.CGIServlet</servlet-class>
  			<init-param>
  				<param-name>interpreter</param-name>
  				<param-value>perl</param-value>
  			</init-param>
  		</servlet>
  
  		<servlet>
  			<servlet-name>php</servlet-name>
  			<servlet-class>com.evermind.server.http.CGIServlet</servlet-class>
  			<init-param>
  			<param-name>interpreter</param-name>
  				<param-value>php</param-value>
  			</init-param>
  		</servlet>
  		<servlet-mapping>
  			<servlet-name>jsp</servlet-name>
  			<url-pattern>/*.jsp</url-pattern>
  		</servlet-mapping>
  
  		<servlet-mapping>
  			<servlet-name>cgi</servlet-name>
  			<url-pattern>/*.cgi</url-pattern>
  		</servlet-mapping>
  
  		<servlet-mapping>
  			<servlet-name>perl</servlet-name>
  			<url-pattern>/*.pl</url-pattern>
  		</servlet-mapping>
  
  		<servlet-mapping>
  			<servlet-name>php</servlet-name>
  			<url-pattern>/*.php</url-pattern>
  		</servlet-mapping>
  
  		<servlet-mapping>
  			<servlet-name>php</servlet-name>
  			<url-pattern>/*.php3</url-pattern>
  		</servlet-mapping>
  
  		<servlet-mapping>
  			<servlet-name>php</servlet-name>
  			<url-pattern>/*.phtml</url-pattern>
  		</servlet-mapping>
  
  		<servlet-mapping>
  			<servlet-name>ssi</servlet-name>
  			<url-pattern>/*.shtml</url-pattern>
  		</servlet-mapping>
  		<welcome-file-list>
  			<welcome-file>index.html</welcome-file>
  			<welcome-file>default.jsp</welcome-file>
  		</welcome-file-list>
  	</web-app>
  </orion-web-app>
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/mime.types
  
  Index: mime.types
  ===================================================================
  # Registered mime-types
  
  application/activemessage
  application/andrew-inset
  application/applefile
  application/atomicmail
  application/dca-rft
  application/dec-dx
  application/mac-binhex40	hqx
  application/mac-compactpro	cpt
  application/macwriteii
  application/msword		doc
  application/news-message-id
  application/news-transmission
  application/octet-stream	bin dms lha lzh exe class
  application/jsp			jsp
  application/oda			oda
  application/pdf			pdf
  application/postscript		ai eps ps
  application/powerpoint		ppt
  application/remote-printing
  application/rtf			rtf
  application/slate
  application/wita
  application/wordperfect5.1
  application/x-bcpio		bcpio
  application/x-cdlink		vcd
  application/x-compress		Z
  application/x-cpio		cpio
  application/x-csh			csh
  application/x-director		dcr dir dxr
  application/x-dvi			dvi
  application/x-gtar		gtar
  application/x-gzip		gz
  application/x-hdf			hdf
  application/x-httpd-cgi		cgi
  application/x-java-jnlp-file	jnlp
  application/x-koan		skp skd skt skm
  application/x-latex		latex
  application/x-mif			mif
  application/x-netcdf		nc cdf
  application/x-sh			sh
  application/x-shar		shar
  application/x-stuffit		sit
  application/x-sv4cpio		sv4cpio
  application/x-sv4crc		sv4crc
  application/x-tar			tar
  application/x-tcl			tcl
  application/x-tex			tex
  application/x-texinfo		texinfo texi
  application/x-troff		t tr roff
  application/x-troff-man		man
  application/x-troff-me		me
  application/x-troff-ms		ms
  application/x-ustar		ustar
  application/x-wais-source	src
  text/xml  		       	xml ent cat sty
  text/dtd				dtd
  text/xsl				xsl
  application/jsp			jsp
  application/zip			zip
  audio/basic				au snd
  audio/mpeg				mpga mp2
  audio/x-aiff			aif aiff aifc
  audio/x-pn-realaudio		ram
  audio/x-pn-realaudio-plugin	rpm
  audio/x-realaudio			ra
  audio/x-wav				wav
  chemical/x-pdb			pdb xyz
  image/gif				gif
  image/ief				ief
  image/jpeg				jpeg jpg jpe
  image/png				png
  image/tiff				tiff tif
  image/x-cmu-raster		ras
  image/x-portable-anymap		pnm
  image/x-portable-bitmap		pbm
  image/x-portable-graymap	pgm
  image/x-portable-pixmap		ppm
  image/x-rgb				rgb
  image/x-xbitmap			xbm
  image/x-xpixmap			xpm
  image/x-xwindowdump		xwd
  message/external-body
  message/news
  message/partial
  message/rfc822
  multipart/alternative
  multipart/appledouble
  multipart/digest
  multipart/mixed
  multipart/parallel
  text/html				html htm
  text/plain				txt
  text/richtext			rtx
  text/tab-separated-values	tsv
  text/x-setext			etx
  text/x-sgml				sgml sgm
  video/mpeg				mpeg mpg mpe
  video/quicktime			qt mov
  video/x-msvideo			avi
  video/x-sgi-movie			movie
  x-conference/x-cooltalk		ice
  x-world/x-vrml			wrl vrml
  text/vnd.wap.wml                wml
  application/vnd.wap.wmlc        wmlc
  text/vnd.wap.wmlscript          wmls
  application/vnd.wap.wmlscriptc  wmlsc
  image/vnd.wap.wbmp              wbmp
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/principals.xml
  
  Index: principals.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE principals PUBLIC "//Evermind - Orion Principals//" "http://www.orionserver.com/dtds/principals.dtd">
  
  <principals>
  	<groups>
  		<group name="administrators">
  			<description>administrators</description>
  			<permission name="administration" />
  			<permission name="com.evermind.server.AdministrationPermission" />
  		</group>
  		<group name="guests">
  			<description>guests</description>
  		</group>
  		<group name="users">
  			<description>users</description>
  			<permission name="rmi:login" />
  			<permission name="com.evermind.server.rmi.RMIPermission" />
  		</group>
  	</groups>
  	<users>
  		<user username="admin" password="password" deactivated="false">
  			<description>The default administrator</description>
  			<group-membership group="administrators" />
  			<group-membership group="guests" />
  			<group-membership group="users" />
  		</user>
          <user username="testuser" password="testpwd" deactivated="false">
              <description>Cactus Test User</description>
          </user>
  	</users>
  </principals>
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/rmi.xml
  
  Index: rmi.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE rmi-server PUBLIC "Orion RMI-server" "http://www.orionserver.com/dtds/rmi-server.dtd">
  
  <rmi-server port="23791">	
  </rmi-server>
  
  
  
  1.1                  jakarta-cactus/sample-servlet/conf/sample/conf/test/share/orion16/server.xml
  
  Index: server.xml
  ===================================================================
  <?xml version="1.0"?>
  <!DOCTYPE application-server PUBLIC "Orion Application Server Config" "http://www.orionserver.com/dtds/application-server.dtd">
  
  <application-server>
  
      <global-application name="default" path="./application.xml" />
  
  	<global-web-app-config path="./global-web-application.xml" />
      <web-site path="./default-web-site.xml" />
  
  	<rmi-config path="./rmi.xml" />
  
  </application-server>
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>