!3 modify compile script of package jamonapi
From: @wang--ge Reviewed-by: @sinever Signed-off-by: @sinever
This commit is contained in:
openeuler-ci-bot
Gitee
commit
33c1319072
216
0001-fix-build-script.patch
Normal file
216
0001-fix-build-script.patch
Normal file
@ -0,0 +1,216 @@
|
|||||||
|
Date: Fri, 16 Oct 2020 17:03:35 +0800
|
||||||
|
Subject: [PATCH] fix build script
|
||||||
|
|
||||||
|
---
|
||||||
|
pom.xml | 44 +++++++++++++++++++-----
|
||||||
|
src/ant/build.xml | 85 +++++++++++++++++++----------------------------
|
||||||
|
2 files changed, 70 insertions(+), 59 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index b654a2a..91d0d2f 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -1,17 +1,12 @@
|
||||||
|
<project>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
- <parent>
|
||||||
|
- <groupId>org.sonatype.oss</groupId>
|
||||||
|
- <artifactId>oss-parent</artifactId>
|
||||||
|
- <version>7</version>
|
||||||
|
- </parent>
|
||||||
|
-
|
||||||
|
+
|
||||||
|
<groupId>com.jamonapi</groupId>
|
||||||
|
<artifactId>jamon</artifactId>
|
||||||
|
<packaging>jar</packaging>
|
||||||
|
<name>JAMon (Java Application Monitor)</name>
|
||||||
|
- <version>2.75</version>
|
||||||
|
+ <version>2.74</version>
|
||||||
|
|
||||||
|
<description>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 +37,37 @@
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
|
||||||
|
-</project>
|
||||||
|
\ No newline at end of file
|
||||||
|
+ <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>tomcat-catalina</artifactId>
|
||||||
|
+ <version>7.0.0</version>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>org.apache.tomcat</groupId>
|
||||||
|
+ <artifactId>tomcat-servlet-api</artifactId>
|
||||||
|
+ <version>7.0.0</version>
|
||||||
|
+ </dependency>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>org.eclipse.jetty</groupId>
|
||||||
|
+ <artifactId>jetty-util</artifactId>
|
||||||
|
+ <version>9.0.3</version>
|
||||||
|
+ </dependency>
|
||||||
|
+ </dependencies>
|
||||||
|
+</project>
|
||||||
|
diff --git a/src/ant/build.xml b/src/ant/build.xml
|
||||||
|
index d9861f6..8d5c7ae 100755
|
||||||
|
--- a/src/ant/build.xml
|
||||||
|
+++ b/src/ant/build.xml
|
||||||
|
@@ -4,25 +4,22 @@
|
||||||
|
<!-- Properties -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<property name="project" value="JAMonAPI"/>
|
||||||
|
- <property name="jamonapi_version" value="2.75"/>
|
||||||
|
+ <property name="jamonapi_version" value="2.74"/>
|
||||||
|
<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="releasedir" value="${basedir}/release/"/>
|
||||||
|
+ <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="/jamon_osmon/osmon/"/>
|
||||||
|
+ <property name="osmon" value="${src}/osmon/"/>
|
||||||
|
<property name="debug" value="true"/>
|
||||||
|
<property name="deprication" value="false"/>
|
||||||
|
- <property name="source" value="1.5"/>
|
||||||
|
- <property name="vm" value="1.5"/>
|
||||||
|
+ <property name="source" value="1.6"/>
|
||||||
|
+ <property name="vm" value="1.6"/>
|
||||||
|
<property name="dist.jar" value="${dist}/jamon-${jamonapi_version}.jar"/>
|
||||||
|
- <property name="sources.jar" value="${dist}/jamon-${jamonapi_version}-sources.jar"/>
|
||||||
|
- <property name="javadoc.jar" value="${dist}/jamon-${jamonapi_version}-javadoc.jar"/>
|
||||||
|
- <property name="osmon.zip" value="${dist}/osmon-${jamonapi_version}.zip"/>
|
||||||
|
<property name="jamontomcat.jar" value="${dist}/jamontomcat-${jamonapi_version}.jar"/>
|
||||||
|
<property name="dist.zip" value="${dist}/JAMON_ALL"/>
|
||||||
|
<property name="webxml" value="${src}/WAR/WEB-INF/web.xml"/>
|
||||||
|
@@ -37,9 +34,14 @@
|
||||||
|
<path id="class.path">
|
||||||
|
|
||||||
|
<fileset dir="${lib}">
|
||||||
|
- <include name="*.zip"/>
|
||||||
|
- <include name="*.jar"/>
|
||||||
|
- <exclude name="catalina_tomcat4.jar"/>
|
||||||
|
+ <include name="tomcat-el-api.jar"/>
|
||||||
|
+ <include name="tomcat-servlet-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"/>
|
||||||
|
+ <include name="log4j12-1.2.17.jar"/>
|
||||||
|
</fileset>
|
||||||
|
|
||||||
|
</path>
|
||||||
|
@@ -86,42 +88,28 @@
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
- <!-- =========================================================================== -->
|
||||||
|
- <!-- TARGET [RELEASE] generates final distribution zip for sourceforge release! -->
|
||||||
|
- <!-- =========================================================================== -->
|
||||||
|
- <target depends="WAR, javadoc" name="release">
|
||||||
|
+ <!-- =========================================================================== -->
|
||||||
|
+ <!-- TARGET [RELEASE] generates final distribution zip for sourceforge release! -->
|
||||||
|
+ <!-- =========================================================================== -->
|
||||||
|
+ <target depends="WAR, javadoc" name="release">
|
||||||
|
+ <!-- Exclude all .class and .java~ (netbeans backup files -->
|
||||||
|
+ <zip destfile="${release}//jamonall-${jamonapi_version}.zip">
|
||||||
|
|
||||||
|
- <jar destfile="${sources.jar}" basedir="${java}">
|
||||||
|
- <include name="**/*.java"/>
|
||||||
|
- </jar>
|
||||||
|
-
|
||||||
|
- <jar destfile="${javadoc.jar}" basedir="${doc}">
|
||||||
|
- </jar>
|
||||||
|
-
|
||||||
|
- <zip destfile="${osmon.zip}" basedir="/jamon_osmon/osmon">
|
||||||
|
- </zip>
|
||||||
|
-
|
||||||
|
+ <zipfileset dir="${dist}" prefix="binaries">
|
||||||
|
+ <include name="*.war"/>
|
||||||
|
+ <include name="*.jar"/>
|
||||||
|
+ </zipfileset>
|
||||||
|
+ <zipfileset dir="${java}" prefix="java"/>
|
||||||
|
+ <zipfileset dir="${doc}" prefix="javadocs"/>
|
||||||
|
+ <zipfileset dir="${osmon}" prefix="osmon"/>
|
||||||
|
+ </zip>
|
||||||
|
|
||||||
|
- <!-- Exclude all .class and .java~ (netbeans backup files -->
|
||||||
|
- <zip destfile="${releasedir}//jamonall-${jamonapi_version}.zip">
|
||||||
|
- <fileset dir="${basedir}">
|
||||||
|
- <include name="pom.xml" />
|
||||||
|
- </fileset>
|
||||||
|
-
|
||||||
|
- <fileset dir="${dist}">
|
||||||
|
- <include name="*.war"/>
|
||||||
|
- <include name="*.jar"/>
|
||||||
|
- <include name="*.zip"/>
|
||||||
|
- </fileset>
|
||||||
|
-
|
||||||
|
- </zip>
|
||||||
|
-
|
||||||
|
- </target>
|
||||||
|
+ </target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [CLEAN] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
-<target depends="prepare,backup" name="clean">
|
||||||
|
+<target depends="prepare" name="clean">
|
||||||
|
<delete dir="${build}"/>
|
||||||
|
<delete>
|
||||||
|
<fileset dir="${dist}">
|
||||||
|
@@ -147,15 +135,10 @@
|
||||||
|
<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">
|
||||||
|
+ <javac classpathref="class.path" debug="${debug}" deprecation="${deprication}" destdir="${build}" srcdir="${java}" target="1.6" source="1.6">
|
||||||
|
<include name="**/jamonapi/aop/JAMonEJBInterceptor.java"/>
|
||||||
|
<include name="**/jamonapi/proxy/JAMonDataSource.java"/>
|
||||||
|
-</javac>
|
||||||
|
+ </javac>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
@@ -164,7 +147,7 @@
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="" name="javadoc">
|
||||||
|
<mkdir dir="${doc}"/>
|
||||||
|
- <javadoc classpathref="class.path" destdir="${doc}" packagenames="${package}" >
|
||||||
|
+ <javadoc classpathref="class.path" destdir="${doc}" packagenames="${package}" additionalparam="-Xdoclint:none" >
|
||||||
|
|
||||||
|
<sourcepath>
|
||||||
|
<pathelement location="${src}/java"/>
|
||||||
|
--
|
||||||
|
2.23.0
|
||||||
|
|
||||||
@ -1,86 +0,0 @@
|
|||||||
From 6d907463edb485f6105ed9c9e8e5962cf80964db Mon Sep 17 00:00:00 2001
|
|
||||||
From: wangge <wang__ge@126.com>
|
|
||||||
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 @@
|
|
||||||
<project>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
-
|
|
||||||
- <parent>
|
|
||||||
- <groupId>org.sonatype.oss</groupId>
|
|
||||||
- <artifactId>oss-parent</artifactId>
|
|
||||||
- <version>7</version>
|
|
||||||
- </parent>
|
|
||||||
-
|
|
||||||
<groupId>com.jamonapi</groupId>
|
|
||||||
<artifactId>jamon</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<name>JAMon (Java Application Monitor)</name>
|
|
||||||
- <version>2.75</version>
|
|
||||||
+ <version>2.74</version>
|
|
||||||
|
|
||||||
<description>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 @@
|
|
||||||
</developer>
|
|
||||||
</developers>
|
|
||||||
|
|
||||||
-</project>
|
|
||||||
\ No newline at end of file
|
|
||||||
+ <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>
|
|
||||||
+
|
|
||||||
+ <plugin>
|
|
||||||
+ <groupId>org.apache.maven.plugins</groupId>
|
|
||||||
+ <artifactId>maven-javadoc-plugin</artifactId>
|
|
||||||
+ <version>3.0.1</version>
|
|
||||||
+ <configuration>
|
|
||||||
+ <additionalparam>
|
|
||||||
+ -Xdoclint:none
|
|
||||||
+ </additionalparam>
|
|
||||||
+ <failOnError>false</failOnError>
|
|
||||||
+ </configuration>
|
|
||||||
+ </plugin>
|
|
||||||
+ </plugins>
|
|
||||||
+ <sourceDirectory>java</sourceDirectory>
|
|
||||||
+ </build>
|
|
||||||
+
|
|
||||||
+ <dependencies>
|
|
||||||
+ <dependency>
|
|
||||||
+ <groupId>org.apache.tomcat</groupId>
|
|
||||||
+ <artifactId>tomcat-catalina</artifactId>
|
|
||||||
+ <version>7.0.0</version>
|
|
||||||
+ </dependency>
|
|
||||||
+ <dependency>
|
|
||||||
+ <groupId>org.apache.tomcat</groupId>
|
|
||||||
+ <artifactId>tomcat-servlet-api</artifactId>
|
|
||||||
+ <version>7.0.0</version>
|
|
||||||
+ </dependency>
|
|
||||||
+ <dependency>
|
|
||||||
+ <groupId>org.eclipse.jetty</groupId>
|
|
||||||
+ <artifactId>jetty-util</artifactId>
|
|
||||||
+ <version>9.0.3</version>
|
|
||||||
+ </dependency>
|
|
||||||
+ </dependencies>
|
|
||||||
+</project>
|
|
||||||
--
|
|
||||||
2.23.0
|
|
||||||
|
|
||||||
286
build.xml
Executable file
286
build.xml
Executable file
@ -0,0 +1,286 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project basedir="../.." default="all" name="jamonapi">
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- Properties -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<property name="project" value="JAMonAPI"/>
|
||||||
|
<property name="jamonapi_version" value="2.75"/>
|
||||||
|
<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="backup" value="${basedir}/backup/"/>
|
||||||
|
<property name="releasedir" value="${basedir}/release/"/>
|
||||||
|
<property name="doc" value="${src}/doc/javadoc/"/>
|
||||||
|
<property name="lib" value="${basedir}/lib/"/>
|
||||||
|
<property name="java" value="${src}/java/"/>
|
||||||
|
<property name="osmon" value="/jamon_osmon/osmon/"/>
|
||||||
|
<property name="debug" value="true"/>
|
||||||
|
<property name="deprication" value="false"/>
|
||||||
|
<property name="source" value="1.5"/>
|
||||||
|
<property name="vm" value="1.5"/>
|
||||||
|
<property name="dist.jar" value="${dist}/jamon-${jamonapi_version}.jar"/>
|
||||||
|
<property name="sources.jar" value="${dist}/jamon-${jamonapi_version}-sources.jar"/>
|
||||||
|
<property name="javadoc.jar" value="${dist}/jamon-${jamonapi_version}-javadoc.jar"/>
|
||||||
|
<property name="osmon.zip" value="${dist}/osmon-${jamonapi_version}.zip"/>
|
||||||
|
<property name="jamontomcat.jar" value="${dist}/jamontomcat-${jamonapi_version}.jar"/>
|
||||||
|
<property name="dist.zip" value="${dist}/JAMON_ALL"/>
|
||||||
|
<property name="webxml" value="${src}/WAR/WEB-INF/web.xml"/>
|
||||||
|
<property name="war_file" value="${dist}\jamon.war"/>
|
||||||
|
<property name="package" value="com.jamonapi, com.jamonapi.proxy, com.jamonapi.http, com.jamonapi.utils, com.jamonapi.log4j"/>
|
||||||
|
<property name="tomcatjavafiles" value="com/jamontomcat/*.class"/>
|
||||||
|
<property name="tomcat4jar" value="${lib}catalina_tomcat4.jar"/>
|
||||||
|
<property name="tomcat55jar" value="${lib}catalina.jar"/>
|
||||||
|
|
||||||
|
|
||||||
|
<!--property environment="env"/-->
|
||||||
|
<path id="class.path">
|
||||||
|
|
||||||
|
<fileset dir="${lib}">
|
||||||
|
<include name="*.zip"/>
|
||||||
|
<include name="*.jar"/>
|
||||||
|
<exclude name="catalina_tomcat4.jar"/>
|
||||||
|
</fileset>
|
||||||
|
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<path id="class.path.tomcat4">
|
||||||
|
|
||||||
|
<fileset dir="${lib}">
|
||||||
|
<include name="*.zip"/>
|
||||||
|
<include name="*.jar"/>
|
||||||
|
<exclude name="catalina.jar"/>
|
||||||
|
</fileset>
|
||||||
|
|
||||||
|
</path>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [PREPARE] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target name="prepare">
|
||||||
|
<!-- Create the timestamp -->
|
||||||
|
<tstamp/>
|
||||||
|
<!-- Create the build directory used by compile -->
|
||||||
|
<mkdir dir="${backup}"/>
|
||||||
|
<mkdir dir="${build}"/>
|
||||||
|
<!--mkdir dir="${dist}"/-->
|
||||||
|
<mkdir dir="${doc}"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [BACKUP] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="prepare" name="backup">
|
||||||
|
<!-- Exclude all .class and .java~ (netbeans backup files -->
|
||||||
|
<jar basedir="${src}" excludes="**/*.class,**/*.java~" jarfile="${backup}/${DSTAMP}_${name}.zip"/>
|
||||||
|
|
||||||
|
<copy todir="${backup}">
|
||||||
|
<fileset dir="${dist}">
|
||||||
|
<include name="*.war"/>
|
||||||
|
<include name="*.jar"/>
|
||||||
|
<include name="*.zip"/>
|
||||||
|
</fileset>
|
||||||
|
<mapper from="*" to="${DSTAMP}_*" type="glob"/>
|
||||||
|
</copy>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [RELEASE] generates final distribution zip for sourceforge release! -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="WAR, javadoc" name="release">
|
||||||
|
|
||||||
|
<jar destfile="${sources.jar}" basedir="${java}">
|
||||||
|
<include name="**/*.java"/>
|
||||||
|
</jar>
|
||||||
|
|
||||||
|
<jar destfile="${javadoc.jar}" basedir="${doc}">
|
||||||
|
</jar>
|
||||||
|
|
||||||
|
<zip destfile="${osmon.zip}" basedir="/jamon_osmon/osmon">
|
||||||
|
</zip>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Exclude all .class and .java~ (netbeans backup files -->
|
||||||
|
<zip destfile="${releasedir}//jamonall-${jamonapi_version}.zip">
|
||||||
|
<fileset dir="${basedir}">
|
||||||
|
<include name="pom.xml" />
|
||||||
|
</fileset>
|
||||||
|
|
||||||
|
<fileset dir="${dist}">
|
||||||
|
<include name="*.war"/>
|
||||||
|
<include name="*.jar"/>
|
||||||
|
<include name="*.zip"/>
|
||||||
|
</fileset>
|
||||||
|
|
||||||
|
</zip>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [CLEAN] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="prepare,backup" name="clean">
|
||||||
|
<delete dir="${build}"/>
|
||||||
|
<delete>
|
||||||
|
<fileset dir="${dist}">
|
||||||
|
<include name ="*.war"/>
|
||||||
|
<include name ="*.jar"/>
|
||||||
|
<include name ="*.zip"/>
|
||||||
|
</fileset>
|
||||||
|
</delete>
|
||||||
|
<delete dir="${doc}"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [COMPILE] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="clean" name="compile">
|
||||||
|
<mkdir dir="${build}"/>
|
||||||
|
<!-- Compile the java code from ${src} into ${build} -->
|
||||||
|
<javac classpathref="class.path" debug="${debug}" deprecation="${deprication}" destdir="${build}" srcdir="${java}" includes="**/*.java" target="${vm}" source="${vm}">
|
||||||
|
<exclude name="**/jamontomcat/JAMonTomcat4Valve.java"/>
|
||||||
|
<exclude name="**/jamontomcat/JAMonTomcat5Valve.java"/>
|
||||||
|
<exclude name="**/jamonapi/aop/JAMonEJBInterceptor.java"/>
|
||||||
|
<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"/>
|
||||||
|
</javac>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [JAVADOC] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="" name="javadoc">
|
||||||
|
<mkdir dir="${doc}"/>
|
||||||
|
<javadoc classpathref="class.path" destdir="${doc}" packagenames="${package}" >
|
||||||
|
|
||||||
|
<sourcepath>
|
||||||
|
<pathelement location="${src}/java"/>
|
||||||
|
</sourcepath>
|
||||||
|
</javadoc>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [ALL] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="dist" name="all"/>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [DIST] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="backup,WAR,JAR,javadoc" name="dist">
|
||||||
|
|
||||||
|
<!--basedir="${src}"-->
|
||||||
|
<zip destfile="${dist.zip}.zip" defaultexcludes="true">
|
||||||
|
|
||||||
|
<zipfileset dir="${src}/java" prefix="src/java">
|
||||||
|
<include name="**/**"/>
|
||||||
|
</zipfileset>
|
||||||
|
<zipfileset dir="${dist}" prefix="dist">
|
||||||
|
<include name="*.jar"/>
|
||||||
|
<include name="*.war"/>
|
||||||
|
</zipfileset>
|
||||||
|
<zipfileset dir="${src}/WAR" prefix="src/WAR">
|
||||||
|
<include name="*"/>
|
||||||
|
</zipfileset>
|
||||||
|
<zipfileset dir="${src}/docs" prefix="docs">
|
||||||
|
<include name="**/**"/>
|
||||||
|
</zipfileset>
|
||||||
|
<zipfileset dir="${src}/images" prefix="src/images">
|
||||||
|
<include name="**/**"/>
|
||||||
|
</zipfileset>
|
||||||
|
</zip>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<move todir="${dist}">
|
||||||
|
<fileset dir="${dist}">
|
||||||
|
<include name = "*.zip"/>
|
||||||
|
</fileset>
|
||||||
|
<mapper from="*" to="${DSTAMP}_*" type="glob"/>
|
||||||
|
</move>
|
||||||
|
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [WAR] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="JAR" name="WAR">
|
||||||
|
<echo message="${war_file}"/>
|
||||||
|
<war destfile="${war_file}" webxml="${webxml}">
|
||||||
|
|
||||||
|
|
||||||
|
<lib dir="${lib}">
|
||||||
|
<include name="hsqldb.jar"/>
|
||||||
|
<include name="fdsapi*.jar"/>
|
||||||
|
<include name="jakarta-oro*.jar"/>
|
||||||
|
</lib>
|
||||||
|
|
||||||
|
<zipfileset dir="${src}/WAR/css" prefix="css">
|
||||||
|
<include name="*"/>
|
||||||
|
</zipfileset>
|
||||||
|
|
||||||
|
<zipfileset dir="${src}/WAR/images" prefix="images">
|
||||||
|
<include name="*"/>
|
||||||
|
</zipfileset>
|
||||||
|
|
||||||
|
<zipfileset dir="${src}/WAR">
|
||||||
|
<include name="*"/>
|
||||||
|
</zipfileset>
|
||||||
|
|
||||||
|
|
||||||
|
</war>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [JAR] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="compile" name="JAR">
|
||||||
|
<echo message="${dist.jar}"/>
|
||||||
|
|
||||||
|
<jar destfile="${dist.jar}" basedir="${build}" >
|
||||||
|
<include name="**/*.class"/>
|
||||||
|
<exclude name="${tomcatjavafiles}"/>
|
||||||
|
|
||||||
|
|
||||||
|
<manifest>
|
||||||
|
<attribute name="version" value="JAMon ${jamonapi_version}"/>
|
||||||
|
</manifest>
|
||||||
|
|
||||||
|
</jar>
|
||||||
|
|
||||||
|
<echo message="${jamontomcat.jar}"/>
|
||||||
|
|
||||||
|
<jar destfile="${jamontomcat.jar}" basedir="${build}" >
|
||||||
|
<include name="${tomcatjavafiles}"/>
|
||||||
|
|
||||||
|
|
||||||
|
<manifest>
|
||||||
|
<attribute name="version" value="JAMon ${jamonapi_version}"/>
|
||||||
|
</manifest>
|
||||||
|
|
||||||
|
</jar>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<!-- TARGET [BINARIES] -->
|
||||||
|
<!-- =========================================================================== -->
|
||||||
|
<target depends="JAR,WAR" name="BINARIES">
|
||||||
|
</target>
|
||||||
|
|
||||||
|
</project>
|
||||||
@ -1,22 +1,28 @@
|
|||||||
%global oname jamon
|
%global oname jamon
|
||||||
Name: jamonapi
|
Name: jamonapi
|
||||||
Version: 2.74
|
Version: 2.74
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: A Java monitoring API
|
Summary: A Java monitoring API
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://jamonapi.sourceforge.net/
|
URL: http://jamonapi.sourceforge.net/
|
||||||
Source0: https://sourceforge.net/projects/%{name}/files/%{name}/v2_74/jamonall-%{version}.zip
|
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
|
Source1: https://repo1.maven.org/maven2/com/%{name}/%{oname}/2.75/%{oname}-2.75.pom
|
||||||
|
#wget https://github.com/stevensouza/jamonapi/archive/v2_82.tar.gz
|
||||||
|
#tar -xvf v2_82.tar.gz
|
||||||
|
#get build.xml
|
||||||
|
Source2: build.xml
|
||||||
|
#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
|
#git clone https://git.code.sf.net/p/jamonapi/jamonapi jamonapi-jamonapi
|
||||||
#cd jamonapi-jamonapi/src
|
#cd jamonapi-jamonapi/src
|
||||||
#tar -cvf jamonapi-JAMonUsersGuide.tar.gz JAMonUsersGuide
|
#tar -cvf jamonapi-JAMonUsersGuide.tar.gz JAMonUsersGuide
|
||||||
Source2: jamonapi-JAMonUsersGuide.tar.gz
|
Source3: jamonapi-JAMonUsersGuide.tar.gz
|
||||||
Patch0: 0001-fix-pom.xml.patch
|
Patch0: 0001-fix-build-script.patch
|
||||||
Patch1: %{name}-jetty8.patch
|
Patch1: %{name}-jetty8.patch
|
||||||
Patch2: %{name}-jetty93.patch
|
Patch2: %{name}-jetty93.patch
|
||||||
BuildRequires: maven-local jetty-util tomcat
|
BuildRequires: java-devel javapackages-local
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
|
BuildRequires: ant jetty log4j12 dos2unix geronimo-interceptor
|
||||||
Requires: geronimo-interceptor log4j12
|
BuildRequires: tomcat-lib tomcat-servlet-4.0-api tomcat-el-3.0-api
|
||||||
|
Requires: geronimo-interceptor log4j12
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%description
|
%description
|
||||||
JAMon API is a free, simple, high performance, thread safe,
|
JAMon API is a free, simple, high performance, thread safe,
|
||||||
@ -34,11 +40,12 @@ This package contains API documentation for Java monitoring API.
|
|||||||
%setup -q -c -n %{name}
|
%setup -q -c -n %{name}
|
||||||
rm -rf binaries
|
rm -rf binaries
|
||||||
rm -rf javadoc
|
rm -rf javadoc
|
||||||
mkdir -p ./src/
|
mkdir -p ./src/ant
|
||||||
mv ./java ./src/
|
mv ./java ./src/
|
||||||
mv ./osmon ./src/
|
mv ./osmon ./src/
|
||||||
cp %{SOURCE1} ./pom.xml
|
cp %{SOURCE1} ./pom.xml
|
||||||
cp %{SOURCE2} ./src/
|
cp %{SOURCE2} src/ant
|
||||||
|
cp %{SOURCE3} ./src/
|
||||||
pushd ./src
|
pushd ./src
|
||||||
tar -xvf %{name}-JAMonUsersGuide.tar.gz
|
tar -xvf %{name}-JAMonUsersGuide.tar.gz
|
||||||
rm -f %{name}-JAMonUsersGuide.tar.gz
|
rm -f %{name}-JAMonUsersGuide.tar.gz
|
||||||
@ -46,49 +53,44 @@ popd
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
mkdir dist
|
||||||
|
mkdir lib
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%mvn_build
|
pushd src/ant
|
||||||
|
ant JAR
|
||||||
|
ant javadoc
|
||||||
|
popd
|
||||||
|
|
||||||
|
find src/JAMonUsersGuide -type f | xargs chmod -x
|
||||||
|
find src/JAMonUsersGuide -regex '.*\(xml\|css\|js\)' -o -name package-list | xargs dos2unix
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
cp -p src/JAMonUsersGuide/JAMonLicense.html .
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
%mvn_artifact %{_builddir}/%{name}/pom.xml dist/%{oname}-%{version}.jar
|
||||||
|
%mvn_file com.jamonapi:jamon %{oname} %{name}
|
||||||
%mvn_install
|
%mvn_install
|
||||||
cp %{buildroot}%{_datadir}/maven-poms/jamonapi/jamon.pom %{buildroot}%{_datadir}/maven-poms/jamonapi.pom
|
mkdir -p %{buildroot}%{_javadocdir}/jamonapi
|
||||||
mv %{buildroot}%{_datadir}/maven-poms/jamonapi/jamon.pom %{buildroot}%{_datadir}/maven-poms/
|
cp -r %{_builddir}/%{name}/src/doc/javadoc/* %{buildroot}%{_javadocdir}/jamonapi
|
||||||
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
|
%files -f .mfiles
|
||||||
%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
|
%doc src/JAMonUsersGuide
|
||||||
%license src/JAMonUsersGuide/JAMonLicense.html
|
%license JAMonLicense.html
|
||||||
|
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr (-,root,root,0755)
|
|
||||||
/usr/share/javadoc/jamonapi
|
/usr/share/javadoc/jamonapi
|
||||||
%license src/JAMonUsersGuide/JAMonLicense.html
|
%license JAMonLicense.html
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 20 2020 Ge Wang <wangge20@huawei.com> - 2.74-2
|
||||||
|
- modify compile script to solve defect of jar package
|
||||||
|
|
||||||
* Sat Sep 5 2020 Ge Wang <wangge20@huawei.com> - 2.74-1
|
* Sat Sep 5 2020 Ge Wang <wangge20@huawei.com> - 2.74-1
|
||||||
- Package init
|
- Package init
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user