[Jpackage-commits] dist/jboss-profiler/devel .cvsignore, 1.1, 1.2 jboss-profiler-ChartView.patch, NONE, 1.1 jboss-profiler-GraphApplet.patch, NONE, 1.1 jboss-profiler-GraphMemoryApplet.patch, NONE, 1.1 jboss-profiler-ServletUpload.patch, NONE, 1.1 jboss-profiler-ServletUploadFile.patch, NONE, 1.1 jboss-profiler-project_properties.patch, NONE, 1.1 jboss-profiler.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:48:58 CEST 2008


Update of /home/projects/jpackage/cvs/dist/jboss-profiler/devel
In directory ryu.zarb.org:/tmp/cvs-serv12049/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jboss-profiler-ChartView.patch 
	jboss-profiler-GraphApplet.patch 
	jboss-profiler-GraphMemoryApplet.patch 
	jboss-profiler-ServletUpload.patch 
	jboss-profiler-ServletUploadFile.patch 
	jboss-profiler-project_properties.patch jboss-profiler.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-profiler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:47:01 -0000	1.1
--- .cvsignore	28 May 2008 18:48:56 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jboss-profiler.tar.gz

--- NEW FILE: jboss-profiler-ChartView.patch ---
--- java/src/web/org/jboss/profiler/web/servlets/ChartView.java.sav	2006-01-04 00:47:27.000000000 +0100
+++ java/src/web/org/jboss/profiler/web/servlets/ChartView.java	2006-06-07 07:48:06.000000000 +0200
@@ -28,8 +28,10 @@
 
 import org.jboss.profiler.model.*;
 import org.jfree.data.*;
+import org.jfree.data.category.*;
 import org.jfree.chart.*;
 import org.jfree.chart.plot.*;
+import org.jfree.chart.labels.*;
 import java.awt.image.BufferedImage;
 
 
@@ -197,9 +199,10 @@
  	      datasetBar.addValue(totalTimeOthers, "Time", "Others");
       }
 
-      JFreeChart chart = ChartFactory.createPieChart("",datasetBar, org.jfree.chart.plot.PiePlot.PER_ROW ,true, false, false);
+      JFreeChart chart = ChartFactory.createMultiplePieChart("",datasetBar, org.jfree.util.TableOrder.BY_ROW ,true, false, false);
       PiePlot piePlot = (PiePlot)chart.getPlot();
-      piePlot.setSectionLabelType(PiePlot.PERCENT_LABELS);
+//      piePlot.setSectionLabelType(PiePlot.PERCENT_LABELS);
+      piePlot.setLabelGenerator(new StandardPieItemLabelGenerator("{2}"));
       saveChart(out, chart);
 
   }
@@ -215,4 +218,4 @@
   //Clean up resources
   public void destroy() {
   }
-}
\ No newline at end of file
+}

--- NEW FILE: jboss-profiler-project_properties.patch ---
--- project.properties.sav	2006-06-07 08:56:30.000000000 +0200
+++ project.properties	2006-06-07 08:56:42.000000000 +0200
@@ -2,7 +2,7 @@
 deploy.dir=C:/usr/src/root-specj2004/jboss-4.0.4beta/server/specj2004/deploy
 
 #this property is useful when you are developing JSPs
-deploydir.activated=true
+deploydir.activated=false
 
 #deploy.activated=true
 

--- NEW FILE: jboss-profiler-ServletUpload.patch ---
--- java/src/web/org/jboss/profiler/web/servlets/ServletUpload.java.sav	2006-06-07 07:55:50.000000000 +0200
+++ java/src/web/org/jboss/profiler/web/servlets/ServletUpload.java	2006-06-07 07:57:05.000000000 +0200
@@ -50,7 +50,8 @@
        //List files = upload.parseRequest(request,10*1024*1024,10*1024*1024,"c:\\temp");
        //System.g
        System.out.println("usando " + getTempDir());
-       List files = upload.parseRequest(request,-1,-1,getTempDir());
+//       List files = upload.parseRequest(request,-1,-1,getTempDir());
+       List files = upload.parseRequest(request);
 
        InputStream input = (InputStream)((FileItem)files.get(0)).getInputStream();
        GZIPInputStream ginput = new GZIPInputStream(input);
@@ -86,4 +87,4 @@
   //Clean up resources
   public void destroy() {
   }
-}
\ No newline at end of file
+}

--- NEW FILE: jboss-profiler.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section		free

Summary:	JBoss Profiler
URL:		http://www.jboss.com/

Source0:	jboss-profiler.tar.gz
# cvs -d:pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss co jboss-profiler

Patch0:		jboss-profiler-ChartView.patch
Patch1:		jboss-profiler-ServletUpload.patch
Patch2:		jboss-profiler-ServletUploadFile.patch
Patch3:		jboss-profiler-GraphApplet.patch
Patch4:		jboss-profiler-GraphMemoryApplet.patch
Patch5:		jboss-profiler-project_properties.patch

Name:		jboss-profiler
Version:	1.0
Release:	0.rc2.1jpp
Epoch:		0
License:	LGPL
Group:		Development/Java
Vendor:		JPackage Project
Distribution:	JPackage
BuildArch:	noarch
BuildRequires:	jpackage-utils >= 0:1.6
BuildRequires:	ant >= 0:1.6
BuildRequires:	jboss-aop
BuildRequires:	jboss4-common
BuildRequires:	gnu-trove
BuildRequires:	struts
BuildRequires:	servletapi5
BuildRequires:	jakarta-commons-beanutils
BuildRequires:	jakarta-commons-fileupload
BuildRequires:	jakarta-poi
BuildRequires:	jcommon
BuildRequires:	jfreechart
BuildRequires:	jgraph
BuildRequires:	junit

Requires:	jpackage-utils >= 0:1.6
Requires:	ant
Requires:	jakarta-commons-beanutils
Requires:	jboss4-common
Requires:	jgraph
Requires:	junit
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
JBoss Profiler is a log based profiler using the JVMPI system.
It uses an agent written in C that captures events from the
JVM and logs them to disk. A web application running on JBoss
or another machine can be used to analyze these logs through a
web browser.
Using log files is especially useful for server application
analysis. Creating profiling snapshots without the need of a
front-end near the JVM means the data can be analyzed#
remotely.
Imagine if your application server slows down and you don't know
why. Why should you have to install a complex tool environment or
have to send data through an open port, breaking firewall rules
between the profiler front-end and the JVMPI/JVMTI? JBoss Profiler
can be easily run though your web browser instead.


%package webapps
Summary:        WARs, SARs, Applet for %{name}
Group:          Development/Java
Requires:	%{name} = %{epoch}:%{version}-%{release}

%description webapps
%{summary}

%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}

%prep
%setup -q -n %{name}
chmod -R go=u-w *
find . -name "*.jar" -exec rm {} \;
for j in $(find . -name "*.jar"); do
	mv $j $j.no
done
find . -depth -type d -name CVS -exec rm -rf {} \;

%patch0 -b .sav
%patch1 -b .sav
%patch2 -b .sav
%patch3 -b .sav
%patch4 -b .sav
%patch5 -b .sav

pushd java/libs/aop
ln -sf $(build-classpath jboss-aop/jboss-aop) .
ln -sf $(build-classpath jboss4/jboss-common) .
ln -sf $(build-classpath gnu-trove) .
popd
pushd java/libs/web
ln -sf $(build-classpath struts) .
ln -sf $(build-classpath servletapi5) .
ln -sf $(build-classpath commons-fileupload) .
ln -sf $(build-classpath poi) .
ln -sf $(build-classpath jfreechart) .
ln -sf $(build-classpath jcommon) .
popd
pushd java/libs/appletsLibs
ln -sf $(build-classpath jgraph) .
popd

%build
ant \
	compile \
	jar \
	war \
	console \
	jboss-mbean \
	javah-full \
	javah-lite \
	antProfiler \
	appletjar \

%install
rm -rf $RPM_BUILD_ROOT

# jar
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -p -m 0644 build/antProfiler.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/antProfiler-%{version}.jar
install -p -m 0644 build/jar/%{name}Engine.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}Engine-%{version}.jar
install -p -m 0644 build/%{name}-jvmti.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-jvmti-%{version}.jar
install -p -m 0644 build/profilerConsole.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/profilerConsole-%{version}.jar
install -p -m 0644 build/profilerSynchronizer.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/profilerSynchronizer-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# webapps
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 0644 build/aop-monitoring.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 0644 build/applet/graphApplet.jar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 0644 build/%{name}-jvmti.sar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 0644 build/%{name}-noAOP.sar $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 0644 build/%{name}.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}

# manual
install -d -m 0755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
mv "docs/JBossProfiler - JVMTI.doc" "docs/JBossProfiler-JVMTI.doc"
mv "docs/JBoss Profiler ARM.doc" "docs/JBossProfilerARM.doc"
cp -pr docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

#%post javadoc
#rm -f %{_javadocdir}/%{name}
#ln -sf %{name}-%{version} %{_javadocdir}/%{name}
#
#%postun javadoc
#if [ "$1" = "0" ]; then
#  rm -f %{_javadocdir}/%{name}
#fi

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}

%files webapps
%defattr(0644,root,root,0755)
%{_datadir}/%{name}-%{version}

%files manual
%defattr(0644,root,root,0755)
%{_docdir}/%{name}-%{version}

%changelog
* Wed Jun 07 2006 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.rc2.1jpp
- First JPP-1.7 release

--- NEW FILE: jboss-profiler-ServletUploadFile.patch ---
--- java/src/web/org/jboss/profiler/web/servlets/ServletUploadFile.java.sav	2006-06-07 07:58:31.000000000 +0200
+++ java/src/web/org/jboss/profiler/web/servlets/ServletUploadFile.java	2006-06-07 07:59:14.000000000 +0200
@@ -56,7 +56,8 @@
      try {
        Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
        FileUpload upload = new FileUpload();
-       List files = upload.parseRequest(request,-1,-1,getTempDir());
+//       List files = upload.parseRequest(request,-1,-1,getTempDir());
+       List files = upload.parseRequest(request);
 
        String destDir = request.getParameter("target.dir");
        if (destDir==null) {
@@ -92,4 +93,4 @@
   //Clean up resources
   public void destroy() {
   }
-}
\ No newline at end of file
+}

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jboss-profiler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:47:01 -0000	1.1
--- sources	28 May 2008 18:48:56 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 97bcf5aea260f16703c74ce4946270fd  jboss-profiler.tar.gz

--- NEW FILE: jboss-profiler-GraphApplet.patch ---
--- java/src/appletGraph/org/jboss/profiler/graphapplet/GraphApplet.java.sav	2006-01-04 00:47:23.000000000 +0100
+++ java/src/appletGraph/org/jboss/profiler/graphapplet/GraphApplet.java	2006-06-07 08:47:31.000000000 +0200
@@ -122,7 +122,7 @@
 				hashMethods.put(graphmethod, graphcell);
 			}
 
-			Map simpleArrow = GraphConstants.createMap();
+			Map simpleArrow = new HashMap();
 			GraphConstants.setLineEnd(
 				simpleArrow,
 				GraphConstants.ARROW_CLASSIC);
@@ -130,7 +130,7 @@
 			GraphConstants.setDashPattern(simpleArrow, new float[] { 3, 3 });
 			GraphConstants.setFont(
 				simpleArrow,
-				GraphConstants.defaultFont.deriveFont(10));
+				GraphConstants.DEFAULTFONT.deriveFont(10));
 
 			GraphMethod key = new GraphMethod();
 
@@ -184,7 +184,7 @@
 	 * Returns an attributeMap for the specified position (line,column) and color.
 	 */
 	public static Map createBounds(int line, int column, Color c) {
-		Map map = GraphConstants.createMap();
+		Map map = new HashMap();
 		GraphConstants.setBounds(
 			map,
 			new Rectangle(column * 130 + 10, line * 60 + 10, 90, 30));
@@ -193,7 +193,7 @@
 		GraphConstants.setForeground(map, Color.white);
 		GraphConstants.setFont(
 			map,
-			GraphConstants.defaultFont.deriveFont(Font.BOLD, 12));
+			GraphConstants.DEFAULTFONT.deriveFont(Font.BOLD, 12));
 		GraphConstants.setOpaque(map, true);
 		return map;
 	}

--- NEW FILE: jboss-profiler-GraphMemoryApplet.patch ---
--- java/src/appletGraph/org/jboss/profiler/graphapplet/GraphMemoryApplet.java.sav	2006-01-04 00:47:23.000000000 +0100
+++ java/src/appletGraph/org/jboss/profiler/graphapplet/GraphMemoryApplet.java	2006-06-07 08:48:01.000000000 +0200
@@ -119,7 +119,7 @@
 				hashMethods.put(graphmethod, graphcell);
 			}
 
-			Map simpleArrow = GraphConstants.createMap();
+			Map simpleArrow = new HashMap();
 			GraphConstants.setLineEnd(
 				simpleArrow,
 				GraphConstants.ARROW_CLASSIC);
@@ -127,7 +127,7 @@
 			GraphConstants.setDashPattern(simpleArrow, new float[] { 3, 3 });
 			GraphConstants.setFont(
 				simpleArrow,
-				GraphConstants.defaultFont.deriveFont(10));
+				GraphConstants.DEFAULTFONT.deriveFont(10));
 
 			GraphMethod key = new GraphMethod();
 
@@ -195,7 +195,7 @@
 	 * Returns an attributeMap for the specified position (line,column) and color.
 	 */
 	public static Map createBounds(int line, int column, Color c) {
-		Map map = GraphConstants.createMap();
+		Map map = new HashMap();
 		GraphConstants.setBounds(
 			map,
 			new Rectangle(column * 130 + 10, line * 60 + 10, 90, 30));
@@ -204,7 +204,7 @@
 		GraphConstants.setForeground(map, Color.white);
 		GraphConstants.setFont(
 			map,
-			GraphConstants.defaultFont.deriveFont(Font.BOLD, 12));
+			GraphConstants.DEFAULTFONT.deriveFont(Font.BOLD, 12));
 		GraphConstants.setOpaque(map, true);
 		return map;
 	}




More information about the JPackage-commits mailing list