diff --git a/0001-fix-pom.xml.patch b/0001-fix-pom.xml.patch new file mode 100644 index 0000000000000000000000000000000000000000..663fb9ffee5cddc950694d6e246b750958557a95 --- /dev/null +++ b/0001-fix-pom.xml.patch @@ -0,0 +1,86 @@ +From 6d907463edb485f6105ed9c9e8e5962cf80964db Mon Sep 17 00:00:00 2001 +From: wangge +Date: Tue, 8 Sep 2020 17:16:24 +0800 +Subject: [PATCH] fix pom.xml + +--- + pom.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++--------- + 1 file changed, 46 insertions(+), 9 deletions(-) + +diff --git a/pom.xml b/pom.xml +index b654a2a..da7ec97 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -1,17 +1,10 @@ + + 4.0.0 +- +- +- org.sonatype.oss +- oss-parent +- 7 +- +- + com.jamonapi + jamon + jar + JAMon (Java Application Monitor) +- 2.75 ++ 2.74 + + The Java Application Monitor (JAMon) is a free, simple, high performance, thread safe, Java API that allows developers to easily monitor production applications. + +@@ -42,4 +35,48 @@ + + + +- +\ No newline at end of file ++ ++ ++ ++ org.apache.maven.plugins ++ maven-compiler-plugin ++ ++ 1.5 ++ 1.5 ++ ++ true ++ ++ ++ ++ org.apache.maven.plugins ++ maven-javadoc-plugin ++ 3.0.1 ++ ++ ++ -Xdoclint:none ++ ++ false ++ ++ ++ ++ java ++ ++ ++ ++ ++ org.apache.tomcat ++ tomcat-catalina ++ 7.0.0 ++ ++ ++ org.apache.tomcat ++ tomcat-servlet-api ++ 7.0.0 ++ ++ ++ org.eclipse.jetty ++ jetty-util ++ 9.0.3 ++ ++ ++ +-- +2.23.0 + diff --git a/jamon-2.75.pom b/jamon-2.75.pom new file mode 100644 index 0000000000000000000000000000000000000000..b654a2a29a5a6f7a2f049cc915dbb654fd18ae65 --- /dev/null +++ b/jamon-2.75.pom @@ -0,0 +1,45 @@ + + 4.0.0 + + + org.sonatype.oss + oss-parent + 7 + + + com.jamonapi + jamon + jar + JAMon (Java Application Monitor) + 2.75 + + The Java Application Monitor (JAMon) is a free, simple, high performance, thread safe, Java API that allows developers to easily monitor production applications. + + 1) It contains the ability to monitor JDBC/SQL, web page requests, ejb's, log4j, interfaces and more. + 2) It tracks aggregate stats for each sql statement, page request etc. and also lets you look at this information and more via the JAMon war. + 3) You can also access JAMon statistics via the api + + http://jamonapi.sourceforge.net/ + + + + JAMon License (BSD) + http://jamonapi.sourceforge.net/JAMonLicense.html + repo + + + + + http://jamonapi.cvs.sourceforge.net/viewvc/jamonapi/jamonapi/src/java/com/jamonapi/ + scm:cvs:pserver:anonymous@jamonapi.cvs.sourceforge.net:/cvsroot/jamonapi + + + + + stevesouza + Steve Souza + admin@jamonapi.com + + + + \ No newline at end of file diff --git a/jamonall-2.74.zip b/jamonall-2.74.zip new file mode 100644 index 0000000000000000000000000000000000000000..d0107b35b4d33ea6a291d98414708482e803acc4 Binary files /dev/null and b/jamonall-2.74.zip differ diff --git a/jamonapi-JAMonUsersGuide.tar.gz b/jamonapi-JAMonUsersGuide.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..15830546fdcd17e523d1f7a8af89641fe42f5d47 Binary files /dev/null and b/jamonapi-JAMonUsersGuide.tar.gz differ diff --git a/jamonapi-jetty8.patch b/jamonapi-jetty8.patch new file mode 100644 index 0000000000000000000000000000000000000000..fc652818828801b7a8df45514a3fc291b0b66b50 --- /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-jetty93.patch b/jamonapi-jetty93.patch new file mode 100644 index 0000000000000000000000000000000000000000..21f7e65f4cc1cae779d92c8ab99df2a6668f5c61 --- /dev/null +++ b/jamonapi-jetty93.patch @@ -0,0 +1,22 @@ +diff -Nru jamonapi/src/java/com/jamonapi/http/JAMonJettyHandler.java jamonapi.jetty9/src/java/com/jamonapi/http/JAMonJettyHandler.java +--- jamonapi/src/java/com/jamonapi/http/JAMonJettyHandler.java 2015-06-24 18:34:23.564257692 +0200 ++++ jamonapi.jetty9/src/java/com/jamonapi/http/JAMonJettyHandler.java 2015-06-24 18:04:20.269305987 +0200 +@@ -11,7 +11,6 @@ + import javax.servlet.http.HttpServletResponse; + + +-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; +@@ -30,8 +29,8 @@ + + /** 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) : BlockingHttpConnection.getCurrentConnection().getRequest(); +- final Response baseResponse = (response instanceof Response) ? ((Response)response) : BlockingHttpConnection.getCurrentConnection().getResponse(); ++ final Request baseRequest = Request.getBaseRequest(request); ++ final Response baseResponse = baseRequest.getResponse(); + + HttpMon httpMon=null; + try { diff --git a/jamonapi.spec b/jamonapi.spec new file mode 100644 index 0000000000000000000000000000000000000000..e4e5834be3e1b1068889bad9d143b12946f04aa2 --- /dev/null +++ b/jamonapi.spec @@ -0,0 +1,94 @@ +%global oname jamon +Name: jamonapi +Version: 2.74 +Release: 1 +Summary: A Java monitoring API +License: BSD +URL: http://jamonapi.sourceforge.net/ +Source0: https://sourceforge.net/projects/%{name}/files/%{name}/v2_74/jamonall-%{version}.zip +Source1: https://repo1.maven.org/maven2/com/%{name}/%{oname}/2.75/%{oname}-2.75.pom +#git clone https://git.code.sf.net/p/jamonapi/jamonapi jamonapi-jamonapi +#cd jamonapi-jamonapi/src +#tar -cvf jamonapi-JAMonUsersGuide.tar.gz JAMonUsersGuide +Source2: jamonapi-JAMonUsersGuide.tar.gz +Patch0: 0001-fix-pom.xml.patch +Patch1: %{name}-jetty8.patch +Patch2: %{name}-jetty93.patch +BuildRequires: maven-local jetty-util tomcat +BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) +Requires: geronimo-interceptor log4j12 +BuildArch: noarch +%description +JAMon API is a free, simple, high performance, thread safe, +Java API that allows developers to easily monitor the +performance and scalability of production applications. JAMon +tracks hits, execution times (total, avg, min, max, std dev), +and more. + +%package javadoc +Summary: API documentation for %{name} +%description javadoc +This package contains API documentation for Java monitoring API. + +%prep +%setup -q -c -n %{name} +rm -rf binaries +rm -rf javadoc +mkdir -p ./src/ +mv ./java ./src/ +mv ./osmon ./src/ +cp %{SOURCE1} ./pom.xml +cp %{SOURCE2} ./src/ +pushd ./src +tar -xvf %{name}-JAMonUsersGuide.tar.gz +rm -f %{name}-JAMonUsersGuide.tar.gz +popd +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%build +%mvn_build + +%install +%mvn_install +cp %{buildroot}%{_datadir}/maven-poms/jamonapi/jamon.pom %{buildroot}%{_datadir}/maven-poms/jamonapi.pom +mv %{buildroot}%{_datadir}/maven-poms/jamonapi/jamon.pom %{buildroot}%{_datadir}/maven-poms/ +rm -rf %{buildroot}/maven-poms/jamonapi/ +cp %{buildroot}%{_javadir}/jamonapi/jamon.jar %{buildroot}%{_javadir}/jamonapi.jar +mv %{buildroot}%{_javadir}/jamonapi/jamon.jar %{buildroot}%{_javadir}/ +rm -rf %{buildroot}%{_javadir}/jamonapi/ +mkdir -p %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/http/ +mkdir -p %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/log4j/ +mkdir -p %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/proxy/ +mkdir -p %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/utils/ +install -D -p -m -r %{_builddir}/%{name}/javadocs/*.* %{buildroot}%{_javadocdir}/jamonapi/ +chmod 644 %{buildroot}%{_javadocdir}/jamonapi/*.* +install -D -p -m -r %{_builddir}/%{name}/javadocs/com/jamonapi/*.* %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/ +chmod 644 %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/*.* +install -D -p -m -r %{_builddir}/%{name}/javadocs/com/jamonapi/http/*.* %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/http/ +chmod 644 %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/http/*.* +install -D -p -m -r %{_builddir}/%{name}/javadocs/com/jamonapi/log4j/*.* %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/log4j/ +chmod 644 %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/log4j/*.* +install -D -p -m -r %{_builddir}/%{name}/javadocs/com/jamonapi/proxy/*.* %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/proxy/ +chmod 644 %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/proxy/*.* +install -D -p -m -r %{_builddir}/%{name}/javadocs/com/jamonapi/utils/*.* %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/utils/ +chmod 644 %{buildroot}%{_javadocdir}/jamonapi/com/jamonapi/utils/*.* + +%files +%attr(0644,root,root) /usr/share/maven-metadata/jamonapi.xml +%attr(0755,root,root) /usr/share/java/jamon.jar +%attr(0755,root,root) /usr/share/java/jamonapi.jar +%attr(0644,root,root) /usr/share/maven-poms/jamon.pom +%attr(0644,root,root) /usr/share/maven-poms/jamonapi.pom +%doc src/JAMonUsersGuide +%license src/JAMonUsersGuide/JAMonLicense.html + +%files javadoc +%defattr (-,root,root,0755) +/usr/share/javadoc/jamonapi +%license src/JAMonUsersGuide/JAMonLicense.html + +%changelog +* Sat Sep 5 2020 Ge Wang - 2.74-1 +- Package init diff --git a/jamonapi.yaml b/jamonapi.yaml new file mode 100644 index 0000000000000000000000000000000000000000..00bbaf050db91e87f0ad529e5c29027a1bf150ae --- /dev/null +++ b/jamonapi.yaml @@ -0,0 +1,4 @@ +version_control: NA +src_repo: NA +tag_prefix: NA +seperator: NA