[jamonapi] Initial commit
Andy Grimm
arg at fedoraproject.org
Fri Mar 2 16:58:31 UTC 2012
commit a65129e30780294533e63a3a2ba40ca9d7b64f5a
Author: Andy Grimm <agrimm at gmail.com>
Date: Fri Mar 2 11:57:15 2012 -0500
Initial commit
.gitignore | 1 +
jamonapi-2.73.pom | 63 +++++++++++++++++++++++++
jamonapi-buildxml.patch | 54 ++++++++++++++++++++++
jamonapi-jetty8.patch | 93 +++++++++++++++++++++++++++++++++++++
jamonapi.spec | 116 +++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
6 files changed, 328 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..a2df1ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jamonapi-2.73.tar.gz
diff --git a/jamonapi-2.73.pom b/jamonapi-2.73.pom
new file mode 100644
index 0000000..a276ed4
--- /dev/null
+++ b/jamonapi-2.73.pom
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.jamonapi</groupId>
+ <artifactId>jamon</artifactId>
+ <packaging>jar</packaging>
+ <name>jamon</name>
+ <url>http://jamonapi.sourceforge.net/</url>
+ <version>2.73</version>
+ <description>
+ Jamon is a Java API that allows developers to easily monitor production
+ applications.
+ </description>
+ <licenses>
+ <license>
+ <name>BSD</name>
+ <url>http://www.opensource.org/licenses/bsd-license.php</url>
+ </license>
+ </licenses>
+
+ <scm>
+ <connection>scm:cvs:pserver:anonymous at jamonapi.cvs.sourceforge.net:/cvsroot/jamonapi</connection>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ <inherited>true</inherited>
+ </plugin>
+ </plugins>
+
+ <sourceDirectory>java</sourceDirectory>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>catalina</artifactId>
+ <version>6.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.0</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/jamonapi-buildxml.patch b/jamonapi-buildxml.patch
new file mode 100644
index 0000000..e81bd05
--- /dev/null
+++ b/jamonapi-buildxml.patch
@@ -0,0 +1,54 @@
+--- src/ant/build.xml 2011-12-20 15:39:21.139447188 -0500
++++ src/ant/build.xml.new 2011-12-20 15:40:18.323443276 -0500
+@@ -8,11 +8,11 @@
+ <property name="name" value="${project}"/>
+ <property name="src" value="${basedir}/src"/>
+ <property name="build" value="${basedir}/build"/>
+- <property name="dist" value="${basedir}\dist"/>
++ <property name="dist" value="${basedir}/dist"/>
+ <property name="backup" value="${basedir}/backup/"/>
+ <property name="release" value="${basedir}/release/"/>
+ <property name="doc" value="${src}/doc/javadoc/"/>
+- <property name="lib" value="${basedir}/lib/"/>
++ <property name="lib" value="/usr/share/java"/>
+ <property name="java" value="${src}/java/"/>
+ <property name="osmon" value="${src}/osmon/"/>
+ <property name="debug" value="true"/>
+@@ -34,9 +34,13 @@
+ <path id="class.path">
+
+ <fileset dir="${lib}">
+- <include name="*.zip"/>
+- <include name="*.jar"/>
+- <exclude name="catalina_tomcat4.jar"/>
++ <include name="tomcat-el-2.2-api.jar"/>
++ <include name="tomcat-servlet-3.0-api.jar"/>
++ <include name="tomcat/*.jar"/>
++ <include name="jetty/jetty-server.jar"/>
++ <include name="jetty/jetty-io.jar"/>
++ <include name="jetty/jetty-util.jar"/>
++ <include name="interceptor.jar"/>
+ </fileset>
+
+ </path>
+@@ -104,7 +107,7 @@
+ <!-- =========================================================================== -->
+ <!-- TARGET [CLEAN] -->
+ <!-- =========================================================================== -->
+-<target depends="prepare,backup" name="clean">
++<target depends="prepare" name="clean">
+ <delete dir="${build}"/>
+ <delete>
+ <fileset dir="${dist}">
+@@ -130,11 +133,6 @@
+ <exclude name="**/jamonapi/proxy/JAMonDataSource.java"/>
+ </javac>
+
+- <javac classpathref="class.path.tomcat4" debug="${debug}" deprecation="${deprication}" destdir="${build}" srcdir="${java}" target="${vm}" source="${vm}">
+- <include name="**/jamontomcat/JAMonTomcat4Valve.java"/>
+- <include name="**/jamontomcat/JAMonTomcat5Valve.java"/>
+- </javac>
+-
+ <javac classpathref="class.path" debug="${debug}" deprecation="${deprication}" destdir="${build}" srcdir="${java}" target="1.5" source="1.5">
+ <include name="**/jamonapi/aop/JAMonEJBInterceptor.java"/>
+ <include name="**/jamonapi/proxy/JAMonDataSource.java"/>
diff --git a/jamonapi-jetty8.patch b/jamonapi-jetty8.patch
new file mode 100644
index 0000000..fc65281
--- /dev/null
+++ b/jamonapi-jetty8.patch
@@ -0,0 +1,93 @@
+diff -urN jamonapi/src/java/com/jamonapi/http/JAMonJettyHandler.java jamonapi.new/src/java/com/jamonapi/http/JAMonJettyHandler.java
+--- jamonapi/src/java/com/jamonapi/http/JAMonJettyHandler.java 2007-09-19 00:37:15.000000000 -0400
++++ jamonapi.new/src/java/com/jamonapi/http/JAMonJettyHandler.java 2012-02-07 06:04:03.254800508 -0500
+@@ -11,10 +11,10 @@
+ import javax.servlet.http.HttpServletResponse;
+
+
+-import org.mortbay.jetty.HttpConnection;
+-import org.mortbay.jetty.Request;
+-import org.mortbay.jetty.Response;
+-import org.mortbay.jetty.handler.HandlerWrapper;
++import org.eclipse.jetty.server.BlockingHttpConnection;
++import org.eclipse.jetty.server.Request;
++import org.eclipse.jetty.server.Response;
++import org.eclipse.jetty.server.handler.HandlerWrapper;
+
+
+ public class JAMonJettyHandler extends HandlerWrapper implements HttpMonManage{
+@@ -30,14 +30,15 @@
+
+ /** Monitor the request and call any other requests in the decorator chain */
+ public void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) throws IOException, ServletException {
+- final Request baseRequest = (request instanceof Request) ? ((Request)request) : HttpConnection.getCurrentConnection().getRequest();
+- final Response baseResponse = (response instanceof Response) ? ((Response)response) : HttpConnection.getCurrentConnection().getResponse();
++ final Request baseRequest = (request instanceof Request) ? ((Request)request) : BlockingHttpConnection.getCurrentConnection().getRequest();
++ final Response baseResponse = (response instanceof Response) ? ((Response)response) : BlockingHttpConnection.getCurrentConnection().getResponse();
+
+ HttpMon httpMon=null;
+ try {
+ httpMon=httpMonFactory.start(baseRequest, baseResponse);
+
+- super.handle(target, request, response, dispatch);
++ // XXX - verify correctness of these arguments
++ super.handle(target, baseRequest, request, response);
+ } catch (Throwable e) {
+ httpMon.throwException(e);
+ } finally {
+diff -urN jamonapi/src/java/com/jamonapi/http/JettyHttpMonItem.java jamonapi.new/src/java/com/jamonapi/http/JettyHttpMonItem.java
+--- jamonapi/src/java/com/jamonapi/http/JettyHttpMonItem.java 2007-09-19 00:37:15.000000000 -0400
++++ jamonapi.new/src/java/com/jamonapi/http/JettyHttpMonItem.java 2012-02-07 05:47:46.287890545 -0500
+@@ -5,7 +5,7 @@
+ */
+ import com.jamonapi.Monitor;
+ import com.jamonapi.MonitorFactory;
+-import org.mortbay.jetty.Request;
++import org.eclipse.jetty.server.Request;
+
+
+ class JettyHttpMonItem extends HttpMonItem {
+diff -urN jamonapi/src/java/com/jamonapi/proxy/JAMonDataSource.java jamonapi.new/src/java/com/jamonapi/proxy/JAMonDataSource.java
+--- jamonapi/src/java/com/jamonapi/proxy/JAMonDataSource.java 2011-07-21 10:27:30.000000000 -0400
++++ jamonapi.new/src/java/com/jamonapi/proxy/JAMonDataSource.java 2012-02-07 06:00:09.744821359 -0500
+@@ -4,6 +4,8 @@
+ import java.io.Serializable;
+ import java.sql.Connection;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+
+ import javax.sql.*;
+ import javax.naming.Referenceable;
+@@ -79,4 +81,8 @@
+ return realDataSource.unwrap(arg0);
+ }
+
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+ }
+diff -urN jamonapi/src/java/com/jamonapi/proxy/JAMonDriver.java jamonapi.new/src/java/com/jamonapi/proxy/JAMonDriver.java
+--- jamonapi/src/java/com/jamonapi/proxy/JAMonDriver.java 2011-08-02 17:48:16.000000000 -0400
++++ jamonapi.new/src/java/com/jamonapi/proxy/JAMonDriver.java 2012-02-07 06:01:13.931815788 -0500
+@@ -4,7 +4,7 @@
+ import java.util.Properties;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+-
++import java.util.logging.Logger;
+
+
+ import java.sql.*;
+@@ -245,6 +245,10 @@
+
+ }
+
++ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++ throw new SQLFeatureNotSupportedException();
++ }
++
+
+ }
+
diff --git a/jamonapi.spec b/jamonapi.spec
new file mode 100644
index 0000000..ba231cc
--- /dev/null
+++ b/jamonapi.spec
@@ -0,0 +1,116 @@
+%global oname jamon
+
+Name: jamonapi
+Version: 2.73
+Release: 4%{?dist}
+Summary: A Java monitoring API
+Group: Development/Libraries
+License: BSD
+URL: http://jamon.sourceforge.net
+
+# cvs -d:pserver:anonymous at jamonapi.cvs.sourceforge.net:/cvsroot/jamonapi login
+# cvs -z3 -d:pserver:anonymous at jamonapi.cvs.sourceforge.net:/cvsroot/jamonapi co -P -r v2_73 jamonapi/src
+# tar caf jamonapi-2.73.tar.gz jamonapi
+Source0: jamonapi-2.73.tar.gz
+# I have not found the original link from which this pom was downloaded
+Source1: jamonapi-2.73.pom
+Patch0: jamonapi-buildxml.patch
+Patch1: jamonapi-jetty8.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+BuildRequires: ant
+BuildRequires: tomcat-lib
+BuildRequires: tomcat-servlet-3.0-api
+BuildRequires: tomcat-el-2.2-api
+BuildRequires: jetty
+BuildRequires: geronimo-interceptor
+BuildRequires: log4j
+BuildRequires: dos2unix
+Requires: java
+Requires: jpackage-utils
+Requires: tomcat-lib
+Requires: tomcat-servlet-3.0-api
+Requires: tomcat-el-2.2-api
+Requires: jetty
+Requires: geronimo-interceptor
+Requires: log4j
+BuildArch: noarch
+
+%description
+A Java monitoring API
+
+%package javadoc
+Summary: API documentation for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+%{summary}.
+
+%prep
+%setup -q -n %{name}
+%patch0 -p0
+%patch1 -p1
+mkdir dist
+mkdir lib
+
+%build
+pushd src/ant
+ant JAR
+ant javadoc
+popd
+
+# Remove spurious executable permissions
+find src/JAMonUsersGuide -type f | xargs chmod -x
+find src/JAMonUsersGuide -regex '.*\(xml\|css\|js\)' -o -name package-list | xargs dos2unix
+
+# Remove pregenerated javadoc files in the source tree
+rm -rf src/JAMonUsersGuide/javadoc/
+# Remove zip file which contains a proprietary binary
+rm src/JAMonUsersGuide/JAMon_PB.zip
+
+# There should be a shorter way to do an iconv task, but I do not know of one
+pushd src/JAMonUsersGuide/presentation/jamon_files/
+mv master04_stylesheet.css master04_stylesheet.css.iso8859-1
+iconv -f ISO-8859-1 -t UTF-8 master04_stylesheet.css.iso8859-1 > master04_stylesheet.css
+rm master04_stylesheet.css.iso8859-1
+popd
+
+%install
+install -d -m 0755 ${RPM_BUILD_ROOT}/%{_javadir}
+install -m 0644 dist/%{oname}-%{version}.jar ${RPM_BUILD_ROOT}/%{_javadir}/%{name}.jar
+ln -s %{name}.jar ${RPM_BUILD_ROOT}/%{_javadir}/%{oname}.jar
+
+install -d -m 0755 ${RPM_BUILD_ROOT}/%{_mavenpomdir}
+install -m 0644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_mavenpomdir}/JPP-%{oname}.pom
+
+install -d -m 0755 ${RPM_BUILD_ROOT}%{_javadocdir}
+cp -rp src/doc/javadoc ${RPM_BUILD_ROOT}%{_javadocdir}/%{name}
+
+%add_maven_depmap JPP-%{oname}.pom %{oname}.jar
+
+%files
+%doc src/JAMonUsersGuide
+%{_javadir}/%{oname}.jar
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{oname}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%files javadoc
+%doc src/JAMonUsersGuide/JAMonLicense.html
+%{_javadocdir}/%{name}
+
+%changelog
+* Sun Feb 26 2012 Andy Grimm <agrimm at gmail.com> 2.73-4
+- remove duplicate javadoc directory
+- Remove PowerBuilder example zipfile
+
+* Thu Feb 16 2012 Andy Grimm <agrimm at gmail.com> 2.73-3
+- add javadoc subpackage
+
+* Tue Feb 14 2012 Andy Grimm <agrimm at gmail.com> 2.73-2
+- Update for Jetty 8
+
+* Tue Dec 20 2011 Andy Grimm <agrimm at gmail.com> 2.73-1
+- Initial Package
diff --git a/sources b/sources
index e69de29..6173f86 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+c16cbb94483029945bc64db743a92c9c jamonapi-2.73.tar.gz
More information about the scm-commits
mailing list