Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: build: reorder java artifacts ......................................................................
packaging: build: reorder java artifacts 1. remove useless reports/jars directory 2. fix up group id Change-Id: I32af8149fb83f92fffa3b00bb4f0252ba98b7df9 Signed-off-by: Alon Bar-Lev <[email protected]> --- R ovirt-engine-reports/ChartsCustomizers/pom.xml R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ActiveOsTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/BarChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DaulSeriesTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrPercentTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DualLineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNamePercentTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNameTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/HorizontalStackedBarChart.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/LineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentDaulSeriesTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentTimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PieChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ScatterChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/StackedBarChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimePieChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimelineChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYBarTimeChartCustomizer.java R ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYLineChartCustomizer.java R ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml R ovirt-engine-reports/CustomOvirtReportsQueryManipulator/src/main/java/org/ovirt/jasperreports/querymodifier/CustomOvirtReportsQueryManipulator.java R ovirt-engine-reports/EngineAuthentication/pom.xml R ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java R ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java R ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml R ovirt-engine-reports/ReportsLineBarChartTheme/src/main/resources/ReportsLineBarChartTheme.jrctx R ovirt-engine-reports/ReportsLineBarChartTheme/src/main/resources/jasperreports_extension.properties R ovirt-engine-reports/ReportsPieChartTheme/pom.xml R ovirt-engine-reports/ReportsPieChartTheme/src/main/resources/ReportsPieChartTheme.jrctx R ovirt-engine-reports/ReportsPieChartTheme/src/main/resources/jasperreports_extension.properties R ovirt-engine-reports/ReportsStatus/pom.xml R ovirt-engine-reports/ReportsStatus/src/main/java/org/ovirt/status/StatusServlet.java R ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml R ovirt-engine-reports/WebadminLineBarChartTheme/src/main/resources/WebadminLineBarChartTheme.jrctx R ovirt-engine-reports/WebadminLineBarChartTheme/src/main/resources/jasperreports_extension.properties R ovirt-engine-reports/pom.xml M pom.xml D reports/pom.xml 40 files changed, 39 insertions(+), 56 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/18/23418/1 diff --git a/reports/jars/ChartsCustomizers/pom.xml b/ovirt-engine-reports/ChartsCustomizers/pom.xml similarity index 91% rename from reports/jars/ChartsCustomizers/pom.xml rename to ovirt-engine-reports/ChartsCustomizers/pom.xml index 2de76cb..3d4bc37 100644 --- a/reports/jars/ChartsCustomizers/pom.xml +++ b/ovirt-engine-reports/ChartsCustomizers/pom.xml @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> - <version>3.4.0</version> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> + <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <groupId>org.ovirt.engine.reports</groupId> <artifactId>ChartsCustomizers</artifactId> - <packaging>jar</packaging> <version>3.4.0</version> + <packaging>jar</packaging> <name>Reports Chart Customizers</name> <description>The jar that contains the chart customizers classes</description> diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ActiveOsTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ActiveOsTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ActiveOsTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ActiveOsTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/BarChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/BarChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/BarChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/BarChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DaulSeriesTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DaulSeriesTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DaulSeriesTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DaulSeriesTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrBarChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrPercentTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrPercentTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrPercentTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrPercentTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DrStackedBarChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DualLineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DualLineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DualLineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/DualLineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNamePercentTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNamePercentTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNamePercentTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNamePercentTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNameTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNameTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNameTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/FullNameTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/HorizontalStackedBarChart.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/HorizontalStackedBarChart.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/HorizontalStackedBarChart.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/HorizontalStackedBarChart.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/LineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/LineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/LineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/LineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentDaulSeriesTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentDaulSeriesTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentDaulSeriesTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentDaulSeriesTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentTimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentTimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentTimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PercentTimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PieChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PieChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PieChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/PieChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ScatterChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ScatterChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ScatterChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/ScatterChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/StackedBarChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/StackedBarChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/StackedBarChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/StackedBarChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimePieChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimePieChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimePieChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimePieChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimelineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimelineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimelineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/TimelineChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYBarTimeChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYBarTimeChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYBarTimeChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYBarTimeChartCustomizer.java diff --git a/reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYLineChartCustomizer.java b/ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYLineChartCustomizer.java similarity index 100% rename from reports/jars/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYLineChartCustomizer.java rename to ovirt-engine-reports/ChartsCustomizers/src/main/java/com/ovirt/reports/jasper/XYLineChartCustomizer.java diff --git a/reports/jars/CustomOvirtReportsQueryManipulator/pom.xml b/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml similarity index 95% rename from reports/jars/CustomOvirtReportsQueryManipulator/pom.xml rename to ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml index 9581aad..2172bf8 100644 --- a/reports/jars/CustomOvirtReportsQueryManipulator/pom.xml +++ b/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/pom.xml @@ -2,12 +2,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <groupId>org.ovirt.engine.reports</groupId> <artifactId>CustomOvirtReportsQueryManipulator</artifactId> <packaging>jar</packaging> <version>3.4.0</version> diff --git a/reports/jars/CustomOvirtReportsQueryManipulator/src/main/java/org/ovirt/jasperreports/querymodifier/CustomOvirtReportsQueryManipulator.java b/ovirt-engine-reports/CustomOvirtReportsQueryManipulator/src/main/java/org/ovirt/jasperreports/querymodifier/CustomOvirtReportsQueryManipulator.java similarity index 100% rename from reports/jars/CustomOvirtReportsQueryManipulator/src/main/java/org/ovirt/jasperreports/querymodifier/CustomOvirtReportsQueryManipulator.java rename to ovirt-engine-reports/CustomOvirtReportsQueryManipulator/src/main/java/org/ovirt/jasperreports/querymodifier/CustomOvirtReportsQueryManipulator.java diff --git a/reports/jars/EngineAuthentication/pom.xml b/ovirt-engine-reports/EngineAuthentication/pom.xml similarity index 95% rename from reports/jars/EngineAuthentication/pom.xml rename to ovirt-engine-reports/EngineAuthentication/pom.xml index cca92b7..1b617ed 100644 --- a/reports/jars/EngineAuthentication/pom.xml +++ b/ovirt-engine-reports/EngineAuthentication/pom.xml @@ -2,12 +2,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <groupId>org.ovirt.engine.reports</groupId> <artifactId>EngineAuthentication</artifactId> <packaging>jar</packaging> <version>3.4.0</version> diff --git a/reports/jars/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java similarity index 100% rename from reports/jars/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java rename to ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineSimplePreAuthFilter.java diff --git a/reports/jars/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java b/ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java similarity index 100% rename from reports/jars/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java rename to ovirt-engine-reports/EngineAuthentication/src/main/java/org/ovirt/authentication/EngineUserDetails.java diff --git a/reports/jars/ReportsLineBarChartTheme/pom.xml b/ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml similarity index 85% rename from reports/jars/ReportsLineBarChartTheme/pom.xml rename to ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml index b91213e..4bd3ded 100644 --- a/reports/jars/ReportsLineBarChartTheme/pom.xml +++ b/ovirt-engine-reports/ReportsLineBarChartTheme/pom.xml @@ -3,17 +3,18 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> - <version>3.4.0</version> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> + <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <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> diff --git a/reports/jars/ReportsLineBarChartTheme/src/main/resources/ReportsLineBarChartTheme.jrctx b/ovirt-engine-reports/ReportsLineBarChartTheme/src/main/resources/ReportsLineBarChartTheme.jrctx similarity index 100% rename from reports/jars/ReportsLineBarChartTheme/src/main/resources/ReportsLineBarChartTheme.jrctx rename to ovirt-engine-reports/ReportsLineBarChartTheme/src/main/resources/ReportsLineBarChartTheme.jrctx diff --git a/reports/jars/ReportsLineBarChartTheme/src/main/resources/jasperreports_extension.properties b/ovirt-engine-reports/ReportsLineBarChartTheme/src/main/resources/jasperreports_extension.properties similarity index 100% rename from reports/jars/ReportsLineBarChartTheme/src/main/resources/jasperreports_extension.properties rename to ovirt-engine-reports/ReportsLineBarChartTheme/src/main/resources/jasperreports_extension.properties diff --git a/reports/jars/ReportsPieChartTheme/pom.xml b/ovirt-engine-reports/ReportsPieChartTheme/pom.xml similarity index 85% rename from reports/jars/ReportsPieChartTheme/pom.xml rename to ovirt-engine-reports/ReportsPieChartTheme/pom.xml index 1cf7249..e5355d2 100644 --- a/reports/jars/ReportsPieChartTheme/pom.xml +++ b/ovirt-engine-reports/ReportsPieChartTheme/pom.xml @@ -3,17 +3,18 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> - <version>3.4.0</version> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> + <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <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> diff --git a/reports/jars/ReportsPieChartTheme/src/main/resources/ReportsPieChartTheme.jrctx b/ovirt-engine-reports/ReportsPieChartTheme/src/main/resources/ReportsPieChartTheme.jrctx similarity index 100% rename from reports/jars/ReportsPieChartTheme/src/main/resources/ReportsPieChartTheme.jrctx rename to ovirt-engine-reports/ReportsPieChartTheme/src/main/resources/ReportsPieChartTheme.jrctx diff --git a/reports/jars/ReportsPieChartTheme/src/main/resources/jasperreports_extension.properties b/ovirt-engine-reports/ReportsPieChartTheme/src/main/resources/jasperreports_extension.properties similarity index 100% rename from reports/jars/ReportsPieChartTheme/src/main/resources/jasperreports_extension.properties rename to ovirt-engine-reports/ReportsPieChartTheme/src/main/resources/jasperreports_extension.properties diff --git a/reports/jars/ReportsStatus/pom.xml b/ovirt-engine-reports/ReportsStatus/pom.xml similarity index 93% rename from reports/jars/ReportsStatus/pom.xml rename to ovirt-engine-reports/ReportsStatus/pom.xml index d324e4f..b6fa639 100644 --- a/reports/jars/ReportsStatus/pom.xml +++ b/ovirt-engine-reports/ReportsStatus/pom.xml @@ -2,12 +2,12 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <groupId>org.ovirt.engine.reports</groupId> <artifactId>ReportsStatus</artifactId> <packaging>jar</packaging> <version>3.4.0</version> diff --git a/reports/jars/ReportsStatus/src/main/java/org/ovirt/status/StatusServlet.java b/ovirt-engine-reports/ReportsStatus/src/main/java/org/ovirt/status/StatusServlet.java similarity index 100% rename from reports/jars/ReportsStatus/src/main/java/org/ovirt/status/StatusServlet.java rename to ovirt-engine-reports/ReportsStatus/src/main/java/org/ovirt/status/StatusServlet.java diff --git a/reports/jars/WebadminLineBarChartTheme/pom.xml b/ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml similarity index 85% rename from reports/jars/WebadminLineBarChartTheme/pom.xml rename to ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml index 0bf9658..59f1104 100644 --- a/reports/jars/WebadminLineBarChartTheme/pom.xml +++ b/ovirt-engine-reports/WebadminLineBarChartTheme/pom.xml @@ -3,17 +3,18 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>jars</artifactId> - <version>3.4.0</version> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> + <version>3.4.0</version> </parent> - <groupId>ovirt_engine_reports</groupId> + <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> diff --git a/reports/jars/WebadminLineBarChartTheme/src/main/resources/WebadminLineBarChartTheme.jrctx b/ovirt-engine-reports/WebadminLineBarChartTheme/src/main/resources/WebadminLineBarChartTheme.jrctx similarity index 100% rename from reports/jars/WebadminLineBarChartTheme/src/main/resources/WebadminLineBarChartTheme.jrctx rename to ovirt-engine-reports/WebadminLineBarChartTheme/src/main/resources/WebadminLineBarChartTheme.jrctx diff --git a/reports/jars/WebadminLineBarChartTheme/src/main/resources/jasperreports_extension.properties b/ovirt-engine-reports/WebadminLineBarChartTheme/src/main/resources/jasperreports_extension.properties similarity index 100% rename from reports/jars/WebadminLineBarChartTheme/src/main/resources/jasperreports_extension.properties rename to ovirt-engine-reports/WebadminLineBarChartTheme/src/main/resources/jasperreports_extension.properties diff --git a/reports/jars/pom.xml b/ovirt-engine-reports/pom.xml similarity index 66% rename from reports/jars/pom.xml rename to ovirt-engine-reports/pom.xml index 844b62c..16d62c8 100644 --- a/reports/jars/pom.xml +++ b/ovirt-engine-reports/pom.xml @@ -2,16 +2,17 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>ovirt_engine_reports</groupId> - <artifactId>reports</artifactId> - <version>3.4.0</version> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>root</artifactId> + <version>3.4.0</version> </parent> - <artifactId>jars</artifactId> + <groupId>org.ovirt.engine.reports</groupId> + <artifactId>ovirt-engine-reports</artifactId> + <version>3.4.0</version> <packaging>pom</packaging> - - <name>Jars</name> - <description>The home of all jars deployed with the reports package</description> + <name>Reports</name> + <description>oVirt Reports Reports Package Home</description> <modules> <module>ChartsCustomizers</module> diff --git a/pom.xml b/pom.xml index bf07c50..b7e5187 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,14 @@ <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>ovirt_engine_reports</groupId> + <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>reports</module> + <module>ovirt-engine-reports</module> </modules> <properties> diff --git a/reports/pom.xml b/reports/pom.xml deleted file mode 100644 index 79ab979..0000000 --- a/reports/pom.xml +++ /dev/null @@ -1,20 +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>ovirt_engine_reports</groupId> - <artifactId>root</artifactId> - <version>3.4.0</version> - </parent> - - <artifactId>reports</artifactId> - <packaging>pom</packaging> - - <name>Reports</name> - <description>oVirt Reports Reports Package Home</description> - - <modules> - <module>jars</module> - </modules> - -</project> -- To view, visit http://gerrit.ovirt.org/23418 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I32af8149fb83f92fffa3b00bb4f0252ba98b7df9 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
