User: jules_gosnell
  Date: 01/09/10 16:52:05

  Modified:    jetty/src/etc README VERSION demo.xml jetty.xml
  Log:
  jetty repackaging and build script fixes
  
  Revision  Changes    Path
  1.4       +34 -29    contrib/jetty/src/etc/README
  
  Index: README
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/etc/README,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- README    2001/08/16 23:57:27     1.3
  +++ README    2001/09/10 23:52:05     1.4
  @@ -1,43 +1,48 @@
  -JBoss-Jetty.
  ------------
  +-----------------------------------------------------------------------
   
  -This is a module that integrates intra-vm JBoss CVS with Jetty3 CVS
  -(jetty.mortbay.com).
  +Un*x users:
   
  -Jetty is then able to provide JBoss with the services of Servlet
  -Container and HTTP Server.
  +run ./run.sh in this dir.
   
  -To INSTALL : (I'm assuming Un*x - Windows later..)
  +If you are thinking of using the CGI Servlet you will want to 'chmod
  ++x jetty/cgi-bin/*' - for some reason the executable bit seems to get
  +lost in the [un]jarring process.
   
  -cd contrib/jetty/src/build
  -(set up JBOSS_HOME and JETTY_HOME)
  -sh ./build.sh install (installs jetty-service.jar in jboss tree)
  -sh ./build.sh client  (builds contrib/jetty/tomcat-test.ear)
  +MS Users:
   
  -Uncomment the necessary Jetty stuff in
  -$JBOSS_HOME/conf/default/jboss.conf and jboss.jcml - ensuring that you
  -set up a ClassPathExtension pointing to Jetty's lib directory,
  -org.jboss.deployment.J2eeDeployer's WarDeployerName Arg is changed to
  -: :service=Jetty and that you set the Attribute url for JettyService
  -as suggested in the comment.
  +cd to ./jboss/bin and 'run.bat jetty'
   
  -To TEST :
  +(please send me the equiv run.bat for this dir)
   
  -Follow the instructions in contrib/tomcat to deploy and run the
  -tomcat-test.ear (WebApp and EJBs).
  +-----------------------------------------------------------------------
   
  -To further test Jetty try hitting <jboss-host>:8080/ (If you haven't
  -altered the port Jetty is configured to run on). This will run the
  -Jetty web-application, giving you access to the Jetty demo test-suite.
  +For some Jetty doc and Demos run up JBoss-Jetty and hit:
   
  -PROBLEMS :
  +http://my-jboss-host:8080
   
  -Jetty questions should be directed to [EMAIL PROTECTED]
  -JBoss questions should be directed to [EMAIL PROTECTED]
  -I shall be happy to answer questions about the integration.
  +You can look around the MBeans running within Jetty by hitting :
   
  +http://my-jboss-host:8082
   
  -Enjoy.
  +and looking at the 'Jetty' links...
   
  -Jules ([EMAIL PROTECTED]) - 11/11/2000
  +-----------------------------------------------------------------------
  +
  +Please post problems accordingly :
  +
  +Jetty (i.e. WAR, JSDK, HTTP) related -> [EMAIL PROTECTED]
  +
  +JBoss/Jetty Integration (Deployment etc...) related ->
  [EMAIL PROTECTED] (put 'Jetty' in your subject
  +line)
  +
  +JBoss (everything else) related -> [EMAIL PROTECTED]
  +
  +-----------------------------------------------------------------------
  +
  +
  +Thanks for using JBoss-Jetty,
  +
  +
  +Jules (JBoss-Jetty maintainer) - [EMAIL PROTECTED]
   
  
  
  
  1.3       +40 -3     contrib/jetty/src/etc/VERSION
  
  Index: VERSION
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/etc/VERSION,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VERSION   2001/08/16 23:53:15     1.2
  +++ VERSION   2001/09/10 23:52:05     1.3
  @@ -1,12 +1,49 @@
  -JBoss-2.4.0.23_BETA-Jetty-3.1.RC7
  +JBoss-2.4.1_Jetty-3.1.RC9
   
   -----------------------------------------------------------------------
   
  -Release Candidate 1. (24/07/2001)
  +Release Candidate 1. (10/09/2001)
   
  +Jetty3          - Jetty-3.1.RC9
  +Jetty3Extra/jmx - Jetty3Extra-0.0.7
  +JBoss           - JBoss-2.4.1
  +JBoss-Jetty     - JBoss/contrib/jetty (cvs update -d -D 'September 10, 2001 11:55pm 
BST')
  +
  +- upgrade JBoss and Jetty components
  +- adapt to Jetty's com->org repackaging
  +- adapt to buildmagic/RabbitHole changes
  +- relocate jboss-web.dtd
  +- for Jetty changes see jetty/VERSION.TXT
  +
  +-----------------------------------------------------------------------
  +
  +JBoss-2.4.0_Jetty-3.1.RC8
  +
  +-----------------------------------------------------------------------
  +
  +Release Candidate 1. (22/08/2001)
  +
  +Jetty3          - Jetty-3.1.RC8
  +Jetty3Extra/jmx - Jetty3Extra-0.0.6
  +JBoss           - JBoss-2.4.0
  +JBoss-Jetty     - JBoss/contrib/jetty (cvs update -d -D 'August 22, 2001 10:30pm 
BST')
  +
  +- move SetupHandler onto latest Jetty API
  +- upgrade to latest JBoss and Jetty
  +
  +- for Jetty changes see jetty/VERSION.TXT
  +
  +-----------------------------------------------------------------------
  +
  +JBoss-2.4.0.26_BETA-Jetty-3.1.RC7
  +
  +-----------------------------------------------------------------------
  +
  +Release Candidate 1. (12/08/2001)
  +
   Jetty3          - Jetty-3.1.RC7 (cvs update -d -D 'August 9, 2001 10:20pm BST')
   Jetty3Extra/jmx - Jetty3Extra-0.0.5
  -JBoss           - JBoss-2.4.0.23_BETA
  +JBoss           - JBoss-2.4.0.26_BETA
   JBoss-Jetty     - JBoss/contrib/jetty (cvs update -d -D 'August 9, 2001 10:20pm 
BST')
   
   - Fix '/' context deployment problems
  
  
  
  1.3       +15 -15    contrib/jetty/src/etc/demo.xml
  
  Index: demo.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/etc/demo.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- demo.xml  2001/08/16 23:53:15     1.2
  +++ demo.xml  2001/09/10 23:52:05     1.3
  @@ -5,8 +5,8 @@
   
   <!--
   This is a Jetty HTTP server configuration file.  This configuration
  -uses the generic com.mortbay.Util.XmlConfiguration class to call
  -the normal com.mortbay.HTTP.HttpServer configuration API from
  +uses the generic org.mortbay.Util.XmlConfiguration class to call
  +the normal org.mortbay.HTTP.HttpServer configuration API from
   within an XML script.
   
   The format of this file is described in the configure.dtd file.
  @@ -49,15 +49,15 @@
   
   
   This file configures the demo server and is equivalent
  -to the com.mortbay.Jetty.Demo class.
  +to the org.mortbay.Jetty.Demo class.
   
   $ID: $
   -->
   
  -<Configure class="com.mortbay.HTTP.HttpServer">
  +<Configure class="org.mortbay.HTTP.HttpServer">
     <Call name="addListener">
       <Arg>
  -      <New class="com.mortbay.HTTP.SocketListener">
  +      <New class="org.mortbay.HTTP.SocketListener">
           <Set name="Port">8080</Set>
           <Set name="MinThreads">5</Set>
           <Set name="MaxThreads">255</Set>
  @@ -70,7 +70,7 @@
   <!--  Uncomment this to add an SSL listener. 
     <Call name="addListener">
       <Arg>
  -      <New class="com.mortbay.HTTP.SunJsseListener">
  +      <New class="org.mortbay.HTTP.SunJsseListener">
           <Set name="Port">8443</Set>
           <Set name="MinThreads">5</Set>
           <Set name="MaxThreads">255</Set>
  @@ -95,17 +95,17 @@
       <Call name="addServlet">
         <Arg>Dump</Arg>
         <Arg>/dump/*,*.DUMP</Arg>
  -      <Arg>com.mortbay.Servlet.Dump</Arg>
  +      <Arg>org.mortbay.Servlet.Dump</Arg>
       </Call>
       <Call name="addServlet">
         <Arg>Session</Arg>
         <Arg>/session</Arg>
  -      <Arg>com.mortbay.Servlet.SessionDump</Arg>
  +      <Arg>org.mortbay.Servlet.SessionDump</Arg>
       </Call>
       <Call name="addServlet">
         <Arg>Dispatch</Arg>
         <Arg>/Dispatch/*</Arg>
  -      <Arg>com.mortbay.Servlet.RequestDispatchTest</Arg>
  +      <Arg>org.mortbay.Servlet.RequestDispatchTest</Arg>
       </Call>
       <Call name="addServlet">
         <Arg>JSP</Arg>
  @@ -114,7 +114,7 @@
       </Call>
       <Set name="ServingResources">TRUE</Set>
       <Call name="addHandler">
  -      <Arg><New class="com.mortbay.HTTP.Handler.DumpHandler"/></Arg>
  +      <Arg><New class="org.mortbay.HTTP.Handler.DumpHandler"/></Arg>
       </Call>
       <Set name="HttpServerAccess">TRUE</Set>
     </Call>
  @@ -137,7 +137,7 @@
       <Call name="addServlet">
         <Arg>Common Gateway Interface</Arg>
         <Arg>/</Arg>
  -      <Arg>com.mortbay.Servlet.CGI</Arg>
  +      <Arg>org.mortbay.Servlet.CGI</Arg>
        <Put name="Path">/bin:/usr/bin:/usr/local/bin</Put>
       </Call>
     </Call>
  @@ -147,17 +147,17 @@
       <Call name="addServlet">
         <Arg>Forward</Arg>
         <Arg>/</Arg>
  -      <Arg>com.mortbay.Servlet.Forward</Arg>
  +      <Arg>org.mortbay.Servlet.Forward</Arg>
         <Put name="/">/jetty/index.html</Put>
       </Call>
       <Call name="addHandler">
  -      <Arg><New class="com.mortbay.HTTP.Handler.NotFoundHandler"/></Arg>
  +      <Arg><New class="org.mortbay.HTTP.Handler.NotFoundHandler"/></Arg>
       </Call>
     </Call>
   
     <Call name="addRealm">
       <Arg>
  -      <New class="com.mortbay.HTTP.HashUserRealm">
  +      <New class="org.mortbay.HTTP.HashUserRealm">
           <Arg>Jetty Demo Realm</Arg>
           <Arg><SystemProperty name="jetty.home"/>/etc/demoRealm.properties</Arg>
         </New>
  @@ -165,7 +165,7 @@
     </Call>
   
     <Set name="LogSink">
  -    <New class="com.mortbay.Util.RolloverFileLogSink">
  +    <New class="org.mortbay.Util.RolloverFileLogSink">
         <Set name="LogDir"><SystemProperty name="jetty.home"/>/logs</Set>
         <Set name="RetainDays">90</Set>
         <Set name="MultiDay">false</Set>
  
  
  
  1.3       +18 -18    contrib/jetty/src/etc/jetty.xml
  
  Index: jetty.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/etc/jetty.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jetty.xml 2001/08/16 23:53:15     1.2
  +++ jetty.xml 2001/09/10 23:52:05     1.3
  @@ -3,8 +3,8 @@
   
   <!--
   This is a Jetty HTTP server configuration file.  This configuration
  -uses the generic com.mortbay.Util.XmlConfiguration class to call
  -the normal com.mortbay.HTTP.HttpServer configuration API from
  +uses the generic org.mortbay.util.XmlConfiguration class to call
  +the normal org.mortbay.http.HttpServer configuration API from
   within an XML script.
   
   The format of this file is described in the configure.dtd file.
  @@ -47,15 +47,15 @@
   
   
   This file configures the demo server and is equivalent
  -to the com.mortbay.Jetty.Demo class.
  +to the org.mortbay.jetty.Demo class.
   
   $ID: $
   -->
   
  -<Configure class="com.mortbay.HTTP.HttpServer">
  +<Configure class="org.mortbay.http.HttpServer">
     <Call name="addListener">
       <Arg>
  -      <New class="com.mortbay.HTTP.SocketListener">
  +      <New class="org.mortbay.http.SocketListener">
           <Set name="Port">8080</Set>
           <Set name="MinThreads">5</Set>
           <Set name="MaxThreads">255</Set>
  @@ -69,7 +69,7 @@
   <!--  Uncomment this to add an SSL listener.
     <Call name="addListener">
       <Arg>
  -      <New class="com.mortbay.HTTP.SunJsseListener">
  +      <New class="org.mortbay.http.SunJsseListener">
           <Set name="Port">8443</Set>
           <Set name="MinThreads">5</Set>
           <Set name="MaxThreads">255</Set>
  @@ -94,7 +94,7 @@
   
       <!-- Remove this comment for .htaccess handling
       <Call name="addHandler">
  -      <Arg><New class="com.mortbay.HTTP.Handler.HTAccessHandler">
  +      <Arg><New class="org.mortbay.http.handler.HTAccessHandler">
            <Set name="Default"><SystemProperty name="jetty.home" 
default="."/>/etc/htaccess</Set>
            <Set name="AccessFile">.htaccess</Set></New></Arg>
       </Call>
  @@ -103,18 +103,18 @@
       <Call name="addServlet">
         <Arg>Dump</Arg>
         <Arg>/dump/*,*.DUMP</Arg>
  -      <Arg>com.mortbay.Servlet.Dump</Arg>
  +      <Arg>org.mortbay.servlet.Dump</Arg>
         <Put name="InitParam">Value</Put>
       </Call>
       <Call name="addServlet">
         <Arg>Session</Arg>
         <Arg>/session</Arg>
  -      <Arg>com.mortbay.Servlet.SessionDump</Arg>
  +      <Arg>org.mortbay.servlet.SessionDump</Arg>
       </Call>
       <Call name="addServlet">
         <Arg>Dispatch</Arg>
         <Arg>/Dispatch/*</Arg>
  -      <Arg>com.mortbay.Servlet.RequestDispatchTest</Arg>
  +      <Arg>org.mortbay.servlet.RequestDispatchTest</Arg>
       </Call>
       <Call name="addServlet">
         <Arg>JSP</Arg>
  @@ -124,20 +124,20 @@
       <Call name="addServlet">
         <Arg>Debug</Arg>
         <Arg>/Debug/*</Arg>
  -      <Arg>com.mortbay.Servlet.Debug</Arg>
  +      <Arg>org.mortbay.servlet.Debug</Arg>
       </Call>
   
       <Set name="ResourceBase"><SystemProperty name="jetty.home" 
default="."/>/docroot/</Set>
       <Set name="ServingResources">TRUE</Set>
       <Call name="addHandler">
  -      <Arg><New class="com.mortbay.HTTP.Handler.DumpHandler"/></Arg>
  +      <Arg><New class="org.mortbay.http.handler.DumpHandler"/></Arg>
       </Call>
       <Set name="HttpServerAccess">TRUE</Set>
   
       <Call name="addHandler">
         <Arg type="int">0</Arg>
         <Arg>
  -        <New class="com.mortbay.HTTP.Handler.ForwardHandler">
  +        <New class="org.mortbay.http.handler.ForwardHandler">
             <Arg>/dump/forwardedRoot</Arg>
             <Call 
name="addForward"><Arg>/forward/*</Arg><Arg>/dump/forwarded</Arg></Call>
           </New>
  @@ -157,7 +157,7 @@
       <Call name="addServlet">
         <Arg>Common Gateway Interface</Arg>
         <Arg>/</Arg>
  -      <Arg>com.mortbay.Servlet.CGI</Arg>
  +      <Arg>org.mortbay.servlet.CGI</Arg>
        <Put name="Path">/bin:/usr/bin:/usr/local/bin</Put>
       </Call>
     </Call>
  @@ -172,7 +172,7 @@
       <Call name="addHandler">
         <Arg type="int">0</Arg>
         <Arg>
  -        <New class="com.mortbay.HTTP.Handler.ForwardHandler">
  +        <New class="org.mortbay.http.handler.ForwardHandler">
             <Arg>/jetty/index.html</Arg>
           </New>
         </Arg>
  @@ -183,7 +183,7 @@
   
     <Call name="addRealm">
       <Arg>
  -      <New class="com.mortbay.HTTP.HashUserRealm">
  +      <New class="org.mortbay.http.HashUserRealm">
           <Arg>Jetty Demo Realm</Arg>
           <Arg><SystemProperty name="jetty.home" 
default="."/>/etc/demoRealm.properties</Arg>
         </New>
  @@ -195,13 +195,13 @@
       <Call name="addServlet">
         <Arg>Admin</Arg>
         <Arg>/</Arg>
  -      <Arg>com.mortbay.Servlet.AdminServlet</Arg>
  +      <Arg>org.mortbay.servlet.AdminServlet</Arg>
       </Call>
     </Call>
   
   <!--
     <Set name="LogSink">
  -    <New class="com.mortbay.Util.RolloverFileLogSink">
  +    <New class="org.mortbay.util.RolloverFileLogSink">
         <Set name="LogDir"><SystemProperty name="jetty.home"/>/logs</Set>
         <Set name="RetainDays">90</Set>
         <Set name="MultiDay">false</Set>
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to