Remove profiler4j

It doesn't work anymore and there are other, non-invasive tools
available.

1 files changed, 4 insertions, 100 deletions

diff --git a/build.xml b/build.xml
index 93df63d..6aa28ed 100644
--- a/build.xml
+++ b/build.xml
@@ -206,10 +206,6 @@
     <!-- set the os.lib.home here in case it was not set before -->
     <property name="os.lib.home" value="${lib}"/>
 
-    <property name="profiler.args" value="" />
-    <property name="profiler.bootdelegation" value="" />
-    <property name="profiler.autostart" value="" />
-
     <tstamp>
         <format property="build.date" pattern="dd-MM-yyyy"/>
     </tstamp>
@@ -811,20 +807,14 @@
             <!-- pass to SC args that have been specified by the user -->
             <arg line="${args}"/>
 
-            <sysproperty key="org.osgi.framework.bootdelegation"
-                         value="${profiler.bootdelegation}" />
-            <sysproperty key="felix.auto.start.68"
-                         value="${profiler.autostart}" />
-
             <jvmarg value="-Xdebug" />
             <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5432" />
 
 
-            <!-- add some eventual profiler args, prevent server-class
+            <!-- prevent server-class
                  detection because -server uses much more memory for 32-bit OS
                  (64-bit always used -server) -->
-            <jvmarg line="${profiler.args} ${jvmarg.line}
-              -client ${jvm.maxheapsize}"/>
+            <jvmarg line="${jvmarg.line} -client ${jvm.maxheapsize}"/>
 
             <sysproperty key="apple.laf.useScreenMenuBar" value="true" />
         </java>
@@ -918,93 +908,22 @@
             <!-- pass to SC args that have been specified by the user -->
             <arg line="${args}"/>
 
-            <sysproperty key="org.osgi.framework.bootdelegation"
-                value="${profiler.bootdelegation}" />
-            <sysproperty key="felix.auto.start.68"
-                value="${profiler.autostart}" />
-
-            <!-- add some eventual profiler args, prevent server-class
+            <!-- prevent server-class
                  detection because -server uses much more memory for 32-bit OS
                  (64-bit always used -server) -->
-            <jvmarg line="${profiler.args} ${jvmarg.line}
+            <jvmarg line="${jvmarg.line}
               -client ${jvm.maxheapsize} ${jvmarg.splash} ${jvmarg.aegeturl}"/>
 
             <sysproperty key="apple.laf.useScreenMenuBar" value="true" />
         </java>
     </target>
 
-    <!--RUN-JITSI-WITH-INTEGRATED-PROFILER -->
-    <target name="run-with-profiler"
-        description="Starts felix and runs sip-comunicator gui (use latest build) with the hooked classloader."
-        depends="bundle-plugin-profiler4j">
-
-        <antcall target="run">
-            <param name="profiler.args"
-                value="-Xmx128m -javaagent:${lib.noinst}/profiler4j-1.0-beta3-SC.jar" />
-            <param name="profiler.bootdelegation"
-                value="net.sf.profiler4j.agent.*" />
-            <param name="profiler.autostart"
-                value="reference:file:sc-bundles/profiler4j.jar" />
-        </antcall>
-    </target>
-
     <target name="run-v4" description="Starts SC with a preference for IPv4.">
         <ant target="run">
           <property name="java.net.preferIPv6Addresses" value="false"/>
         </ant>
     </target>
 
-    <!--PROFILE-JITSI-IN-NETBEANS-IDE -->
-    <target name="profile" depends="bundle-plugin-profiler4j,deploy-os-specific-bundles"
-        description="Profile Project">
-        <fail unless="netbeans.home">
-            This target can only run inside the NetBeans IDE.
-        </fail>
-
-        <nbprofiledirect>
-            <classpath> <pathelement location="${dest}"/> </classpath>
-        </nbprofiledirect>
-
-        <java classname="net.java.sip.communicator.launcher.SIPCommunicator"
-            fork="true"
-            failonerror="true"
-            classpathref="project.class.path">
-
-            <jvmarg value="${profiler.info.jvmargs.agent}"/>
-
-            <!-- Tell felix to run Jitsi -->
-            <sysproperty key="felix.config.properties"
-                value="file:${lib}/felix.client.run.properties"/>
-
-            <!-- Tell java.util.logging about our logging preferences -->
-            <sysproperty key="java.util.logging.config.file"
-                value="${lib}/logging.properties"/>
-
-            <sysproperty key="java.net.preferIPv6Addresses"
-                value="false"/>
-
-            <sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
-                    value="${user.home}/schome"/>
-
-            <!-- Setting properties necessary for dependencies on native libs-->
-            <sysproperty key="java.library.path"
-                path="${ld.library.path}:${path}:${dyld.library.path}"/>
-
-            <!-- pass l10n properties from ant call for
-                     easy translation debugging -->
-            <sysproperty key="user.language" value="${user.language}" />
-            <sysproperty key="user.country" value="${user.country}" />
-            <sysproperty key="user.variant" value="${user.variant}" />
-
-            <env key="LD_LIBRARY_PATH" path="${ld.library.path}"/>
-            <env key="PATH" path="${path}"/>
-            <env key="DYLD_LIBRARY_PATH" path="${dyld.library.path}"/>
-
-        </java>
-
-        <delete file="${bundles.dest}/profiler4j.jar"/>
-    </target>
-
     <!-- we run this target before we run SC in order to copy os-specific
              bundles from sc-bundles/osname to its parent sc-bundles-->
     <target name="deploy-os-specific-bundles" if="bundles.dest.os">
@@ -2185,21 +2104,6 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
-   <!--BUNDLE-PLUGIN-PROFILER-->
-   <target name="bundle-plugin-profiler4j">
-        <jar compress="false" destfile="${bundles.dest}/profiler4j.jar"
-            manifest="${src}/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf">
-            <zipfileset dir="${dest}/net/java/sip/communicator/plugin/profiler4j"
-                prefix="net/java/sip/communicator/plugin/profiler4j" />
-            <zipfileset src="${lib.noinst}/profiler4j-1.0-beta3-SC.jar"
-                prefix=""/>
-            <zipfileset src="${lib.noinst}/jdom.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jcommon-1.0.0.jar" prefix=""/>
-            <zipfileset src="${lib.noinst}/jfreechart-1.0.1.jar" prefix=""/>
-            <fileset file="${lib.noinst}/p4j-exclusions.txt"/>
-        </jar>
-    </target>
-
     <!--BUNDLE-SimpleAccRegPlugin-->
     <target name="bundle-plugin-simpleaccreg">
         <jar compress="false" destfile="${bundles.dest}/simpleaccreg.jar"