jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1656250 - in /jmeter/trunk: bin/saveservice.properties build.xml eclipse.classpath res/maven/ApacheJMeter_report.pom test/src/org/apache/jmeter/testelement/BarChartTest.java test/src/org/apache/jmeter/testelement/LineGraphTest.java
Date Sat, 31 Jan 2015 20:32:01 GMT
Author: pmouawad
Date: Sat Jan 31 20:32:01 2015
New Revision: 1656250

URL: http://svn.apache.org/r1656250
Log:
Bug 57269 - Drop org.apache.jmeter.reports package
Bugzilla Id: 57269

Removed:
    jmeter/trunk/res/maven/ApacheJMeter_report.pom
    jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
    jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
Modified:
    jmeter/trunk/bin/saveservice.properties
    jmeter/trunk/build.xml
    jmeter/trunk/eclipse.classpath

Modified: jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/saveservice.properties?rev=1656250&r1=1656249&r2=1656250&view=diff
==============================================================================
--- jmeter/trunk/bin/saveservice.properties (original)
+++ jmeter/trunk/bin/saveservice.properties Sat Jan 31 20:32:01 2015
@@ -81,8 +81,6 @@ Authorization=org.apache.jmeter.protocol
 AuthPanel=org.apache.jmeter.protocol.http.gui.AuthPanel
 BackendListener=org.apache.jmeter.visualizers.backend.BackendListener
 BackendListenerGui=org.apache.jmeter.visualizers.backend.BackendListenerGui
-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
@@ -139,8 +137,6 @@ HeaderManager=org.apache.jmeter.protocol
 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
@@ -206,8 +202,6 @@ LDAPExtSampler=org.apache.jmeter.protoco
 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
@@ -255,10 +249,6 @@ RemoteListenerWrapper=org.apache.jmeter.
 RemoteSampleListenerWrapper=org.apache.jmeter.samplers.RemoteSampleListenerWrapper
 RemoteTestListenerWrapper=org.apache.jmeter.samplers.RemoteTestListenerWrapper
 RemoteThreadsListenerWrapper=org.apache.jmeter.threads.RemoteThreadsListenerWrapper
-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
 RespTimeGraphVisualizer=org.apache.jmeter.visualizers.RespTimeGraphVisualizer
 ResultAction=org.apache.jmeter.reporters.ResultAction
@@ -294,8 +284,6 @@ SwitchControllerGui=org.apache.jmeter.co
 SyncTimer=org.apache.jmeter.timers.SyncTimer
 SystemSampler=org.apache.jmeter.protocol.system.SystemSampler
 SystemSamplerGui=org.apache.jmeter.protocol.system.gui.SystemSamplerGui
-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
@@ -391,3 +379,4 @@ _org.apache.jmeter.save.ScriptWrapperCon
 #
 #	Remember to update the _version entry
 #
+_com.ubikingenierie.jmeter.plugin.hls.result.HLSSampleResultConverter=collection
\ No newline at end of file

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1656250&r1=1656249&r2=1656250&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Jan 31 20:32:01 2015
@@ -142,7 +142,6 @@
       <class location="${dest.jar}/ApacheJMeter_monitors.jar"/>
       <class location="${dest.jar}/ApacheJMeter_native.jar"/>
       <class location="${dest.jar}/ApacheJMeter_mongodb.jar"/>
-      <class location="${dest.jar}/ApacheJMeter_report.jar"/>
       <class location="${dest.jar}/ApacheJMeter_tcp.jar"/>
       <class location="${dest.jar.jmeter}/ApacheJMeter.jar" />
       <sourcePath path="${src.jorphan}" />
@@ -150,7 +149,6 @@
       <sourcePath path="${src.jms}" />
       <sourcePath path="${src.native}" />
       <sourcePath path="${src.mongodb}" />
-      <sourcePath path="${src.report}" />
 
       <auxClasspath>
           <fileset dir="${lib.dir}">
@@ -214,7 +212,6 @@
   <property name="src.jms" value="src/protocol/jms"/>
   <property name="src.native" value="src/protocol/native"/>
   <property name="src.mongodb" value="src/protocol/mongodb"/>
-  <property name="src.report" value="src/reports"/>
 
   <!-- Where the documentation sources live -->
   <property name="src.docs" value="xdocs"/>
@@ -242,7 +239,6 @@
     <pathelement location="${src.jms}"/>
     <pathelement location="${src.native}"/>
     <pathelement location="${src.mongodb}"/>
-    <pathelement location="${src.report}"/>
   </path>
 
   <!-- Temporary build directories: where the .class live -->
@@ -732,21 +728,6 @@
     </javac>
   </target>
 
-  <target name="compile-report" depends="compile-jorphan,compile-core,compile-components"
-    description="Compile report components.">
-    <mkdir dir="${build.report}"/>
-    <javac srcdir="${src.report}" destdir="${build.report}" source="${src.java.version}"
optimize="${optimize}" debug="on" target="${target.java.version}"
-           includeAntRuntime="${includeAntRuntime}" deprecation="${deprecation}" encoding="${encoding}">
-      <include name="**/*.java"/>
-      <classpath>
-        <pathelement location="${build.jorphan}"/>
-        <pathelement location="${build.core}"/>
-        <pathelement location="${build.components}"/>
-        <path refid="classpath"/>
-      </classpath>
-    </javac>
-  </target>
-
   <target name="compile-tcp" depends="compile-jorphan,compile-core" description="Compile
components specific to TCP sampling.">
     <mkdir dir="${build.tcp}"/>
     <javac srcdir="${src.tcp}" destdir="${build.tcp}" source="${src.java.version}" optimize="${optimize}"
debug="on" target="${target.java.version}"
@@ -861,7 +842,7 @@
   </target>
 
   <target name="compile"
-  depends="_message_3rdParty,compile-core,compile-components,compile-functions,compile-protocols,compile-monitor,compile-junit,compile-jms,compile-native,
compile-mongodb, compile-report"
+  depends="_message_3rdParty,compile-core,compile-components,compile-functions,compile-protocols,compile-monitor,compile-junit,compile-jms,compile-native,
compile-mongodb"
   description="Compile everything."/>
 
   <target name="run_gui" depends="package" description="Run the JMeter GUI off the jar
files">
@@ -1065,16 +1046,6 @@ run JMeter unless all the JMeter jars ar
       <fileset dir="${src.junit}"   excludes="org/**/*" />
     </jar>
 
-    <!-- report -->
-    <jar jarfile="${dest.jar}/ApacheJMeter_report.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
-      <zipfileset file="${resources.meta-inf}/default.notice"
-        fullpath="META-INF/NOTICE" />
-      <zipfileset file="${resources.meta-inf}/default.license"
-        fullpath="META-INF/LICENSE" />
-      <fileset dir="${build.report}" includes="**/*.class" />
-      <fileset dir="${src.report}" includes="**/*.properties" />
-    </jar>
-
     <!-- ldap -->
     <jar jarfile="${dest.jar}/ApacheJMeter_ldap.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
       <zipfileset file="${resources.meta-inf}/default.notice"
@@ -1959,7 +1930,6 @@ run JMeter unless all the JMeter jars ar
     <deployfile stem="ApacheJMeter_mongodb"/>
     <deployfile stem="ApacheJMeter_monitors"/>
     <deployfile stem="ApacheJMeter_native"/>
-    <deployfile stem="ApacheJMeter_report"/>
     <deployfile stem="ApacheJMeter_tcp"/>
   </target>
 

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1656250&r1=1656249&r2=1656250&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Jan 31 20:32:01 2015
@@ -42,7 +42,6 @@
 	<classpathentry kind="src" output="build/protocol/mongodb" path="src/protocol/mongodb"/>
 	<classpathentry kind="src" output="build/protocol/native" path="src/protocol/native"/>
 	<classpathentry kind="src" output="build/protocol/tcp" path="src/protocol/tcp"/>
-	<classpathentry kind="src" output="build/reports" path="src/reports"/>
 	<classpathentry kind="src" output="build/test" path="test/src"/>
 	<classpathentry kind="lib" path="lib/avalon-framework-4.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/bsf-2.4.0.jar"/>



Mime
View raw message