Alon Bar-Lev has uploaded a new change for review.
Change subject: packaging: build: switch to ant
......................................................................
packaging: build: switch to ant
no reason at all to use maven, we can build our-self linked into the
jasperreports-server instance.
Change-Id: Idd3f37d7dc813c1b34693e50bdda3aabf2db9fb7
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M .gitignore
M Makefile
A build.xml
M ovirt-engine-reports.spec.in
A ovirt-engine-reports/ChartsCustomizers/build.xml
D ovirt-engine-reports/ChartsCustomizers/pom.xml
A ovirt-engine-reports/CustomOvirtReportsQueryManipulator/build.xml
D ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml
A ovirt-engine-reports/EngineAuthentication/build.xml
D ovirt-engine-reports/EngineAuthentication/pom.xml
A ovirt-engine-reports/ReportsLineBarChartTheme/build.xml
D ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml
A ovirt-engine-reports/ReportsPieChartTheme/build.xml
D ovirt-engine-reports/ReportsPieChartTheme/pom.xml
A ovirt-engine-reports/ReportsStatus/build.xml
D ovirt-engine-reports/ReportsStatus/pom.xml
A ovirt-engine-reports/WebadminLineBarChartTheme/build.xml
D ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml
D ovirt-engine-reports/pom.xml
D pom.xml
M version.mak
21 files changed, 253 insertions(+), 598 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/24/24224/1
diff --git a/.gitignore b/.gitignore
index cbcffca..42faf81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,7 @@
-# build-time files
-###########################
+lib
+target
tmp.*
-# IDE files
-###########################
-.project
-.classpath
-*.prefs
-
-# mvn folders
-###########################
-target
-
-# generated files
-###########################
build/python-check.sh
ovirt-engine-reports.spec
packaging/jasper-customizations/WEB-INF/applicationContext-ovirt-override.xml
diff --git a/Makefile b/Makefile
index 31be6b3..e32511d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,12 +24,11 @@
#
# CUSTOMIZATION-BEGIN
#
-BUILD_UT=1
EXTRA_BUILD_FLAGS=
BUILD_VALIDATION=1
PACKAGE_NAME=ovirt-engine-reports
-MVN=mvn
+ANT=ant
PYTHON=python
PYFLAKES=pyflakes
PEP8=pep8
@@ -54,19 +53,11 @@
#
include version.mak
-# major, minor, seq
-POM_VERSION:=$(shell cat pom.xml | grep '<ovirt-reports.version>' | sed -e
's/.*>\(.*\)<.*/\1/' -e 's/-SNAPSHOT//')
-# major, minor from pom and fix
-APP_VERSION=$(shell echo $(POM_VERSION) | sed
's/\([^.]*\.[^.]\)\..*/\1/').$(FIX_RELEASE)
-RPM_VERSION=$(APP_VERSION)
-PACKAGE_VERSION=$(APP_VERSION)$(if $(MILESTONE),_$(MILESTONE))
+RPM_VERSION=$(VERSION)
+PACKAGE_VERSION=$(VERSION)$(if $(MILESTONE),_$(MILESTONE))
DISPLAY_VERSION=$(PACKAGE_VERSION)
-
BUILD_FLAGS:=
-ifeq ($(BUILD_UT),0)
-BUILD_FLAGS:=$(BUILD_FLAGS) -D skipTests
-endif
BUILD_FLAGS:=$(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS)
PYTHON_SYS_DIR:=$(shell $(PYTHON) -c "from distutils.sysconfig import
get_python_lib as f;print(f())")
@@ -76,16 +67,6 @@
BUILD_FILE=tmp.built
MAVEN_OUTPUT_DIR=.
BUILD_TARGET=install
-
-ARTIFACTS = \
- ChartsCustomizers \
- EngineAuthentication \
- ReportsLineBarChartTheme \
- ReportsPieChartTheme \
- ReportsStatus \
- WebadminLineBarChartTheme \
- CustomOvirtReportsQueryManipulator \
- $(NULL)
.SUFFIXES:
.SUFFIXES: .in
@@ -129,20 +110,14 @@
chmod a+x build/python-check.sh
$(BUILD_FILE):
- export MAVEN_OPTS="${MAVEN_OPTS} -XX:MaxPermSize=512m"
- $(MVN) \
- $(BUILD_FLAGS) \
- $(BUILD_TARGET) \
- $(NULL)
+ $(ANT) $(BUILD_FLAGS) all
touch $(BUILD_FILE)
clean:
- $(MVN) clean $(EXTRA_BUILD_FLAGS)
- rm -rf $(OUTPUT_DIR) $(BUILD_FILE) tmp.dev.flist
+ $(ANT) $(BUILD_FLAGS) clean
+ rm -rf $(BUILD_FILE)
+ rm -fr tmp.dev.flist
rm -rf $(GENERATED)
-
-test:
- $(MVN) install $(BUILD_FLAGS) $(EXTRA_BUILD_FLAGS)
install: \
all \
@@ -199,9 +174,9 @@
install-artifacts:
install -d "$(DESTDIR)$(PKG_JAVA_DIR)"
- for artifact_id in $(ARTIFACTS); do \
- JAR=`find "$(MAVEN_OUTPUT_DIR)" -name "$${artifact_id}-*.jar" |
grep -v tmp.repos`; \
- install -p -m 644 "$${JAR}"
"$(DESTDIR)$(PKG_JAVA_DIR)/$${artifact_id}.jar"; \
+ install -d -m 755 "$(DESTDIR)$(PKG_JAVA_DIR)"
+ for jar in lib/*.jar; do \
+ install -m 0644 "$${jar}" "$(DESTDIR)$(PKG_JAVA_DIR)"; \
done
install-packaging-files: \
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..82539ed
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="oVirt Engine Reports" default="all">
+ <property file="build.properties"/>
+ <property name="build.root" location="."/>
+ <property name="build.output" value="${build.root}/lib"/>
+ <property name="jasper.home"
location="/usr/share/jasperreports-server"/>
+ <property name="jasper.type" value="ieCe"/>
+ <property name="jasper.lib"
location="${jasper.home}/buildomatic/conf_source/${jasper.type}/lib"/>
+
+ <target name="dependencies">
+ <fail message="Jasper lib '${jasper.lib}' could not be found">
+ <condition>
+ <not>
+ <available
property="jasper.lib.present" file="${jasper.lib}" type="dir"/>
+ </not>
+ </condition>
+ </fail>
+ </target>
+
+ <target name="all" depends="dependencies">
+ <antcall target="jars">
+ <param name="target" value="all"/>
+ </antcall>
+ </target>
+
+ <target name="clean">
+ <antcall target="jars">
+ <param name="target" value="clean"/>
+ </antcall>
+ <delete dir="${build.output}"/>
+ </target>
+
+ <target name="jars">
+ <echo message="ChartsCustomizers"/>
+ <ant dir="ovirt-engine-reports/ChartsCustomizers"
target="${target}"/>
+ <echo message="CustomOvirtReportsQueryManipulator"/>
+ <ant
dir="ovirt-engine-reports/CustomOvirtReportsQueryManipulator"
target="${target}"/>
+ <echo message="EngineAuthentication"/>
+ <ant dir="ovirt-engine-reports/EngineAuthentication"
target="${target}"/>
+ <echo message="ReportsLineBarChartTheme"/>
+ <ant dir="ovirt-engine-reports/ReportsLineBarChartTheme"
target="${target}"/>
+ <echo message="ReportsPieChartTheme"/>
+ <ant dir="ovirt-engine-reports/ReportsPieChartTheme"
target="${target}"/>
+ <echo message="ReportsStatus"/>
+ <ant dir="ovirt-engine-reports/ReportsStatus"
target="${target}"/>
+ <echo message="WebadminLineBarChartTheme"/>
+ <ant dir="ovirt-engine-reports/WebadminLineBarChartTheme"
target="${target}"/>
+ </target>
+
+</project>
diff --git a/ovirt-engine-reports.spec.in b/ovirt-engine-reports.spec.in
index 30d5efd..a23257d 100644
--- a/ovirt-engine-reports.spec.in
+++ b/ovirt-engine-reports.spec.in
@@ -1,13 +1,3 @@
-# Settings
-
-%if 0%{?fedora}
-%global ovirt_require_maven 1
-%endif
-
-%if 0%{?rhel}
-%global ovirt_require_maven 0
-%endif
-
%global product_name Reports package for oVirt Virtualization Management
%global product_description oVirt virtualization reports
@@ -45,21 +35,20 @@
BuildArch: noarch
Source:
http://ovirt.org/releases/stable/src/@PACKAGE_NAME@-@package_vers...@.tar.gz
-BuildRequires: java-1.7.0-openjdk-devel
+BuildRequires: jasperreports-server >= 5.5.0-6
+BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: log4j
BuildRequires: make
-%if %{ovirt_require_maven}
-BuildRequires: maven
-%endif
+BuildRequires: ant
+
Requires: %{name}-setup >= %{version}-%{release}
Requires: jasperreports-server < 5.6.0
Requires: jasperreports-server >= 5.5.0-6
-Requires: java-1.7.0-openjdk
+Requires: java
Requires: jpackage-utils
Requires: m2crypto
Requires: ovirt-engine >= 3.4.0
-Requires: python
# bug#862355
Requires: liberation-mono-fonts
@@ -78,6 +67,7 @@
Requires: libxml2-python
Requires: ovirt-engine-dwh-setup
Requires: ovirt-engine-setup-plugin-ovirt-engine-common
+Requires: python
%description setup
%{product_description} setup package.
diff --git a/ovirt-engine-reports/ChartsCustomizers/build.xml
b/ovirt-engine-reports/ChartsCustomizers/build.xml
new file mode 100644
index 0000000..243f898
--- /dev/null
+++ b/ovirt-engine-reports/ChartsCustomizers/build.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="ChartsCustomizers" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/ChartsCustomizers.jar"/>
+
+ <path id="local.classpath">
+ <fileset dir="${jasper.lib}"><filename
regex="jasperreports-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="jcommon-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="jfreechart-\d.*.jar"/></fileset>
+ </path>
+
+ <target name="all">
+ <mkdir dir="target"/>
+ <mkdir dir="${build.output}"/>
+ <javac
+ srcdir="src"
+ destdir="target"
+ includeAntRuntime="no"
+ encoding="utf-8"
+ classpathref="local.classpath"
+ />
+ <jar
+ destfile="${local.output}"
+ basedir="target"
+ includes="**/*.class"
+ />
+ </target>
+
+ <target name="clean">
+ <delete dir="target"/>
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/ChartsCustomizers/pom.xml
b/ovirt-engine-reports/ChartsCustomizers/pom.xml
deleted file mode 100644
index 3d4bc37..0000000
--- a/ovirt-engine-reports/ChartsCustomizers/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ChartsCustomizers</artifactId>
- <version>3.4.0</version>
- <packaging>jar</packaging>
- <name>Reports Chart Customizers</name>
- <description>The jar that contains the chart customizers
classes</description>
-
- <dependencies>
- <dependency>
- <groupId>net.sf.jasperreports</groupId>
- <artifactId>jasperreports</artifactId>
- <version>${version.jasperreports}</version>
- </dependency>
-
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>${version.jfreechart}</version>
- </dependency>
-
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jcommon</artifactId>
- <version>${version.jcommon}</version>
- </dependency>
-
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source> <target>1.6</target> <includes>
- <include>**/*.txt</include>
<include>**/*.java</include> <include>**/*.properties</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>jasper-reports</id>
- <name>jasper-reports</name>
- <url>http://repo2.maven.org/maven2/net/sf/</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
diff --git a/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/build.xml
b/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/build.xml
new file mode 100644
index 0000000..83426da
--- /dev/null
+++ b/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/build.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="CustomOvirtReportsQueryManipulator" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/CustomOvirtReportsQueryManipulator.jar"/>
+
+ <path id="local.classpath">
+ <fileset dir="${jasper.lib}"><filename
regex="commons-lang-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="jasperserver-api-common-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="jasperserver-api-engine-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="jasperserver-war-jar-\d.*.jar"/></fileset>
+ </path>
+
+ <target name="all">
+ <mkdir dir="target"/>
+ <mkdir dir="${build.output}"/>
+ <javac
+ srcdir="src"
+ destdir="target"
+ includeAntRuntime="no"
+ encoding="utf-8"
+ classpathref="local.classpath"
+ />
+ <jar
+ destfile="${local.output}"
+ basedir="target"
+ includes="**/*.class"
+ />
+ </target>
+
+ <target name="clean">
+ <delete dir="target"/>
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml
b/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml
deleted file mode 100644
index 2172bf8..0000000
--- a/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>CustomOvirtReportsQueryManipulator</artifactId>
- <packaging>jar</packaging>
- <version>3.4.0</version>
- <name>CustomOvirtReportsQueryManipulator jar to support adding parameters to
input controls</name>
- <description>CustomOvirtReportsQueryManipulator jar to support adding
parameters to input controls</description>
-
- <properties>
- <jasper.version>4.5.0</jasper.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>com.jaspersoft.jasperserver</groupId>
- <artifactId>jasperserver-war-jar</artifactId>
- <version>${jasper.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>mondrian</groupId>
- <artifactId>mondrian</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.jaspersoft.jasperserver.api.engine</groupId>
- <artifactId>jasperserver-api-engine</artifactId>
- <version>${jasper.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>mondrian</groupId>
- <artifactId>mondrian</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>boksa.de</id>
- <name>boksa.de</name>
- <layout>default</layout>
-
<url>https://services.boksa.de/maven/repositories/jasperreports-server-cp-4.5.0</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jaspersoft</id>
- <url>http://jasperreports.sourceforge.net/maven2</url>
- </repository>
- <repository>
- <id>central</id>
- <name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </repository>
- <repository>
- <id>maven.search.repo</id>
- <name>maven search repo</name>
- <layout>default</layout>
- <url>http://mvnsearch.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-</project>
diff --git a/ovirt-engine-reports/EngineAuthentication/build.xml
b/ovirt-engine-reports/EngineAuthentication/build.xml
new file mode 100644
index 0000000..0c3b353
--- /dev/null
+++ b/ovirt-engine-reports/EngineAuthentication/build.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="EngineAuthentication" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/EngineAuthentication.jar"/>
+
+ <path id="local.classpath">
+ <fileset dir="${jasper.lib}"><filename
regex="commons-logging-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="jasperserver-api-metadata-impl-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="servlet-api-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="spring-(core|context|beans)-\d.*.jar"/></fileset>
+ <fileset dir="${jasper.lib}"><filename
regex="spring-security-core-\d.*.jar"/></fileset>
+ </path>
+
+ <target name="all">
+ <mkdir dir="target"/>
+ <mkdir dir="${build.output}"/>
+ <javac
+ srcdir="src"
+ destdir="target"
+ includeAntRuntime="no"
+ encoding="utf-8"
+ classpathref="local.classpath"
+ />
+ <jar
+ destfile="${local.output}"
+ basedir="target"
+ includes="**/*.class"
+ />
+ </target>
+
+ <target name="clean">
+ <delete dir="target"/>
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/EngineAuthentication/pom.xml
b/ovirt-engine-reports/EngineAuthentication/pom.xml
deleted file mode 100644
index e6da908..0000000
--- a/ovirt-engine-reports/EngineAuthentication/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>EngineAuthentication</artifactId>
- <packaging>jar</packaging>
- <version>3.4.0</version>
- <name>EngineAuthentication jar to support webadmin-reports integration</name>
- <description>EngineAuthentication jar to support webadmin-reports
integration</description>
-
- <properties>
- <spring.version>2.0.7.RELEASE</spring.version>
- <jasper.version>4.5.0</jasper.version>
- <javax.servlet.api.version>2.3</javax.servlet.api.version>
- <commons-logging.version>1.1</commons-logging.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.jaspersoft.jasperserver.api.metadata.impl</groupId>
- <artifactId>jasperserver-api-metadata-impl</artifactId>
- <version>${jasper.version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>mondrian</groupId>
- <artifactId>mondrian</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>boksa.de</id>
- <name>boksa.de</name>
- <layout>default</layout>
-
<url>https://services.boksa.de/maven/repositories/jasperreports-server-cp-4.5.0</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>central</id>
- <name>maven repo1</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>maven.search.repo</id>
- <name>maven search repo</name>
- <layout>default</layout>
- <url>http://mvnsearch.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jaspersoft</id>
- <url>http://www.jasperforge.org/maven2</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
-</project>
diff --git a/ovirt-engine-reports/ReportsLineBarChartTheme/build.xml
b/ovirt-engine-reports/ReportsLineBarChartTheme/build.xml
new file mode 100644
index 0000000..5186137
--- /dev/null
+++ b/ovirt-engine-reports/ReportsLineBarChartTheme/build.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="ReportsLineBarChartTheme" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/ReportsLineBarChartTheme.jar"/>
+
+ <target name="all">
+ <mkdir dir="${build.output}"/>
+ <jar
+ destfile="${local.output}"
+ basedir="src/main/resources"
+ />
+ </target>
+
+ <target name="clean">
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml
b/ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml
deleted file mode 100644
index 4bd3ded..0000000
--- a/ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ReportsLineBarChartTheme</artifactId>
- <packaging>jar</packaging>
- <version>3.4.0</version>
- <name>Reports Chart Theme for Line and Bar Charts</name>
- <description>The jar that contains the chart theme line and bar
charts</description>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source> <target>1.6</target> <includes>
- <include>**/*.txt</include>
<include>**/*.java</include> <include>**/*.properties</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/ovirt-engine-reports/ReportsPieChartTheme/build.xml
b/ovirt-engine-reports/ReportsPieChartTheme/build.xml
new file mode 100644
index 0000000..fe93e5c
--- /dev/null
+++ b/ovirt-engine-reports/ReportsPieChartTheme/build.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="ReportsPieChartTheme" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/ReportsPieChartTheme.jar"/>
+
+ <target name="all">
+ <mkdir dir="${build.output}"/>
+ <jar
+ destfile="${local.output}"
+ basedir="src/main/resources"
+ />
+ </target>
+
+ <target name="clean">
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/ReportsPieChartTheme/pom.xml
b/ovirt-engine-reports/ReportsPieChartTheme/pom.xml
deleted file mode 100644
index e5355d2..0000000
--- a/ovirt-engine-reports/ReportsPieChartTheme/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ReportsPieChartTheme</artifactId>
- <packaging>jar</packaging>
- <version>3.4.0</version>
- <name>Reports Chart Theme For Pie Charts</name>
- <description>The jar that contains the chart theme for pie
charts</description>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source> <target>1.6</target> <includes>
- <include>**/*.txt</include>
<include>**/*.java</include> <include>**/*.properties</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/ovirt-engine-reports/ReportsStatus/build.xml
b/ovirt-engine-reports/ReportsStatus/build.xml
new file mode 100644
index 0000000..91b27f5
--- /dev/null
+++ b/ovirt-engine-reports/ReportsStatus/build.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="ReportsStatus" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/ReportsStatus.jar"/>
+
+ <path id="local.classpath">
+ <fileset dir="${jasper.lib}"><filename
regex="servlet-api-\d.*.jar"/></fileset>
+ </path>
+
+ <target name="all">
+ <mkdir dir="target"/>
+ <mkdir dir="${build.output}"/>
+ <javac
+ srcdir="src"
+ destdir="target"
+ includeAntRuntime="no"
+ encoding="utf-8"
+ classpathref="local.classpath"
+ />
+ <jar
+ destfile="${local.output}"
+ basedir="target"
+ includes="**/*.class"
+ />
+ </target>
+
+ <target name="clean">
+ <delete dir="target"/>
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/ReportsStatus/pom.xml
b/ovirt-engine-reports/ReportsStatus/pom.xml
deleted file mode 100644
index b6fa639..0000000
--- a/ovirt-engine-reports/ReportsStatus/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ReportsStatus</artifactId>
- <packaging>jar</packaging>
- <version>3.4.0</version>
- <name>Report Status Servlet</name>
- <description>Report Status Servlet</description>
-
- <properties>
- <javax.servlet.api.version>2.3</javax.servlet.api.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${javax.servlet.api.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <includes>
- <include>**/*.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <repositories>
- <repository>
- <id>central</id>
- <name>maven repo1</name>
- <layout>default</layout>
- <url>http://repo1.maven.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>maven.search.repo</id>
- <name>maven search repo</name>
- <layout>default</layout>
- <url>http://mvnsearch.org/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>central</id>
- <name>Maven Plugin Repository</name>
- <url>http://repo1.maven.org/maven2</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
-</project>
diff --git a/ovirt-engine-reports/WebadminLineBarChartTheme/build.xml
b/ovirt-engine-reports/WebadminLineBarChartTheme/build.xml
new file mode 100644
index 0000000..70d742c
--- /dev/null
+++ b/ovirt-engine-reports/WebadminLineBarChartTheme/build.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="WebadminLineBarChartTheme" default="all">
+ <property name="build.output" location="lib"/>
+ <property name="local.output"
value="${build.output}/WebadminLineBarChartTheme.jar"/>
+
+ <target name="all">
+ <mkdir dir="${build.output}"/>
+ <jar
+ destfile="${local.output}"
+ basedir="src/main/resources"
+ />
+ </target>
+
+ <target name="clean">
+ <delete file="${local.output}"/>
+ </target>
+</project>
diff --git a/ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml
b/ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml
deleted file mode 100644
index 59f1104..0000000
--- a/ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>WebadminLineBarChartTheme</artifactId>
- <packaging>jar</packaging>
- <version>3.4.0</version>
- <name>Webadmin Chart Theme for Line and Bar Charts</name>
- <description>The jar that contains the chart theme line and bar charts in
the webadmin dashboards</description>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source> <target>1.6</target> <includes>
- <include>**/*.txt</include>
<include>**/*.java</include> <include>**/*.properties</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-</project>
diff --git a/ovirt-engine-reports/pom.xml b/ovirt-engine-reports/pom.xml
deleted file mode 100644
index 16d62c8..0000000
--- a/ovirt-engine-reports/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<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>
-
- <parent>
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>root</artifactId>
- <version>3.4.0</version>
- </parent>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>ovirt-engine-reports</artifactId>
- <version>3.4.0</version>
- <packaging>pom</packaging>
- <name>Reports</name>
- <description>oVirt Reports Reports Package Home</description>
-
- <modules>
- <module>ChartsCustomizers</module>
- <module>EngineAuthentication</module>
- <module>ReportsPieChartTheme</module>
- <module>ReportsLineBarChartTheme</module>
- <module>ReportsStatus</module>
- <module>WebadminLineBarChartTheme</module>
- <module>CustomOvirtReportsQueryManipulator</module>
- </modules>
-
-</project>
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index b7e5187..0000000
--- a/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.ovirt.engine.reports</groupId>
- <artifactId>root</artifactId>
- <version>3.4.0</version>
- <packaging>pom</packaging>
- <name>oVirt Reports Root Project</name>
-
- <modules>
- <module>ovirt-engine-reports</module>
- </modules>
-
- <properties>
- <!-- dependency versions -->
- <ovirt-reports.version>3.4.0</ovirt-reports.version>
- <version.jasperreports>4.0.2</version.jasperreports>
- <version.jfreechart>1.0.12</version.jfreechart>
- <version.jcommon>1.0.15</version.jcommon>
- </properties>
-
- <!-- ======================================================================
-->
- <!-- Needed for MEAD, which runs 'mvn deploy -DaltDeploymentRepository=..'
-->
- <!-- and gets an error if there is no distributionManagement section
-->
- <!-- ======================================================================
-->
- <distributionManagement>
- <repository>
- <id>dummy</id>
- <name>Dummy Repo</name>
- <url>scp://dummy.org/dummy</url>
- <layout>default</layout>
- </repository>
- </distributionManagement>
-</project>
diff --git a/version.mak b/version.mak
index 858fa35..5a9761a 100644
--- a/version.mak
+++ b/version.mak
@@ -4,7 +4,7 @@
# Fix release is manually specified,
# increment after releasing/branching
-FIX_RELEASE=0
+VERSION=3.4.0
# Milestone is manually specified,
# example for ordering:
--
To view, visit http://gerrit.ovirt.org/24224
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd3f37d7dc813c1b34693e50bdda3aabf2db9fb7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-reports
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
