User: starksm 
  Date: 02/04/04 19:10:27

  Modified:    jetty/src/build Tag: Branch_2_4 build.bat build.xml
                        jetty-service.xml
  Log:
  The service must be inserted before the J2EE deployer or ears/wars
  that exist on startup will not deploy correctly.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +33 -33    contrib/jetty/src/build/Attic/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/Attic/build.bat,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- build.bat 22 Feb 2002 19:40:34 -0000      1.2.2.2
  +++ build.bat 5 Apr 2002 03:10:27 -0000       1.2.2.3
  @@ -1,33 +1,33 @@
  -@echo off
  -REM $Id: build.bat,v 1.2.2.2 2002/02/22 19:40:34 danch Exp $
  -
  -if not exist "%JBOSS_HOME%\bin\run.jar" (
  -    echo $JBOSS_HOME/bin/run.jar does not exist
  -    echo set JBOSS_HOME to your JBoss dist directory
  -    goto done
  -)
  -if not exist "%JETTY_HOME%\lib\org.mortbay.jetty.jar" (
  -    echo %JETTY_HOME%/lib/org.mortbay.jetty.jar does not exist
  -    echo set JETTY_HOME to your Jetty3 directory
  -    goto done
  -)
  -
  -if not exist "%JETTY_EXTRA%/jmx/lib/org.mortbay.jetty.jmx.jar" (
  -    echo %JETTY_EXTRA%/jmx/lib/org.mortbay.jetty.jmx.jar does not exist
  -    echo set JETTY_EXTRA to your Jetty3Extra directory
  -    goto done
  -)
  -
  -SET CLASSPATH=..\..\build\classes
  -SET CLASSPATH=%CLASSPATH%;..\..\..\tomcat\lib\ant.jar
  -SET CLASSPATH=%CLASSPATH%;..\..\..\tomcat\lib\javac.jar
  -SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jaxp.jar
  -SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\crimson.jar
  -SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jboss-jaas.jar
  -SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\ext\jbosssx.jar
  -SET CLASSPATH=%CLASSPATH%;%JETTY_EXTRA%\jmx\lib\org.mortbay.jetty.jmx.jar
  -
  -SET OPTS= -Djetty.dist="%JETTY_HOME%" -Djboss.dist="%JBOSS_HOME%" 
-Djetty.jmx="%JETTY_EXTRA%"
  -java %OPTS% org.apache.tools.ant.Main %*
  -
  -:done
  \ No newline at end of file
  +@echo off
  +REM $Id: build.bat,v 1.2.2.3 2002/04/05 03:10:27 starksm Exp $
  +
  +if not exist "%JBOSS_HOME%\bin\run.jar" (
  +    echo $JBOSS_HOME/bin/run.jar does not exist
  +    echo set JBOSS_HOME to your JBoss dist directory
  +    goto done
  +)
  +if not exist "%JETTY_HOME%\lib\org.mortbay.jetty.jar" (
  +    echo %JETTY_HOME%/lib/org.mortbay.jetty.jar does not exist
  +    echo set JETTY_HOME to your Jetty3 directory
  +    goto done
  +)
  +
  +if not exist "%JETTY_EXTRA%/jmx/lib/org.mortbay.jmx.jar" (
  +    echo %JETTY_EXTRA%/jmx/lib/org.mortbay.jmx.jar does not exist
  +    echo set JETTY_EXTRA to your Jetty3Extra directory
  +    goto done
  +)
  +
  +SET CLASSPATH=..\..\build\classes
  +SET CLASSPATH=%CLASSPATH%;..\..\..\tomcat\lib\ant.jar
  +SET CLASSPATH=%CLASSPATH%;..\..\..\tomcat\lib\javac.jar
  +SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jaxp.jar
  +SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\crimson.jar
  +SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\jboss-jaas.jar
  +SET CLASSPATH=%CLASSPATH%;%JBOSS_HOME%\lib\ext\jbosssx.jar
  +SET CLASSPATH=%CLASSPATH%;%JETTY_EXTRA%\jmx\lib\org.mortbay.jmx.jar
  +
  +SET OPTS= -Djetty.dist="%JETTY_HOME%" -Djboss.dist="%JBOSS_HOME%" 
-Djetty.jmx="%JETTY_EXTRA%"
  +java %OPTS% org.apache.tools.ant.Main %*
  +
  +:done
  
  
  
  1.6.2.9   +2 -2      contrib/jetty/src/build/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/Attic/build.xml,v
  retrieving revision 1.6.2.8
  retrieving revision 1.6.2.9
  diff -u -r1.6.2.8 -r1.6.2.9
  --- build.xml 4 Apr 2002 19:17:06 -0000       1.6.2.8
  +++ build.xml 5 Apr 2002 03:10:27 -0000       1.6.2.9
  @@ -3,7 +3,7 @@
     <!ENTITY jetty-service.xml SYSTEM "jetty-service.xml">
   ]>
   
  -<!-- $Id: build.xml,v 1.6.2.8 2002/04/04 19:17:06 starksm Exp $ -->
  +<!-- $Id: build.xml,v 1.6.2.9 2002/04/05 03:10:27 starksm Exp $ -->
   
   <!-- An Ant build file for the jetty-service jar and the
       JBoss/Jetty bundle. The buildfile requires a JBoss dist
  @@ -196,7 +196,7 @@
   
     <replace
        file="${jcml.tgt}"
  -     token="&lt;/server&gt;"
  +     token="&lt;!-- Insert WebContainer HERE --&gt;"
        >
          <replacevalue>&jetty-service.xml;</replacevalue>
     </replace>
  
  
  
  1.1.2.2   +1 -1      contrib/jetty/src/build/Attic/jetty-service.xml
  
  Index: jetty-service.xml
  ===================================================================
  RCS file: /cvsroot/jboss/contrib/jetty/src/build/Attic/jetty-service.xml,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- jetty-service.xml 4 Apr 2002 18:26:00 -0000       1.1.2.1
  +++ jetty-service.xml 5 Apr 2002 03:10:27 -0000       1.1.2.2
  @@ -1,4 +1,5 @@
   <![CDATA[
  +  <!-- The Jetty service configuration -->
     <mbean code="org.jboss.jetty.JettyService" name="DefaultDomain:service=Jetty">
   
       <!-- ================================================================= -->
  @@ -133,6 +134,5 @@
       <attribute name="SubjectAttributeName">j_subject</attribute>
   
     </mbean>
  -</server>
   ]]>
   
  
  
  

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

Reply via email to