Author: sebb
Date: Thu May 12 09:54:27 2011
New Revision: 1102223
URL: http://svn.apache.org/viewvc?rev=1102223&view=rev
Log:
Merge some fixes from JMeter trunk
Added:
jakarta/jmeter/branches/docs-2.4/xdocs/issues.xml (with props)
Removed:
jakarta/jmeter/branches/docs-2.4/xdocs/known_bugs.xml
jakarta/jmeter/branches/docs-2.4/xdocs/license.xml
Modified:
jakarta/jmeter/branches/docs-2.4/xdocs/building.xml
jakarta/jmeter/branches/docs-2.4/xdocs/index.xml
jakarta/jmeter/branches/docs-2.4/xdocs/stylesheets/project.xml
jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/boss.xml
jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/regular_expressions.xml
Modified: jakarta/jmeter/branches/docs-2.4/xdocs/building.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/docs-2.4/xdocs/building.xml?rev=1102223&r1=1102222&r2=1102223&view=diff
==============================================================================
--- jakarta/jmeter/branches/docs-2.4/xdocs/building.xml (original)
+++ jakarta/jmeter/branches/docs-2.4/xdocs/building.xml Thu May 12 09:54:27 2011
@@ -36,26 +36,36 @@ You may want to also download the source
<h2>Building JMeter</h2>
<h3>Acquiring the source</h3>
-<p>The source is distributed alongside the binary, or it can be downloaded
from SVN.</p>
+<p>The full source is distributed alongside the binary, or it can be
downloaded from SVN.</p>
<p>
The source archive and SVN do not contain any of the required library files.
-You can download these by running the Ant command:
+These need to be downloaded by running the Ant command:
<pre>
ant download_jars
</pre>
</p>
-<p>Or you can download the binary archive for a release and unpack it into the
same directory structure as the source.
-This will ensure that the lib/ directory contains all the required jar files.
+<p>Or you can download the binary distribution archive for a release and
unpack it into the same directory structure as the source.
+This will ensure that the lib/ directory contains the jar files needed for
running JMeter.
+There are a few additional jars that are needed to build JMeter, download
these using:
+<pre>
+ant download_jars
+</pre>
+This will retrieve any missing jars.
</p>
<h3>Compiling and packaging JMeter using Ant</h3>
<p>
-JMeter can be built entirely using Ant; see build.xml for the targets that can
be used.
+JMeter can be built entirely using Ant.
+The basic command is:
+<pre>
+ant [install]
+</pre>
+See build.xml for the other targets that can be used.
</p>
<h3>Compiling and packaging JMeter using Eclipse</h3>
<p>
-Once you have downloaded the source from SVN or the release archives, you can
configure Eclipse.
-The easiest way to do this is to replace the Eclipse .classpath file with the
eclipse.classpath file provided with JMeter.
-This will set up the source-paths and most of the libraries.
+Once you have downloaded the source from SVN or the release archives and run
the ant download_jars target to
+install the dependent jars, you can configure Eclipse. The easiest way to do
this is to replace the Eclipse .classpath
+file with the eclipse.classpath file provided with JMeter. This will set up
the source-paths and most of the libraries.
<p>
See also the file eclipse.readme.
</p>
Modified: jakarta/jmeter/branches/docs-2.4/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/docs-2.4/xdocs/index.xml?rev=1102223&r1=1102222&r2=1102223&view=diff
==============================================================================
--- jakarta/jmeter/branches/docs-2.4/xdocs/index.xml (original)
+++ jakarta/jmeter/branches/docs-2.4/xdocs/index.xml Thu May 12 09:54:27 2011
@@ -97,8 +97,8 @@ Nor does it render the HTML pages as a b
<h2>Further Information About JMeter</h2>
<ul>
<li><a href="changes.html">Change List</a></li>
-<li><a href="known_bugs.html">Known Bugs</a></li>
-<li><a href="license.html">License</a></li>
+<li><a href="issues.html">Issues</a></li>
+<li><a href="http://www.apache.org/licenses/";>License</a></li>
<li><a
href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters";>Contributors</a></li>
</ul>
</section>
Added: jakarta/jmeter/branches/docs-2.4/xdocs/issues.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/docs-2.4/xdocs/issues.xml?rev=1102223&view=auto
==============================================================================
--- jakarta/jmeter/branches/docs-2.4/xdocs/issues.xml (added)
+++ jakarta/jmeter/branches/docs-2.4/xdocs/issues.xml Thu May 12 09:54:27 2011
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<document>
+<properties>
+ <title>Issues</title>
+</properties>
+<body>
+<section name="Issue tracker">
+<p>
+JMeter uses Bugzilla for issue tracking, i.e. for reporting bugs and
requesting enhancements.
+</p>
+<p>
+Before creating a new issue, please check whether the issue has already been
reported by searching Bugzilla.
+It's also worth checking first on the JMeter user mailing list; others may
already have a solution.
+</p>
+</section>
+<section name="Known Bugs">
+<ul>
+<li>
+<a
href="http://issues.apache.org/bugzilla/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=JMeter&content=";>
+Bugzilla - All open bugs</a>
+</li>
+<li>
+<a
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_severity=Blocker&bug_severity=Critical&bug_severity=Major&bug_severity=Normal&bug_severity=Minor&bug_severity=Trivial&product=JMeter&cmdtype=doit&order=Bug+Number";>
+Bugzilla - Open bugs (excluding enhancements)</a></li>
+<li>
+<a
href="http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=NEEDINFO&bug_severity=Enhancement&product=JMeter&cmdtype=doit&order=Bug+Number";>
+Bugzilla - Enhancements only</a>
+</li>
+</ul>
+</section>
+<section name="Raising an Issue">
+<p>
+First check that the issue has not already been reported.
+If reporting a bug, are you sure it really is a bug in JMeter, not just a
misunderstanding of how JMeter works?
+</p>
+<p>
+If you have not already done so, you need to register an account first, using
the "New Account" link at the top of the
+main Bugzilla page: <a
href="https://issues.apache.org/bugzilla/";>https://issues.apache.org/bugzilla/</a>.
+</p>
+<p>
+Make sure you read and understand the information on the account creation page
before signing up.
+</p>
+<p>
+Once logged in, click "File a bug" and select JMeter from the list.
+</p>
+</section>
+<section name="Required Information">
+<p>
+Please make sure you provide sufficient information for others to be able to
make use of the report effectively.
+Use the checklist below to guide you.
+</p>
+<ul>
+<li>JMeter version</li>
+<li>Java version (output from java -version)</li>
+<li>OS version</li>
+<li>jmeter.log file (unlikely to contain sensitive information, but check
before uploading)</li>
+<li>JMX file if relevant (redact any sensitive information first)</li>
+<li>JTL file if relevant (may need to redact sensitive information)</li>
+<li>For a suspected bug, describe what you did, what happened, and how this
differs from what you expected to happen.
+Does it happen every time?
+</li>
+<li>If you are providing a patch to fix a bug, please ensure it is in unified
diff format.
+If using Eclipse, please set the patch root to "Project", not the default
"Workspace" which is harder to apply.</li>
+<li>New source files can be provided as is; please ensure they have the
standard Apache License header (as per other JMeter files).
+Please do not use @author tags (credit will be given in the changes file).
+</li>
+<li>In the case of patches for new features, please also provide documentation
patches if at all possible.
+Components are documented in xdocs/usermanual/component_reference.xml.</li>
+</ul>
+<p><b>See also the following <a
href="https://issues.apache.org/bugwritinghelp.html";>Bug writing guidelines</a>,
+also the terms and conditions noted on the <a
href="https://issues.apache.org/bugzilla/createaccount.cgi";>Bugzilla account
creation page.</a></b></p>
+</section>
+</body>
+</document>
Propchange: jakarta/jmeter/branches/docs-2.4/xdocs/issues.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/jmeter/branches/docs-2.4/xdocs/stylesheets/project.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/docs-2.4/xdocs/stylesheets/project.xml?rev=1102223&r1=1102222&r2=1102223&view=diff
==============================================================================
--- jakarta/jmeter/branches/docs-2.4/xdocs/stylesheets/project.xml (original)
+++ jakarta/jmeter/branches/docs-2.4/xdocs/stylesheets/project.xml Thu May 12
09:54:27 2011
@@ -26,8 +26,8 @@
<menu name="About">
<item name="Overview" href="/index.html"/>
<item name="Changes" href="/changes.html"/>
- <item name="Known Bugs" href="/known_bugs.html"/>
- <item name="License" href="/license.html"/>
+ <item name="Issues" href="/issues.html"/>
+ <item name="License"
href="http://www.apache.org/licenses/"/>
<item name="Contributors"
href="http://wiki.apache.org/jakarta-jmeter/JMeterCommitters"/>
</menu>
<menu name="Download">
Modified: jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/boss.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/boss.xml?rev=1102223&r1=1102222&r2=1102223&view=diff
==============================================================================
--- jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/boss.xml (original)
+++ jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/boss.xml Thu May 12
09:54:27 2011
@@ -93,8 +93,8 @@ do not multi-thread past 50-60 connectio
more users than that).
</p>
<p>Good free platforms include the linuxes, the BSDs, and Solaris Intel. If
-you have a little more money, there are commercial linuxes. If you can justify
-it, a commercial Unix (Solaris, etc) is probably the best choice.
+you have a little more money, there are commercial linuxes.
+This may be worth it if you need the support.
</p>
<p>
For non-Windows platforms, investigate "ulimit -n unlimited" with a view to
Modified:
jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/regular_expressions.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/regular_expressions.xml?rev=1102223&r1=1102222&r2=1102223&view=diff
==============================================================================
--- jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/regular_expressions.xml
(original)
+++ jakarta/jmeter/branches/docs-2.4/xdocs/usermanual/regular_expressions.xml
Thu May 12 09:54:27 2011
@@ -187,6 +187,25 @@ Here is a list of the meta characters an
</ul>
<p>Please note that ORO does not support the \Q and \E meta-characters.
[In other RE engines, these can be used to quote a portion of an RE so that
the meta-characters stand for themselves.]</p>
+
+<p>
+The following Perl5 extended regular expressions are supported by ORO.
+
+<dl>
+<dt>(?#text)</dt>
+<dd>An embedded comment causing text to be ignored.</dd>
+<dt>(?:regexp)</dt>
+<dd>Groups things like "()" but doesn't cause the group match to be saved.</dd>
+<dt>(?=regexp)</dt>
+<dd>A zero-width positive lookahead assertion. For example, \w+(?=\s) matches
a word followed by whitespace, without including whitespace in the
MatchResult.</dd>
+<dt>(?!regexp)</dt>
+<dd>A zero-width negative lookahead assertion. For example foo(?!bar) matches
any occurrence of "foo" that isn't followed by "bar". Remember that this is a
zero-width assertion, which means that a(?!b)d will match ad because a is
followed by a character that is not b (the d) and a d follows the zero-width
assertion.</dd>
+<dt>(?imsx)</dt>
+<dd>One or more embedded pattern-match modifiers. i enables case
insensitivity, m enables multiline treatment of the input, s enables single
line treatment of the input, and x enables extended whitespace comments.</dd>
+</dl>
+<b>Note that <code>(?<=regexp)</code> - lookbehind - is not supported.</b>
+</p>
+
</subsection>
<subsection name="§-num;.5 Placement of modifiers" anchor="placement">
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@jakarta.apache.org
For additional commands, e-mail: notifications-h...@jakarta.apache.org
