[pkg-java] r10718 - in trunk/jakarta-jmeter/debian: . patches wrappers

Onkar Shinde onkarshinde-guest at alioth.debian.org
Thu Oct 1 14:19:42 UTC 2009 

Author: onkarshinde-guest
Date: 2009-10-01 14:19:42 +0000 (Thu, 01 Oct 2009)
New Revision: 10718

Modified:
   trunk/jakarta-jmeter/debian/changelog
   trunk/jakarta-jmeter/debian/control
   trunk/jakarta-jmeter/debian/jmeter.install
   trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch
   trunk/jakarta-jmeter/debian/rules
   trunk/jakarta-jmeter/debian/wrappers/jmeter
Log:
get-orig-source rule and other fixes

Modified: trunk/jakarta-jmeter/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog	2009-10-01 06:50:56 UTC (rev 10717)
+++ trunk/jakarta-jmeter/debian/changelog	2009-10-01 14:19:42 UTC (rev 10718)
@@ -2,5 +2,5 @@
 
   * Initial version: Merge from Ubuntu. (Closes: #505877)
 
- -- Onkar Shinde <onkarshinde at ubuntu.com>  Wed, 23 Sep 2009 00:47:41 +0530
+ -- Onkar Shinde <onkarshinde at ubuntu.com>  Wed, 30 Sep 2009 10:49:06 +0530
 

Modified: trunk/jakarta-jmeter/debian/control
===================================================================
--- trunk/jakarta-jmeter/debian/control	2009-10-01 06:50:56 UTC (rev 10717)
+++ trunk/jakarta-jmeter/debian/control	2009-10-01 14:19:42 UTC (rev 10718)
@@ -34,7 +34,7 @@
 
 Package: jmeter-http
 Architecture: all
-Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libexcalibur-logkit-java, libhtmlparser-java, libjtidy-java, liboro-java, libxstream-java
+Depends: ${misc:Depends}, jmeter (= ${binary:Version}), libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, libcommons-logging-java, libexcalibur-logkit-java, libhtmlparser-java, libjtidy-java, liboro-java, libxstream-java
 Description: Load testing and performance measurement application
  Apache JMeter is a 100% pure Java desktop application designed to load test
  functional behavior and measure performance. It was originally designed for

Modified: trunk/jakarta-jmeter/debian/jmeter.install
===================================================================
--- trunk/jakarta-jmeter/debian/jmeter.install	2009-10-01 06:50:56 UTC (rev 10717)
+++ trunk/jakarta-jmeter/debian/jmeter.install	2009-10-01 14:19:42 UTC (rev 10718)
@@ -1,5 +1,5 @@
 debian/jmeter.properties usr/share/jmeter/bin/
-bin/upgrade.properties usr/share/jmeter/bin/
+bin/*.properties usr/share/jmeter/bin/
 bin/ApacheJMeter.jar usr/share/jmeter/bin/
 lib/*.jar usr/share/jmeter/lib/
 lib/ext/ApacheJMeter_components.jar usr/share/jmeter/lib/ext/

Modified: trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch	2009-10-01 06:50:56 UTC (rev 10717)
+++ trunk/jakarta-jmeter/debian/patches/04_files_from_upstream.patch	2009-10-01 14:19:42 UTC (rev 10718)
@@ -1,6 +1,6 @@
 diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/bin/jmeter-server jakarta-jmeter-2.3.4.new/bin/jmeter-server
 --- jakarta-jmeter-2.3.4/bin/jmeter-server	1970-01-01 05:30:00.000000000 +0530
-+++ jakarta-jmeter-2.3.4.new/bin/jmeter-server	2009-07-28 00:14:11.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/bin/jmeter-server	2009-09-30 10:48:16.000000000 +0530
 @@ -0,0 +1,32 @@
 +#!/bin/sh
 +
@@ -34,9 +34,331 @@
 +#RMI_HOST_DEF=-Djava.rmi.server.hostname=xxx.xxx.xxx.xxx
 +
 +${DIRNAME}/jmeter ${RMI_HOST_DEF} -Dserver_port=${SERVER_PORT:-1099} -s -j jmeter-server.log "$@"
+diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/bin/saveservice.properties jakarta-jmeter-2.3.4.new/bin/saveservice.properties
+--- jakarta-jmeter-2.3.4/bin/saveservice.properties	1970-01-01 05:30:00.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/bin/saveservice.properties	2009-09-30 10:48:30.000000000 +0530
+@@ -0,0 +1,317 @@
++#---------------------------------------------------------
++#         SAVESERVICE PROPERTIES
++#---------------------------------------------------------
++
++##   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.
++
++#---------------------------------------------------------
++# N.B. To ensure backward compatibility, please do not
++# change or delete any entries that have been used.
++# New entries can be added as necessary.
++#
++# Note that keys starting with an underscore are special,
++# and are not used as aliases.
++#
++# Please keep the entries in alphabetical order within the sections
++# to reduce the likelihood of duplicates
++#
++# version number of this file (automatically generated by SVN)
++_file_version=$Revision: 697317 $
++#
++# Conversion version (for JMX output files)
++# Must be updated if the file has been changed since the previous release
++#
++# 1.7 = 2.1.1
++# 1.8 = 2.1.2
++# (Some version updates were missed here...)
++# 2.0 = 2.3.1
++# 2.1 = 2.3.2
++#
++_version=2.1
++#
++#
++# Character set encoding used to read and write JMeter XML files
++#
++_file_encoding=UTF-8
++#
++#---------------------------------------------------------
++#
++# The following properties are used to create aliases
++# [Must all start with capital letter]
++#
++AccessLogSampler=org.apache.jmeter.protocol.http.sampler.AccessLogSampler
++AjpSampler=org.apache.jmeter.protocol.http.sampler.AjpSampler
++AjpSamplerGui=org.apache.jmeter.protocol.http.control.gui.AjpSamplerGui
++AnchorModifier=org.apache.jmeter.protocol.http.modifier.AnchorModifier
++AnchorModifierGui=org.apache.jmeter.protocol.http.modifier.gui.AnchorModifierGui
++Argument=org.apache.jmeter.config.Argument
++Arguments=org.apache.jmeter.config.Arguments
++ArgumentsPanel=org.apache.jmeter.config.gui.ArgumentsPanel
++AssertionGui=org.apache.jmeter.assertions.gui.AssertionGui
++AssertionVisualizer=org.apache.jmeter.visualizers.AssertionVisualizer
++AuthManager=org.apache.jmeter.protocol.http.control.AuthManager
++Authorization=org.apache.jmeter.protocol.http.control.Authorization
++AuthPanel=org.apache.jmeter.protocol.http.gui.AuthPanel
++BarChart=org.apache.jmeter.testelement.BarChart
++BarChartGui=org.apache.jmeter.report.gui.BarChartGui
++BeanShellAssertion=org.apache.jmeter.assertions.BeanShellAssertion
++BeanShellAssertionGui=org.apache.jmeter.assertions.gui.BeanShellAssertionGui
++BeanShellListener=org.apache.jmeter.visualizers.BeanShellListener
++BeanShellPostProcessor=org.apache.jmeter.extractor.BeanShellPostProcessor
++BeanShellPreProcessor=org.apache.jmeter.modifiers.BeanShellPreProcessor
++BeanShellSampler=org.apache.jmeter.protocol.java.sampler.BeanShellSampler
++BeanShellSamplerGui=org.apache.jmeter.protocol.java.control.gui.BeanShellSamplerGui
++BeanShellTimer=org.apache.jmeter.timers.BeanShellTimer
++BSFAssertion=org.apache.jmeter.assertions.BSFAssertion
++BSFListener=org.apache.jmeter.visualizers.BSFListener
++BSFPreProcessor=org.apache.jmeter.modifiers.BSFPreProcessor
++BSFPostProcessor=org.apache.jmeter.extractor.BSFPostProcessor
++BSFSampler=org.apache.jmeter.protocol.java.sampler.BSFSampler
++BSFSamplerGui=org.apache.jmeter.protocol.java.control.gui.BSFSamplerGui
++CacheManager=org.apache.jmeter.protocol.http.control.CacheManager
++CacheManagerGui=org.apache.jmeter.protocol.http.gui.CacheManagerGui
++ConfigTestElement=org.apache.jmeter.config.ConfigTestElement
++ConstantThroughputTimer=org.apache.jmeter.timers.ConstantThroughputTimer
++ConstantTimer=org.apache.jmeter.timers.ConstantTimer
++ConstantTimerGui=org.apache.jmeter.timers.gui.ConstantTimerGui
++Cookie=org.apache.jmeter.protocol.http.control.Cookie
++CookieManager=org.apache.jmeter.protocol.http.control.CookieManager
++CookiePanel=org.apache.jmeter.protocol.http.gui.CookiePanel
++CounterConfig=org.apache.jmeter.modifiers.CounterConfig
++CounterConfigGui=org.apache.jmeter.modifiers.gui.CounterConfigGui
++CSVDataSet=org.apache.jmeter.config.CSVDataSet
++DebugPostProcessor=org.apache.jmeter.extractor.DebugPostProcessor
++DebugSampler=org.apache.jmeter.sampler.DebugSampler
++DistributionGraphVisualizer=org.apache.jmeter.visualizers.DistributionGraphVisualizer
++DurationAssertion=org.apache.jmeter.assertions.DurationAssertion
++DurationAssertionGui=org.apache.jmeter.assertions.gui.DurationAssertionGui
++# Should really have been defined as floatProp to agree with other properties
++# No point changing this now
++FloatProperty=org.apache.jmeter.testelement.property.FloatProperty
++ForeachController=org.apache.jmeter.control.ForeachController
++ForeachControlPanel=org.apache.jmeter.control.gui.ForeachControlPanel
++FtpConfigGui=org.apache.jmeter.protocol.ftp.config.gui.FtpConfigGui
++FTPSampler=org.apache.jmeter.protocol.ftp.sampler.FTPSampler
++FtpTestSamplerGui=org.apache.jmeter.protocol.ftp.control.gui.FtpTestSamplerGui
++GaussianRandomTimer=org.apache.jmeter.timers.GaussianRandomTimer
++GaussianRandomTimerGui=org.apache.jmeter.timers.gui.GaussianRandomTimerGui
++GenericController=org.apache.jmeter.control.GenericController
++GraphAccumVisualizer=org.apache.jmeter.visualizers.GraphAccumVisualizer
++GraphVisualizer=org.apache.jmeter.visualizers.GraphVisualizer
++Header=org.apache.jmeter.protocol.http.control.Header
++HeaderManager=org.apache.jmeter.protocol.http.control.HeaderManager
++HeaderPanel=org.apache.jmeter.protocol.http.gui.HeaderPanel
++HTMLAssertion=org.apache.jmeter.assertions.HTMLAssertion
++HTMLAssertionGui=org.apache.jmeter.assertions.gui.HTMLAssertionGui
++HTMLReportWriter=org.apache.jmeter.report.writers.HTMLReportWriter
++HTMLReportWriterGui=org.apache.jmeter.report.writers.gui.HTMLReportWriterGui
++HTTPArgument=org.apache.jmeter.protocol.http.util.HTTPArgument
++HTTPArgumentsPanel=org.apache.jmeter.protocol.http.gui.HTTPArgumentsPanel
++HTTPFileArg=org.apache.jmeter.protocol.http.util.HTTPFileArg
++HTTPFileArgs=org.apache.jmeter.protocol.http.util.HTTPFileArgs
++HttpDefaultsGui=org.apache.jmeter.protocol.http.config.gui.HttpDefaultsGui
++HttpGenericSampler=org.apache.jmeter.protocol.http.sampler.HttpGenericSampler
++HttpGenericSamplerGui=org.apache.jmeter.protocol.http.control.gui.HttpGenericSamplerGui
++HTTPSampler=org.apache.jmeter.protocol.http.sampler.HTTPSampler
++HttpMirrorControl=org.apache.jmeter.protocol.http.control.HttpMirrorControl
++HttpMirrorControlGui=org.apache.jmeter.protocol.http.control.gui.HttpMirrorControlGui
++HTTPSampler2=org.apache.jmeter.protocol.http.sampler.HTTPSampler2
++HttpTestSampleGui=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui
++HttpTestSampleGui2=org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui2
++IfController=org.apache.jmeter.control.IfController
++IfControllerPanel=org.apache.jmeter.control.gui.IfControllerPanel
++IncludeController=org.apache.jmeter.control.IncludeController
++IncludeControllerGui=org.apache.jmeter.control.gui.IncludeControllerGui
++InterleaveControl=org.apache.jmeter.control.InterleaveControl
++InterleaveControlGui=org.apache.jmeter.control.gui.InterleaveControlGui
++JavaConfig=org.apache.jmeter.protocol.java.config.JavaConfig
++JavaConfigGui=org.apache.jmeter.protocol.java.config.gui.JavaConfigGui
++JavaSampler=org.apache.jmeter.protocol.java.sampler.JavaSampler
++JavaTestSamplerGui=org.apache.jmeter.protocol.java.control.gui.JavaTestSamplerGui
++JDBCDataSource=org.apache.jmeter.protocol.jdbc.config.DataSourceElement
++JDBCSampler=org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler
++JMSConfigGui=org.apache.jmeter.protocol.jms.control.gui.JMSConfigGui
++JMSPublisherGui=org.apache.jmeter.protocol.jms.control.gui.JMSPublisherGui
++JMSSampler=org.apache.jmeter.protocol.jms.sampler.JMSSampler
++JMSSubscriberGui=org.apache.jmeter.protocol.jms.control.gui.JMSSubscriberGui
++JUnitSampler=org.apache.jmeter.protocol.java.sampler.JUnitSampler
++JUnitTestSamplerGui=org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui
++LDAPArgument=org.apache.jmeter.protocol.ldap.config.gui.LDAPArgument
++LDAPArguments=org.apache.jmeter.protocol.ldap.config.gui.LDAPArguments
++LDAPArgumentsPanel=org.apache.jmeter.protocol.ldap.config.gui.LDAPArgumentsPanel
++LdapConfigGui=org.apache.jmeter.protocol.ldap.config.gui.LdapConfigGui
++LdapExtConfigGui=org.apache.jmeter.protocol.ldap.config.gui.LdapExtConfigGui
++LDAPExtSampler=org.apache.jmeter.protocol.ldap.sampler.LDAPExtSampler
++LdapExtTestSamplerGui=org.apache.jmeter.protocol.ldap.control.gui.LdapExtTestSamplerGui
++LDAPSampler=org.apache.jmeter.protocol.ldap.sampler.LDAPSampler
++LdapTestSamplerGui=org.apache.jmeter.protocol.ldap.control.gui.LdapTestSamplerGui
++LineChart=org.apache.jmeter.testelement.LineChart
++LineGraphGui=org.apache.jmeter.report.gui.LineGraphGui
++LogicControllerGui=org.apache.jmeter.control.gui.LogicControllerGui
++LoginConfig=org.apache.jmeter.config.LoginConfig
++LoginConfigGui=org.apache.jmeter.config.gui.LoginConfigGui
++LoopController=org.apache.jmeter.control.LoopController
++LoopControlPanel=org.apache.jmeter.control.gui.LoopControlPanel
++MailerModel=org.apache.jmeter.reporters.MailerModel
++MailerResultCollector=org.apache.jmeter.reporters.MailerResultCollector
++MailerVisualizer=org.apache.jmeter.visualizers.MailerVisualizer
++MailReaderSampler=org.apache.jmeter.protocol.mail.sampler.MailReaderSampler
++MailReaderSamplerGui=org.apache.jmeter.protocol.mail.sampler.gui.MailReaderSamplerGui
++MD5HexAssertion=org.apache.jmeter.assertions.MD5HexAssertion
++MD5HexAssertionGUI=org.apache.jmeter.assertions.gui.MD5HexAssertionGUI
++ModuleController=org.apache.jmeter.control.ModuleController
++ModuleControllerGui=org.apache.jmeter.control.gui.ModuleControllerGui
++MonitorHealthVisualizer=org.apache.jmeter.visualizers.MonitorHealthVisualizer
++NamePanel=org.apache.jmeter.gui.NamePanel
++OnceOnlyController=org.apache.jmeter.control.OnceOnlyController
++OnceOnlyControllerGui=org.apache.jmeter.control.gui.OnceOnlyControllerGui
++ParamMask=org.apache.jmeter.protocol.http.modifier.ParamMask
++ParamModifier=org.apache.jmeter.protocol.http.modifier.ParamModifier
++ParamModifierGui=org.apache.jmeter.protocol.http.modifier.gui.ParamModifierGui
++PropertyControlGui=org.apache.jmeter.visualizers.PropertyControlGui
++ProxyControl=org.apache.jmeter.protocol.http.proxy.ProxyControl
++ProxyControlGui=org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui
++PublisherSampler=org.apache.jmeter.protocol.jms.sampler.PublisherSampler
++RandomControlGui=org.apache.jmeter.control.gui.RandomControlGui
++RandomController=org.apache.jmeter.control.RandomController
++RandomOrderController=org.apache.jmeter.control.RandomOrderController
++RandomOrderControllerGui=org.apache.jmeter.control.gui.RandomOrderControllerGui
++RandomVariableConfig=org.apache.jmeter.config.RandomVariableConfig
++RecordController=org.apache.jmeter.protocol.http.control.gui.RecordController
++RecordingController=org.apache.jmeter.protocol.http.control.RecordingController
++ReflectionThreadGroup=org.apache.jmeter.threads.ReflectionThreadGroup
++RegexExtractor=org.apache.jmeter.extractor.RegexExtractor
++RegexExtractorGui=org.apache.jmeter.extractor.gui.RegexExtractorGui
++RemoteListenerWrapper=org.apache.jmeter.samplers.RemoteListenerWrapper
++RemoteSampleListenerWrapper=org.apache.jmeter.samplers.RemoteSampleListenerWrapper
++RemoteTestListenerWrapper=org.apache.jmeter.samplers.RemoteTestListenerWrapper
++ReportGui=org.apache.jmeter.control.gui.ReportGui
++ReportPage=org.apache.jmeter.testelement.ReportPage
++ReportPageGui=org.apache.jmeter.report.gui.ReportPageGui
++ReportPlan=org.apache.jmeter.testelement.ReportPlan
++ResponseAssertion=org.apache.jmeter.assertions.ResponseAssertion
++ResultAction=org.apache.jmeter.reporters.ResultAction
++ResultActionGui=org.apache.jmeter.reporters.gui.ResultActionGui
++ResultCollector=org.apache.jmeter.reporters.ResultCollector
++ResultSaver=org.apache.jmeter.reporters.ResultSaver
++ResultSaverGui=org.apache.jmeter.reporters.gui.ResultSaverGui
++RunTime=org.apache.jmeter.control.RunTime
++RunTimeGui=org.apache.jmeter.control.gui.RunTimeGui
++SampleSaveConfiguration=org.apache.jmeter.samplers.SampleSaveConfiguration
++SimpleConfigGui=org.apache.jmeter.config.gui.SimpleConfigGui
++SimpleDataWriter=org.apache.jmeter.visualizers.SimpleDataWriter
++SizeAssertion=org.apache.jmeter.assertions.SizeAssertion
++SizeAssertionGui=org.apache.jmeter.assertions.gui.SizeAssertionGui
++SoapSampler=org.apache.jmeter.protocol.http.sampler.SoapSampler
++SoapSamplerGui=org.apache.jmeter.protocol.http.control.gui.SoapSamplerGui
++SplineVisualizer=org.apache.jmeter.visualizers.SplineVisualizer
++StatGraphVisualizer=org.apache.jmeter.visualizers.StatGraphVisualizer
++StatVisualizer=org.apache.jmeter.visualizers.StatVisualizer
++SubscriberSampler=org.apache.jmeter.protocol.jms.sampler.SubscriberSampler
++Summariser=org.apache.jmeter.reporters.Summariser
++SummariserGui=org.apache.jmeter.reporters.gui.SummariserGui
++SummaryReport=org.apache.jmeter.visualizers.SummaryReport
++SwitchController=org.apache.jmeter.control.SwitchController
++SwitchControllerGui=org.apache.jmeter.control.gui.SwitchControllerGui
++SyncTimer=org.apache.jmeter.timers.SyncTimer
++Table=org.apache.jmeter.testelement.Table
++TableGui=org.apache.jmeter.report.gui.TableGui
++TableVisualizer=org.apache.jmeter.visualizers.TableVisualizer
++TCPConfigGui=org.apache.jmeter.protocol.tcp.config.gui.TCPConfigGui
++TCPSampler=org.apache.jmeter.protocol.tcp.sampler.TCPSampler
++TCPSamplerGui=org.apache.jmeter.protocol.tcp.control.gui.TCPSamplerGui
++TestAction=org.apache.jmeter.sampler.TestAction
++TestActionGui=org.apache.jmeter.sampler.gui.TestActionGui
++TestBeanGUI=org.apache.jmeter.testbeans.gui.TestBeanGUI
++TestPlan=org.apache.jmeter.testelement.TestPlan
++TestPlanGui=org.apache.jmeter.control.gui.TestPlanGui
++ThreadGroup=org.apache.jmeter.threads.ThreadGroup
++ThreadGroupGui=org.apache.jmeter.threads.gui.ThreadGroupGui
++ThroughputController=org.apache.jmeter.control.ThroughputController
++ThroughputControllerGui=org.apache.jmeter.control.gui.ThroughputControllerGui
++TransactionController=org.apache.jmeter.control.TransactionController
++TransactionControllerGui=org.apache.jmeter.control.gui.TransactionControllerGui
++UniformRandomTimer=org.apache.jmeter.timers.UniformRandomTimer
++UniformRandomTimerGui=org.apache.jmeter.timers.gui.UniformRandomTimerGui
++URLRewritingModifier=org.apache.jmeter.protocol.http.modifier.URLRewritingModifier
++URLRewritingModifierGui=org.apache.jmeter.protocol.http.modifier.gui.URLRewritingModifierGui
++UserParameterModifier=org.apache.jmeter.protocol.http.modifier.UserParameterModifier
++UserParameterModifierGui=org.apache.jmeter.protocol.http.modifier.gui.UserParameterModifierGui
++UserParameters=org.apache.jmeter.modifiers.UserParameters
++UserParametersGui=org.apache.jmeter.modifiers.gui.UserParametersGui
++ViewResultsFullVisualizer=org.apache.jmeter.visualizers.ViewResultsFullVisualizer
++WebServiceSampler=org.apache.jmeter.protocol.http.sampler.WebServiceSampler
++WebServiceSamplerGui=org.apache.jmeter.protocol.http.control.gui.WebServiceSamplerGui
++WhileController=org.apache.jmeter.control.WhileController
++WhileControllerGui=org.apache.jmeter.control.gui.WhileControllerGui
++WorkBench=org.apache.jmeter.testelement.WorkBench
++WorkBenchGui=org.apache.jmeter.control.gui.WorkBenchGui
++XMLAssertion=org.apache.jmeter.assertions.XMLAssertion
++XMLAssertionGui=org.apache.jmeter.assertions.gui.XMLAssertionGui
++XMLSchemaAssertion=org.apache.jmeter.assertions.XMLSchemaAssertion
++XMLSchemaAssertionGUI=org.apache.jmeter.assertions.gui.XMLSchemaAssertionGUI
++XPathAssertion=org.apache.jmeter.assertions.XPathAssertion
++XPathAssertionGui=org.apache.jmeter.assertions.gui.XPathAssertionGui
++XPathExtractor=org.apache.jmeter.extractor.XPathExtractor
++XPathExtractorGui=org.apache.jmeter.extractor.gui.XPathExtractorGui
++#
++# Properties - all start with lower case letter and end with Prop
++#
++boolProp=org.apache.jmeter.testelement.property.BooleanProperty
++collectionProp=org.apache.jmeter.testelement.property.CollectionProperty
++doubleProp=org.apache.jmeter.testelement.property.DoubleProperty
++elementProp=org.apache.jmeter.testelement.property.TestElementProperty
++# see above - already defined as FloatProperty
++#floatProp=org.apache.jmeter.testelement.property.FloatProperty
++intProp=org.apache.jmeter.testelement.property.IntegerProperty
++longProp=org.apache.jmeter.testelement.property.LongProperty
++mapProp=org.apache.jmeter.testelement.property.MapProperty
++objProp=org.apache.jmeter.testelement.property.ObjectProperty
++stringProp=org.apache.jmeter.testelement.property.StringProperty
++#
++# Other - must start with a lower case letter (and not end with Prop)
++# (otherwise they could clash with the initial set of aliases)
++#
++hashTree=org.apache.jorphan.collections.ListedHashTree
++jmeterTestPlan=org.apache.jmeter.save.ScriptWrapper
++sample=org.apache.jmeter.samplers.SampleResult
++httpSample=org.apache.jmeter.protocol.http.sampler.HTTPSampleResult
++testResults=org.apache.jmeter.save.TestResultWrapper
++assertionResult=org.apache.jmeter.assertions.AssertionResult
++monitorStats=org.apache.jmeter.visualizers.MonitorStats
++sampleEvent=org.apache.jmeter.samplers.SampleEvent
++#
++# Converters to register.  Must start line with '_'
++# If the converter is a collection of subitems, set equal to "collection"
++# If the converter needs to know the class mappings but is not a collection of 
++#      subitems, set it equal to "mapping"
++_org.apache.jmeter.protocol.http.util.HTTPResultConverter=collection
++_org.apache.jmeter.save.converters.BooleanPropertyConverter=
++_org.apache.jmeter.save.converters.IntegerPropertyConverter=
++_org.apache.jmeter.save.converters.LongPropertyConverter=
++_org.apache.jmeter.save.converters.MultiPropertyConverter=collection
++_org.apache.jmeter.save.converters.SampleEventConverter=
++_org.apache.jmeter.save.converters.SampleResultConverter=collection
++_org.apache.jmeter.save.converters.SampleSaveConfigurationConverter=collection
++_org.apache.jmeter.save.converters.StringPropertyConverter=
++_org.apache.jmeter.save.converters.HashTreeConverter=collection
++_org.apache.jmeter.save.converters.TestElementConverter=collection
++_org.apache.jmeter.save.converters.TestElementPropertyConverter=collection
++_org.apache.jmeter.save.converters.TestResultWrapperConverter=collection
++_org.apache.jmeter.save.ScriptWrapperConverter=mapping
++#
++#	Remember to update the _version entry
++#
+\ No newline at end of file
 diff -Nur -x '*.orig' -x '*~' jakarta-jmeter-2.3.4/bin/upgrade.properties jakarta-jmeter-2.3.4.new/bin/upgrade.properties
 --- jakarta-jmeter-2.3.4/bin/upgrade.properties	1970-01-01 05:30:00.000000000 +0530
-+++ jakarta-jmeter-2.3.4.new/bin/upgrade.properties	2009-07-28 00:13:58.000000000 +0530
++++ jakarta-jmeter-2.3.4.new/bin/upgrade.properties	2009-09-30 10:48:16.000000000 +0530
 @@ -0,0 +1,78 @@
 +# Class, property and value upgrade equivalences.
 +

Modified: trunk/jakarta-jmeter/debian/rules
===================================================================
--- trunk/jakarta-jmeter/debian/rules	2009-10-01 06:50:56 UTC (rev 10717)
+++ trunk/jakarta-jmeter/debian/rules	2009-10-01 14:19:42 UTC (rev 10718)
@@ -13,3 +13,10 @@
 	mkdir -p debian/jmeter/usr/share/jmeter/bin
 	install -m 755 debian/wrappers/jmeter debian/jmeter/usr/share/jmeter/bin
 	install -m 755 bin/jmeter-server debian/jmeter/usr/share/jmeter/bin
+
+get-orig-source:
+	cd .. && wget -c http://www.apache.org/dist/jakarta/jmeter/source/jakarta-jmeter-$(DEB_UPSTREAM_VERSION)_src.tgz
+	tar -zxvf ../jakarta-jmeter-$(DEB_UPSTREAM_VERSION)_src.tgz
+	tar -zcv --exclude *.jar \
+	    -f ../jakarta-jmeter_$(DEB_UPSTREAM_VERSION).orig.tar.gz jakarta-jmeter-$(DEB_UPSTREAM_VERSION)/
+	rm -rf jakarta-jmeter-$(DEB_UPSTREAM_VERSION)

Modified: trunk/jakarta-jmeter/debian/wrappers/jmeter
===================================================================
--- trunk/jakarta-jmeter/debian/wrappers/jmeter	2009-10-01 06:50:56 UTC (rev 10717)
+++ trunk/jakarta-jmeter/debian/wrappers/jmeter	2009-10-01 14:19:42 UTC (rev 10718)
@@ -4,7 +4,8 @@
 . /usr/lib/java-wrappers/java-wrappers.sh
 
 find_jars avalon-framework batik bsf bsh commons-collections3
-find_jars commons-httpclient commons-io commons-jexl commons-lang commons-net
+find_jars commons-httpclient commons-io commons-jexl commons-lang
+find_jars commons-logging commons-net
 find_jars excalibur-logger excalibur-logkit gnumail jcharts jdom1 jtidy js
 find_jars junit libhtmlparser oro xalan2 xstream
 find_jars /usr/share/jmeter/lib/jorphan.jar

More information about the pkg-java-commits mailing list