Attachment #58970 for bug #68082

View | Details | Raw Unified | Return to bug 68082
Collapse All | Expand All

Lines 23-28 Link Here

(-)jetty-5.1.3/build.xml (+7 lines)
23	<property name="dist" value="${basedir}/dist"/>	23	<property name="dist" value="${basedir}/dist"/>
24	<property name="contrib" value="${basedir}/contrib"/>	24	<property name="contrib" value="${basedir}/contrib"/>
25	<property name="extra" value="${basedir}/extra"/>	25	<property name="extra" value="${basedir}/extra"/>
		26	<property name="extra-ext" value="${basedir}/extra/ext"/>
26	<property name="classes" value="${basedir}/classes"/>	27	<property name="classes" value="${basedir}/classes"/>
27	<property name="javadoc" value="${basedir}/javadoc"/>	28	<property name="javadoc" value="${basedir}/javadoc"/>
28	<property name="logs" value="${basedir}/logs"/>	29	<property name="logs" value="${basedir}/logs"/>
Lines 69-74 Link Here
69	<exclude name="javax.xml.jaxp.jar"/>	70	<exclude name="javax.xml.jaxp.jar"/>
70	<exclude name="crimson.jar"/>	71	<exclude name="crimson.jar"/>
71	</fileset>	72	</fileset>
		73	<fileset dir="${extra-ext}">
		74	<include name="*.jar"/>
		75	<include name="*.JAR"/>
		76	<include name="*.zip"/>
		77	<include name="*.ZIP"/>
		78	</fileset>
72	</path>	79	</path>
73		80
74	<path id="classpath">	81	<path id="classpath">




      <Call name="add">
        <Arg>
          <New class="org.mortbay.log.OutputStreamLogSink">
            <Set name="filename">/var/log/jetty5/yyyy_mm_dd.jetty.log</Set>
            <Set name="retainDays">90</Set>
            <Set name="append">true</Set>
            <Set name="logLabels">true</Set>

      </New>
    </Arg>
  </Call>
  -->

  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
  <!-- Add a HTTPS SSL listener on port 8443                           -->

  <!-- =============================================================== -->
  <Set name="RequestLog">
    <New class="org.mortbay.http.NCSARequestLog">
      <Arg>/var/log/jetty5/yyyy_mm_dd.request.log</Arg>
      <Set name="retainDays">90</Set>
      <Set name="append">true</Set>
      <Set name="extended">false</Set>




        Jetty                    \
        jetty3                   \
        Jetty3                   \
        jetty-5                  \
        "
        
  JETTY_HOME=

#####################################################
# Check that jetty is where we think it is
#####################################################
if [ ! -r /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE ] 
then
   echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
   echo "** ERROR:  /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE is not readable!"
   exit 1
fi


                echo $VERSION:$J
            done
        done
    done | sort | tail -n 1 > $TMPJ
    JAVA=`cat $TMPJ | cut -d: -f2`
    JVERSION=`cat $TMPJ | cut -d: -f1`


    exit 1
fi

JAVA_VERSION=`expr "$($JAVA -version 2>&1 | head -n 1)" : '.*1\.\([0-9]\)'`

#####################################################
# See if JETTY_PORT is defined

#####################################################
if [ $JAVA_VERSION -lt 4 ]
then
   CP=$(ls /usr/share/jetty-5/lib/*.jar | \
      egrep -v org.mortbay.jetty.jar | \
      paste -s -d"$PATH_SEPARATOR" - )
else
   CP=$(ls /usr/share/jetty-5/lib/*.jar | \
      egrep -v org.mortbay.jetty-jdk1.2.jar\|crimson.jar\|javax.xml.jaxp.jar | \
      paste -s -d"$PATH_SEPARATOR" - )
fi

Return to bug 68082

Lines 155-160 Link Here

(-)jetty-5.1.3/extra/unix/bin/jetty.sh (-6 / +7 lines)
155	Jetty \	155	Jetty \
156	jetty3 \	156	jetty3 \
157	Jetty3 \	157	Jetty3 \
		158	jetty-5 \
158	"	159	"
159		160
160	JETTY_HOME=	161	JETTY_HOME=
Lines 184-193 Link Here
184	#####################################################	185	#####################################################
185	# Check that jetty is where we think it is	186	# Check that jetty is where we think it is
186	#####################################################	187	#####################################################
187	if [ ! -r $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE ]	188	if [ ! -r /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE ]
188	then	189	then
189	echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"	190	echo "** ERROR: Oops! Jetty doesn't appear to be installed in $JETTY_HOME"
190	echo "** ERROR: $JETTY_HOME/$JETTY_INSTALL_TRACE_FILE is not readable!"	191	echo "** ERROR: /usr/share/jetty-5/$JETTY_INSTALL_TRACE_FILE is not readable!"
191	exit 1	192	exit 1
192	fi	193	fi
193		194
Lines 362-368 Link Here
362	echo $VERSION:$J	363	echo $VERSION:$J
363	done	364	done
364	done	365	done
365	done \| sort \| tail -1 > $TMPJ	366	done \| sort \| tail -n 1 > $TMPJ
366	JAVA=`cat $TMPJ \| cut -d: -f2`	367	JAVA=`cat $TMPJ \| cut -d: -f2`
367	JVERSION=`cat $TMPJ \| cut -d: -f1`	368	JVERSION=`cat $TMPJ \| cut -d: -f1`
368		369
Lines 397-403 Link Here
397	exit 1	398	exit 1
398	fi	399	fi
399		400
400	JAVA_VERSION=`expr "$($JAVA -version 2>&1 \| head -1)" : '.*1\.\([0-9]\)'`	401	JAVA_VERSION=`expr "$($JAVA -version 2>&1 \| head -n 1)" : '.*1\.\([0-9]\)'`
401		402
402	#####################################################	403	#####################################################
403	# See if JETTY_PORT is defined	404	# See if JETTY_PORT is defined
Lines 422-432 Link Here
422	#####################################################	423	#####################################################
423	if [ $JAVA_VERSION -lt 4 ]	424	if [ $JAVA_VERSION -lt 4 ]
424	then	425	then
425	CP=$(ls $JETTY_HOME/ext/.jar $JETTY_HOME/lib/.jar \| \	426	CP=$(ls /usr/share/jetty-5/lib/*.jar \| \
426	egrep -v org.mortbay.jetty.jar \| \	427	egrep -v org.mortbay.jetty.jar \| \
427	paste -s -d"$PATH_SEPARATOR" - )	428	paste -s -d"$PATH_SEPARATOR" - )
428	else	429	else
429	CP=$(ls $JETTY_HOME/ext/.jar $JETTY_HOME/lib/.jar \| \	430	CP=$(ls /usr/share/jetty-5/lib/*.jar \| \
430	egrep -v org.mortbay.jetty-jdk1.2.jar\\|crimson.jar\\|javax.xml.jaxp.jar \| \	431	egrep -v org.mortbay.jetty-jdk1.2.jar\\|crimson.jar\\|javax.xml.jaxp.jar \| \
431	paste -s -d"$PATH_SEPARATOR" - )	432	paste -s -d"$PATH_SEPARATOR" - )
432	fi	433	fi

Lines 24-30 Link Here

(-)jetty-5.1.3/etc/jetty.xml (-3 / +3 lines)
24	<Call name="add">	24	<Call name="add">
25	<Arg>	25	<Arg>
26	<New class="org.mortbay.log.OutputStreamLogSink">	26	<New class="org.mortbay.log.OutputStreamLogSink">
27	<Set name="filename"><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.jetty.log</Set>	27	<Set name="filename">/var/log/jetty5/yyyy_mm_dd.jetty.log</Set>
28	<Set name="retainDays">90</Set>	28	<Set name="retainDays">90</Set>
29	<Set name="append">true</Set>	29	<Set name="append">true</Set>
30	<Set name="logLabels">true</Set>	30	<Set name="logLabels">true</Set>
Lines 64-70 Link Here
64	</New>	64	</New>
65	</Arg>	65	</Arg>
66	</Call>	66	</Call>
67		67	-->
68		68
69	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->	69	<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
70	<!-- Add a HTTPS SSL listener on port 8443 -->	70	<!-- Add a HTTPS SSL listener on port 8443 -->
Lines 192-198 Link Here
192	<!-- =============================================================== -->	192	<!-- =============================================================== -->
193	<Set name="RequestLog">	193	<Set name="RequestLog">
194	<New class="org.mortbay.http.NCSARequestLog">	194	<New class="org.mortbay.http.NCSARequestLog">
195	<Arg><SystemProperty name="jetty.home" default="."/>/logs/yyyy_mm_dd.request.log</Arg>	195	<Arg>/var/log/jetty5/yyyy_mm_dd.request.log</Arg>
196	<Set name="retainDays">90</Set>	196	<Set name="retainDays">90</Set>
197	<Set name="append">true</Set>	197	<Set name="append">true</Set>
198	<Set name="extended">false</Set>	198	<Set name="extended">false</Set>