Changes between Version 28 and Version 29 of waue/2009/0811


Ignore:
Timestamp:
Aug 14, 2009, 12:26:54 PM (15 years ago)
Author:
waue
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • waue/2009/0811

    v28 v29  
    100100{{{
    101101#!diff
    102 jetty-src:start.config  > apt-get:start.config
    103 
    104 
    105 
    106 25,28c25,27
    107 
    108 < #   available classname        # true if class on classpath
    109 
    110 < #   property name              # true of set
    111 
    112 < #   java OPERATOR version      # java version compared to literal
    113 
    114 < #   nargs OPERATOR number      # number of command line args compared to literal
    115 
    116 ---
    117 
    118 > #   available classname
    119 
    120 > #   java OPERATOR version
    121 
    122 > #   nargs OPERATOR number
    123 
    124 39,40c38
    125 
    126 < org.mortbay.log.LogFactory.noDiscovery=true       ! property org.mortbay.log.LogFactory.noDiscovery
    127 
    128 < javax.management.builder.initial=mx4j.server.MX4JMBeanServerBuilder java > 1.4
    129 
    130 ---
    131 
    132 > org.apache.commons.logging.LogFactory=org.mortbay.log.Factory AND ! property org.apache.commons.logging.LogFactory ! property org.apache.commons.logging.Log
    133 
    134 43,47c41,50
    135 
    136 < jetty.home=.                                     ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
    137 
    138 < jetty.home=..                                    ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
    139 
    140 < jetty.home=/home/jetty                           ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
    141 
    142 < jetty.home=/C:/jetty                             ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
    143 
    144 < jetty.home=.                                     ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
    145 
    146 ---
    147 
    148 > jetty.home=/usr/share/jetty
    149 
    150 >
    151 
    152 > # Debian jars home
    153 
    154 > java.lib.home=/usr/share/java                  always
    155 
    156 > tomcat.lib.home=/usr/share/tomcat5.5/common/lib/ always
    157 
    158 >
    159 
    160 > # Do not validate xml files by default.
    161 
    162 > # Disabled because servlet-2.3.jar references an XSD which is not longer
    163 
    164 > # hostet by IBM. This should generally make the startup faster.
    165 
    166 > property=org.mortbay.xml.XmlParser.NotValidating=true
    167 
    168 50,54c53
    169 
    170 < org.mortbay.jetty.Server.class
    171 
    172 < # override class with old property name
    173 
    174 < $(start.class).class
    175 
    176 < # override class with preferred property name
    177 
    178 < $(main.class).class
    179 
    180 ---
    181 
    182 > org.mortbay.jetty.Server.class                   
    183 
    184 57,58c56,57
    185 
    186 < $(jetty.home)/etc/admin.xml                      nargs == 0
    187 
    188 < $(jetty.home)/etc/jetty.xml                      nargs == 0
    189 
    190 ---
    191 
    192 > #/etc/admin.xml                                   nargs == 0
    193 
    194 > /etc/jetty/jetty.xml                             nargs == 0
    195 
    196 61,65c60,66
    197 
    198 < $(jetty.home)/lib/org.mortbay.jetty.jar          java >= 1.4
    199 
    200 < $(jetty.home)/lib/javax.servlet.jar              always
    201 
    202 <
    203 
    204 < # Add JMX jars
    205 
    206 < $(jetty.home)/lib/org.mortbay.jmx.jar            java >= 1.4
    207 
    208 ---
    209 
    210 > # Always use the >1.2 version because version matching does not work with kaffe
    211 
    212 > $(jetty.home)/lib/org.mortbay.jetty.jar         
    213 
    214 > #$(jetty.home)/lib/org.mortbay.jetty.jar          java >= 1.4
    215 
    216 > #$(jetty.home)/extra/lib/org.mortbay.jetty-jdk1.2.jar   java < 1.4 AND java >= 1.2
    217 
    218 > $(jetty.home)/lib/org.mortbay.jmx.jar           
    219 
    220 > $(java.lib.home)/servlet-api-2.4.jar                 
    221 
    222 > $(java.lib.home)/jsp-api-2.0.jar                 
    223 
    224 67,68c68,69
    225 
    226 < # Always use xercesImpl from ext if it is present
    227 
    228 < $(jetty.home)/ext/xercesImpl.jar                 ! available org.apache.xerces.jaxp.DocumentBuilderImpl
    229 
    230 ---
    231 
    232 > # Always use xercesImpl from debian if it is present
    233 
    234 > $(java.lib.home)/xercesImpl.jar                  ! available org.apache.xerces.jaxp.DocumentBuilderImpl.class
    235 
    236 71,72c72,73
    237 
    238 < $(jetty.home)/ext/xmlParserAPIs-2.5.jar          ! available org.w3c.dom.DOMError
    239 
    240 < $(jetty.home)/ext/xml-apis.jar                   ! available org.w3c.dom.Document
    241 
    242 ---
    243 
    244 > $(java.lib.home)/xmlParserAPIs.jar               ! available org.w3c.dom.DOMError
    245 
    246 > $(java.lib.home)/xml-apis.jar                    ! available org.w3c.dom.Document
    247 
    248 75,85c76,82
    249 
    250 < $(jetty.home)/ext/ant.jar                        ! available org.apache.tools.ant.Main
    251 
    252 < $(jetty.home)/ext/jasper-runtime.jar             ! available org.apache.jasper.Constants
    253 
    254 < $(jetty.home)/ext/jasper-compiler.jar            ! available org.apache.jasper.JspCompilationContext
    255 
    256 < $(jetty.home)/ext/jnet.jar                       ! available javax.net.SocketFactory
    257 
    258 < $(jetty.home)/ext/jsse.jar                       ! available javax.net.ssl.SSLServerSocket
    259 
    260 < $(jetty.home)/ext/jcert.jar                      ! available javax.security.cert.X509Certificate
    261 
    262 < # Add anything in ext we have not yet considered.
    263 
    264 < $(jetty.home)/ext/*                 
    265 
    266 <
    267 
    268 < # Try some standard locations for anything missing.
    269 
    270 < /usr/share/java/ant.jar                          ! available org.apache.tools.ant.Main
    271 
    272 ---
    273 
    274 > $(java.lib.home)/commons-logging.jar             ! available org.apache.commons.logging.LogFactory
    275 
    276 > $(java.lib.home)/commons-el.jar                  ! available org.apache.commons.el.ExpressionEvaluatorImpl
    277 
    278 > $(java.lib.home)/jmxri.jar                       ! available javax.management.MBeanServer
    279 
    280 > $(tomcat.lib.home)/jasper-compiler-jdt.jar       ! available org.eclipse.jdt.core.JDTCompilerAdapter
    281 
    282 > $(tomcat.lib.home)/jasper-runtime.jar            ! available org.apache.jasper.Constants
    283 
    284 > $(tomcat.lib.home)/jasper-compiler.jar           ! available org.apache.jasper.JspCompilationContext
    285 
    286 > $(java.lib.home)/ant-1.6.jar                         ! available org.apache.tools.ant.BuildException
    287 
    288 89,90c86,87
    289 
    290 < # Add a resources directory if it is there
    291 
    292 < $(jetty.home)/resources/
    293 
    294 ---
    295 
    296 > # Add anything in ext we have not yet considered.
    297 
    298 > $(jetty.home)/ext/*                 
     102--- /home/waue/Desktop/start.config     2009-08-12 17:53:10.000000000 +0800
     103+++ /etc/jetty/start.config     2009-08-14 12:12:47.000000000 +0800
     104@@ -22,10 +22,9 @@
     105 # CONDITION is one of:
     106 #   always
     107 #   never
     108-#   available classname        # true if class on classpath
     109-#   property name              # true of set
     110-#   java OPERATOR version      # java version compared to literal
     111-#   nargs OPERATOR number      # number of command line args compared to literal
     112+#   available classname
     113+#   java OPERATOR version
     114+#   nargs OPERATOR number
     115 #   OPERATOR := one of "<",">","<=",">=","==","!="
     116 #
     117 # CONTITIONS can be combined with AND OR or !, with AND being the assume
     118@@ -36,55 +35,53 @@
     119 
     120 $(jetty.class.path)                              always
     121 
     122-org.mortbay.log.LogFactory.noDiscovery=true       ! property org.mortbay.log.LogFactory.noDiscovery
     123-javax.management.builder.initial=mx4j.server.MX4JMBeanServerBuilder java > 1.4
     124+org.apache.commons.logging.LogFactory=org.mortbay.log.Factory AND ! property org.apache.commons.logging.LogFactory ! property org.apache.commons.logging.Log
     125 
     126 # Try different settings of jetty.home until the jetty.jar is found.
     127-jetty.home=.                                     ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
     128-jetty.home=..                                    ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
     129-jetty.home=/home/jetty                           ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
     130-jetty.home=/C:/jetty                             ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
     131-jetty.home=.                                     ! exists $(jetty.home)/lib/org.mortbay.jetty.jar
     132+jetty.home=/usr/share/jetty
     133+
     134+# Debian jars home
     135+java.lib.home=/usr/share/java                   always
     136+tomcat.lib.home=/usr/share/tomcat5.5/common/lib/ always
     137+
     138+# Do not validate xml files by default.
     139+# Disabled because servlet-2.3.jar references an XSD which is not longer
     140+# hostet by IBM. This should generally make the startup faster.
     141+property=org.mortbay.xml.XmlParser.NotValidating=true
     142 
     143 # The main class to run
     144-org.mortbay.jetty.Server.class
     145-# override class with old property name
     146-$(start.class).class
     147-# override class with preferred property name
     148-$(main.class).class
     149+org.mortbay.jetty.Server.class                   
     150 
     151 # The default configuration files
     152-$(jetty.home)/etc/admin.xml                      nargs == 0
     153-$(jetty.home)/etc/jetty.xml                      nargs == 0
     154+#/etc/admin.xml                                   nargs == 0
     155+/etc/jetty/jetty.xml                             nargs == 0
     156 
     157 # Set the jetty classpath
     158-$(jetty.home)/lib/org.mortbay.jetty.jar          java >= 1.4
     159-$(jetty.home)/lib/javax.servlet.jar              always
     160-
     161-# Add JMX jars
     162-$(jetty.home)/lib/org.mortbay.jmx.jar            java >= 1.4
     163+# Always use the >1.2 version because version matching does not work with kaffe
     164+$(jetty.home)/lib/org.mortbay.jetty.jar         
     165+#$(jetty.home)/lib/org.mortbay.jetty.jar          java >= 1.4
     166+#$(jetty.home)/extra/lib/org.mortbay.jetty-jdk1.2.jar   java < 1.4 AND java >= 1.2
     167+$(jetty.home)/lib/org.mortbay.jmx.jar           
     168+$(java.lib.home)/servlet-api-2.4.jar                 
     169+$(java.lib.home)/jsp-api-2.0.jar                 
     170 
     171-# Always use xercesImpl from ext if it is present
     172-$(jetty.home)/ext/xercesImpl.jar                 ! available org.apache.xerces.jaxp.DocumentBuilderImpl
     173+# Always use xercesImpl from debian if it is present
     174+$(java.lib.home)/xercesImpl.jar                  ! available org.apache.xerces.jaxp.DocumentBuilderImpl.class
     175 
     176 # Add the XML support jars if needed.
     177-$(jetty.home)/ext/xmlParserAPIs-2.5.jar          ! available org.w3c.dom.DOMError
     178-$(jetty.home)/ext/xml-apis.jar                   ! available org.w3c.dom.Document
     179+$(java.lib.home)/xmlParserAPIs.jar               ! available org.w3c.dom.DOMError
     180+$(java.lib.home)/xml-apis.jar                    ! available org.w3c.dom.Document
     181 
     182 # Set the classpath for the supporting cast
     183-$(jetty.home)/ext/ant.jar                        ! available org.apache.tools.ant.Main
     184-$(jetty.home)/ext/jasper-runtime.jar             ! available org.apache.jasper.Constants
     185-$(jetty.home)/ext/jasper-compiler.jar            ! available org.apache.jasper.JspCompilationContext
     186-$(jetty.home)/ext/jnet.jar                       ! available javax.net.SocketFactory
     187-$(jetty.home)/ext/jsse.jar                       ! available javax.net.ssl.SSLServerSocket
     188-$(jetty.home)/ext/jcert.jar                      ! available javax.security.cert.X509Certificate
     189-# Add anything in ext we have not yet considered.
     190-$(jetty.home)/ext/*                 
     191-
     192-# Try some standard locations for anything missing.
     193-/usr/share/java/ant.jar                          ! available org.apache.tools.ant.Main
     194+$(java.lib.home)/commons-logging.jar             ! available org.apache.commons.logging.LogFactory
     195+$(java.lib.home)/commons-el.jar                  ! available org.apache.commons.el.ExpressionEvaluatorImpl
     196+$(java.lib.home)/jmxri.jar                       ! available javax.management.MBeanServer
     197+$(tomcat.lib.home)/jasper-compiler-jdt.jar       ! available org.eclipse.jdt.core.JDTCompilerAdapter
     198+$(tomcat.lib.home)/jasper-runtime.jar            ! available org.apache.jasper.Constants
     199+$(tomcat.lib.home)/jasper-compiler.jar           ! available org.apache.jasper.JspCompilationContext
     200+$(java.lib.home)/ant-1.6.jar                         ! available org.apache.tools.ant.BuildException
     201 $(java.home)/lib/tools.jar                       ! available com.sun.tools.javac.Main
     202 $(java.home)/../lib/tools.jar                    ! available com.sun.tools.javac.Main
     203 
     204-# Add a resources directory if it is there
     205-$(jetty.home)/resources/
     206+# Add anything in ext we have not yet considered.
     207+$(jetty.home)/ext/*                             
    299208}}}
    300209