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 2001/12/16 00:09:10 UTC

cvs commit: jakarta-cactus/conf/sample/conf/test/servlet23/weblogic61 SerializedSystemIni.dat config.xml fileRealm.properties

vmassol     01/12/15 15:09:10

  Modified:    build    build-servletapi.xml build.properties.sample
               conf/sample/build/servlet23 build.properties.sample
                        build.xml
               docs/framework/xdocs changes.xml todo.xml
  Added:       conf/sample/build/servlet23 build-tests-weblogic-61.xml
               conf/sample/conf/test/servlet23/weblogic61
                        SerializedSystemIni.dat config.xml
                        fileRealm.properties
  Log:
  added sample scripts for automatically running cactus tests on WebLogic 6.1
  
  Revision  Changes    Path
  1.29      +2 -0      jakarta-cactus/build/build-servletapi.xml
  
  Index: build-servletapi.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build/build-servletapi.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- build-servletapi.xml	2001/11/16 22:09:54	1.28
  +++ build-servletapi.xml	2001/12/15 23:09:10	1.29
  @@ -269,6 +269,7 @@
   
           <!-- Only run the ajc task if at least one of the source file has been
                modified. -->
  +<!-- Fixme: not working: no recompile when file changed -->
           <uptodate property="ajc.notrequired" targetfile="${final.jar.name}">
               <srcfiles dir="${out.src.dir}">
                   <patternset refid="all.src.files"/>
  @@ -624,6 +625,7 @@
               <property name="tomcat.home.40"/>
               <property name="orion.home.14"/>
               <property name="orion.home.15"/>
  +            <property name="weblogic.home.61"/>
               <property name="test.port"/>
           </argsList>
   
  
  
  
  1.18      +5 -1      jakarta-cactus/build/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/build/build.properties.sample,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.properties.sample	2001/11/16 19:49:14	1.17
  +++ build.properties.sample	2001/12/15 23:09:10	1.18
  @@ -49,8 +49,12 @@
   #resin.home.20 = f:/applis/resin-2.0.s010820
   #tomcat.home.40 = f:/applis/jakarta-tomcat-4.0-b7
   #resin.home.13 = f:/applis/resin-1.3.s010125
  -#tomcat.home.33 = f:/applis/jakarta-tomcat-3.3-b2
  +#tomcat.home.33 = f:/applis/jakarta-tomcat-3.3.1-dev
   #enhydra.home.31 = xxx
  +
  +# Note: weblogic.home.61 is the location of BEA Home and NOT the location of
  +# wlserver6.1, inside the bea home directory.
  +#weblogic.home.61 = c:/bea
   
   # Note: There seems to be a bug in Orion 1.4 preventing it to run correctly
   #       the testSendUserData() test. It runs fine in Orion 1.5 however.
  
  
  
  1.18      +4 -0      jakarta-cactus/conf/sample/build/servlet23/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/conf/sample/build/servlet23/build.properties.sample,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.properties.sample	2001/11/16 22:09:54	1.17
  +++ build.properties.sample	2001/12/15 23:09:10	1.18
  @@ -41,3 +41,7 @@
   #tomcat.home.40 = f:/applis/jakarta-tomcat-4.0
   #orion.home.14 = f:/applis/orion-1.4.5
   #orion.home.15 = f:/applis/orion-1.5.2
  +
  +# Note: weblogic.home.61 is the location of BEA Home and NOT the location of
  +# wlserver6.1, inside the bea home directory.
  +#weblogic.home.61 = c:/bea
  
  
  
  1.9       +4 -1      jakarta-cactus/conf/sample/build/servlet23/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/conf/sample/build/servlet23/build.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.xml	2001/11/16 22:09:54	1.8
  +++ build.xml	2001/12/15 23:09:10	1.9
  @@ -7,6 +7,7 @@
       <!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-tomcat-40 SYSTEM "file:./build-tests-tomcat-40.xml">
  +    <!ENTITY build-tests-weblogic-61 SYSTEM "file:./build-tests-weblogic-61.xml">
   ]>
   
   <!--
  @@ -99,6 +100,7 @@
           <echo message=" tests_tomcat_40   --> run tests for Tomcat 4.0"/>
           <echo message=" tests_orion_14    --> run tests for Orion 1.4"/>
           <echo message=" tests_orion_15    --> run tests for Orion 1.5"/>
  +        <echo message=" tests_weblogic_61 --> run tests for WebLogic 6.1"/>
           <echo message=""/>
   
       </target>
  @@ -109,7 +111,7 @@
          ========================================================================
       -->
       <target name="tests_all"
  -        depends="tests_resin_20,tests_resin_13,tests_tomcat_40,tests_orion_14,tests_orion_15">
  +        depends="tests_resin_20,tests_resin_13,tests_tomcat_40,tests_orion_14,tests_orion_15,tests_weblogic_61">
       </target>
   
       &build-tests-resin-20;
  @@ -117,5 +119,6 @@
       &build-tests-orion-14;
       &build-tests-orion-15;
       &build-tests-tomcat-40;
  +    &build-tests-weblogic-61;
   
   </project>
  
  
  
  1.1                  jakarta-cactus/conf/sample/build/servlet23/build-tests-weblogic-61.xml
  
  Index: build-tests-weblogic-61.xml
  ===================================================================
      <!--
         ========================================================================
           Run WebLogic 6.1 tests
         ========================================================================
      -->
      <target name="tests_weblogic_61" depends="prepare_tests_weblogic_61" if="weblogic.home.61">
  
          <!-- 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/test/test.jsp"
              startTarget="start_weblogic_61"
              stopTarget="stop_weblogic_61"
              testTarget="tests"/>
  
      </target>
  
      <!--
         ========================================================================
           Start WebLogic 6.1
         ========================================================================
      -->
      <target name="start_weblogic_61">
  
          <java classname="weblogic.Server" fork="yes" dir="${out.weblogic61.dir}">
  
              <classpath>
                  <pathelement location="${weblogic.home.61}/wlserver6.1/lib/weblogic_sp.jar"/>
                  <pathelement location="${weblogic.home.61}/wlserver6.1/lib/weblogic.jar"/>
              </classpath>
  
              <jvmarg value="-hotspot"/>
              <jvmarg value="-ms64m"/>
              <jvmarg value="-mx64m"/>
              <jvmarg value="-Djava.library.path=${java.library.path};${weblogic.home.61}/wlserver6.1/bin"/>
              <jvmarg value="-Dweblogic.RootDirectory=."/>
              <jvmarg value="-Dweblogic.Domain=testdomain"/>
              <jvmarg value="-Dweblogic.Name=testserver"/>
              <jvmarg value="-Dbea.home=${weblogic.home.61}"/>
              <jvmarg value="-Dweblogic.management.password=password"/>
              <jvmarg value="-Djava.security.policy==./lib/weblogic.policy"/>
  
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Stop WebLogic 6.1
         ========================================================================
      -->
      <target name="stop_weblogic_61">
  
          <java classname="weblogic.Admin" fork="yes">
  
              <classpath>
                  <pathelement location="${weblogic.home.61}/wlserver6.1/lib/weblogic_sp.jar"/>
                  <pathelement location="${weblogic.home.61}/wlserver6.1/lib/weblogic.jar"/>
              </classpath>
  
              <arg line="-url t3://localhost:${test.port}"/>
              <arg line="-username system"/>
              <arg line="-password password"/>
              <arg value="SHUTDOWN"/>
  
          </java>
  
      </target>
  
      <!--
         ========================================================================
           Display a warning message if the needed servlet engine home property
           is not set
         ========================================================================
      -->
      <target name="check_tests_weblogic_61" depends="testwar" unless="weblogic.home.61">
  
          <echo message=""/>
          <echo message="***********************************************************"/>
          <echo message="WARNING : The 'weblogic.home.61' property has not been set."/>
          <echo message="          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_tests_weblogic_61" depends="check_tests_weblogic_61"
          if="weblogic.home.61">
  
          <echo message="weblogic.home.61 = ${weblogic.home.61}"/>
  
          <property name="out.weblogic61.dir" value="${out.test.dir}/weblogic61"/>
          <property name="conf.weblogic61.dir" value="${conf.test.dir}/weblogic61"/>
  
          <mkdir dir="${out.weblogic61.dir}/config/testdomain/applications"/>
  
          <!-- Copy WL 6.1 configuration files -->
          <copy file="${conf.weblogic61.dir}/config.xml"
              todir="${out.weblogic61.dir}/config/testdomain" filtering="on"/>
          <copy file="${conf.weblogic61.dir}/fileRealm.properties"
              todir="${out.weblogic61.dir}/config/testdomain"/>
          <copy file="${conf.weblogic61.dir}/SerializedSystemIni.dat"
              todir="${out.weblogic61.dir}/config/testdomain"/>
  
          <!-- Copy the war file -->
          <copy file="${out.test.dir}/test.war"
              todir="${out.weblogic61.dir}/config/testdomain/applications"/>
  
      </target>
  
  
  
  1.71      +3 -0      jakarta-cactus/docs/framework/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/docs/framework/xdocs/changes.xml,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- changes.xml	2001/12/15 22:48:54	1.70
  +++ changes.xml	2001/12/15 23:09:10	1.71
  @@ -127,6 +127,9 @@
       </devs>
   
       <release version="1.3 in CVS">
  +      <action dev="VMA" type="add">
  +        Added automatic script support for WebLogic 6.1.
  +      </action>
         <action dev="VMA" type="fix">
           Corrected bug in
           <code>AbstractHttpServletRequestWrapper.getPathTranslated()</code> which
  
  
  
  1.70      +0 -9      jakarta-cactus/docs/framework/xdocs/todo.xml
  
  Index: todo.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/docs/framework/xdocs/todo.xml,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- todo.xml	2001/12/15 21:09:24	1.69
  +++ todo.xml	2001/12/15 23:09:10	1.70
  @@ -31,15 +31,6 @@
   
     <version title="Version 1.3">
   
  -    <category title="Build Process">
  -      <p>
  -        All tasks that are related to building Cactus in general.
  -      </p>
  -      <action assigned-to="Wind Li, Vincent Massol">
  -        Add Ant scripts to support WebLogic 6.x.
  -      </action>
  -    </category>
  -
       <category title="Design/Code">
         <action assigned-to="Peter Wong, Vincent Massol">
           Support unit testing of Servlet code that uses Security APIs, such as
  
  
  
  1.1                  jakarta-cactus/conf/sample/conf/test/servlet23/weblogic61/SerializedSystemIni.dat
  
  	<<Binary file>>
  
  
  1.1                  jakarta-cactus/conf/sample/conf/test/servlet23/weblogic61/config.xml
  
  Index: config.xml
  ===================================================================
  <Domain Name="testdomain">
    <Server Name="testserver" NativeIOEnabled="true" ListenPort="@test.port@"/>
  </Domain>
  
  
  
  1.1                  jakarta-cactus/conf/sample/conf/test/servlet23/weblogic61/fileRealm.properties
  
  Index: fileRealm.properties
  ===================================================================
  #Mon Dec 10 17:24:02 GMT 2001
  acl.unlockServer.weblogic.admin=Administrators
  user.system=0xb925d776addde243d018a561318650afadb954cc
  acl.lockServer.weblogic.admin=Administrators
  acl.unlockuser.weblogic.passwordpolicy=Administrators
  acl.shutdown.weblogic.admin=Administrators
  acl.boot.weblogic.server=Administrators,everyone
  group.Administrators=system
  
  
  

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