modules/enterprise/gui/coregui/pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit fcc436196afd138e15c4813194bbbc2cc1fee6d3
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Thu Oct 7 11:41:01 2010 +0200
Fixing the pom so that there's no need to specify the -Dgwt.module=org.rhq.enterprise.gui.coregui.CoreGUI when running mvn gwt:debug. Note that this only works with maven 2.2.0 and later.
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index c24aa4f..2b61393 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -264,12 +264,23 @@
<executions>
<execution>
+ <id>gwt-goals</id>
<goals>
<goal>compile</goal>
<goal>generateAsync</goal>
<goal>i18n</goal>
</goals>
</execution>
+ <execution>
+ <!-- This id is what does the trick, don't change it. For this to work maven 2.2.0 and later is needed. -->
+ <id>default-cli</id>
+ <goals>
+ <goal>debug</goal>
+ </goals>
+ <configuration>
+ <module>org.rhq.enterprise.gui.coregui.CoreGUI</module>
+ </configuration>
+ </execution>
</executions>
</plugin>
1
0
modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementScheduleComposite.java | 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleCompositeDataSource.java | 218 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java | 24 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java | 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java | 26 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java | 19
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java | 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java | 12
15 files changed, 314 insertions(+), 28 deletions(-)
New commits:
commit 83f95657d84271fcf717cb2b9109b4ed0136a9cb
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Oct 6 13:08:59 2010 -0400
fix issue where URL history was not getting updated when switching between group tabs
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
index 33b22e9..74c5ca3 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/AbstractTwoLevelTabSetView.java
@@ -122,12 +122,10 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
}
public void onTabSelected(TwoLevelTabSelectedEvent tabSelectedEvent) {
- //CoreGUI.printWidgetTree();
-
if (getSelectedItemId() == null) {
- // History.fireCurrentHistoryState();
+ CoreGUI.goToView(History.getToken());
} else {
- // Switch tabs directly, rather than letting the history framework do it, to avoid redrawing the outer views.
+
// selectSubTabByTitle(tabSelectedEvent.getId(), tabSelectedEvent.getSubTabId());
String tabPath = "/" + tabSelectedEvent.getId() + "/" + tabSelectedEvent.getSubTabId();
String path = this.baseViewPath + "/" + getSelectedItemId() + tabPath;
@@ -136,9 +134,10 @@ public abstract class AbstractTwoLevelTabSetView<T, U extends Layout> extends Lo
// than going directly to the tab's URL. In this case, fire a history event to go to the tab and make it the
// current history item.
if (!History.getToken().equals(path)) {
- History.newItem(path, true);
+ CoreGUI.goToView(path);
}
}
+ // TODO?: Switch tabs directly, rather than letting the history framework do it, to avoid redrawing the outer views.
}
public void renderView(final ViewPath viewPath) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
index 9e2442b..481354b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
@@ -398,7 +398,8 @@ public class ResourceGroupTreeView extends LocatableVLayout implements Bookmarka
public void renderView(ViewPath viewPath) {
this.currentViewId = viewPath.getCurrent();
if (this.currentViewId != null) {
- int groupId = Integer.parseInt(this.currentViewId.getPath());
+ String groupIdString = this.currentViewId.getPath();
+ int groupId = Integer.parseInt(groupIdString);
setSelectedGroup(groupId);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index 97a7d2f..923b925 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -774,10 +774,12 @@ public class ResourceTreeView extends LocatableVLayout {
if ("AutoGroup".equals(currentViewIdPath)) {
// Move the currentViewId to the ID portion to play better with other code
currentViewId = viewPath.getNext();
- Integer autoGroupId = Integer.parseInt(currentViewId.getPath());
+ String autoGroupIdString = currentViewId.getPath();
+ Integer autoGroupId = Integer.parseInt(autoGroupIdString);
setSelectedAutoGroup(autoGroupId);
} else {
- Integer resourceId = Integer.parseInt(currentViewId.getPath());
+ String resourceIdString = currentViewId.getPath();
+ Integer resourceId = Integer.parseInt(resourceIdString);
setSelectedResource(resourceId);
}
}
commit 860fa0aafec9718235c7224da73583431a6fe045
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Oct 6 12:42:43 2010 -0400
fix group Monitor > Schedules subtab so it aggregates the schedules, rather than showing each of the member schedules (https://bugzilla.redhat.com/show_bug.cgi?id=640562)
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementScheduleComposite.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementScheduleComposite.java
index a3416d3..235082e 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementScheduleComposite.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/composite/MeasurementScheduleComposite.java
@@ -46,6 +46,10 @@ public class MeasurementScheduleComposite implements Serializable {
private Boolean collectionEnabled; // null flagged as "SOME"
private long collectionInterval; // 0 flagged as "DIFFERENT"
+ // No-arg constructor required by GWT.
+ public MeasurementScheduleComposite() {
+ }
+
public MeasurementScheduleComposite(MeasurementDefinition measurementDefinition) {
this.measurementDefinition = measurementDefinition;
this.collectionEnabled = measurementDefinition.isDefaultOn();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java
index 9e7ddb4..f1661c8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/tree/BundleTreeDataSource.java
@@ -29,7 +29,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
-import com.smartgwt.client.data.fields.DataSourceImageField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.tree.TreeNode;
@@ -55,7 +54,6 @@ public class BundleTreeDataSource extends RPCDataSource {
private BundleGWTServiceAsync bundleService = GWTServiceLookup.getBundleService();
-
public BundleTreeDataSource() {
DataSourceField idDataField = new DataSourceTextField("id", "ID");
idDataField.setPrimaryKey(true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
index 9297d96..c6c44d8 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/MeasurementDataGWTService.java
@@ -24,6 +24,8 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
+import org.rhq.core.domain.auth.Subject;
+import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.core.domain.criteria.MeasurementDefinitionCriteria;
import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
@@ -35,6 +37,7 @@ import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
+import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -58,6 +61,8 @@ public interface MeasurementDataGWTService extends RemoteService {
PageList<MeasurementSchedule> findMeasurementSchedulesByCriteria(MeasurementScheduleCriteria criteria);
+ PageList<MeasurementScheduleComposite> getMeasurementScheduleCompositesByContext(EntityContext context);
+
PageList<MeasurementOOBComposite> getSchedulesWithOOBs(String metricNameFilter,
String resourceNameFilter, String parentNameFilter, PageControl pc);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleCompositeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleCompositeDataSource.java
new file mode 100644
index 0000000..7782c87
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleCompositeDataSource.java
@@ -0,0 +1,218 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.enterprise.gui.coregui.client.inventory.common;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
+import com.smartgwt.client.data.DataSourceField;
+import com.smartgwt.client.data.fields.DataSourceBooleanField;
+import com.smartgwt.client.data.fields.DataSourceIntegerField;
+import com.smartgwt.client.data.fields.DataSourceTextField;
+import com.smartgwt.client.rpc.RPCResponse;
+import com.smartgwt.client.widgets.grid.ListGrid;
+import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.common.EntityContext;
+import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
+import org.rhq.core.domain.measurement.MeasurementDefinition;
+import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
+import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync;
+import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
+
+/**
+ * A server-side SmartGWT DataSource for reading and updating {@link MeasurementScheduleComposite}s.
+ *
+ * @author Ian Springer
+ */
+public abstract class AbstractMeasurementScheduleCompositeDataSource extends RPCDataSource<MeasurementScheduleComposite> {
+ private MeasurementDataGWTServiceAsync measurementService = GWTServiceLookup.getMeasurementDataService();
+
+ protected AbstractMeasurementScheduleCompositeDataSource() {
+ super();
+
+ setCanMultiSort(true);
+
+ List<DataSourceField> fields = createFields();
+ addFields(fields);
+ }
+
+ protected List<DataSourceField> createFields() {
+ List<DataSourceField> fields = new ArrayList<DataSourceField>();
+
+ DataSourceIntegerField idField = new DataSourceIntegerField(MeasurementScheduleCriteria.SORT_FIELD_DEFINITION_ID,
+ "Id");
+ idField.setPrimaryKey(true);
+ idField.setHidden(true);
+ fields.add(idField);
+
+ DataSourceTextField nameField = new DataSourceTextField(MeasurementScheduleCriteria.SORT_FIELD_DISPLAY_NAME,
+ "Metric");
+ fields.add(nameField);
+
+ DataSourceTextField descriptionField = new DataSourceTextField(MeasurementScheduleCriteria.SORT_FIELD_DESCRIPTION,
+ "Description");
+ fields.add(descriptionField);
+
+ DataSourceTextField typeField = new DataSourceTextField(MeasurementScheduleCriteria.SORT_FIELD_DATA_TYPE,
+ "Type");
+ fields.add(typeField);
+
+ DataSourceBooleanField enabledField = new DataSourceBooleanField(MeasurementScheduleCriteria.SORT_FIELD_ENABLED,
+ "Enabled?");
+ fields.add(enabledField);
+
+ DataSourceIntegerField intervalField = new DataSourceIntegerField(MeasurementScheduleCriteria.SORT_FIELD_INTERVAL,
+ "Collection Interval");
+ fields.add(intervalField);
+
+ return fields;
+ }
+
+ protected void executeFetch(final DSRequest request, final DSResponse response) {
+ final EntityContext entityContext = getEntityContext(request);
+
+ this.measurementService.getMeasurementScheduleCompositesByContext(entityContext, new AsyncCallback<PageList<MeasurementScheduleComposite>>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to fetch measurement schedules for context " + entityContext,
+ caught);
+ response.setStatus(RPCResponse.STATUS_FAILURE);
+ processResponse(request.getRequestId(), response);
+ }
+
+ public void onSuccess(PageList<MeasurementScheduleComposite> result) {
+ response.setData(buildRecords(result));
+ // For paging to work, we have to specify size of full result set.
+ response.setTotalRows(result.getTotalSize());
+ processResponse(request.getRequestId(), response);
+ }
+ });
+ }
+
+ protected EntityContext getEntityContext(DSRequest request) {
+ EntityContext entityContext = null;
+
+ Criteria requestCriteria = request.getCriteria();
+ if (requestCriteria != null) {
+ Map values = requestCriteria.getValues();
+ for (Object key : values.keySet()) {
+ String fieldName = (String) key;
+ if (fieldName.equals(MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_ID)) {
+ Integer resourceId = (Integer) values.get(fieldName);
+ entityContext = EntityContext.forResource(resourceId);
+ } else if (fieldName.equals(MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID)) {
+ Integer groupId = (Integer) values.get(fieldName);
+ entityContext = EntityContext.forGroup(groupId);
+ }
+ // TODO: Add support for other fields we need to filter by (e.g. resourceTypeId for metric templates).
+ }
+ }
+
+ if (entityContext == null) {
+ throw new IllegalStateException("No support criteria fields were found.");
+ }
+
+ return entityContext;
+ }
+
+ @Override
+ public MeasurementScheduleComposite copyValues(ListGridRecord from) {
+ return null;
+ }
+
+ @Override
+ public ListGridRecord copyValues(MeasurementScheduleComposite from) {
+ ListGridRecord record = new ListGridRecord();
+
+ MeasurementDefinition measurementDefinition = from.getMeasurementDefinition();
+ record.setAttribute(MeasurementScheduleCriteria.SORT_FIELD_DEFINITION_ID, measurementDefinition.getId());
+ record.setAttribute(MeasurementScheduleCriteria.SORT_FIELD_DISPLAY_NAME, measurementDefinition.getDisplayName());
+ record.setAttribute(MeasurementScheduleCriteria.SORT_FIELD_DESCRIPTION, measurementDefinition.getDescription());
+ record.setAttribute(MeasurementScheduleCriteria.SORT_FIELD_DATA_TYPE,
+ measurementDefinition.getDataType().name().toLowerCase());
+ record.setAttribute(MeasurementScheduleCriteria.SORT_FIELD_ENABLED, from.getCollectionEnabled());
+ record.setAttribute(MeasurementScheduleCriteria.SORT_FIELD_INTERVAL, from.getCollectionInterval());
+
+ // TODO: resourceId and resourceGroupId (in subclasses)
+
+ return record;
+ }
+
+ public void enableSchedules(AbstractMeasurementScheduleListView measurementScheduleListView) {
+ int[] ids = getMeasurementDefinitionIds(measurementScheduleListView);
+ List<String> displayNames = getMeasurementDefinitionDisplayNames(measurementScheduleListView);
+ enableSchedules(measurementScheduleListView, ids, displayNames);
+ measurementScheduleListView.refresh();
+ }
+
+ protected abstract void enableSchedules(AbstractMeasurementScheduleListView measurementScheduleListView,
+ int[] measurementDefinitionIds, List<String> measurementDefinitionDisplayNames);
+
+ public void disableSchedules(AbstractMeasurementScheduleListView measurementScheduleListView) {
+ int[] ids = getMeasurementDefinitionIds(measurementScheduleListView);
+ List<String> displayNames = getMeasurementDefinitionDisplayNames(measurementScheduleListView);
+ disableSchedules(measurementScheduleListView, ids, displayNames);
+ measurementScheduleListView.refresh();
+ }
+
+ protected abstract void disableSchedules(AbstractMeasurementScheduleListView measurementScheduleListView,
+ int[] measurementDefinitionIds, List<String> measurementDefinitionDisplayNames);
+
+ public void updateSchedules(AbstractMeasurementScheduleListView measurementScheduleListView, long interval) {
+ int[] ids = getMeasurementDefinitionIds(measurementScheduleListView);
+ List<String> displayNames = getMeasurementDefinitionDisplayNames(measurementScheduleListView);
+ updateSchedules(measurementScheduleListView, ids, displayNames, interval);
+ measurementScheduleListView.refresh();
+ }
+
+ private int[] getMeasurementDefinitionIds(AbstractMeasurementScheduleListView measurementScheduleListView) {
+ ListGrid listGrid = measurementScheduleListView.getListGrid();
+ ListGridRecord[] records = listGrid.getSelection();
+
+ int[] measurementDefinitionIds = new int[records.length];
+ for (int i = 0, selectionLength = records.length; i < selectionLength; i++) {
+ ListGridRecord record = records[i];
+ Integer measurementDefinitionId = record.getAttributeAsInt(MeasurementScheduleCriteria.SORT_FIELD_DEFINITION_ID);
+ measurementDefinitionIds[i] = measurementDefinitionId;
+ }
+ return measurementDefinitionIds;
+ }
+
+ private List<String> getMeasurementDefinitionDisplayNames(AbstractMeasurementScheduleListView measurementScheduleListView) {
+ ListGrid listGrid = measurementScheduleListView.getListGrid();
+ ListGridRecord[] records = listGrid.getSelection();
+ List<String> displayNames = new ArrayList<String>(records.length);
+ for (ListGridRecord record : records) {
+ String displayName = record.getAttributeAsString(MeasurementScheduleCriteria.SORT_FIELD_DISPLAY_NAME);
+ displayNames.add(displayName);
+ }
+ return displayNames;
+ }
+
+ protected abstract void updateSchedules(final AbstractMeasurementScheduleListView measurementScheduleListView,
+ final int[] measurementDefinitionIds, List<String> measurementDefinitionDisplayNames, final long interval);
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java
index e1181ab..fac403e 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleDataSource.java
@@ -29,6 +29,7 @@ import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.rpc.RPCResponse;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.util.PageList;
@@ -44,8 +45,13 @@ import java.util.Map;
/**
* A server-side SmartGWT DataSource for reading and updating {@link MeasurementSchedule}s.
*
+ * @deprecated this class has been replaced by {@link AbstractMeasurementScheduleCompositeDataSource}, but
+ * I'm keeping it around in case we want to switch back to fetching schedules via criteria at
+ * some point. (ips, 10/06/10)
+ *
* @author Ian Springer
*/
+@Deprecated
public abstract class AbstractMeasurementScheduleDataSource extends RPCDataSource<MeasurementSchedule> {
private MeasurementDataGWTServiceAsync measurementService = GWTServiceLookup.getMeasurementDataService();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
index c00175a..64b93e5 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementScheduleListView.java
@@ -42,14 +42,14 @@ public abstract class AbstractMeasurementScheduleListView extends Table {
MeasurementScheduleCriteria.SORT_FIELD_DISPLAY_NAME, SortDirection.ASCENDING) };
public AbstractMeasurementScheduleListView(String locatorId, String title,
- AbstractMeasurementScheduleDataSource dataSource, Criteria criteria, String[] excludedFieldNames) {
+ AbstractMeasurementScheduleCompositeDataSource dataSource, Criteria criteria, String[] excludedFieldNames) {
super(locatorId, title, criteria, SORT_SPECIFIERS, excludedFieldNames);
setDataSource(dataSource);
}
@Override
- public AbstractMeasurementScheduleDataSource getDataSource() {
- return (AbstractMeasurementScheduleDataSource) super.getDataSource();
+ public AbstractMeasurementScheduleCompositeDataSource getDataSource() {
+ return (AbstractMeasurementScheduleCompositeDataSource) super.getDataSource();
}
protected void configureTable() {
@@ -62,9 +62,9 @@ public abstract class AbstractMeasurementScheduleListView extends Table {
listGrid.getField(MeasurementScheduleCriteria.SORT_FIELD_DATA_TYPE).setWidth("10%");
ListGridField enabledField = listGrid.getField(MeasurementScheduleCriteria.SORT_FIELD_ENABLED);
enabledField.setWidth("10%");
- enabledField.setCellFormatter(new BooleanCellFormatter());
+ enabledField.setCellFormatter(new CollectionEnabledCellFormatter());
ListGridField intervalField = listGrid.getField(MeasurementScheduleCriteria.SORT_FIELD_INTERVAL);
- intervalField.setCellFormatter(new MillisecondsCellFormatter());
+ intervalField.setCellFormatter(new CollectionIntervalCellFormatter());
intervalField.setWidth("25%");
// Add action buttons and widgets.
@@ -81,15 +81,23 @@ public abstract class AbstractMeasurementScheduleListView extends Table {
addExtraWidget(new UpdateCollectionIntervalWidget(this.getLocatorId(), this));
}
- class MillisecondsCellFormatter implements CellFormatter {
+ protected class CollectionEnabledCellFormatter extends BooleanCellFormatter {
+ @Override
+ public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
+ String result = super.format(value, record, rowNum, colNum);
+ return ("".equals(result)) ? "mixed" : result;
+ }
+ }
+
+ protected class CollectionIntervalCellFormatter implements CellFormatter {
public String format(Object value, ListGridRecord record, int rowNum, int colNum) {
if (value == null) {
- return "";
+ return "mixed";
}
long milliseconds = ((Number) value).longValue();
if (milliseconds == 0) {
- return "0";
+ return "mixed";
}
StringBuilder result = new StringBuilder();
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java
index 7bf4903..158448b 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/schedules/SchedulesDataSource.java
@@ -19,15 +19,20 @@
package org.rhq.enterprise.gui.coregui.client.inventory.groups.detail.monitoring.schedules;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
+import com.smartgwt.client.data.DSResponse;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.fields.DataSourceIntegerField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
-import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementScheduleDataSource;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementScheduleCompositeDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementScheduleListView;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
@@ -38,7 +43,7 @@ import java.util.List;
*
* @author Ian Springer
*/
-public class SchedulesDataSource extends AbstractMeasurementScheduleDataSource {
+public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDataSource {
private MeasurementDataGWTServiceAsync measurementService = GWTServiceLookup.getMeasurementDataService();
private int resourceGroupId;
@@ -57,7 +62,20 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleDataSource {
}
@Override
- public ListGridRecord copyValues(MeasurementSchedule from) {
+ protected void executeFetch(DSRequest request, DSResponse response) {
+ super.executeFetch(request, response);
+
+ }
+
+ @Override
+ protected EntityContext getEntityContext(DSRequest request) {
+ Criteria requestCriteria = request.getCriteria();
+ Integer groupId = requestCriteria.getAttributeAsInt(MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID);
+ return EntityContext.forGroup(groupId);
+ }
+
+ @Override
+ public ListGridRecord copyValues(MeasurementScheduleComposite from) {
ListGridRecord record = super.copyValues(from);
record.setAttribute(MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_GROUP_ID, this.resourceGroupId);
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
index 35eb2d6..ddda348 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeDataSource.java
@@ -54,7 +54,10 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
/**
* @author Greg Hinkle
+ *
+ * @deprecated {@link ResourceTreeDatasource} is used instead
*/
+@Deprecated
public class NewResourceTreeDataSource extends DataSource {
int rootId;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java
index da08c04..6fef545 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/NewResourceTreeView.java
@@ -72,7 +72,10 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* @author Greg Hinkle
+ *
+ * @deprecated {@link ResourceTreeView} is used instead
*/
+@Deprecated
public class NewResourceTreeView extends LocatableVLayout {
private Resource selectedResource;
private Resource rootResource;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java
index 4dd6710..21fe764 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/schedules/SchedulesDataSource.java
@@ -19,15 +19,19 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.schedules;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.smartgwt.client.data.Criteria;
+import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DataSourceField;
import com.smartgwt.client.data.fields.DataSourceIntegerField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
+import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
-import org.rhq.core.domain.measurement.MeasurementSchedule;
+import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.MeasurementDataGWTServiceAsync;
-import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementScheduleDataSource;
+import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementScheduleCompositeDataSource;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementScheduleListView;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
@@ -38,7 +42,7 @@ import java.util.List;
*
* @author Ian Springer
*/
-public class SchedulesDataSource extends AbstractMeasurementScheduleDataSource {
+public class SchedulesDataSource extends AbstractMeasurementScheduleCompositeDataSource {
private MeasurementDataGWTServiceAsync measurementService = GWTServiceLookup.getMeasurementDataService();
private int resourceId;
@@ -57,7 +61,14 @@ public class SchedulesDataSource extends AbstractMeasurementScheduleDataSource {
}
@Override
- public ListGridRecord copyValues(MeasurementSchedule from) {
+ protected EntityContext getEntityContext(DSRequest request) {
+ Criteria requestCriteria = request.getCriteria();
+ Integer resourceId = requestCriteria.getAttributeAsInt(MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_ID);
+ return EntityContext.forResource(resourceId);
+ }
+
+ @Override
+ public ListGridRecord copyValues(MeasurementScheduleComposite from) {
ListGridRecord record = super.copyValues(from);
record.setAttribute(MeasurementScheduleCriteria.FILTER_FIELD_RESOURCE_ID, this.resourceId);
return record;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
index 0df9e99..6a31020 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
@@ -23,12 +23,10 @@
package org.rhq.enterprise.gui.coregui.client.report.measurement;
import java.util.Collection;
-import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
-import com.smartgwt.client.data.fields.DataSourceLinkField;
import com.smartgwt.client.data.fields.DataSourceTextField;
import com.smartgwt.client.widgets.HTMLFlow;
import com.smartgwt.client.widgets.grid.ListGridRecord;
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
index 1cc9170..8f5c9be 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/MeasurementDataGWTServiceImpl.java
@@ -21,6 +21,7 @@ package org.rhq.enterprise.gui.coregui.server.gwt;
import java.util.List;
import java.util.Set;
+import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.core.domain.criteria.MeasurementDefinitionCriteria;
import org.rhq.core.domain.criteria.MeasurementScheduleCriteria;
@@ -32,6 +33,7 @@ import org.rhq.core.domain.measurement.MeasurementSchedule;
import org.rhq.core.domain.measurement.calltime.CallTimeDataComposite;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
+import org.rhq.core.domain.measurement.composite.MeasurementScheduleComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.util.exception.ThrowableUtil;
@@ -114,6 +116,16 @@ public class MeasurementDataGWTServiceImpl extends AbstractGWTServiceImpl implem
}
}
+ public PageList<MeasurementScheduleComposite> getMeasurementScheduleCompositesByContext(EntityContext context) {
+ try {
+ return SerialUtility.prepare(scheduleManager.getMeasurementScheduleCompositesByContext(getSessionSubject(),
+ context, PageControl.getUnlimitedInstance()),
+ "MeasurementDataService.getMeasurementScheduleCompositesByContext");
+ } catch (Exception e) {
+ throw new RuntimeException(ThrowableUtil.getAllMessages(e));
+ }
+ }
+
public PageList<MeasurementOOBComposite> getSchedulesWithOOBs(String metricNameFilter, String resourceNameFilter,
String parentNameFilter, PageControl pc) {
try {
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 23 +---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java | 48 +++++-----
2 files changed, 37 insertions(+), 34 deletions(-)
New commits:
commit 9929d400b0558c8cc65c30438db650b876e9bf72
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Oct 5 19:36:41 2010 -0400
set order field on propdefs in test config in order to verify that the config editor renders the props according to the specified order
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index ded34ef..ed165ea 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -497,13 +497,6 @@ public class ConfigurationEditor extends LocatableVLayout {
private DynamicForm buildPropertiesForm(String locatorId, Collection<PropertyDefinition> propertyDefinitions,
AbstractPropertyMap propertyMap, boolean firePropertyChangedEvents) {
- List<PropertyDefinition> propertyDefinitionsList;
- if (!(propertyDefinitions instanceof List)) {
- propertyDefinitionsList = new ArrayList<PropertyDefinition>(propertyDefinitions);
- } else {
- propertyDefinitionsList = (List<PropertyDefinition>)propertyDefinitions;
- }
- Collections.sort(propertyDefinitionsList, new PropertyDefinitionComparator());
LocatableDynamicForm form = new LocatableDynamicForm(locatorId);
form.setValuesManager(valuesManager);
@@ -524,7 +517,7 @@ public class ConfigurationEditor extends LocatableVLayout {
form.setColWidths(190, 28, 210);
List<FormItem> fields = new ArrayList<FormItem>();
- addItemsForPropertiesRecursively(locatorId, propertyDefinitionsList, propertyMap, fields, firePropertyChangedEvents);
+ addItemsForPropertiesRecursively(locatorId, propertyDefinitions, propertyMap, fields, firePropertyChangedEvents);
form.setFields(fields.toArray(new FormItem[fields.size()]));
return form;
@@ -534,7 +527,9 @@ public class ConfigurationEditor extends LocatableVLayout {
AbstractPropertyMap propertyMap, List<FormItem> fields,
boolean firePropertyChangedEvents) {
boolean odd = true;
- for (PropertyDefinition propertyDefinition : propertyDefinitions) {
+ List<PropertyDefinition> sortedPropertyDefinitions = new ArrayList<PropertyDefinition>(propertyDefinitions);
+ Collections.sort(sortedPropertyDefinitions, new PropertyDefinitionComparator());
+ for (PropertyDefinition propertyDefinition : sortedPropertyDefinitions) {
Property property = propertyMap.get(propertyDefinition.getName());
if (property == null) {
if (propertyDefinition instanceof PropertyDefinitionSimple) {
@@ -864,11 +859,11 @@ public class ConfigurationEditor extends LocatableVLayout {
});
List<ListGridField> fieldsList = new ArrayList<ListGridField>();
- List<PropertyDefinition> definitions = new ArrayList<PropertyDefinition>(memberPropertyDefinitionMap
+ List<PropertyDefinition> propertyDefinitions = new ArrayList<PropertyDefinition>(memberPropertyDefinitionMap
.getPropertyDefinitions().values());
- Collections.sort(definitions, new PropertyDefinitionComparator());
+ Collections.sort(propertyDefinitions, new PropertyDefinitionComparator());
- for (PropertyDefinition subDef : definitions) {
+ for (PropertyDefinition subDef : propertyDefinitions) {
if (subDef.isSummary()) {
ListGridField field = new ListGridField(subDef.getName(), subDef.getDisplayName(), 90);
@@ -885,7 +880,7 @@ public class ConfigurationEditor extends LocatableVLayout {
if (fieldsList.isEmpty()) {
// An extra "feature of the config system". If no fields are labeled summary, all are considered summary.
- for (PropertyDefinition subDef : definitions) {
+ for (PropertyDefinition subDef : propertyDefinitions) {
ListGridField field = new ListGridField(subDef.getName(), subDef.getDisplayName());
fieldsList.add(field);
PropertyDefinitionSimple defSimple = (PropertyDefinitionSimple) subDef;
@@ -948,7 +943,7 @@ public class ConfigurationEditor extends LocatableVLayout {
summaryTable.setFields(fieldsList.toArray(new ListGridField[fieldsList.size()]));
// Now add rows containing the actual data (i.e. member property values).
- ListGridRecord[] rows = buildSummaryRecords(propertyList, definitions);
+ ListGridRecord[] rows = buildSummaryRecords(propertyList, propertyDefinitions);
summaryTable.setData(rows);
VLayout summaryTableHolder = new LocatableVLayout(locatorId);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java
index 0ad4e0a..4bddff6 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java
@@ -48,36 +48,38 @@ public abstract class TestConfigurationFactory {
Map<String, PropertyDefinition> propertyDefinitions = new HashMap<String, PropertyDefinition>();
configurationDefinition.setPropertyDefinitions(propertyDefinitions);
+ int orderIndex = 0;
+
PropertyDefinitionSimple simplePropDef;
simplePropDef = createStringPropDef1();
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = createStringPropDef2();
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = new PropertyDefinitionSimple("LongString", "a Long String simple prop", false,
PropertySimpleType.LONG_STRING);
simplePropDef.setDisplayName(simplePropDef.getName());
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = new PropertyDefinitionSimple("Password", "a Password simple prop", false,
PropertySimpleType.PASSWORD);
simplePropDef.setDisplayName(simplePropDef.getName());
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = new PropertyDefinitionSimple("Boolean", "a required Boolean simple prop", true,
PropertySimpleType.BOOLEAN);
simplePropDef.setDisplayName(simplePropDef.getName());
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef.setRequired(true);
simplePropDef = createIntegerPropDef();
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = new PropertyDefinitionSimple("Float", "a Float simple prop", false, PropertySimpleType.FLOAT);
simplePropDef.setDisplayName(simplePropDef.getName());
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = new PropertyDefinitionSimple("StringEnum1",
"a String enum prop with <=5 items - should be rendered as radio buttons", false,
@@ -88,7 +90,7 @@ public abstract class TestConfigurationFactory {
propDefEnums.add(new PropertyDefinitionEnumeration("NJ", "NJ", true));
propDefEnums.add(new PropertyDefinitionEnumeration("PA", "PA"));
simplePropDef.setEnumeratedValues(propDefEnums, false);
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
simplePropDef = new PropertyDefinitionSimple("StringEnum2",
"a String enum prop with >5 items - should be rendered as a popup menu", false, PropertySimpleType.STRING);
@@ -101,31 +103,31 @@ public abstract class TestConfigurationFactory {
propDefEnums.add(new PropertyDefinitionEnumeration("blue", "blue"));
propDefEnums.add(new PropertyDefinitionEnumeration("purple", "purple"));
simplePropDef.setEnumeratedValues(propDefEnums, false);
- propertyDefinitions.put(simplePropDef.getName(), simplePropDef);
+ addPropertyDefinition(propertyDefinitions, simplePropDef, orderIndex++);
PropertyDefinitionMap mapPropDef = new PropertyDefinitionMap("MapOfSimples", "a map of simples", false);
mapPropDef.put(createStringPropDef1());
mapPropDef.put(createStringPropDef2());
mapPropDef.put(createIntegerPropDef());
mapPropDef.setDisplayName(mapPropDef.getName());
- propertyDefinitions.put(mapPropDef.getName(), mapPropDef);
+ addPropertyDefinition(propertyDefinitions, mapPropDef, orderIndex++);
PropertyDefinitionMap openMapPropDef = new PropertyDefinitionMap("OpenMapOfSimples", "an open map of simples",
false);
openMapPropDef.setDisplayName(openMapPropDef.getName());
- propertyDefinitions.put(openMapPropDef.getName(), openMapPropDef);
+ addPropertyDefinition(propertyDefinitions, openMapPropDef, orderIndex++);
PropertyDefinitionMap readOnlyOpenMapPropDef = new PropertyDefinitionMap("ReadOnlyOpenMapOfSimples",
"a read-only open map of simples", false);
readOnlyOpenMapPropDef.setDisplayName(readOnlyOpenMapPropDef.getName());
readOnlyOpenMapPropDef.setReadOnly(true);
- propertyDefinitions.put(readOnlyOpenMapPropDef.getName(), readOnlyOpenMapPropDef);
+ addPropertyDefinition(propertyDefinitions, readOnlyOpenMapPropDef, orderIndex++);
PropertyDefinitionList listOfSimplesPropDef = new PropertyDefinitionList("ListOfSimples",
"a list of Integer simples", true, new PropertyDefinitionSimple("integer", "an integer", false,
PropertySimpleType.INTEGER));
listOfSimplesPropDef.setDisplayName(listOfSimplesPropDef.getName());
- propertyDefinitions.put(listOfSimplesPropDef.getName(), listOfSimplesPropDef);
+ addPropertyDefinition(propertyDefinitions, listOfSimplesPropDef, orderIndex++);
PropertyDefinitionMap mapInListPropDef =
new PropertyDefinitionMap("MapOfSimplesInList", "a map of simples in a list", false);
@@ -137,7 +139,7 @@ public abstract class TestConfigurationFactory {
PropertyDefinitionList listPropDef = new PropertyDefinitionList("ListOfMaps", "a list of maps", true,
mapInListPropDef);
listPropDef.setDisplayName(listPropDef.getName());
- propertyDefinitions.put(listPropDef.getName(), listPropDef);
+ addPropertyDefinition(propertyDefinitions, listPropDef, orderIndex++);
PropertyDefinitionMap mapInReadOnlyListPropDef =
new PropertyDefinitionMap("MapOfSimplesInReadOnlyList", "a map of simples in a list", false);
@@ -150,7 +152,7 @@ public abstract class TestConfigurationFactory {
"a read-only list of maps", true, mapInReadOnlyListPropDef);
readOnlyListPropDef.setDisplayName(readOnlyListPropDef.getName());
readOnlyListPropDef.setReadOnly(true);
- propertyDefinitions.put(readOnlyListPropDef.getName(), readOnlyListPropDef);
+ addPropertyDefinition(propertyDefinitions, readOnlyListPropDef, orderIndex++);
PropertyGroupDefinition propertyGroupDefinition = new PropertyGroupDefinition("myGroup");
propertyGroupDefinition.setDisplayName(propertyGroupDefinition.getName());
@@ -160,14 +162,14 @@ public abstract class TestConfigurationFactory {
PropertySimpleType.STRING);
myString.setDisplayName(myString.getName());
myString.setSummary(true);
- propertyDefinitions.put(myString.getName(), myString);
+ addPropertyDefinition(propertyDefinitions, myString, orderIndex++);
myString.setPropertyGroupDefinition(propertyGroupDefinition);
PropertyDefinitionSimple myString2 = new PropertyDefinitionSimple("myString2", "my other little string", true,
PropertySimpleType.STRING);
myString2.setDisplayName(myString2.getName());
myString2.setSummary(true);
- propertyDefinitions.put(myString2.getName(), myString2);
+ addPropertyDefinition(propertyDefinitions, myString2, orderIndex++);
myString2.setPropertyGroupDefinition(propertyGroupDefinition);
PropertyGroupDefinition propertyGroupDefinition2 = new PropertyGroupDefinition("myGroup2");
@@ -178,7 +180,7 @@ public abstract class TestConfigurationFactory {
PropertySimpleType.STRING);
myString3.setDisplayName((myString3.getName()));
myString3.setSummary(true);
- propertyDefinitions.put(myString3.getName(), myString3);
+ addPropertyDefinition(propertyDefinitions, myString3, orderIndex++);
myString3.setPropertyGroupDefinition(propertyGroupDefinition2);
PropertyDefinitionSimple enumExample = new PropertyDefinitionSimple("myEnum",
@@ -189,16 +191,22 @@ public abstract class TestConfigurationFactory {
myEnums.add(new PropertyDefinitionEnumeration("Camden", "Camden", true));
myEnums.add(new PropertyDefinitionEnumeration("Gloucester", "Gloucester"));
enumExample.setEnumeratedValues(myEnums, false);
- propertyDefinitions.put(enumExample.getName(), enumExample);
+ addPropertyDefinition(propertyDefinitions, enumExample, orderIndex++);
enumExample.setPropertyGroupDefinition(propertyGroupDefinition2);
return configurationDefinition;
}
+ private static void addPropertyDefinition(Map<String, PropertyDefinition> propertyDefinitions,
+ PropertyDefinition propDef, int orderIndex) {
+ propDef.setOrder(orderIndex);
+ propertyDefinitions.put(propDef.getName(), propDef);
+ }
+
public static Configuration createConfiguration() {
Configuration configuration = new Configuration();
configuration.setNotes("a test config");
- configuration.setVersion(1);
+ configuration.setVersion(1);
configuration.put(new PropertySimple("String1", "blah"));
configuration.put(new PropertySimple("String2",
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java | 392 +++++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java | 13
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java | 16
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java | 37
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java | 6
6 files changed, 360 insertions(+), 115 deletions(-)
New commits:
commit 3fce691f6843509313f3dcb36da95a6c55c105b6
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Tue Oct 5 18:58:06 2010 -0400
add support for lists-of-simples to config editor and make other miscellaneous fixes and improvements to config editor
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index fc63830..ded34ef 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -25,6 +25,7 @@ import java.util.Comparator;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -36,6 +37,7 @@ import com.smartgwt.client.data.Record;
import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Autofit;
import com.smartgwt.client.types.ListGridFieldType;
+import com.smartgwt.client.types.MultipleAppearance;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.TreeModelType;
import com.smartgwt.client.types.VisibilityMode;
@@ -140,7 +142,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTreeGrid;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
- * A SmartGWT widget for editing an RHQ {@link Configuration}, which conforms to a {@link ConfigurationDefinition}.
+ * A SmartGWT widget for editing an RHQ {@link Configuration} that conforms to a {@link ConfigurationDefinition}.
*
* @author Greg Hinkle
* @author Ian Springer
@@ -253,7 +255,7 @@ public class ConfigurationEditor extends LocatableVLayout {
public void onSuccess(Configuration result) {
configuration = result;
- com.allen_sauer.gwt.log.client.Log.info("Config retreived in: " + (System.currentTimeMillis() - start));
+ Log.info("Config retreived in: " + (System.currentTimeMillis() - start));
reload();
}
});
@@ -288,7 +290,7 @@ public class ConfigurationEditor extends LocatableVLayout {
EnumSet.of(ResourceTypeRepository.MetadataType.pluginConfigurationDefinition),
new ResourceTypeRepository.TypesLoadedCallback() {
public void onTypesLoaded(Map<Integer, ResourceType> types) {
- com.allen_sauer.gwt.log.client.Log.debug("ConfigDef retreived in: " + (System.currentTimeMillis() - start));
+ Log.debug("ConfigDef retreived in: " + (System.currentTimeMillis() - start));
configurationDefinition = types.get(resourceTypeId).getPluginConfigurationDefinition();
if (configurationDefinition == null) {
showError("Connection settings are not supported by this Resource.");
@@ -487,14 +489,14 @@ public class ConfigurationEditor extends LocatableVLayout {
List<PropertyDefinition> propertyDefinitions = new ArrayList<PropertyDefinition>(((group == null) ? configurationDefinition
.getNonGroupedProperties() : configurationDefinition.getPropertiesInGroup(group.getName())));
- DynamicForm form = buildPropertiesForm(locatorId + "_Props", propertyDefinitions, configuration);
+ DynamicForm form = buildPropertiesForm(locatorId + "_Props", propertyDefinitions, configuration, true);
section.addItem(form);
return section;
}
private DynamicForm buildPropertiesForm(String locatorId, Collection<PropertyDefinition> propertyDefinitions,
- AbstractPropertyMap propertyMap) {
+ AbstractPropertyMap propertyMap, boolean firePropertyChangedEvents) {
List<PropertyDefinition> propertyDefinitionsList;
if (!(propertyDefinitions instanceof List)) {
propertyDefinitionsList = new ArrayList<PropertyDefinition>(propertyDefinitions);
@@ -522,14 +524,15 @@ public class ConfigurationEditor extends LocatableVLayout {
form.setColWidths(190, 28, 210);
List<FormItem> fields = new ArrayList<FormItem>();
- addItemsForPropertiesRecursively(locatorId, propertyDefinitionsList, propertyMap, fields);
+ addItemsForPropertiesRecursively(locatorId, propertyDefinitionsList, propertyMap, fields, firePropertyChangedEvents);
form.setFields(fields.toArray(new FormItem[fields.size()]));
return form;
}
private void addItemsForPropertiesRecursively(String locatorId, Collection<PropertyDefinition> propertyDefinitions,
- AbstractPropertyMap propertyMap, List<FormItem> fields) {
+ AbstractPropertyMap propertyMap, List<FormItem> fields,
+ boolean firePropertyChangedEvents) {
boolean odd = true;
for (PropertyDefinition propertyDefinition : propertyDefinitions) {
Property property = propertyMap.get(propertyDefinition.getName());
@@ -540,7 +543,7 @@ public class ConfigurationEditor extends LocatableVLayout {
}
}
addItemsForPropertyRecursively(locatorId + "_" + propertyDefinition.getName(), propertyDefinition, property,
- odd, fields);
+ odd, fields, firePropertyChangedEvents);
odd = !odd;
}
}
@@ -548,7 +551,7 @@ public class ConfigurationEditor extends LocatableVLayout {
public void addItemsForPropertyRecursively(String locatorId, PropertyDefinition propertyDefinition,
Property property,
boolean oddRow,
- List<FormItem> fields) {
+ List<FormItem> fields, final boolean firePropertyChangedEvents) {
List<FormItem> fieldsForThisProperty = new ArrayList<FormItem>();
StaticTextItem nameItem = new StaticTextItem();
@@ -562,12 +565,24 @@ public class ConfigurationEditor extends LocatableVLayout {
fieldsForThisProperty.add(nameItem);
fields.add(nameItem);
- FormItem valueItem;
+ final FormItem valueItem;
if (propertyDefinition instanceof PropertyDefinitionSimple) {
- PropertyDefinitionSimple propertyDefinitionSimple = (PropertyDefinitionSimple)propertyDefinition;
- PropertySimple propertySimple = (PropertySimple)property;
+ final PropertyDefinitionSimple propertyDefinitionSimple = (PropertyDefinitionSimple)propertyDefinition;
+ final PropertySimple propertySimple = (PropertySimple)property;
valueItem = buildSimpleField(propertyDefinitionSimple, propertySimple);
+ valueItem.addChangedHandler(new ChangedHandler() {
+ public void onChanged(ChangedEvent changedEvent) {
+ propertySimple.setErrorMessage(null);
+ boolean isValid = changedEvent.getItem().validate();
+ if (isValid) {
+ propertySimple.setValue(changedEvent.getValue());
+ }
+ if (firePropertyChangedEvents) {
+ firePropertyChangedEvent(propertySimple, propertyDefinitionSimple, isValid);
+ }
+ }
+ });
FormItem unsetItem = buildUnsetItem(propertyDefinitionSimple, propertySimple, valueItem);
fieldsForThisProperty.add(unsetItem);
@@ -583,15 +598,44 @@ public class ConfigurationEditor extends LocatableVLayout {
fieldsForThisProperty.add(descriptionItem);
fields.add(descriptionItem);
} else if (propertyDefinition instanceof PropertyDefinitionList) {
- if (((PropertyDefinitionList) propertyDefinition).getMemberDefinition() instanceof PropertyDefinitionMap) {
+ PropertyDefinitionList propertyDefinitionList = (PropertyDefinitionList)propertyDefinition;
+ PropertyDefinition memberDefinition = propertyDefinitionList.getMemberDefinition();
+ PropertyList propertyList = (PropertyList)property;
+ if (memberDefinition instanceof PropertyDefinitionMap) {
// List of Maps is a specially supported case with summary fields as columns in a table
// Note: This field spans 3 columns.
+ PropertyDefinitionMap memberDefinitionMap = (PropertyDefinitionMap)memberDefinition;
CanvasItem listOfMapsItem = buildListOfMapsField(locatorId,
- (PropertyDefinitionMap)((PropertyDefinitionList)propertyDefinition).getMemberDefinition(),
- oddRow, (PropertyList)property);
+ memberDefinitionMap,
+ propertyList, oddRow);
+ fieldsForThisProperty.add(listOfMapsItem);
fields.add(listOfMapsItem);
+ } else if (memberDefinition instanceof PropertyDefinitionSimple) {
+ SpacerItem unsetItem = new SpacerItem();
+ fieldsForThisProperty.add(unsetItem);
+ fields.add(unsetItem);
+
+ CanvasItem listOfSimplesItem = buildListOfSimplesField(locatorId, propertyDefinitionList, propertyList,
+ oddRow);
+ fieldsForThisProperty.add(listOfSimplesItem);
+ fields.add(listOfSimplesItem);
+
+ StaticTextItem descriptionItem = new StaticTextItem();
+ descriptionItem.setValue(propertyDefinition.getDescription());
+ descriptionItem.setShowTitle(false);
+ descriptionItem.setEndRow(true);
+ fieldsForThisProperty.add(descriptionItem);
+ fields.add(descriptionItem);
+ } else {
+ Log.error("List " + propertyList + " has unsupported member type: " + memberDefinition);
+ Canvas canvas = new Canvas();
+ // TODO: Add label with error message to canvas.
+ CanvasItem canvasItem = buildComplexPropertyField(canvas);
+ canvasItem.setColSpan(3);
+ canvasItem.setEndRow(true);
+ fieldsForThisProperty.add(canvasItem);
+ fields.add(canvasItem);
}
- // TODO (ips): Add support for lists of simples.
} else if (propertyDefinition instanceof PropertyDefinitionMap) {
// Note: This field spans 3 columns.
FormItem mapField =
@@ -605,6 +649,27 @@ public class ConfigurationEditor extends LocatableVLayout {
}
}
+ private void firePropertyChangedEvent(Property property,
+ PropertyDefinition propertyDefinition,
+ boolean isValid) {
+ boolean wasValidBefore = this.invalidPropertyNames.isEmpty();
+ Property topLevelProperty = getTopLevelProperty(property);
+ validate();
+ if (isValid) {
+ this.invalidPropertyNames.remove(topLevelProperty.getName());
+ } else {
+ this.invalidPropertyNames.add(topLevelProperty.getName());
+ }
+ boolean isValidNow = this.invalidPropertyNames.isEmpty();
+
+ boolean validationStateChanged = (isValidNow != wasValidBefore);
+ for (PropertyValueChangeListener propertyValueChangeListener : this.propertyValueChangeListeners) {
+ PropertyValueChangeEvent event = new PropertyValueChangeEvent(property, propertyDefinition,
+ validationStateChanged, this.invalidPropertyNames);
+ propertyValueChangeListener.propertyValueChanged(event);
+ }
+ }
+
public Set<String> getInvalidPropertyNames() {
return this.invalidPropertyNames;
}
@@ -620,6 +685,8 @@ public class ConfigurationEditor extends LocatableVLayout {
canvas = buildStaticMapField(locatorId, propertyDefinitionMap, propertyMap);
}
CanvasItem canvasItem = buildComplexPropertyField(canvas);
+ canvasItem.setColSpan(3);
+ canvasItem.setEndRow(true);
return canvasItem;
}
@@ -627,8 +694,6 @@ public class ConfigurationEditor extends LocatableVLayout {
private CanvasItem buildComplexPropertyField(Canvas canvas) {
CanvasItem canvasItem = new CanvasItem();
canvasItem.setCanvas(canvas);
- canvasItem.setColSpan(3);
- canvasItem.setEndRow(true);
canvasItem.setShowTitle(false);
return canvasItem;
}
@@ -672,15 +737,14 @@ public class ConfigurationEditor extends LocatableVLayout {
VLayout canvas = new VLayout();
canvas.addMember(propertyGrid);
- // Footer
- ToolStrip footer = new ToolStrip();
- footer.setPadding(5);
- footer.setWidth100();
- footer.setMembersMargin(15);
- canvas.addMember(footer);
+ if (!isReadOnly(propertyDefinitionMap)) {
+ // Map is not read-only - add footer with New and Delete buttons to allow user to add or remove members.
+ ToolStrip footer = new ToolStrip();
+ footer.setPadding(5);
+ footer.setWidth100();
+ footer.setMembersMargin(15);
+ canvas.addMember(footer);
- // Properties can only be added to or deleted from non-read-only dynamic maps.
- if (!propertyDefinitionMap.isReadOnly()) {
final IButton deleteButton = new LocatableIButton(extendLocatorId(propertyMap.getName()), "Delete");
deleteButton.setDisabled(true);
deleteButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
@@ -765,13 +829,14 @@ public class ConfigurationEditor extends LocatableVLayout {
PropertyMap propertyMap) {
Log.debug("Building static map field for " + propertyMap + "...");
- return buildPropertiesForm(parentLocatorId, propertyDefinitionMap.getPropertyDefinitions().values(), propertyMap);
-
+ return buildPropertiesForm(parentLocatorId, propertyDefinitionMap.getPropertyDefinitions().values(),
+ propertyMap, true);
}
private CanvasItem buildListOfMapsField(final String locatorId,
- final PropertyDefinitionMap memberPropertyDefinitionMap, boolean oddRow,
- final PropertyList propertyList) {
+ final PropertyDefinitionMap memberPropertyDefinitionMap,
+ final PropertyList propertyList, boolean oddRow
+ ) {
Log.debug("Building list-of-maps field for " + propertyList + "...");
final ListGrid summaryTable = new ListGrid();
@@ -845,7 +910,7 @@ public class ConfigurationEditor extends LocatableVLayout {
Log.info("You want to edit: " + recordClickEvent.getRecord());
PropertyMap memberPropertyMap = (PropertyMap)recordClickEvent.getRecord().getAttributeAsObject(
RHQ_PROPERTY_ATTRIBUTE_NAME);
- displayMapEditor(locatorId + "_MapEdit", summaryTable, recordClickEvent.getRecord(),
+ displayMapEditor(extendLocatorId("MapEdit"), summaryTable, recordClickEvent.getRecord(),
memberPropertyDefinitionMap, propertyList, memberPropertyMap);
}
});
@@ -894,7 +959,7 @@ public class ConfigurationEditor extends LocatableVLayout {
addRowButton.setIcon(Window.getImgURL("[SKIN]/actions/add.png"));
addRowButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- displayMapEditor(locatorId + "_MapEdit", summaryTable, null, memberPropertyDefinitionMap, propertyList, null);
+ displayMapEditor(extendLocatorId("MapEdit"), summaryTable, null, memberPropertyDefinitionMap, propertyList, null);
}
});
@@ -902,9 +967,11 @@ public class ConfigurationEditor extends LocatableVLayout {
summaryTableHolder.setMembers(summaryTable, toolStrip);
- CanvasItem item = buildComplexPropertyField(summaryTableHolder);
+ CanvasItem canvasItem = buildComplexPropertyField(summaryTableHolder);
+ canvasItem.setColSpan(3);
+ canvasItem.setEndRow(true);
- return item;
+ return canvasItem;
}
private ListGridRecord[] buildSummaryRecords(PropertyList propertyList, List<PropertyDefinition> definitions) {
@@ -947,25 +1014,206 @@ public class ConfigurationEditor extends LocatableVLayout {
record.setAttribute(subDefSimple.getName(), propertySimple.getStringValue());
break;
}*/
- } else {
-
}
}
record.setAttribute(RHQ_PROPERTY_ATTRIBUTE_NAME, memberPropertyMap);
return record;
}
- private FormItem buildSimpleField(final PropertyDefinitionSimple propertyDefinition,
+ private CanvasItem buildListOfSimplesField(String locatorId, final PropertyDefinitionList propertyDefinitionList,
+ final PropertyList propertyList, boolean oddRow) {
+ Log.debug("Building list-of-simples field for " + propertyList + "...");
+
+ LocatableVLayout vLayout = new LocatableVLayout(locatorId);
+
+ final DynamicForm listGrid = new DynamicForm();
+ vLayout.addMember(listGrid);
+
+ final SelectItem membersItem = new SelectItem(propertyList.getName());
+ membersItem.setShowTitle(false);
+ membersItem.setMultiple(true);
+ membersItem.setMultipleAppearance(MultipleAppearance.GRID);
+ membersItem.setWidth(220);
+ membersItem.setHeight(60);
+ LinkedHashMap<String, String> memberValueToIndexMap = buildValueMap(propertyList);
+ membersItem.setValueMap(memberValueToIndexMap);
+ listGrid.setItems(membersItem);
+
+ if (!isReadOnly(propertyDefinitionList)) {
+ // List is not read-only - add footer with New and Delete buttons to allow user to add or remove members.
+ ToolStrip footer = new ToolStrip();
+ footer.setPadding(5);
+ footer.setWidth100();
+ footer.setMembersMargin(15);
+ vLayout.addMember(footer);
+
+ final IButton deleteButton = new LocatableIButton(extendLocatorId("Delete"));
+ deleteButton.setIcon(Window.getImgURL("[SKIN]/actions/remove.png"));
+ deleteButton.setTooltip("Delete the selected items from the list.");
+ deleteButton.setDisabled(true);
+ deleteButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ final String[] selectedValues = membersItem.getValues();
+ final String noun = (selectedValues.length == 1) ? "item" : "items";
+ String message = "Are you sure you want to delete the " + selectedValues.length + " selected "
+ + noun + "?";
+ SC.ask(message, new BooleanCallback() {
+ public void execute(Boolean confirmed) {
+ if (confirmed) {
+ for (int i = selectedValues.length - 1; i >= 0; i--) {
+ String selectedValue = selectedValues[i];
+ int index = Integer.valueOf(selectedValue);
+ propertyList.getList().remove(index);
+
+ // Rebuild the select item options.
+ LinkedHashMap<String, String> memberValueToIndexMap = buildValueMap(propertyList);
+ membersItem.setValueMap(memberValueToIndexMap);
+
+ deleteButton.disable();
+
+ firePropertyChangedEvent(propertyList, propertyDefinitionList, true);
+ CoreGUI.getMessageCenter().notify(new Message(selectedValues.length + " " + noun
+ + " deleted from list.",
+ EnumSet.of(
+ Message.Option.Transient)));
+ }
+ }
+ }
+ });
+ }
+ });
+ footer.addMember(deleteButton);
+
+ membersItem.addChangedHandler(new ChangedHandler() {
+ @Override
+ public void onChanged(ChangedEvent changedEvent) {
+ String[] selectedValues = membersItem.getValues();
+ int count = selectedValues.length;
+ deleteButton.setDisabled(count < 1);
+ }
+ });
+
+ final IButton newButton = new LocatableIButton(extendLocatorId("New"));
+ newButton.setIcon(Window.getImgURL("[SKIN]/actions/add.png"));
+ newButton.setTooltip("Add an item to the list.");
+ newButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ final Window popup = new Window();
+ popup.setTitle("Add Item to List");
+ popup.setWidth(300);
+ popup.setHeight(110);
+ popup.setIsModal(true);
+ popup.setShowModalMask(true);
+ popup.setShowCloseButton(false);
+ popup.centerInPage();
+
+ VLayout vLayout = new VLayout();
+ vLayout.setMargin(10);
+
+ final DynamicForm form = new DynamicForm();
+
+ PropertyDefinitionSimple memberPropertyDefinitionSimple =
+ (PropertyDefinitionSimple)propertyDefinitionList.getMemberDefinition();
+ final String propertyName = memberPropertyDefinitionSimple.getName();
+ final PropertySimple newMemberPropertySimple = new PropertySimple(propertyName, null);
+
+ FormItem simpleField =
+ buildSimpleField(memberPropertyDefinitionSimple, newMemberPropertySimple);
+ simpleField.setAlign(Alignment.CENTER);
+ simpleField.setDisabled(false);
+ simpleField.setRequired(true);
+ simpleField.setEndRow(true);
+
+ SpacerItem spacer = new SpacerItem();
+ spacer.setHeight(9);
+
+ form.setItems(simpleField, spacer);
+ vLayout.addMember(form);
+
+ final IButton okButton = new IButton("OK");
+ okButton.disable();
+ // saveButton.setID("config_structured_button_save");
+ okButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ propertyList.add(newMemberPropertySimple);
+
+ // Rebuild the select item options.
+ LinkedHashMap<String, String> memberValueToIndexMap = buildValueMap(propertyList);
+ membersItem.setValueMap(memberValueToIndexMap);
+
+ firePropertyChangedEvent(propertyList, propertyDefinitionList, true);
+ CoreGUI.getMessageCenter().notify(new Message("Item added to list.", EnumSet.of(
+ Message.Option.Transient)));
+
+ popup.destroy();
+ }
+ });
+
+ form.addItemChangedHandler(new ItemChangedHandler() {
+ public void onItemChanged(ItemChangedEvent itemChangedEvent) {
+ newMemberPropertySimple.setStringValue((String)itemChangedEvent.getNewValue());
+
+ // Only enable the OK button, allowing the user to add the property to the map, if the
+ // property is valid.
+ boolean isValid = form.validate();
+ okButton.setDisabled(!isValid);
+ }
+ });
+
+ final IButton cancelButton = new IButton("Cancel");
+ cancelButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
+ public void onClick(ClickEvent clickEvent) {
+ popup.destroy();
+ }
+ });
+
+ HLayout buttons = new HLayout();
+ buttons.setAlign(Alignment.CENTER);
+ buttons.setTop(10);
+ buttons.setMembersMargin(10);
+ buttons.setMembers(okButton, cancelButton);
+ vLayout.addMember(buttons);
+
+ popup.addItem(vLayout);
+ popup.show();
+
+ simpleField.focusInItem();
+ }
+ });
+ footer.addMember(newButton);
+ }
+
+ return buildComplexPropertyField(vLayout);
+ }
+
+ private LinkedHashMap<String, String> buildValueMap(PropertyList propertyList) {
+ LinkedHashMap<String, String> memberValueToIndexMap = new LinkedHashMap<String, String>();
+ List<Property> memberProperties = propertyList.getList();
+ int index = 0;
+ for (Iterator<Property> iterator = memberProperties.iterator(); iterator.hasNext();) {
+ Property memberProperty = iterator.next();
+ PropertySimple memberPropertySimple = (PropertySimple)memberProperty;
+ String memberValue = memberPropertySimple.getStringValue();
+ if (memberValue == null) {
+ Log.error("List " + propertyList + " contains property with null value - removing and skipping...");
+ iterator.remove();
+ continue;
+ }
+ memberValueToIndexMap.put(String.valueOf(index++), memberValue);
+ }
+ return memberValueToIndexMap;
+ }
+
+ private FormItem buildSimpleField(final PropertyDefinitionSimple propertyDefinitionSimple,
final PropertySimple propertySimple) {
Log.debug("Building simple field for " + propertySimple + "...");
FormItem valueItem = null;
- List<PropertyDefinitionEnumeration> enumeratedValues = propertyDefinition.getEnumeratedValues();
+ List<PropertyDefinitionEnumeration> enumeratedValues = propertyDefinitionSimple.getEnumeratedValues();
if (enumeratedValues != null && !enumeratedValues.isEmpty()) {
-
LinkedHashMap<String, String> valueOptions = new LinkedHashMap<String, String>();
- for (PropertyDefinitionEnumeration option : propertyDefinition.getEnumeratedValues()) {
+ for (PropertyDefinitionEnumeration option : propertyDefinitionSimple.getEnumeratedValues()) {
valueOptions.put(option.getValue(), option.getName());
}
@@ -979,7 +1227,7 @@ public class ConfigurationEditor extends LocatableVLayout {
valueItem.setValue(propertySimple.getStringValue());
}
} else {
- switch (propertyDefinition.getType()) {
+ switch (propertyDefinitionSimple.getType()) {
case STRING:
case FILE:
@@ -1019,12 +1267,12 @@ public class ConfigurationEditor extends LocatableVLayout {
}
}
- valueItem.setRequired(propertyDefinition.isRequired());
+ valueItem.setRequired(propertyDefinitionSimple.isRequired());
- List<Validator> validators = buildValidators(propertyDefinition, propertySimple);
+ List<Validator> validators = buildValidators(propertyDefinitionSimple, propertySimple);
valueItem.setValidators(validators.toArray(new Validator[validators.size()]));
- valueItem.setDisabled(isReadOnly(propertyDefinition) || isUnset(propertyDefinition, propertySimple));
+ valueItem.setDisabled(isReadOnly(propertyDefinitionSimple) || isUnset(propertyDefinitionSimple, propertySimple));
/*
Click handlers seem to be turned off for disabled fields... need an alternative
valueItem.addClickHandler(new com.smartgwt.client.widgets.form.fields.events.ClickHandler() {
@@ -1040,36 +1288,11 @@ public class ConfigurationEditor extends LocatableVLayout {
valueItem.setShowTitle(false);
valueItem.setWidth(220);
- final FormItem finalValueItem = valueItem;
-
- finalValueItem.addChangedHandler(new ChangedHandler() {
- public void onChanged(ChangedEvent changedEvent) {
- propertySimple.setErrorMessage(null);
-
- boolean wasValidBefore = ConfigurationEditor.this.invalidPropertyNames.isEmpty();
- Property topLevelProperty = getTopLevelProperty(propertySimple);
- if (changedEvent.getItem().validate()) {
- ConfigurationEditor.this.invalidPropertyNames.remove(topLevelProperty.getName());
- propertySimple.setValue(changedEvent.getValue());
- } else {
- ConfigurationEditor.this.invalidPropertyNames.add(topLevelProperty.getName());
- }
- boolean isValidNow = ConfigurationEditor.this.invalidPropertyNames.isEmpty();
-
- boolean validationStateChanged = (isValidNow != wasValidBefore);
- for (PropertyValueChangeListener propertyValueChangeListener : ConfigurationEditor.this.propertyValueChangeListeners) {
- PropertyValueChangeEvent event = new PropertyValueChangeEvent(propertySimple, propertyDefinition,
- validationStateChanged, ConfigurationEditor.this.invalidPropertyNames);
- propertyValueChangeListener.propertyValueChanged(event);
- }
- }
- });
-
return valueItem;
}
- private static Property getTopLevelProperty(PropertySimple propertySimple) {
- Property currentProperty = propertySimple;
+ private static Property getTopLevelProperty(Property property) {
+ Property currentProperty = property;
while (currentProperty.getConfiguration() == null) {
if (currentProperty.getParentList() != null) {
currentProperty = currentProperty.getParentList();
@@ -1167,24 +1390,20 @@ public class ConfigurationEditor extends LocatableVLayout {
}
private void displayMapEditor(String locatorId, final ListGrid summaryTable, final Record existingRecord,
- PropertyDefinitionMap definition, final PropertyList list, PropertyMap map) {
+ PropertyDefinitionMap definition, final PropertyList list, final PropertyMap map) {
final List<PropertyDefinition> memberDefinitions = new ArrayList<PropertyDefinition>(definition
.getPropertyDefinitions().values());
Collections.sort(memberDefinitions, new PropertyDefinitionComparator());
- final boolean newRow = map == null;
- if (newRow) {
- map = new PropertyMap(definition.getName());
- }
-
- final PropertyMap finalMap = map;
- final PropertyMap copy = finalMap.deepCopy(true);
+ final boolean newRow = (map == null);
+ final PropertyMap workingMap = newRow ? new PropertyMap(definition.getName()) : map.deepCopy(true);
LocatableVLayout layout = new LocatableVLayout(locatorId);
layout.setHeight100();
- final DynamicForm childForm = buildPropertiesForm(locatorId + "_Child", memberDefinitions, finalMap);
+ final DynamicForm childForm = buildPropertiesForm(extendLocatorId("Editor"), memberDefinitions, workingMap,
+ false);
childForm.setHeight100();
layout.addMember(childForm);
@@ -1203,22 +1422,26 @@ public class ConfigurationEditor extends LocatableVLayout {
okButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(ClickEvent clickEvent) {
if (newRow) {
- list.add(finalMap);
- ListGridRecord record = buildSummaryRecord(memberDefinitions, finalMap);
+ list.add(workingMap);
+ ListGridRecord record = buildSummaryRecord(memberDefinitions, workingMap);
try {
summaryTable.addData(record);
} catch (Exception e) {
e.printStackTrace();
}
} else {
+ // TODO: Pass in the map's index, rather than using indexOf(), which is not 100% reliable,
+ // since a list could contain two or more identical maps.
+ //list.getList().set(list.getList().indexOf(map), workingMap);
for (PropertyDefinition subDef : memberDefinitions) {
PropertyDefinitionSimple subDefSimple = (PropertyDefinitionSimple) subDef;
- PropertySimple propertySimple = ((PropertySimple) finalMap.get(subDefSimple.getName()));
+ PropertySimple propertySimple = ((PropertySimple) workingMap.get(subDefSimple.getName()));
existingRecord.setAttribute(subDefSimple.getName(), propertySimple != null ? propertySimple
.getStringValue() : null);
}
summaryTable.updateData(existingRecord);
}
+ firePropertyChangedEvent(list, null, true);
summaryTable.redraw();
// ListGridRecord[] rows = buildSummaryRecords(list, definitions);
@@ -1239,9 +1462,6 @@ public class ConfigurationEditor extends LocatableVLayout {
final IButton cancelButton = new IButton("Cancel");
cancelButton.addClickHandler(new com.smartgwt.client.widgets.events.ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- if (!newRow) {
- list.getList().set(list.getList().indexOf(finalMap), copy);
- }
popup.destroy();
}
});
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
index 3f9f225..d616f81 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration;
import java.util.EnumSet;
+import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
@@ -130,13 +131,15 @@ public class ResourceConfigurationEditView extends LocatableVLayout implements P
MessageCenter messageCenter = CoreGUI.getMessageCenter();
Message message;
if (event.isValidationStateChanged()) {
- if (event.getInvalidPropertyNames().isEmpty()) {
- this.saveButton.enable();
- message = new Message("All configuration properties now have valid values, so the configuration can now be saved.",
- Message.Severity.Info, EnumSet.of(Message.Option.Transient));
+ Set<String> invalidPropertyNames = event.getInvalidPropertyNames();
+ if (invalidPropertyNames.isEmpty()) {
+ this.saveButton.enable();
+ message = new Message("All configuration properties have valid values, so the configuration can now be saved.",
+ Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
} else {
this.saveButton.disable();
- message = new Message("One or more configuration properties have invalid values. The values must be corrected before the configuration can be saved.",
+ message = new Message("The following configuration properties have invalid values: "
+ + invalidPropertyNames + ". The values must be corrected before the configuration can be saved.",
Message.Severity.Error, EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
}
messageCenter.notify(message);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
index 1f1cc52..703f9d4 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory;
import java.util.EnumSet;
+import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
@@ -129,13 +130,15 @@ public class PluginConfigurationEditView extends LocatableVLayout implements Pro
MessageCenter messageCenter = CoreGUI.getMessageCenter();
Message message;
if (event.isValidationStateChanged()) {
- if (event.getInvalidPropertyNames().isEmpty()) {
+ Set<String> invalidPropertyNames = event.getInvalidPropertyNames();
+ if (invalidPropertyNames.isEmpty()) {
this.saveButton.enable();
- message = new Message("All connection settings now have valid values, so the settings can now be saved.",
- Message.Severity.Info, EnumSet.of(Message.Option.Transient));
+ message = new Message("All connection settings have valid values, so the settings can now be saved.",
+ Message.Severity.Info, EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
} else {
this.saveButton.disable();
- message = new Message("One or more connection settings have invalid values. The values must be corrected before the settings can be saved.",
+ message = new Message("The following connection settings have invalid values: " + invalidPropertyNames
+ + ". The values must be corrected before the settings can be saved.",
Message.Severity.Error, EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
}
messageCenter.notify(message);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java
index cc71a2c..0ad4e0a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestConfigurationFactory.java
@@ -121,9 +121,9 @@ public abstract class TestConfigurationFactory {
readOnlyOpenMapPropDef.setReadOnly(true);
propertyDefinitions.put(readOnlyOpenMapPropDef.getName(), readOnlyOpenMapPropDef);
- PropertyDefinitionList listOfSimplesPropDef = new PropertyDefinitionList("ListOfStrings",
- "another list of Strings", true, new PropertyDefinitionSimple("note", "a note", false,
- PropertySimpleType.STRING));
+ PropertyDefinitionList listOfSimplesPropDef = new PropertyDefinitionList("ListOfSimples",
+ "a list of Integer simples", true, new PropertyDefinitionSimple("integer", "an integer", false,
+ PropertySimpleType.INTEGER));
listOfSimplesPropDef.setDisplayName(listOfSimplesPropDef.getName());
propertyDefinitions.put(listOfSimplesPropDef.getName(), listOfSimplesPropDef);
@@ -230,15 +230,15 @@ public abstract class TestConfigurationFactory {
openPropMap2.put(new PropertySimple("ANT_OPTS", "-Xms128M -Xmx256M"));
configuration.put(openPropMap2);
- configuration.put(new PropertyList("ListOfStrings", new PropertySimple("note", "Do"), new PropertySimple(
- "note", "Re"), new PropertySimple("note", "Mi"), new PropertySimple("note", "Fa"), new PropertySimple(
- "note", "So"), new PropertySimple("note", "La"), new PropertySimple("note", "Ti")));
+ configuration.put(new PropertyList("ListOfSimples", new PropertySimple("integer", "18"), new PropertySimple(
+ "integer", "127"), new PropertySimple("integer", "311"), new PropertySimple("integer", "2"), new PropertySimple(
+ "integer", "301"), new PropertySimple("integer", "79"), new PropertySimple("integer", "62")));
- PropertyMap propMap2 = new PropertyMap("MapOfSimples");
+ PropertyMap propMap2 = new PropertyMap("MapOfSimplesInList");
propMap2.put(new PropertySimple("String1", "Uno"));
propMap2.put(new PropertySimple("String2", "Dos"));
propMap2.put(new PropertySimple("Integer", Integer.MIN_VALUE));
- PropertyMap propMap3 = new PropertyMap("MapOfSimples");
+ PropertyMap propMap3 = new PropertyMap("MapOfSimplesInList");
propMap3.put(new PropertySimple("String1", "Un"));
propMap3.put(new PropertySimple("String2", "Deux"));
propMap3.put(new PropertySimple("Integer", Integer.MAX_VALUE));
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
index 6b356ae..04fceff 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/message/MessageBar.java
@@ -38,7 +38,7 @@ import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableHLayout;
*/
public class MessageBar extends LocatableHLayout implements MessageCenter.MessageListener {
private static final String LOCATOR_ID = "MessageBar";
- private static final int AUTO_HIDE_DELAY_MILLIS = 30000; // 30 seconds
+ private static final int AUTO_HIDE_DELAY_MILLIS = 15000; // 15 seconds
private static final Map<Message.Severity, String> SEVERITY_TO_STYLE_NAME_MAP = new HashMap<Message.Severity, String>();
static {
@@ -56,6 +56,7 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag
}
private Label label;
+ private Message stickyMessage;
public MessageBar() {
super(LOCATOR_ID);
@@ -79,19 +80,20 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag
public void onMessage(Message message) {
if (!message.isBackgroundJobResult()) {
// First clear any previous message.
- clearMessage();
+ clearMessage(message.isSticky());
+ displayMessage(message);
- this.label = createLabel(message);
-
- addMember(this.label);
- markForRedraw();
-
- // Auto-clear the message after 30 seconds unless it's been designated as sticky.
- if (!message.isSticky()) {
+ // Auto-clear the message after 15 seconds unless it's been designated as sticky.
+ if (message.isSticky()) {
+ this.stickyMessage = message;
+ } else {
Timer hideTimer = new Timer() {
@Override
- public void run() {
- clearMessage();
+ public void run() {
+ clearMessage(false);
+ if (stickyMessage != null) {
+ displayMessage(stickyMessage);
+ }
}
};
hideTimer.schedule(AUTO_HIDE_DELAY_MILLIS);
@@ -100,11 +102,24 @@ public class MessageBar extends LocatableHLayout implements MessageCenter.Messag
}
public void clearMessage() {
+ clearMessage(true);
+ }
+
+ private void displayMessage(Message message) {
+ this.label = createLabel(message);
+ addMember(this.label);
+ markForRedraw();
+ }
+
+ private void clearMessage(boolean clearSticky) {
if (this.label != null) {
this.label.destroy();
removeMember(this.label);
markForRedraw();
}
+ if (clearSticky) {
+ this.stickyMessage = null;
+ }
}
private Label createLabel(Message message) {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java
index f265697..359abfd 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableIButton.java
@@ -9,7 +9,11 @@ import com.smartgwt.client.widgets.IButton;
*/
public class LocatableIButton extends IButton {
- /**
+ public LocatableIButton(String locatorId) {
+ this(locatorId, null);
+ }
+
+ /**
* <pre>
* ID Format: "simpleClassname_locatorId"
* </pre>
1
0
modules/enterprise/server/container/pom.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e72bec6073b058f6dc33ab5b5e9713592ed64fde
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Oct 5 23:05:46 2010 +0200
Cobertura xml report
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index 793e85b..831ec5e 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -415,7 +415,9 @@
Pattern sourceCodeFolder = Pattern.compile(".*/src/main/java")
Pattern sourceCodeFile = Pattern.compile('.*/src/main/java/(.*.java)')
-
+
+ list.add("--format")
+ list.add("xml")
list.add("--datafile")
list.add("${project.build.directory}/cobertura/cobertura.ser")
list.add("--destination")
1
0
[rhq] 3 commits - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/test-utils pom.xml
by fdrabek 05 Oct '10
by fdrabek 05 Oct '10
05 Oct '10
modules/cli-tests/pom.xml | 86 +++++++++
modules/common/ant-bundle/pom.xml | 89 ++++++++++
modules/common/filetemplate-bundle/pom.xml | 89 ++++++++++
modules/common/jboss-as/pom.xml | 95 ++++++++++-
modules/core/client-api/pom.xml | 86 +++++++++
modules/core/dbutils/pom.xml | 85 +++++++++
modules/core/domain/pom.xml | 86 +++++++++
modules/core/native-system/pom.xml | 92 ++++++++++
modules/core/plugin-api/pom.xml | 90 ++++++++++
modules/core/plugin-container/pom.xml | 89 ++++++++++
modules/core/pom.xml | 12 +
modules/core/util/pom.xml | 86 +++++++++
modules/enterprise/comm/pom.xml | 86 +++++++++
modules/enterprise/gui/installer-war/pom.xml | 86 +++++++++
modules/enterprise/gui/portal-war/pom.xml | 86 +++++++++
modules/enterprise/pom.xml | 11 +
modules/enterprise/remoting/cli/pom.xml | 88 +++++++++-
modules/enterprise/server/container/pom.xml | 112 ++++++++++++-
modules/enterprise/server/jar/pom.xml | 102 ++++++++++-
modules/enterprise/server/plugins/alert-operations/pom.xml | 87 +++++++++-
modules/enterprise/server/plugins/groovy-script/pom.xml | 86 +++++++++
modules/enterprise/server/plugins/jboss-software/pom.xml | 86 +++++++++
modules/enterprise/server/plugins/rhnhosted/pom.xml | 89 ++++++++++
modules/enterprise/server/plugins/url/pom.xml | 87 +++++++++-
modules/enterprise/server/xml-schemas/pom.xml | 87 +++++++++-
modules/helpers/pom.xml | 12 -
modules/plugins/JBossOSGi/pom.xml | 85 +++++++++
modules/plugins/aliases/pom.xml | 86 +++++++++
modules/plugins/ant-bundle/pom.xml | 85 +++++++++
modules/plugins/apache/pom.xml | 92 ++++++++++
modules/plugins/byteman/pom.xml | 86 +++++++++
modules/plugins/cobbler/pom.xml | 87 +++++++++-
modules/plugins/cron/pom.xml | 86 +++++++++
modules/plugins/database/pom.xml | 86 +++++++++
modules/plugins/filetemplate-bundle/pom.xml | 86 +++++++++
modules/plugins/grub/pom.xml | 86 +++++++++
modules/plugins/hadoop/pom.xml | 85 +++++++++
modules/plugins/hibernate/pom.xml | 86 +++++++++
modules/plugins/hosts/pom.xml | 86 +++++++++
modules/plugins/hudson/pom.xml | 2
modules/plugins/iis/pom.xml | 86 +++++++++
modules/plugins/irc/pom.xml | 85 +++++++++
modules/plugins/jboss-as-5/pom.xml | 86 +++++++++
modules/plugins/jboss-as/pom.xml | 86 +++++++++
modules/plugins/jboss-cache-v3/pom.xml | 86 +++++++++
modules/plugins/jboss-cache/pom.xml | 86 +++++++++
modules/plugins/jdbctrace/pom.xml | 86 +++++++++
modules/plugins/jira/pom.xml | 86 +++++++++
modules/plugins/jmx/pom.xml | 86 +++++++++
modules/plugins/kickstart/pom.xml | 86 +++++++++
modules/plugins/lsof/pom.xml | 86 +++++++++
modules/plugins/mysql/pom.xml | 86 +++++++++
modules/plugins/netservices/pom.xml | 86 +++++++++
modules/plugins/nss/pom.xml | 85 +++++++++
modules/plugins/onewire/pom.xml | 86 +++++++++
modules/plugins/oracle/pom.xml | 86 +++++++++
modules/plugins/perftest/pom.xml | 2
modules/plugins/platform/pom.xml | 86 +++++++++
modules/plugins/pom.xml | 6
modules/plugins/postfix/pom.xml | 86 +++++++++
modules/plugins/postgres/pom.xml | 86 +++++++++
modules/plugins/rhq-agent/pom.xml | 86 +++++++++
modules/plugins/rhq-server/pom.xml | 86 +++++++++
modules/plugins/samba/pom.xml | 86 +++++++++
modules/plugins/script/pom.xml | 86 +++++++++
modules/plugins/script2/pom.xml | 85 +++++++++
modules/plugins/services/pom.xml | 85 +++++++++
modules/plugins/snmptrapd/pom.xml | 86 +++++++++
modules/plugins/sshd/pom.xml | 86 +++++++++
modules/plugins/sudoers/pom.xml | 86 +++++++++
modules/plugins/tomcat/pom.xml | 86 +++++++++
modules/plugins/twitter/pom.xml | 86 +++++++++
modules/plugins/virt/pom.xml | 86 +++++++++
modules/test-utils/pom.xml | 6
pom.xml | 17 +
75 files changed, 5809 insertions(+), 98 deletions(-)
New commits:
commit 91afe1dcdc446bf9a1a9219f9fa4630792a3ef96
Merge: dd1eab3... 26dfcd6...
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Oct 5 18:27:41 2010 +0200
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit dd1eab3b377362ee5c3461f5b492d958ae7afe18
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Oct 5 16:52:12 2010 +0200
Cobertura settings
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 6eed8b4..37068b2 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -140,7 +140,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 0833b2a..d8fe9bc 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -31,7 +31,7 @@
<artifactId>rhq-core-domain</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-core-util</artifactId>
@@ -121,4 +121,91 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 7f7127c..b157e77 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -31,7 +31,7 @@
<artifactId>getopt</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-core-native-system</artifactId>
@@ -50,4 +50,91 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index b60da0b..a54012e 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -31,7 +31,6 @@
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
-
<dependency>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
@@ -97,5 +96,97 @@
</plugins>
</build>
-->
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <path id="cobertura.classpath">
+ <fileset dir="${user.home}/.m2/repository/net/sourceforge/cobertura/cobertura/1.9.4.1/">
+ <include name="cobertura*.jar" />
+ <include name="lib/**/*.jar" />
+ </fileset>
+ </path>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index ae391f8..4617b45 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -192,7 +192,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 4035ed5..4cf8ae1 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -458,6 +458,91 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<pluginRepositories>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 0806490..c3a2f08 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -436,7 +436,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index b3a20e2..63feda4 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -27,7 +27,7 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-util</artifactId>
@@ -46,7 +46,6 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<type>zip</type>
</dependency>
-
</dependencies>
<build>
@@ -106,7 +105,94 @@
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<repositories>
<!-- This is for SIGAR 1.6.4. -->
<repository>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index d9c8d4c..092b730 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -71,7 +71,7 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<!--<scope>test</scope> not sure about this -->
</dependency>
-
+
</dependencies>
<pluginRepositories>
@@ -97,5 +97,91 @@
</snapshots>
</repository>
</repositories>
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index 4d6e753..c3e939b 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -359,6 +359,93 @@
</repository>
</repositories>
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b895d04..5853b59 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -23,9 +23,17 @@
<properties>
<scm.module.path>modules/core/</scm.module.path>
</properties>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<profiles>
-
+
<profile>
<id>default</id>
<activation>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 458c635..5f84103 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -127,7 +127,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index dcd5bed..3ccab17 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -224,7 +224,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index b3ccdca..0ad00e4 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -302,7 +302,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index f802053..048b66a 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -587,7 +587,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 89f283c..f90816a 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -23,7 +23,16 @@
<properties>
<scm.module.path>modules/enterprise/</scm.module.path>
</properties>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index b118a9e..250ee16 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -81,7 +81,7 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -335,7 +335,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index d51c61d..793e85b 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -110,7 +110,11 @@
<type>zip</type>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
-
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.7.3</version>
+ </dependency>
</dependencies>
<build>
@@ -347,11 +351,109 @@
</executions>
</plugin>
-
- </plugins>
- </build>
+ </plugins>
+ </build>
</profile>
-
+
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-merge</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-merge datafile="${project.build.directory}/cobertura/cobertura.ser">
+ <fileset dir="../../../../">
+ <include name="**/cobertura.ser"/>
+ </fileset>
+ </cobertura-merge>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ import java.util.regex.Pattern
+ import java.util.regex.Matcher
+
+ def repClos
+ def list = new ArrayList()
+
+ Pattern sourceCodeFolder = Pattern.compile(".*/src/main/java")
+ Pattern sourceCodeFile = Pattern.compile('.*/src/main/java/(.*.java)')
+
+ list.add("--datafile")
+ list.add("${project.build.directory}/cobertura/cobertura.ser")
+ list.add("--destination")
+ list.add("${project.build.directory}/site/cobertura")
+
+ repClosFile = {
+ Matcher matcher = sourceCodeFile.matcher(it.canonicalPath)
+ if (matcher.matches()){
+ list.add(matcher[0][1])
+ }
+
+ if (it.isDirectory()){
+ it.eachFile(repClosFile)
+ }
+ }
+
+ repClosDir = {
+ Matcher matcher = sourceCodeFolder.matcher(it.canonicalPath)
+ if (matcher.matches()){
+ list.add("--basedir")
+ list.add(it.canonicalPath)
+ it.eachFile(repClosFile)
+ }
+ it.eachDir(repClosDir);
+ }
+
+ def ear = new File("${project.build.directory}/../../../../")
+ repClosDir(ear)
+
+ net.sourceforge.cobertura.reporting.Main.main((String[]) list)
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index b54dfd8..697056a 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -349,7 +349,7 @@
<version>${jboss-embeddable-ejb3.version}</version>
<scope>test</scope>
</dependency>
-
+
<!-- NOTE: The remaining test deps correspond to the classes contained in hibernate-all.jar and thirdparty-all.jar. -->
<dependency>
@@ -407,7 +407,7 @@
<version>1.3</version>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -483,10 +483,10 @@ Build-OS-Version=${os.version}
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<!-- Everything but the web service tests, this is the standard test execution -->
- <configuration>
+ <configuration>
<excludes>
<exclude>com/**/*.java</exclude>
</excludes>
@@ -496,9 +496,9 @@ Build-OS-Version=${os.version}
<deploymentDirectory>target/classes</deploymentDirectory>
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
</systemPropertyVariables>
- <additionalClasspathElements>
+ <additionalClasspathElements>
<!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -693,7 +693,93 @@ Build-OS-Version=${os.version}
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ <exclude name="**/DynamicConfigurationPropertyLocal.class" />
+ <exclude name="**/DynamicConfigurationPropertyBean.class" />
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e6019b8..5946922 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -35,7 +35,6 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
<build>
@@ -187,7 +186,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 1abb9b3..e382b3e 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -216,7 +216,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/groovy">
+ <include name="**/*.groovy" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 8d1e368..3f65589 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -147,7 +147,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 6634e78..b1b201d 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -88,7 +88,8 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
- </dependency>
+ </dependency>
+
</dependencies>
@@ -260,7 +261,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 9ada86c..9dd8df4 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -152,7 +152,92 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 5990106..8577a40 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -25,7 +25,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-domain</artifactId>
@@ -227,7 +226,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a26b7f2..b5fc339 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -24,12 +24,16 @@
<scm.module.path>modules/helpers/</scm.module.path>
</properties>
- <dependencies>
-
-
-
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
<modules>
<!-- plugins that are used by both enterprise and embedded -->
diff --git a/modules/plugins/JBossOSGi/pom.xml b/modules/plugins/JBossOSGi/pom.xml
index 38828c4..8debc52 100644
--- a/modules/plugins/JBossOSGi/pom.xml
+++ b/modules/plugins/JBossOSGi/pom.xml
@@ -165,7 +165,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -192,7 +193,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -210,7 +211,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 4a4c20c..d670a77 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -222,7 +222,7 @@
</build>
</profile>
- <profile>
+ <profile>
<id>cobertura</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -230,7 +230,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -257,14 +258,14 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
<include name="**/*.class"/>
</fileset>
</cobertura-instrument>
- </tasks>
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
@@ -275,7 +276,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
@@ -305,9 +306,6 @@
</plugin>
</plugins>
</build>
- </profile>
-
-
+ </profile>
</profiles>
-
</project>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 812bba1..96a571a 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -281,7 +281,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -308,7 +309,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -326,7 +327,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index ef266c1..96814b5 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -108,15 +108,14 @@
<profiles>
<profile>
<id>integration-tests</id>
- <!--
+
<activation>
<property>
<name>maven.test.skip</name>
<value>!true</value>
</property>
</activation>
- -->
-
+
<build>
<plugins>
<!-- Integration testing voodoo to load and test this plugin with its plugin dependencies -->
@@ -128,7 +127,7 @@
<configuration>
<tasks>
<echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo>
- <property name="settings.localRepository" location="${user.home}/.m2/repository/net/sourceforge/cobertura/cobertura/1.9.4.1/" />
+ <property name="settings.localRepository" location="${user.home}/.m2/repository/" />
<mkdir dir="target/itest" />
<mkdir dir="target/itest/plugins" />
<mkdir dir="target/itest/lib" />
@@ -287,7 +286,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -314,7 +314,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -332,7 +332,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index edae303..2888195 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -247,7 +247,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -274,7 +275,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -292,7 +293,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index d4ea9bb..f239545 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -33,6 +33,7 @@
<artifactId>rhq-augeas-plugin</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -256,7 +257,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -283,7 +285,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -301,7 +303,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 3869f7f..3ad74be 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -220,7 +220,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -247,7 +248,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -265,7 +266,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index d4b383a..6bdbfcb 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -102,7 +102,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -129,7 +130,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -147,7 +148,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index e7134fe..55b7b7d 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -255,6 +255,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -281,7 +282,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -299,7 +300,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 787131c..257f174 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -220,6 +220,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -246,7 +247,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -264,7 +265,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index fb74b41..e74609a 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -128,7 +128,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -155,7 +156,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -173,7 +174,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index f852671..e6cea36 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -247,7 +247,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -274,7 +275,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -292,7 +293,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index e7d4d5b..c1f68e8 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -230,7 +230,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -257,7 +258,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -275,7 +276,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index e2f2c75..fa03477 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -206,7 +206,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -233,7 +234,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -251,7 +252,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index d56d15a..b949586 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -140,7 +140,7 @@
</build>
</profile>
- <profile>
+ <profile>
<id>cobertura</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -148,7 +148,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -175,7 +176,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -193,7 +194,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index ef4aff1..e788ecb 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -637,7 +637,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -664,7 +665,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -682,7 +683,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 77e628e..e39c240 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -358,6 +358,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -384,7 +385,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -402,7 +403,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 1c024f7..8c64a30 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -568,7 +568,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -595,7 +596,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -613,7 +614,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index e5a2f5b..6344b88 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -222,7 +222,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -249,7 +250,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -267,7 +268,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml
index 6601d08..6b918f4 100644
--- a/modules/plugins/jdbctrace/pom.xml
+++ b/modules/plugins/jdbctrace/pom.xml
@@ -276,7 +276,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -303,7 +304,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -321,7 +322,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml
index 8551a65..ba59116 100644
--- a/modules/plugins/jira/pom.xml
+++ b/modules/plugins/jira/pom.xml
@@ -325,6 +325,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -351,7 +352,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -369,7 +370,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 0d9c538..55b5fdb 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -262,7 +262,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -289,7 +290,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -307,7 +308,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index c8a04aa..2831c16 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -116,7 +116,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -143,7 +144,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -161,7 +162,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml
index df802e2..7cf372b 100644
--- a/modules/plugins/lsof/pom.xml
+++ b/modules/plugins/lsof/pom.xml
@@ -248,6 +248,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -274,7 +275,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -292,7 +293,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index ad260d7..ba3514a 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -250,6 +250,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -276,7 +277,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -294,7 +295,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 66e1ec5..913afcb 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -256,7 +256,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -283,7 +284,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -301,7 +302,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml
index b63e10f..1cfe880 100644
--- a/modules/plugins/nss/pom.xml
+++ b/modules/plugins/nss/pom.xml
@@ -99,7 +99,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -126,7 +127,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -144,7 +145,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml
index 3fa0f08..16165d5 100644
--- a/modules/plugins/onewire/pom.xml
+++ b/modules/plugins/onewire/pom.xml
@@ -160,7 +160,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -187,7 +188,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -205,7 +206,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 6551f7f..b425488 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -255,7 +255,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -282,7 +283,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -300,7 +301,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 5e5c810..c688558 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -205,7 +205,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -232,7 +233,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -250,7 +251,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 059f197..837e1e4 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -228,7 +228,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -255,7 +256,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -273,7 +274,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index b227b4a..145ae59 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -248,7 +248,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -275,7 +276,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -293,7 +294,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index df376e9..afd2a38 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -221,6 +221,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -247,7 +248,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -265,7 +266,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 1b50ec5..40a19c5 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -247,6 +247,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -273,7 +274,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -291,7 +292,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 0a4becf..1208f7f 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -229,6 +229,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -255,7 +256,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -273,7 +274,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index c61942f..242913a 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -200,7 +200,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -227,7 +228,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -245,7 +246,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 5a76049..4666ae1 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -179,7 +179,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -206,7 +207,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -224,7 +225,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml
index e48e3d7..f27b3ec 100644
--- a/modules/plugins/services/pom.xml
+++ b/modules/plugins/services/pom.xml
@@ -123,7 +123,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -150,7 +151,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -168,7 +169,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 035eaba..072985e 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -160,7 +160,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -187,7 +188,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -205,7 +206,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index f05a21e..08a2ef1 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -220,7 +220,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -247,7 +248,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -265,7 +266,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 8aaf25c..251d7f3 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -217,7 +217,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -244,7 +245,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -262,7 +263,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 8d53a0a..88c9156 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -214,7 +214,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -241,7 +242,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -259,7 +260,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index f94b21b..ba123b3 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -140,7 +140,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -167,7 +168,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -185,7 +186,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 35082d0..757207c 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -288,7 +288,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -315,7 +316,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -333,7 +334,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5f96131..c873303 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -27,5 +27,11 @@
<artifactId>commons-beanutils</artifactId>
<version>1.8.2</version>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 497a520..686608a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<!-- NOTE: The below line is a workaround for a Maven bug, where it does not expand settings.* properties
used in the distributionManagement section of the POM. -->
- <localRepository>${user.home}/.m2/repository</localRepository>
+ <localRepository>${user.home}/.m2/repository</localRepository>
</properties>
@@ -413,7 +413,6 @@
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
@@ -457,6 +456,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -1144,12 +1150,7 @@
<inherited>true</inherited>
</plugin>
-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- <inherited>true</inherited>
- </plugin>
+
<plugin>
<!-- must be last plugin in the list -->
<groupId>org.codehaus.mojo</groupId>
commit 34846f927d07ee5e90182f4594fa0468a7c08c69
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Thu Sep 23 13:28:48 2010 +0200
Settings of cobertura for rhq plugins.
diff --git a/modules/plugins/JBossOSGi/pom.xml b/modules/plugins/JBossOSGi/pom.xml
index fa6dde6..38828c4 100644
--- a/modules/plugins/JBossOSGi/pom.xml
+++ b/modules/plugins/JBossOSGi/pom.xml
@@ -157,6 +157,90 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 0370302..4a4c20c 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -222,6 +222,92 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
</profiles>
</project>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index d7e6d8a..812bba1 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -273,6 +273,90 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index 9f46fc9..ef266c1 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -128,7 +128,7 @@
<configuration>
<tasks>
<echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo>
- <property name="settings.localRepository" location="${user.home}/.m2/repository" />
+ <property name="settings.localRepository" location="${user.home}/.m2/repository/net/sourceforge/cobertura/cobertura/1.9.4.1/" />
<mkdir dir="target/itest" />
<mkdir dir="target/itest/plugins" />
<mkdir dir="target/itest/lib" />
@@ -279,6 +279,90 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index cb324cc..edae303 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -239,7 +239,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index 1082bb3..d4ea9bb 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -248,7 +248,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 9371766..3869f7f 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -212,7 +212,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index c72f79a..d4b383a 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -94,7 +94,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index 0b85a57..e7134fe 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -246,7 +246,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index d783ffc..787131c 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -211,7 +211,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index 7fc2837..fb74b41 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -120,6 +120,90 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index a7bac31..f852671 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -239,7 +239,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index ef32374..e7d4d5b 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -222,7 +222,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/hudson/pom.xml b/modules/plugins/hudson/pom.xml
index 68eae1a..ed2fffc 100644
--- a/modules/plugins/hudson/pom.xml
+++ b/modules/plugins/hudson/pom.xml
@@ -72,9 +72,7 @@
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-
</project>
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index ad90e83..e2f2c75 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -198,7 +198,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index ab18766..d56d15a 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -140,6 +140,90 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index 2766efd..ef4aff1 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -629,7 +629,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 31d5fbc..77e628e 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -349,7 +349,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index b09a9aa..1c024f7 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -560,7 +560,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index e9dca27..e5a2f5b 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -214,7 +214,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml
index c7ab30c..6601d08 100644
--- a/modules/plugins/jdbctrace/pom.xml
+++ b/modules/plugins/jdbctrace/pom.xml
@@ -268,7 +268,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml
index 8e0a879..8551a65 100644
--- a/modules/plugins/jira/pom.xml
+++ b/modules/plugins/jira/pom.xml
@@ -316,7 +316,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 83e3030..0d9c538 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -254,7 +254,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index a1a61cf..c8a04aa 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -108,6 +108,89 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
-
</project>
diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml
index 0667659..df802e2 100644
--- a/modules/plugins/lsof/pom.xml
+++ b/modules/plugins/lsof/pom.xml
@@ -239,7 +239,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index 5152236..ad260d7 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -241,7 +241,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 9f35dbf..66e1ec5 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -248,7 +248,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml
index 0b8578a..b63e10f 100644
--- a/modules/plugins/nss/pom.xml
+++ b/modules/plugins/nss/pom.xml
@@ -91,6 +91,90 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml
index 8b2fa39..3fa0f08 100644
--- a/modules/plugins/onewire/pom.xml
+++ b/modules/plugins/onewire/pom.xml
@@ -152,7 +152,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index be37d2b..6551f7f 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -247,7 +247,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/perftest/pom.xml b/modules/plugins/perftest/pom.xml
index 136770c..4f56cf4 100644
--- a/modules/plugins/perftest/pom.xml
+++ b/modules/plugins/perftest/pom.xml
@@ -138,5 +138,5 @@
<layout>legacy</layout>
</pluginRepository>
</pluginRepositories>
-
+
</project>
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 5597a30..5e5c810 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -197,7 +197,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/pom.xml b/modules/plugins/pom.xml
index 880254c..6220581 100644
--- a/modules/plugins/pom.xml
+++ b/modules/plugins/pom.xml
@@ -76,6 +76,12 @@
<scope>provided</scope> <!-- by RHQ container -->
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!-- !!! -->
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 2130abe..059f197 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -220,7 +220,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index beab355..b227b4a 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -240,7 +240,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index 3aa3bb6..df376e9 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -212,6 +212,89 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index d0ef9fe..1b50ec5 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -238,6 +238,89 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index a338a98..0a4becf 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -220,7 +220,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index 05cb816..c61942f 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -192,7 +192,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index ed7473b..5a76049 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -171,6 +171,90 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml
index f6b8556..e48e3d7 100644
--- a/modules/plugins/services/pom.xml
+++ b/modules/plugins/services/pom.xml
@@ -115,6 +115,90 @@
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 93bb45a..035eaba 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -152,7 +152,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index a68e444..f05a21e 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -212,7 +212,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 0353f4f..8aaf25c 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -209,7 +209,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 4c93bb3..8d53a0a 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -206,7 +206,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index a6fdf4f..f94b21b 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -131,6 +131,91 @@
</build>
</profile>
+
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index c2550aa..35082d0 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -280,7 +280,90 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
1
0
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java | 188 ++++++++--
1 file changed, 155 insertions(+), 33 deletions(-)
New commits:
commit d348c2c2395bdbbb8d53d2aabfc0fed950d5426d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Oct 5 17:48:18 2010 +0200
Do header stuff in bold
diff --git a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
index 8d6f9d5..4eaf30c 100644
--- a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
+++ b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
@@ -40,6 +40,7 @@ public class ExcelExporter implements PerformanceReportExporter {
private static final String DOT_XLS = ".xls";
String baseFileName ;
CellStyle integerStyle;
+ CellStyle boldText;
@Override
public void setBaseFile(String fileName) {
@@ -75,6 +76,10 @@ public class ExcelExporter implements PerformanceReportExporter {
DataFormat df = wb.createDataFormat();
integerStyle = wb.createCellStyle();
integerStyle.setDataFormat(df.getFormat("#######0"));
+ Font boldFont = wb.createFont();
+ boldFont.setBoldweight(Font.BOLDWEIGHT_BOLD);
+ boldText = wb.createCellStyle();
+ boldText.setFont(boldFont);
createOverviewHeaderIfNeeded(sheet);
@@ -104,31 +109,51 @@ public class ExcelExporter implements PerformanceReportExporter {
Sheet sheet = wb.createSheet(result.getName());
Row row = sheet.createRow(0);
- row.createCell(0).setCellValue("Class");
+ Cell cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Class");
String name = result.getTestClass().getName();
name = name.replace("org.rhq.enterprise.server.performance.test.","");
row.createCell(1).setCellValue(name);
row = appendRow(sheet);
- row.createCell(0).setCellValue("Method");
+
+ cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Method");
row.createCell(1).setCellValue(result.getName());
- row.createCell(0).setCellValue("Success:");
+ cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Success:");
row.createCell(1).setCellValue(result.isSuccess());
+
row = appendRow(sheet);
- row.createCell(0).setCellValue("TestNG timing");
+ cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("TestNG timing");
row.createCell(1).setCellValue(result.getEndMillis()-result.getStartMillis());
+
row = appendRow(sheet);
- row.createCell(0).setCellValue("Perf test timing");
+ cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Perf test timing");
row.createCell(1).setCellValue(getTotalTime(timings));
- row = appendRow(sheet); // Empty
+
+ row = appendRow(sheet); // Empty row
row = appendRow(sheet);
- row.createCell(0).setCellValue("Individual Timings");
+ cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Individual Timings");
// Now the timings
row = appendRow(sheet);
- row.createCell(0).setCellValue("Name");
- row.createCell(1).setCellValue("Duration");
+ cell = row.createCell(0);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Name");
+ cell = row.createCell(1);
+ cell.setCellStyle(boldText);
+ cell.setCellValue("Duration");
Set<Map.Entry<String,Long>> data = timings.entrySet();
SortedSet<Map.Entry<String,Long>> sorted = new TreeSet<Map.Entry<String,Long>>(new Comparator<Map.Entry<String,Long>>() {
@@ -142,7 +167,7 @@ public class ExcelExporter implements PerformanceReportExporter {
for (Map.Entry<String,Long> entry: sorted) {
row = appendRow(sheet);
- Cell cell = row.createCell(0);
+ cell = row.createCell(0);
cell.setCellValue(entry.getKey());
cell = row.createCell(1);
cell.setCellStyle(integerStyle);
@@ -185,7 +210,6 @@ public class ExcelExporter implements PerformanceReportExporter {
cell.setCellValue(result.getEndMillis()-result.getStartMillis());
// timing of our business logic
-
cell = row.createCell(4);
cell.setCellType(Cell.CELL_TYPE_NUMERIC);
cell.setCellStyle(integerStyle);
@@ -202,15 +226,21 @@ public class ExcelExporter implements PerformanceReportExporter {
row = sheet.createRow(0);
Cell cell = row.createCell(0);
+ cell.setCellStyle(boldText);
cell.setCellValue("Class");
cell = row.createCell(1);
+ cell.setCellStyle(boldText);
cell.setCellValue("Name");
cell = row.createCell(2);
+ cell.setCellStyle(boldText);
cell.setCellValue("Success");
cell = row.createCell(3);
+ cell.setCellStyle(boldText);
cell.setCellValue("TestNG timing");
+ cell.setCellStyle(boldText);
cell = row.createCell(4);
cell.setCellValue("Perf timing");
+ cell.setCellStyle(boldText);
sheet.autoSizeColumn(0);
sheet.autoSizeColumn(1);
commit 6e422587818f1d28791551fa2ae0532dd907e56d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Oct 5 17:25:10 2010 +0200
Create detail sheets for individual tests.
diff --git a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
index 5959dfa..8d6f9d5 100644
--- a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
+++ b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
@@ -23,7 +23,11 @@ import org.apache.poi.ss.usermodel.*;
import org.testng.ITestResult;
import java.io.*;
+import java.util.Comparator;
import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
/**
@@ -76,6 +80,7 @@ public class ExcelExporter implements PerformanceReportExporter {
createOverviewHeaderIfNeeded(sheet);
long time = getTotalTime(timings);
createOverviewEntry(sheet, time, result);
+ createDetailsSheet(wb,timings,result);
// Write the output to a file
FileOutputStream fileOut = new FileOutputStream(baseFileName);
@@ -90,6 +95,65 @@ public class ExcelExporter implements PerformanceReportExporter {
}
/**
+ * Create a sheet per test to show the individual timings we recorded
+ * @param wb Workbook to attach the new sheet to
+ * @param timings The map with timings from the test
+ * @param result TestNG results of the test
+ */
+ private void createDetailsSheet(Workbook wb, Map<String,Long> timings, ITestResult result) {
+ Sheet sheet = wb.createSheet(result.getName());
+
+ Row row = sheet.createRow(0);
+ row.createCell(0).setCellValue("Class");
+ String name = result.getTestClass().getName();
+ name = name.replace("org.rhq.enterprise.server.performance.test.","");
+ row.createCell(1).setCellValue(name);
+ row = appendRow(sheet);
+ row.createCell(0).setCellValue("Method");
+ row.createCell(1).setCellValue(result.getName());
+
+
+ row.createCell(0).setCellValue("Success:");
+ row.createCell(1).setCellValue(result.isSuccess());
+ row = appendRow(sheet);
+ row.createCell(0).setCellValue("TestNG timing");
+ row.createCell(1).setCellValue(result.getEndMillis()-result.getStartMillis());
+ row = appendRow(sheet);
+ row.createCell(0).setCellValue("Perf test timing");
+ row.createCell(1).setCellValue(getTotalTime(timings));
+ row = appendRow(sheet); // Empty
+ row = appendRow(sheet);
+ row.createCell(0).setCellValue("Individual Timings");
+
+ // Now the timings
+ row = appendRow(sheet);
+ row.createCell(0).setCellValue("Name");
+ row.createCell(1).setCellValue("Duration");
+
+ Set<Map.Entry<String,Long>> data = timings.entrySet();
+ SortedSet<Map.Entry<String,Long>> sorted = new TreeSet<Map.Entry<String,Long>>(new Comparator<Map.Entry<String,Long>>() {
+
+ public int compare(Map.Entry<String,Long> item1, Map.Entry<String,Long> item2) {
+
+ return item1.getKey().compareTo(item2.getKey());
+ }
+ });
+ sorted.addAll(data);
+
+ for (Map.Entry<String,Long> entry: sorted) {
+ row = appendRow(sheet);
+ Cell cell = row.createCell(0);
+ cell.setCellValue(entry.getKey());
+ cell = row.createCell(1);
+ cell.setCellStyle(integerStyle);
+ cell.setCellValue(entry.getValue());
+ }
+
+ sheet.autoSizeColumn(0);
+ sheet.autoSizeColumn(1);
+ }
+
+ /**
* Create a row on the overview sheet
* @param sheet sheet to use
* @param testTime time this test took within the perf biz logic
commit 83a25b0117d50d0ace4012c4ec48f8ed6cd447f0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Oct 5 16:06:37 2010 +0200
Refactoring and add class name to sheet
diff --git a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
index aabeb23..5959dfa 100644
--- a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
+++ b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
@@ -18,7 +18,6 @@
*/
package org.rhq.helpers.perftest.support.reporting;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.*;
import org.testng.ITestResult;
@@ -36,6 +35,7 @@ public class ExcelExporter implements PerformanceReportExporter {
private static final String DOT_XLS = ".xls";
String baseFileName ;
+ CellStyle integerStyle;
@Override
public void setBaseFile(String fileName) {
@@ -51,7 +51,7 @@ public class ExcelExporter implements PerformanceReportExporter {
Workbook wb;
InputStream inp = null;
- CellStyle integerStyle;
+
// Check if Workbook is present - otherwise create it
try {
inp = new FileInputStream(baseFileName);
@@ -73,32 +73,9 @@ public class ExcelExporter implements PerformanceReportExporter {
integerStyle.setDataFormat(df.getFormat("#######0"));
- createHeaderIfNeeded(sheet);
-
- // Test name
- Row row = appendRow(sheet);
- Cell cell = row.createCell(0);
- cell.setCellType(Cell.CELL_TYPE_STRING);
- cell.setCellValue(result.getName());
-
- // success ?
- cell = row.createCell(1);
- cell.setCellType(Cell.CELL_TYPE_BOOLEAN);
- cell.setCellValue(result.isSuccess());
-
- // timing from TestNG
- cell = row.createCell(2);
- cell.setCellType(Cell.CELL_TYPE_NUMERIC);
- cell.setCellStyle(integerStyle);
- cell.setCellValue(result.getEndMillis()-result.getStartMillis());
-
- // timing of our business logic
+ createOverviewHeaderIfNeeded(sheet);
long time = getTotalTime(timings);
- cell = row.createCell(3);
- cell.setCellType(Cell.CELL_TYPE_NUMERIC);
- cell.setCellStyle(integerStyle);
- cell.setCellValue(time);
-
+ createOverviewEntry(sheet, time, result);
// Write the output to a file
FileOutputStream fileOut = new FileOutputStream(baseFileName);
@@ -112,29 +89,80 @@ public class ExcelExporter implements PerformanceReportExporter {
}
}
- private void createHeaderIfNeeded(Sheet sheet) {
+ /**
+ * Create a row on the overview sheet
+ * @param sheet sheet to use
+ * @param testTime time this test took within the perf biz logic
+ * @param result the TestNG result object
+ */
+ private void createOverviewEntry(Sheet sheet, long testTime, ITestResult result) {
+ // Class name
+ Row row = appendRow(sheet);
+ Cell cell = row.createCell(0);
+ cell.setCellType(Cell.CELL_TYPE_STRING);
+ String name = result.getTestClass().getName();
+ name = name.replace("org.rhq.enterprise.server.performance.test.","");
+ cell.setCellValue(name);
+
+ // Test name
+ cell = row.createCell(1);
+ cell.setCellType(Cell.CELL_TYPE_STRING);
+ cell.setCellValue(result.getName());
+
+ // success ?
+ cell = row.createCell(2);
+ cell.setCellType(Cell.CELL_TYPE_BOOLEAN);
+ cell.setCellValue(result.isSuccess());
+
+ // timing from TestNG
+ cell = row.createCell(3);
+ cell.setCellType(Cell.CELL_TYPE_NUMERIC);
+ cell.setCellStyle(integerStyle);
+ cell.setCellValue(result.getEndMillis()-result.getStartMillis());
+
+ // timing of our business logic
+
+ cell = row.createCell(4);
+ cell.setCellType(Cell.CELL_TYPE_NUMERIC);
+ cell.setCellStyle(integerStyle);
+ cell.setCellValue(testTime);
+ }
+
+ /**
+ * Create a header row that describes the columns on the overview sheet
+ * @param sheet sheet to write to.
+ */
+ private void createOverviewHeaderIfNeeded(Sheet sheet) {
Row row = sheet.getRow(0);
if (row==null)
row = sheet.createRow(0);
+
Cell cell = row.createCell(0);
- cell.setCellValue("Name");
+ cell.setCellValue("Class");
cell = row.createCell(1);
- cell.setCellValue("Success");
+ cell.setCellValue("Name");
cell = row.createCell(2);
- cell.setCellValue("TestNG timing");
+ cell.setCellValue("Success");
cell = row.createCell(3);
+ cell.setCellValue("TestNG timing");
+ cell = row.createCell(4);
cell.setCellValue("Perf timing");
sheet.autoSizeColumn(0);
- sheet.autoSizeColumn(2);
+ sheet.autoSizeColumn(1);
sheet.autoSizeColumn(3);
+ sheet.autoSizeColumn(4);
}
+ /**
+ * Get the accumulated time from all the perf test biz logic of the test
+ * @param timings Map with timings and 'sub tests'
+ * @return summary time
+ */
private long getTotalTime(Map<String, Long> timings) {
long summaryTime = 0L;
for (Map.Entry<String,Long> item : timings.entrySet()) {
- System.out.println(":| " + item.getKey() + " => " + item.getValue());
summaryTime += item.getValue();
}
return summaryTime;
1
0
modules/core/domain/pom.xml | 61 ---
modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml | 18 -
modules/core/domain/src/main/java/org/rhq/core/client/RHQDomain.java | 31 -
modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.css | 7
modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.html | 10
modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java | 172 ----------
modules/enterprise/gui/coregui/pom.xml | 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/core/RHQDomain.gwt.xml | 15
modules/enterprise/gui/coregui/src/main/java/org/rhq/core/client/RHQDomain.java | 31 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java | 172 ++++++++++
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 2
modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopComponent.java | 2
12 files changed, 242 insertions(+), 290 deletions(-)
New commits:
commit 26dfcd67680366513e1820bd18219a614437fb88
Author: Lukas Krejci <lkrejci(a)redhat.com>
Date: Tue Oct 5 17:34:16 2010 +0200
Removing the dependency on GWT from the core/domain. The RHQDomain GWT module is now defined within the coregui and pulls the sources from the core/domain during the build.
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 0806490..d033ae3 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -219,27 +219,6 @@
<version>2.8.1</version>
<scope>test</scope>
</dependency>
-
-
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-user</artifactId>
- <version>2.0.3</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.gwt</groupId>
- <artifactId>gwt-dev</artifactId>
- <version>2.0.3</version>
- <scope>provided</scope>
- </dependency>
-
- <!--<dependency>
- <groupId>com.smartgwt</groupId>
- <artifactId>smartgwt</artifactId>
- <version>2.0</version>
- </dependency>-->
-
</dependencies>
<build>
@@ -265,32 +244,20 @@
<plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>gwt-maven-plugin</artifactId>
- <version>1.2</version>
-
- <configuration>
- <noServer>true</noServer>
- <inplace>false</inplace>
- <logLevel>INFO</logLevel>
- <extraJvmArgs>-Xmx512m</extraJvmArgs>
- <localWorkers>2</localWorkers>
- <draftCompile>true</draftCompile>
- <buildOutputDirectory>target/gwtclasses</buildOutputDirectory>
- <hostedWebapp>target/hostedwar</hostedWebapp>
- <debugSuspend>false</debugSuspend>
- </configuration>
-
- <executions>
- <execution>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml b/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml
deleted file mode 100644
index a9a94a9..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/RHQDomain.gwt.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6//EN"
- "http://google-web-toolkit.googlecode.com/svn/releases/1.6/distro-source/cor…">
-<module>
-
- <inherits name='com.google.gwt.user.User'/>
-
- <entry-point class='org.rhq.core.client.RHQDomain'/>
-
- <source path="client"/>
- <source path="domain"/>
-
-
- <!--<generate-with class="org.rhq.core.rebind.RecordBuilderGenerator">
- <when-type-assignable class="org.rhq.core.domain.util.Recordizable"/>
- </generate-with>-->
-
-
-</module>
\ No newline at end of file
diff --git a/modules/core/domain/src/main/java/org/rhq/core/client/RHQDomain.java b/modules/core/domain/src/main/java/org/rhq/core/client/RHQDomain.java
deleted file mode 100644
index 9669149..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/client/RHQDomain.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation, and/or the GNU Lesser
- * General Public License, version 2.1, also as published by the Free
- * Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License and the GNU Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License
- * and the GNU Lesser General Public License along with this program;
- * if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-package org.rhq.core.client;
-
-import com.google.gwt.core.client.EntryPoint;
-import com.google.gwt.user.client.ui.*;
-
-public class RHQDomain implements EntryPoint {
- public void onModuleLoad() {
- }
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.css b/modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.css
deleted file mode 100644
index a111f82..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.css
+++ /dev/null
@@ -1,7 +0,0 @@
-body {
- background-color: white;
- color: black;
- font-family: Arial, sans-serif;
- font-size: small;
- margin: 8px;
-}
diff --git a/modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.html b/modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.html
deleted file mode 100644
index 3878eb5..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/public/RHQDomain.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<head>
- <title>RHQDomain Application</title>
- <link rel="stylesheet" href="RHQDomain.css">
-</head>
-<body>
-<script type="text/javascript" language="javascript" src="org.rhq.core.RHQDomain.nocache.js"></script>
-<h1>RHQDomain Application</h1>
-</body>
-</html>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java b/modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java
deleted file mode 100644
index ca6a5ab..0000000
--- a/modules/core/domain/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * RHQ Management Platform
- * Copyright (C) 2005-2010 Red Hat, Inc.
- * All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-package org.rhq.core.rebind;
-
-import com.google.gwt.core.ext.Generator;
-import com.google.gwt.core.ext.GeneratorContext;
-import com.google.gwt.core.ext.TreeLogger;
-import com.google.gwt.core.ext.UnableToCompleteException;
-import com.google.gwt.core.ext.typeinfo.JClassType;
-import com.google.gwt.core.ext.typeinfo.JField;
-import com.google.gwt.core.ext.typeinfo.NotFoundException;
-import com.google.gwt.core.ext.typeinfo.TypeOracle;
-import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
-import com.google.gwt.user.rebind.SourceWriter;
-
-import javax.persistence.Entity;
-
-import java.io.PrintWriter;
-
-
-/**
- * This is the start to a rebinder for our domain entities to allow for the
- * easy generation of Smart's Record objecgts. I have not yet gotten this working.
- *
- *
- * @author Greg Hinkle
- */
-public class RecordBuilderGenerator extends Generator {
-
-
-
-
- protected TreeLogger logger;
- private String packageName;
- private String qualifiedStubClassName;
- private JClassType requestedClass;
- private String simpleStubClassName;
- private SourceWriter sourceWriter;
- private TypeOracle typeOracle;
-
- /**
- * Create a new type that satisfies the rebind request.
- */
- @Override
- public String generate(TreeLogger logger, GeneratorContext context, String typeName) throws UnableToCompleteException {
-
- System.out.println("classType " + typeName);
-
- if (!init(logger, context, typeName)) {
- return null;
- }
-
- writeSource();
- sourceWriter.commit(logger);
-
- return qualifiedStubClassName;
- }
-
- protected JClassType getRequestedClass() {
- return requestedClass;
- }
-
- protected SourceWriter getSourceWriter() {
- return sourceWriter;
- }
-
- protected TypeOracle getTypeOracle() {
- return typeOracle;
- }
-
- @SuppressWarnings("unused")
- protected void writeSource() throws UnableToCompleteException {
-
-
-
- JField[] fields = requestedClass.getFields();
-
- writeBuildRecordMethod(fields, sourceWriter);
- }
-
- /**
- * Gets the name of the native stub class.
- */
- private String getSimpleStubClassName(JClassType baseClass) {
- return "__" + baseClass.getSimpleSourceName() + "_RecordBuilder";
- }
-
- private SourceWriter getSourceWriter(TreeLogger logger, GeneratorContext ctx,
- String packageName, String className, String superclassName) {
-
- PrintWriter printWriter = ctx.tryCreate(logger, packageName, className);
- if (printWriter == null) {
- return null;
- }
-
- ClassSourceFileComposerFactory composerFactory = new ClassSourceFileComposerFactory(
- packageName, className);
-
- composerFactory.setSuperclass(superclassName);
-
- return composerFactory.createSourceWriter(ctx, printWriter);
- }
-
- private boolean init(TreeLogger logger, GeneratorContext context,
- String typeName) throws UnableToCompleteException {
- this.logger = logger;
- typeOracle = context.getTypeOracle();
- assert typeOracle != null;
-
- try {
- requestedClass = typeOracle.getType(typeName);
- } catch (NotFoundException e) {
- logger.log(
- TreeLogger.ERROR,
- "Could not find type '"
- + typeName
- + "'; please see the log, as this usually indicates a previous error ",
- e);
- throw new UnableToCompleteException();
- }
-
- if (requestedClass.getAnnotation(Entity.class) == null) {
- System.out.println("Not an entity: " + typeName);
- return false;
- }
-
- System.out.println("$$$$$$$$Making a record builder for: "+ typeName);
-
- // Get the stub class name, and see if its source file exists.
- //
- simpleStubClassName = getSimpleStubClassName(requestedClass);
- packageName = requestedClass.getPackage().getName();
- qualifiedStubClassName = packageName + "." + simpleStubClassName;
-
- sourceWriter = getSourceWriter(logger, context, packageName,
- simpleStubClassName, requestedClass.getQualifiedSourceName());
-
- return sourceWriter != null;
- }
-
- private void writeBuildRecordMethod(JField[] fields, SourceWriter sw) {
- sw.println();
- sw.println("protected final com.smartgwt.client.data.Record buildRecord(" + requestedClass.getQualifiedSourceName() + " entity) throws Throwable {");
- sw.indent();
-
- sw.println("com.smartgwt.client.data.Record record = new com.smartgwt.client.data.Record();");
-
- for (JField field :fields) {
- sw.println("record.setAttribute(\"" + field.getName() + "\", " + field.getName() + ");");
- }
- sw.println("return record;");
- sw.outdent();
- sw.println("}");
- }
-
-}
diff --git a/modules/enterprise/gui/coregui/pom.xml b/modules/enterprise/gui/coregui/pom.xml
index 21dd681..c24aa4f 100644
--- a/modules/enterprise/gui/coregui/pom.xml
+++ b/modules/enterprise/gui/coregui/pom.xml
@@ -63,8 +63,7 @@
<scope>provided</scope>
<!-- by rhq.ear -->
</dependency>
-
-
+
<!-- =============== 3rd Party Deps =============== -->
<dependency>
@@ -80,6 +79,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-dev</artifactId>
+ <scope>provided</scope>
+ <version>${gwt.version}</version>
+ </dependency>
+
<!--<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-incubator</artifactId>
@@ -253,6 +259,7 @@
<debugSuspend>false</debugSuspend>
<servicePattern>**/gwt/*GWTService.java</servicePattern>
<i18nMessagesBundle>org.rhq.enterprise.gui.coregui.client.Messages</i18nMessagesBundle>
+ <compileSourcesArtifacts>org.rhq:rhq-core-domain</compileSourcesArtifacts>
</configuration>
<executions>
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/RHQDomain.gwt.xml b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/RHQDomain.gwt.xml
new file mode 100644
index 0000000..4d702c2
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/RHQDomain.gwt.xml
@@ -0,0 +1,15 @@
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.6//EN"
+ "http://google-web-toolkit.googlecode.com/svn/releases/1.6/distro-source/cor…">
+<module>
+ <inherits name='com.google.gwt.user.User'/>
+
+ <entry-point class='org.rhq.core.client.RHQDomain'/>
+
+ <source path="client"/>
+ <source path="domain"/>
+
+ <!--<generate-with class="org.rhq.core.rebind.RecordBuilderGenerator">
+ <when-type-assignable class="org.rhq.core.domain.util.Recordizable"/>
+ </generate-with>-->
+
+</module>
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/client/RHQDomain.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/client/RHQDomain.java
new file mode 100644
index 0000000..9669149
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/client/RHQDomain.java
@@ -0,0 +1,31 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation, and/or the GNU Lesser
+ * General Public License, version 2.1, also as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License and the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * and the GNU Lesser General Public License along with this program;
+ * if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package org.rhq.core.client;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.user.client.ui.*;
+
+public class RHQDomain implements EntryPoint {
+ public void onModuleLoad() {
+ }
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java
new file mode 100644
index 0000000..ca6a5ab
--- /dev/null
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/core/rebind/RecordBuilderGenerator.java
@@ -0,0 +1,172 @@
+/*
+ * RHQ Management Platform
+ * Copyright (C) 2005-2010 Red Hat, Inc.
+ * All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+package org.rhq.core.rebind;
+
+import com.google.gwt.core.ext.Generator;
+import com.google.gwt.core.ext.GeneratorContext;
+import com.google.gwt.core.ext.TreeLogger;
+import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.core.ext.typeinfo.JClassType;
+import com.google.gwt.core.ext.typeinfo.JField;
+import com.google.gwt.core.ext.typeinfo.NotFoundException;
+import com.google.gwt.core.ext.typeinfo.TypeOracle;
+import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
+import com.google.gwt.user.rebind.SourceWriter;
+
+import javax.persistence.Entity;
+
+import java.io.PrintWriter;
+
+
+/**
+ * This is the start to a rebinder for our domain entities to allow for the
+ * easy generation of Smart's Record objecgts. I have not yet gotten this working.
+ *
+ *
+ * @author Greg Hinkle
+ */
+public class RecordBuilderGenerator extends Generator {
+
+
+
+
+ protected TreeLogger logger;
+ private String packageName;
+ private String qualifiedStubClassName;
+ private JClassType requestedClass;
+ private String simpleStubClassName;
+ private SourceWriter sourceWriter;
+ private TypeOracle typeOracle;
+
+ /**
+ * Create a new type that satisfies the rebind request.
+ */
+ @Override
+ public String generate(TreeLogger logger, GeneratorContext context, String typeName) throws UnableToCompleteException {
+
+ System.out.println("classType " + typeName);
+
+ if (!init(logger, context, typeName)) {
+ return null;
+ }
+
+ writeSource();
+ sourceWriter.commit(logger);
+
+ return qualifiedStubClassName;
+ }
+
+ protected JClassType getRequestedClass() {
+ return requestedClass;
+ }
+
+ protected SourceWriter getSourceWriter() {
+ return sourceWriter;
+ }
+
+ protected TypeOracle getTypeOracle() {
+ return typeOracle;
+ }
+
+ @SuppressWarnings("unused")
+ protected void writeSource() throws UnableToCompleteException {
+
+
+
+ JField[] fields = requestedClass.getFields();
+
+ writeBuildRecordMethod(fields, sourceWriter);
+ }
+
+ /**
+ * Gets the name of the native stub class.
+ */
+ private String getSimpleStubClassName(JClassType baseClass) {
+ return "__" + baseClass.getSimpleSourceName() + "_RecordBuilder";
+ }
+
+ private SourceWriter getSourceWriter(TreeLogger logger, GeneratorContext ctx,
+ String packageName, String className, String superclassName) {
+
+ PrintWriter printWriter = ctx.tryCreate(logger, packageName, className);
+ if (printWriter == null) {
+ return null;
+ }
+
+ ClassSourceFileComposerFactory composerFactory = new ClassSourceFileComposerFactory(
+ packageName, className);
+
+ composerFactory.setSuperclass(superclassName);
+
+ return composerFactory.createSourceWriter(ctx, printWriter);
+ }
+
+ private boolean init(TreeLogger logger, GeneratorContext context,
+ String typeName) throws UnableToCompleteException {
+ this.logger = logger;
+ typeOracle = context.getTypeOracle();
+ assert typeOracle != null;
+
+ try {
+ requestedClass = typeOracle.getType(typeName);
+ } catch (NotFoundException e) {
+ logger.log(
+ TreeLogger.ERROR,
+ "Could not find type '"
+ + typeName
+ + "'; please see the log, as this usually indicates a previous error ",
+ e);
+ throw new UnableToCompleteException();
+ }
+
+ if (requestedClass.getAnnotation(Entity.class) == null) {
+ System.out.println("Not an entity: " + typeName);
+ return false;
+ }
+
+ System.out.println("$$$$$$$$Making a record builder for: "+ typeName);
+
+ // Get the stub class name, and see if its source file exists.
+ //
+ simpleStubClassName = getSimpleStubClassName(requestedClass);
+ packageName = requestedClass.getPackage().getName();
+ qualifiedStubClassName = packageName + "." + simpleStubClassName;
+
+ sourceWriter = getSourceWriter(logger, context, packageName,
+ simpleStubClassName, requestedClass.getQualifiedSourceName());
+
+ return sourceWriter != null;
+ }
+
+ private void writeBuildRecordMethod(JField[] fields, SourceWriter sw) {
+ sw.println();
+ sw.println("protected final com.smartgwt.client.data.Record buildRecord(" + requestedClass.getQualifiedSourceName() + " entity) throws Throwable {");
+ sw.indent();
+
+ sw.println("com.smartgwt.client.data.Record record = new com.smartgwt.client.data.Record();");
+
+ for (JField field :fields) {
+ sw.println("record.setAttribute(\"" + field.getName() + "\", " + field.getName() + ");");
+ }
+ sw.println("return record;");
+ sw.outdent();
+ sw.println("}");
+ }
+
+}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index 040fc16..8096fcf 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -5,7 +5,7 @@
<inherits name='com.google.gwt.user.User'/>
<inherits name='com.google.gwt.i18n.I18N'/>
- <inherits name='org.rhq.core.RHQDomain'/>
+ <inherits name='org.rhq.core.RHQDomain'/>
<inherits name='com.smartgwt.SmartGwt' />
<inherits name="com.smartgwt.tools.SmartGwtTools"/>
diff --git a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopComponent.java b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopComponent.java
index a568de9..848d560 100644
--- a/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopComponent.java
+++ b/modules/plugins/hadoop/src/main/java/org/rhq/plugins/hadoop/HadoopComponent.java
@@ -18,8 +18,6 @@
*/
package org.rhq.plugins.hadoop;
-import com.google.gwt.user.client.ui.ResizeComposite;
-
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.pluginapi.inventory.InvalidPluginConfigurationException;
import org.rhq.core.pluginapi.inventory.ResourceComponent;
1
0
[rhq] Branch 'coverage' - modules/cli-tests modules/common modules/core modules/enterprise modules/helpers modules/plugins modules/test-utils pom.xml
by fdrabek 05 Oct '10
by fdrabek 05 Oct '10
05 Oct '10
modules/cli-tests/pom.xml | 86 +++++++++
modules/common/ant-bundle/pom.xml | 89 ++++++++++
modules/common/filetemplate-bundle/pom.xml | 89 ++++++++++
modules/common/jboss-as/pom.xml | 95 ++++++++++-
modules/core/client-api/pom.xml | 86 +++++++++
modules/core/dbutils/pom.xml | 85 +++++++++
modules/core/domain/pom.xml | 86 +++++++++
modules/core/native-system/pom.xml | 92 ++++++++++
modules/core/plugin-api/pom.xml | 90 ++++++++++
modules/core/plugin-container/pom.xml | 89 ++++++++++
modules/core/pom.xml | 12 +
modules/core/util/pom.xml | 86 +++++++++
modules/enterprise/comm/pom.xml | 86 +++++++++
modules/enterprise/gui/installer-war/pom.xml | 86 +++++++++
modules/enterprise/gui/portal-war/pom.xml | 86 +++++++++
modules/enterprise/pom.xml | 11 +
modules/enterprise/remoting/cli/pom.xml | 88 +++++++++-
modules/enterprise/server/container/pom.xml | 112 ++++++++++++-
modules/enterprise/server/jar/pom.xml | 102 ++++++++++-
modules/enterprise/server/plugins/alert-operations/pom.xml | 87 +++++++++-
modules/enterprise/server/plugins/groovy-script/pom.xml | 86 +++++++++
modules/enterprise/server/plugins/jboss-software/pom.xml | 86 +++++++++
modules/enterprise/server/plugins/rhnhosted/pom.xml | 89 ++++++++++
modules/enterprise/server/plugins/url/pom.xml | 87 +++++++++-
modules/enterprise/server/xml-schemas/pom.xml | 87 +++++++++-
modules/helpers/pom.xml | 12 -
modules/plugins/JBossOSGi/pom.xml | 7
modules/plugins/aliases/pom.xml | 16 -
modules/plugins/ant-bundle/pom.xml | 7
modules/plugins/apache/pom.xml | 14 -
modules/plugins/byteman/pom.xml | 7
modules/plugins/cobbler/pom.xml | 8
modules/plugins/cron/pom.xml | 7
modules/plugins/database/pom.xml | 7
modules/plugins/filetemplate-bundle/pom.xml | 5
modules/plugins/grub/pom.xml | 5
modules/plugins/hadoop/pom.xml | 7
modules/plugins/hibernate/pom.xml | 7
modules/plugins/hosts/pom.xml | 7
modules/plugins/iis/pom.xml | 7
modules/plugins/irc/pom.xml | 9 -
modules/plugins/jboss-as-5/pom.xml | 7
modules/plugins/jboss-as/pom.xml | 5
modules/plugins/jboss-cache-v3/pom.xml | 7
modules/plugins/jboss-cache/pom.xml | 7
modules/plugins/jdbctrace/pom.xml | 7
modules/plugins/jira/pom.xml | 5
modules/plugins/jmx/pom.xml | 7
modules/plugins/kickstart/pom.xml | 7
modules/plugins/lsof/pom.xml | 5
modules/plugins/mysql/pom.xml | 5
modules/plugins/netservices/pom.xml | 7
modules/plugins/nss/pom.xml | 7
modules/plugins/onewire/pom.xml | 7
modules/plugins/oracle/pom.xml | 7
modules/plugins/platform/pom.xml | 7
modules/plugins/postfix/pom.xml | 7
modules/plugins/postgres/pom.xml | 7
modules/plugins/rhq-agent/pom.xml | 5
modules/plugins/rhq-server/pom.xml | 5
modules/plugins/samba/pom.xml | 5
modules/plugins/script/pom.xml | 7
modules/plugins/script2/pom.xml | 7
modules/plugins/services/pom.xml | 7
modules/plugins/snmptrapd/pom.xml | 7
modules/plugins/sshd/pom.xml | 7
modules/plugins/sudoers/pom.xml | 7
modules/plugins/tomcat/pom.xml | 7
modules/plugins/twitter/pom.xml | 7
modules/plugins/virt/pom.xml | 7
modules/test-utils/pom.xml | 6
pom.xml | 17 +
72 files changed, 2232 insertions(+), 190 deletions(-)
New commits:
commit bdd8354d32fb5262c43409924fd43659ea5d991c
Author: Filip Drabek <fdrabek(a)dhcp-lab-136.englab.brq.redhat.com>
Date: Tue Oct 5 16:52:12 2010 +0200
Cobertura settings
diff --git a/modules/cli-tests/pom.xml b/modules/cli-tests/pom.xml
index 6eed8b4..37068b2 100644
--- a/modules/cli-tests/pom.xml
+++ b/modules/cli-tests/pom.xml
@@ -140,7 +140,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/common/ant-bundle/pom.xml b/modules/common/ant-bundle/pom.xml
index 0833b2a..d8fe9bc 100644
--- a/modules/common/ant-bundle/pom.xml
+++ b/modules/common/ant-bundle/pom.xml
@@ -31,7 +31,7 @@
<artifactId>rhq-core-domain</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-core-util</artifactId>
@@ -121,4 +121,91 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/common/filetemplate-bundle/pom.xml b/modules/common/filetemplate-bundle/pom.xml
index 7f7127c..b157e77 100644
--- a/modules/common/filetemplate-bundle/pom.xml
+++ b/modules/common/filetemplate-bundle/pom.xml
@@ -31,7 +31,7 @@
<artifactId>getopt</artifactId>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>rhq-core-native-system</artifactId>
@@ -50,4 +50,91 @@
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/modules/common/jboss-as/pom.xml b/modules/common/jboss-as/pom.xml
index b60da0b..a54012e 100644
--- a/modules/common/jboss-as/pom.xml
+++ b/modules/common/jboss-as/pom.xml
@@ -31,7 +31,6 @@
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
-
<dependency>
<groupId>jboss</groupId>
<artifactId>jbpm</artifactId>
@@ -97,5 +96,97 @@
</plugins>
</build>
-->
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <path id="cobertura.classpath">
+ <fileset dir="${user.home}/.m2/repository/net/sourceforge/cobertura/cobertura/1.9.4.1/">
+ <include name="cobertura*.jar" />
+ <include name="lib/**/*.jar" />
+ </fileset>
+ </path>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
diff --git a/modules/core/client-api/pom.xml b/modules/core/client-api/pom.xml
index ae391f8..4617b45 100644
--- a/modules/core/client-api/pom.xml
+++ b/modules/core/client-api/pom.xml
@@ -192,7 +192,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 11ba639..8843748 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -458,6 +458,91 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<pluginRepositories>
diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml
index 0806490..c3a2f08 100644
--- a/modules/core/domain/pom.xml
+++ b/modules/core/domain/pom.xml
@@ -436,7 +436,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/core/native-system/pom.xml b/modules/core/native-system/pom.xml
index b3a20e2..63feda4 100644
--- a/modules/core/native-system/pom.xml
+++ b/modules/core/native-system/pom.xml
@@ -27,7 +27,7 @@
</properties>
<dependencies>
-
+
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-util</artifactId>
@@ -46,7 +46,6 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<type>zip</type>
</dependency>
-
</dependencies>
<build>
@@ -106,7 +105,94 @@
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
<repositories>
<!-- This is for SIGAR 1.6.4. -->
<repository>
diff --git a/modules/core/plugin-api/pom.xml b/modules/core/plugin-api/pom.xml
index d9c8d4c..092b730 100644
--- a/modules/core/plugin-api/pom.xml
+++ b/modules/core/plugin-api/pom.xml
@@ -71,7 +71,7 @@
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
<!--<scope>test</scope> not sure about this -->
</dependency>
-
+
</dependencies>
<pluginRepositories>
@@ -97,5 +97,91 @@
</snapshots>
</repository>
</repositories>
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/modules/core/plugin-container/pom.xml b/modules/core/plugin-container/pom.xml
index bc886fe..9fb1d2b 100644
--- a/modules/core/plugin-container/pom.xml
+++ b/modules/core/plugin-container/pom.xml
@@ -215,6 +215,93 @@
</repository>
</repositories>
-
+ <profiles>
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index b895d04..5853b59 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -23,9 +23,17 @@
<properties>
<scm.module.path>modules/core/</scm.module.path>
</properties>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
<profiles>
-
+
<profile>
<id>default</id>
<activation>
diff --git a/modules/core/util/pom.xml b/modules/core/util/pom.xml
index 458c635..5f84103 100644
--- a/modules/core/util/pom.xml
+++ b/modules/core/util/pom.xml
@@ -127,7 +127,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/comm/pom.xml b/modules/enterprise/comm/pom.xml
index dcd5bed..3ccab17 100644
--- a/modules/enterprise/comm/pom.xml
+++ b/modules/enterprise/comm/pom.xml
@@ -224,7 +224,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/gui/installer-war/pom.xml b/modules/enterprise/gui/installer-war/pom.xml
index b3ccdca..0ad00e4 100644
--- a/modules/enterprise/gui/installer-war/pom.xml
+++ b/modules/enterprise/gui/installer-war/pom.xml
@@ -302,7 +302,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
diff --git a/modules/enterprise/gui/portal-war/pom.xml b/modules/enterprise/gui/portal-war/pom.xml
index f802053..048b66a 100644
--- a/modules/enterprise/gui/portal-war/pom.xml
+++ b/modules/enterprise/gui/portal-war/pom.xml
@@ -587,7 +587,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
diff --git a/modules/enterprise/pom.xml b/modules/enterprise/pom.xml
index 89f283c..f90816a 100644
--- a/modules/enterprise/pom.xml
+++ b/modules/enterprise/pom.xml
@@ -23,7 +23,16 @@
<properties>
<scm.module.path>modules/enterprise/</scm.module.path>
</properties>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<profiles>
<profile>
diff --git a/modules/enterprise/remoting/cli/pom.xml b/modules/enterprise/remoting/cli/pom.xml
index b118a9e..250ee16 100644
--- a/modules/enterprise/remoting/cli/pom.xml
+++ b/modules/enterprise/remoting/cli/pom.xml
@@ -81,7 +81,7 @@
<artifactId>commons-lang</artifactId>
<version>2.4</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
<build>
@@ -335,7 +335,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml
index d51c61d..793e85b 100644
--- a/modules/enterprise/server/container/pom.xml
+++ b/modules/enterprise/server/container/pom.xml
@@ -110,7 +110,11 @@
<type>zip</type>
<!-- NOTE: The version is defined in the root POM's dependencyManagement section. -->
</dependency>
-
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.7.3</version>
+ </dependency>
</dependencies>
<build>
@@ -347,11 +351,109 @@
</executions>
</plugin>
-
- </plugins>
- </build>
+ </plugins>
+ </build>
</profile>
-
+
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-merge</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-merge datafile="${project.build.directory}/cobertura/cobertura.ser">
+ <fileset dir="../../../../">
+ <include name="**/cobertura.ser"/>
+ </fileset>
+ </cobertura-merge>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.groovy.maven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ import java.util.regex.Pattern
+ import java.util.regex.Matcher
+
+ def repClos
+ def list = new ArrayList()
+
+ Pattern sourceCodeFolder = Pattern.compile(".*/src/main/java")
+ Pattern sourceCodeFile = Pattern.compile('.*/src/main/java/(.*.java)')
+
+ list.add("--datafile")
+ list.add("${project.build.directory}/cobertura/cobertura.ser")
+ list.add("--destination")
+ list.add("${project.build.directory}/site/cobertura")
+
+ repClosFile = {
+ Matcher matcher = sourceCodeFile.matcher(it.canonicalPath)
+ if (matcher.matches()){
+ list.add(matcher[0][1])
+ }
+
+ if (it.isDirectory()){
+ it.eachFile(repClosFile)
+ }
+ }
+
+ repClosDir = {
+ Matcher matcher = sourceCodeFolder.matcher(it.canonicalPath)
+ if (matcher.matches()){
+ list.add("--basedir")
+ list.add(it.canonicalPath)
+ it.eachFile(repClosFile)
+ }
+ it.eachDir(repClosDir);
+ }
+
+ def ear = new File("${project.build.directory}/../../../../")
+ repClosDir(ear)
+
+ net.sourceforge.cobertura.reporting.Main.main((String[]) list)
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/jar/pom.xml b/modules/enterprise/server/jar/pom.xml
index 04d3557..2d64943 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -349,7 +349,7 @@
<version>${jboss-embeddable-ejb3.version}</version>
<scope>test</scope>
</dependency>
-
+
<!-- NOTE: The remaining test deps correspond to the classes contained in hibernate-all.jar and thirdparty-all.jar. -->
<dependency>
@@ -400,7 +400,7 @@
<version>1.8</version>
<scope>test</scope>
</dependency>
-
+
</dependencies>
<build>
@@ -467,10 +467,10 @@ Build-OS-Version=${os.version}
</executions>
</plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
<!-- Everything but the web service tests, this is the standard test execution -->
- <configuration>
+ <configuration>
<excludes>
<exclude>com/**/*.java</exclude>
</excludes>
@@ -480,9 +480,9 @@ Build-OS-Version=${os.version}
<deploymentDirectory>target/classes</deploymentDirectory>
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
</systemPropertyVariables>
- <additionalClasspathElements>
+ <additionalClasspathElements>
<!-- The below is required for tests to run against Oracle. -->
- <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
+ <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement>
</additionalClasspathElements>
</configuration>
</plugin>
@@ -677,7 +677,93 @@ Build-OS-Version=${os.version}
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ <exclude name="**/DynamicConfigurationPropertyLocal.class" />
+ <exclude name="**/DynamicConfigurationPropertyBean.class" />
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/alert-operations/pom.xml b/modules/enterprise/server/plugins/alert-operations/pom.xml
index e6019b8..5946922 100644
--- a/modules/enterprise/server/plugins/alert-operations/pom.xml
+++ b/modules/enterprise/server/plugins/alert-operations/pom.xml
@@ -35,7 +35,6 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
<build>
@@ -187,7 +186,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/groovy-script/pom.xml b/modules/enterprise/server/plugins/groovy-script/pom.xml
index 1abb9b3..e382b3e 100644
--- a/modules/enterprise/server/plugins/groovy-script/pom.xml
+++ b/modules/enterprise/server/plugins/groovy-script/pom.xml
@@ -216,7 +216,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/groovy">
+ <include name="**/*.groovy" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<repositories>
diff --git a/modules/enterprise/server/plugins/jboss-software/pom.xml b/modules/enterprise/server/plugins/jboss-software/pom.xml
index 8d1e368..3f65589 100644
--- a/modules/enterprise/server/plugins/jboss-software/pom.xml
+++ b/modules/enterprise/server/plugins/jboss-software/pom.xml
@@ -147,7 +147,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/rhnhosted/pom.xml b/modules/enterprise/server/plugins/rhnhosted/pom.xml
index 6634e78..b1b201d 100644
--- a/modules/enterprise/server/plugins/rhnhosted/pom.xml
+++ b/modules/enterprise/server/plugins/rhnhosted/pom.xml
@@ -88,7 +88,8 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxb-impl.version}</version>
- </dependency>
+ </dependency>
+
</dependencies>
@@ -260,7 +261,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/enterprise/server/plugins/url/pom.xml b/modules/enterprise/server/plugins/url/pom.xml
index 9ada86c..9dd8df4 100644
--- a/modules/enterprise/server/plugins/url/pom.xml
+++ b/modules/enterprise/server/plugins/url/pom.xml
@@ -152,7 +152,92 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
\ No newline at end of file
diff --git a/modules/enterprise/server/xml-schemas/pom.xml b/modules/enterprise/server/xml-schemas/pom.xml
index 5990106..8577a40 100644
--- a/modules/enterprise/server/xml-schemas/pom.xml
+++ b/modules/enterprise/server/xml-schemas/pom.xml
@@ -25,7 +25,6 @@
</properties>
<dependencies>
-
<dependency>
<groupId>${rhq.groupId}</groupId>
<artifactId>rhq-core-domain</artifactId>
@@ -227,7 +226,91 @@
</plugins>
</build>
</profile>
-
+ <profile>
+ <id>cobertura</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>cobertura-instrument</id>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <tasks>
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/cobertura/backup"/>
+ <!-- backup all classes so that we can instrument the original classes-->
+ <copy toDir="target/cobertura/backup" verbose="true" overwrite="true">
+ <fileset dir="target/classes">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- create a properties file and save there location of cobertura data file-->
+ <touch file="target/classes/cobertura.properties"/>
+ <echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- instrument all classes in target/classes directory -->
+ <cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
+ <fileset dir="${project.build.directory}/classes">
+ <include name="**/*.class"/>
+ </fileset>
+ </cobertura-instrument>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>cobertura-report</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
+ <!-- prepare directory structure for cobertura-->
+ <mkdir dir="target/cobertura" />
+ <mkdir dir="target/site/cobertura" />
+ <!-- restore classes from backup folder to classes folder -->
+ <copy toDir="target/classes" verbose="true" overwrite="true">
+ <fileset dir="target/cobertura/backup">
+ <include name="**/*.class" />
+ </fileset>
+ </copy>
+ <!-- delete backup folder-->
+ <delete dir="target/cobertura/backup"/>
+ <!-- create a code coverage report -->
+ <cobertura-report format="html" datafile="${project.build.directory}/cobertura/cobertura.ser" destdir="${project.build.directory}/site/cobertura">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="**/*.java" />
+ </fileset>
+ </cobertura-report>
+ <!-- delete cobertura.properties file -->
+ <delete file="target/classes/cobertura.properties"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
diff --git a/modules/helpers/pom.xml b/modules/helpers/pom.xml
index a26b7f2..b5fc339 100644
--- a/modules/helpers/pom.xml
+++ b/modules/helpers/pom.xml
@@ -24,12 +24,16 @@
<scm.module.path>modules/helpers/</scm.module.path>
</properties>
- <dependencies>
-
-
-
+ <dependencies>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
+
<modules>
<!-- plugins that are used by both enterprise and embedded -->
diff --git a/modules/plugins/JBossOSGi/pom.xml b/modules/plugins/JBossOSGi/pom.xml
index 38828c4..8debc52 100644
--- a/modules/plugins/JBossOSGi/pom.xml
+++ b/modules/plugins/JBossOSGi/pom.xml
@@ -165,7 +165,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -192,7 +193,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -210,7 +211,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/aliases/pom.xml b/modules/plugins/aliases/pom.xml
index 4a4c20c..d670a77 100644
--- a/modules/plugins/aliases/pom.xml
+++ b/modules/plugins/aliases/pom.xml
@@ -222,7 +222,7 @@
</build>
</profile>
- <profile>
+ <profile>
<id>cobertura</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -230,7 +230,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -257,14 +258,14 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
<include name="**/*.class"/>
</fileset>
</cobertura-instrument>
- </tasks>
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
@@ -275,7 +276,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
@@ -305,9 +306,6 @@
</plugin>
</plugins>
</build>
- </profile>
-
-
+ </profile>
</profiles>
-
</project>
diff --git a/modules/plugins/ant-bundle/pom.xml b/modules/plugins/ant-bundle/pom.xml
index 812bba1..96a571a 100644
--- a/modules/plugins/ant-bundle/pom.xml
+++ b/modules/plugins/ant-bundle/pom.xml
@@ -281,7 +281,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -308,7 +309,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -326,7 +327,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/apache/pom.xml b/modules/plugins/apache/pom.xml
index ef266c1..96814b5 100644
--- a/modules/plugins/apache/pom.xml
+++ b/modules/plugins/apache/pom.xml
@@ -108,15 +108,14 @@
<profiles>
<profile>
<id>integration-tests</id>
- <!--
+
<activation>
<property>
<name>maven.test.skip</name>
<value>!true</value>
</property>
</activation>
- -->
-
+
<build>
<plugins>
<!-- Integration testing voodoo to load and test this plugin with its plugin dependencies -->
@@ -128,7 +127,7 @@
<configuration>
<tasks>
<echo>Setting up plugin dependencies for ${project.artifactId}-${project.version}.jar...</echo>
- <property name="settings.localRepository" location="${user.home}/.m2/repository/net/sourceforge/cobertura/cobertura/1.9.4.1/" />
+ <property name="settings.localRepository" location="${user.home}/.m2/repository/" />
<mkdir dir="target/itest" />
<mkdir dir="target/itest/plugins" />
<mkdir dir="target/itest/lib" />
@@ -287,7 +286,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -314,7 +314,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -332,7 +332,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/byteman/pom.xml b/modules/plugins/byteman/pom.xml
index edae303..2888195 100644
--- a/modules/plugins/byteman/pom.xml
+++ b/modules/plugins/byteman/pom.xml
@@ -247,7 +247,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -274,7 +275,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -292,7 +293,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/cobbler/pom.xml b/modules/plugins/cobbler/pom.xml
index d4ea9bb..f239545 100644
--- a/modules/plugins/cobbler/pom.xml
+++ b/modules/plugins/cobbler/pom.xml
@@ -33,6 +33,7 @@
<artifactId>rhq-augeas-plugin</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -256,7 +257,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -283,7 +285,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -301,7 +303,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/cron/pom.xml b/modules/plugins/cron/pom.xml
index 3869f7f..3ad74be 100644
--- a/modules/plugins/cron/pom.xml
+++ b/modules/plugins/cron/pom.xml
@@ -220,7 +220,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -247,7 +248,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -265,7 +266,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/database/pom.xml b/modules/plugins/database/pom.xml
index d4b383a..6bdbfcb 100644
--- a/modules/plugins/database/pom.xml
+++ b/modules/plugins/database/pom.xml
@@ -102,7 +102,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -129,7 +130,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -147,7 +148,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/filetemplate-bundle/pom.xml b/modules/plugins/filetemplate-bundle/pom.xml
index e7134fe..55b7b7d 100644
--- a/modules/plugins/filetemplate-bundle/pom.xml
+++ b/modules/plugins/filetemplate-bundle/pom.xml
@@ -255,6 +255,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -281,7 +282,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -299,7 +300,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/grub/pom.xml b/modules/plugins/grub/pom.xml
index 787131c..257f174 100644
--- a/modules/plugins/grub/pom.xml
+++ b/modules/plugins/grub/pom.xml
@@ -220,6 +220,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -246,7 +247,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -264,7 +265,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/hadoop/pom.xml b/modules/plugins/hadoop/pom.xml
index fb74b41..e74609a 100644
--- a/modules/plugins/hadoop/pom.xml
+++ b/modules/plugins/hadoop/pom.xml
@@ -128,7 +128,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -155,7 +156,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -173,7 +174,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/hibernate/pom.xml b/modules/plugins/hibernate/pom.xml
index f852671..e6cea36 100644
--- a/modules/plugins/hibernate/pom.xml
+++ b/modules/plugins/hibernate/pom.xml
@@ -247,7 +247,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -274,7 +275,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -292,7 +293,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/hosts/pom.xml b/modules/plugins/hosts/pom.xml
index e7d4d5b..c1f68e8 100644
--- a/modules/plugins/hosts/pom.xml
+++ b/modules/plugins/hosts/pom.xml
@@ -230,7 +230,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -257,7 +258,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -275,7 +276,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/iis/pom.xml b/modules/plugins/iis/pom.xml
index e2f2c75..fa03477 100644
--- a/modules/plugins/iis/pom.xml
+++ b/modules/plugins/iis/pom.xml
@@ -206,7 +206,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -233,7 +234,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -251,7 +252,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/irc/pom.xml b/modules/plugins/irc/pom.xml
index d56d15a..b949586 100644
--- a/modules/plugins/irc/pom.xml
+++ b/modules/plugins/irc/pom.xml
@@ -140,7 +140,7 @@
</build>
</profile>
- <profile>
+ <profile>
<id>cobertura</id>
<activation>
<activeByDefault>false</activeByDefault>
@@ -148,7 +148,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -175,7 +176,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -193,7 +194,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index ef4aff1..e788ecb 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -637,7 +637,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -664,7 +665,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -682,7 +683,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index 77e628e..e39c240 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -358,6 +358,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -384,7 +385,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -402,7 +403,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-cache-v3/pom.xml b/modules/plugins/jboss-cache-v3/pom.xml
index 1c024f7..8c64a30 100644
--- a/modules/plugins/jboss-cache-v3/pom.xml
+++ b/modules/plugins/jboss-cache-v3/pom.xml
@@ -568,7 +568,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -595,7 +596,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -613,7 +614,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jboss-cache/pom.xml b/modules/plugins/jboss-cache/pom.xml
index e5a2f5b..6344b88 100644
--- a/modules/plugins/jboss-cache/pom.xml
+++ b/modules/plugins/jboss-cache/pom.xml
@@ -222,7 +222,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -249,7 +250,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -267,7 +268,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jdbctrace/pom.xml b/modules/plugins/jdbctrace/pom.xml
index 6601d08..6b918f4 100644
--- a/modules/plugins/jdbctrace/pom.xml
+++ b/modules/plugins/jdbctrace/pom.xml
@@ -276,7 +276,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -303,7 +304,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -321,7 +322,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jira/pom.xml b/modules/plugins/jira/pom.xml
index 8551a65..ba59116 100644
--- a/modules/plugins/jira/pom.xml
+++ b/modules/plugins/jira/pom.xml
@@ -325,6 +325,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -351,7 +352,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -369,7 +370,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/jmx/pom.xml b/modules/plugins/jmx/pom.xml
index 0d9c538..55b5fdb 100644
--- a/modules/plugins/jmx/pom.xml
+++ b/modules/plugins/jmx/pom.xml
@@ -262,7 +262,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -289,7 +290,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -307,7 +308,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/kickstart/pom.xml b/modules/plugins/kickstart/pom.xml
index c8a04aa..2831c16 100644
--- a/modules/plugins/kickstart/pom.xml
+++ b/modules/plugins/kickstart/pom.xml
@@ -116,7 +116,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -143,7 +144,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -161,7 +162,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/lsof/pom.xml b/modules/plugins/lsof/pom.xml
index df802e2..7cf372b 100644
--- a/modules/plugins/lsof/pom.xml
+++ b/modules/plugins/lsof/pom.xml
@@ -248,6 +248,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -274,7 +275,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -292,7 +293,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/mysql/pom.xml b/modules/plugins/mysql/pom.xml
index ad260d7..ba3514a 100644
--- a/modules/plugins/mysql/pom.xml
+++ b/modules/plugins/mysql/pom.xml
@@ -250,6 +250,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -276,7 +277,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -294,7 +295,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/netservices/pom.xml b/modules/plugins/netservices/pom.xml
index 66e1ec5..913afcb 100644
--- a/modules/plugins/netservices/pom.xml
+++ b/modules/plugins/netservices/pom.xml
@@ -256,7 +256,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -283,7 +284,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -301,7 +302,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/nss/pom.xml b/modules/plugins/nss/pom.xml
index b63e10f..1cfe880 100644
--- a/modules/plugins/nss/pom.xml
+++ b/modules/plugins/nss/pom.xml
@@ -99,7 +99,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -126,7 +127,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -144,7 +145,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/onewire/pom.xml b/modules/plugins/onewire/pom.xml
index 3fa0f08..16165d5 100644
--- a/modules/plugins/onewire/pom.xml
+++ b/modules/plugins/onewire/pom.xml
@@ -160,7 +160,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -187,7 +188,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -205,7 +206,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml
index 6551f7f..b425488 100644
--- a/modules/plugins/oracle/pom.xml
+++ b/modules/plugins/oracle/pom.xml
@@ -255,7 +255,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -282,7 +283,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -300,7 +301,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/platform/pom.xml b/modules/plugins/platform/pom.xml
index 5e5c810..c688558 100644
--- a/modules/plugins/platform/pom.xml
+++ b/modules/plugins/platform/pom.xml
@@ -205,7 +205,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -232,7 +233,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -250,7 +251,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/postfix/pom.xml b/modules/plugins/postfix/pom.xml
index 059f197..837e1e4 100644
--- a/modules/plugins/postfix/pom.xml
+++ b/modules/plugins/postfix/pom.xml
@@ -228,7 +228,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -255,7 +256,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -273,7 +274,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/postgres/pom.xml b/modules/plugins/postgres/pom.xml
index b227b4a..145ae59 100644
--- a/modules/plugins/postgres/pom.xml
+++ b/modules/plugins/postgres/pom.xml
@@ -248,7 +248,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -275,7 +276,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -293,7 +294,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/rhq-agent/pom.xml b/modules/plugins/rhq-agent/pom.xml
index df376e9..afd2a38 100644
--- a/modules/plugins/rhq-agent/pom.xml
+++ b/modules/plugins/rhq-agent/pom.xml
@@ -221,6 +221,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -247,7 +248,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -265,7 +266,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/rhq-server/pom.xml b/modules/plugins/rhq-server/pom.xml
index 1b50ec5..40a19c5 100644
--- a/modules/plugins/rhq-server/pom.xml
+++ b/modules/plugins/rhq-server/pom.xml
@@ -247,6 +247,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -273,7 +274,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -291,7 +292,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/samba/pom.xml b/modules/plugins/samba/pom.xml
index 0a4becf..1208f7f 100644
--- a/modules/plugins/samba/pom.xml
+++ b/modules/plugins/samba/pom.xml
@@ -229,6 +229,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -255,7 +256,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -273,7 +274,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/script/pom.xml b/modules/plugins/script/pom.xml
index c61942f..242913a 100644
--- a/modules/plugins/script/pom.xml
+++ b/modules/plugins/script/pom.xml
@@ -200,7 +200,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -227,7 +228,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -245,7 +246,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/script2/pom.xml b/modules/plugins/script2/pom.xml
index 5a76049..4666ae1 100644
--- a/modules/plugins/script2/pom.xml
+++ b/modules/plugins/script2/pom.xml
@@ -179,7 +179,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -206,7 +207,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -224,7 +225,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/services/pom.xml b/modules/plugins/services/pom.xml
index e48e3d7..f27b3ec 100644
--- a/modules/plugins/services/pom.xml
+++ b/modules/plugins/services/pom.xml
@@ -123,7 +123,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -150,7 +151,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -168,7 +169,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/snmptrapd/pom.xml b/modules/plugins/snmptrapd/pom.xml
index 035eaba..072985e 100644
--- a/modules/plugins/snmptrapd/pom.xml
+++ b/modules/plugins/snmptrapd/pom.xml
@@ -160,7 +160,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -187,7 +188,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -205,7 +206,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/sshd/pom.xml b/modules/plugins/sshd/pom.xml
index f05a21e..08a2ef1 100644
--- a/modules/plugins/sshd/pom.xml
+++ b/modules/plugins/sshd/pom.xml
@@ -220,7 +220,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -247,7 +248,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -265,7 +266,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/sudoers/pom.xml b/modules/plugins/sudoers/pom.xml
index 8aaf25c..251d7f3 100644
--- a/modules/plugins/sudoers/pom.xml
+++ b/modules/plugins/sudoers/pom.xml
@@ -217,7 +217,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -244,7 +245,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -262,7 +263,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/tomcat/pom.xml b/modules/plugins/tomcat/pom.xml
index 8d53a0a..88c9156 100644
--- a/modules/plugins/tomcat/pom.xml
+++ b/modules/plugins/tomcat/pom.xml
@@ -214,7 +214,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -241,7 +242,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -259,7 +260,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/twitter/pom.xml b/modules/plugins/twitter/pom.xml
index f94b21b..ba123b3 100644
--- a/modules/plugins/twitter/pom.xml
+++ b/modules/plugins/twitter/pom.xml
@@ -140,7 +140,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -167,7 +168,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -185,7 +186,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/plugins/virt/pom.xml b/modules/plugins/virt/pom.xml
index 35082d0..757207c 100644
--- a/modules/plugins/virt/pom.xml
+++ b/modules/plugins/virt/pom.xml
@@ -288,7 +288,8 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
@@ -315,7 +316,7 @@
<!-- create a properties file and save there location of cobertura data file-->
<touch file="target/classes/cobertura.properties"/>
<echo file="target/classes/cobertura.properties">net.sourceforge.cobertura.datafile=${project.build.directory}/cobertura/cobertura.ser</echo>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- instrument all classes in target/classes directory -->
<cobertura-instrument datafile="${project.build.directory}/cobertura/cobertura.ser" todir="${project.build.directory}/classes">
<fileset dir="${project.build.directory}/classes">
@@ -333,7 +334,7 @@
<phase>post-integration-test</phase>
<configuration>
<tasks>
- <taskdef classpathref="maven.runtime.classpath" resource="tasks.properties" />
+ <taskdef classpathref="maven.plugin.classpath" resource="tasks.properties" />
<!-- prepare directory structure for cobertura-->
<mkdir dir="target/cobertura" />
<mkdir dir="target/site/cobertura" />
diff --git a/modules/test-utils/pom.xml b/modules/test-utils/pom.xml
index 5f96131..c873303 100644
--- a/modules/test-utils/pom.xml
+++ b/modules/test-utils/pom.xml
@@ -27,5 +27,11 @@
<artifactId>commons-beanutils</artifactId>
<version>1.8.2</version>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/pom.xml b/pom.xml
index 497a520..686608a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,7 +146,7 @@
<!-- NOTE: The below line is a workaround for a Maven bug, where it does not expand settings.* properties
used in the distributionManagement section of the POM. -->
- <localRepository>${user.home}/.m2/repository</localRepository>
+ <localRepository>${user.home}/.m2/repository</localRepository>
</properties>
@@ -413,7 +413,6 @@
<artifactId>jna</artifactId>
<version>${jna.version}</version>
</dependency>
-
</dependencies>
</dependencyManagement>
@@ -457,6 +456,13 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>net.sourceforge.cobertura</groupId>
+ <artifactId>cobertura</artifactId>
+ <version>1.9.4.1</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
@@ -1144,12 +1150,7 @@
<inherited>true</inherited>
</plugin>
-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- <inherited>true</inherited>
- </plugin>
+
<plugin>
<!-- must be last plugin in the list -->
<groupId>org.codehaus.mojo</groupId>
1
0
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java | 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java | 40 ++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java | 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java | 23 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java | 109 ++++++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java | 14 +
7 files changed, 132 insertions(+), 63 deletions(-)
New commits:
commit b1efc0296a80ed58d317466a78e141b285290fb1
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Oct 4 18:03:28 2010 -0400
Initial Manual Add Work
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
index 69fed11..d2c971a 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/gwt/ResourceGWTService.java
@@ -68,7 +68,8 @@ public interface ResourceGWTService extends RemoteService {
void ignoreResources(Integer[] resourceIds);
void unignoreResources(Integer[] resourceIds);
-
+
List<ResourceError> findResourceErrors(int resourceId);
-}
+ Resource manuallyAddResource(int resourceTypeId, int parentResourceId, Configuration pluginConfiguration);
+}
\ No newline at end of file
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
index d6cfdba..97a7d2f 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceTreeView.java
@@ -300,9 +300,11 @@ public class ResourceTreeView extends LocatableVLayout {
// Update breadcrumbs
if (currentViewId != null) {
currentViewId.getBreadcrumbs().clear();
- for (int i = parents.length - 1; i >= 0; i--) {
- TreeNode n = parents[i];
- adjustBreadcrumb(n, currentViewId);
+ if (null != parents) {
+ for (int i = parents.length - 1; i >= 0; i--) {
+ TreeNode n = parents[i];
+ adjustBreadcrumb(n, currentViewId);
+ }
}
adjustBreadcrumb(selectedNode, currentViewId);
CoreGUI.refreshBreadCrumbTrail();
@@ -456,13 +458,15 @@ public class ResourceTreeView extends LocatableVLayout {
for (final ResourceType childType : resourceType.getChildResourceTypes()) {
if (childType.isCreatable()) {
MenuItem createItem = new MenuItem(childType.getName());
- createChildSubMenu.addItem(createItem);
+
createItem.addClickHandler(new ClickHandler() {
public void onClick(MenuItemClickEvent event) {
ResourceFactoryCreateWizard.showCreateWizard(resource, childType);
}
});
+ createChildSubMenu.addItem(createItem);
+
}
}
createChildMenu.setSubmenu(createChildSubMenu);
@@ -472,21 +476,30 @@ public class ResourceTreeView extends LocatableVLayout {
// Manually Add Menu
MenuItem importChildMenu = new MenuItem("Import");
Menu importChildSubMenu = new Menu();
- for (ResourceType childType : resourceType.getChildResourceTypes()) {
+ for (final ResourceType childType : resourceType.getChildResourceTypes()) {
if (childType.isSupportsManualAdd()) {
- importChildSubMenu.addItem(new MenuItem(childType.getName()));
- //todo action
+ MenuItem importItem = new MenuItem(childType.getName());
+
+ importItem.addClickHandler(new ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ ResourceFactoryCreateWizard.showImportWizard(resource, childType);
+ }
+ });
+
+ importChildSubMenu.addItem(importItem);
}
}
+
if (resourceType.getCategory() == ResourceCategory.PLATFORM) {
- loadManuallyAddServersToPlatforms(importChildSubMenu);
+ loadManuallyAddServersToPlatforms(importChildSubMenu, resource);
}
+
importChildMenu.setSubmenu(importChildSubMenu);
importChildMenu.setEnabled(importChildSubMenu.getItems().length > 0);
resourceContextMenu.addItem(importChildMenu);
}
- private void loadManuallyAddServersToPlatforms(final Menu manuallyAddMenu) {
+ private void loadManuallyAddServersToPlatforms(final Menu manuallyAddMenu, final Resource resource) {
ResourceTypeGWTServiceAsync rts = GWTServiceLookup.getResourceTypeGWTService();
ResourceTypeCriteria criteria = new ResourceTypeCriteria();
@@ -498,9 +511,16 @@ public class ResourceTreeView extends LocatableVLayout {
}
public void onSuccess(PageList<ResourceType> result) {
- for (ResourceType type : result) {
+ for (final ResourceType type : result) {
if (type.getParentResourceTypes() == null || type.getParentResourceTypes().isEmpty()) {
MenuItem item = new MenuItem(type.getName());
+
+ item.addClickHandler(new ClickHandler() {
+ public void onClick(MenuItemClickEvent event) {
+ ResourceFactoryCreateWizard.showImportWizard(resource, type);
+ }
+ });
+
manuallyAddMenu.addItem(item);
}
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java
index 84c6b55..5d7fbdc 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationStep.java
@@ -49,6 +49,7 @@ public class ConfigurationStep extends AbstractWizardStep {
}
public boolean nextPage() {
+ wizard.execute();
return true;
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java
index 0db5af8..a588010 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ConfigurationTemplateStep.java
@@ -20,6 +20,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.factory;
import java.util.Map;
+import com.smartgwt.client.types.TitleOrientation;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.fields.SelectItem;
@@ -49,10 +50,17 @@ public class ConfigurationTemplateStep extends AbstractWizardStep {
form = new LocatableDynamicForm("ResFactConfigTemplate");
- TextItem nameItem = new TextItem("resourceName", "Resource Name");
- nameItem.setRequired(true);
+ TextItem nameItem = null;
- SelectItem templateSelect = new SelectItem("template", "Template");
+ if (!this.wizard.isImport()) {
+ nameItem = new TextItem("resourceName", "New Resource Name");
+ nameItem.setWidth(300);
+ nameItem.setRequired(true);
+ }
+
+ SelectItem templateSelect = new SelectItem("template", "Connection Property Templates (Choose One)");
+ templateSelect.setTitleOrientation(TitleOrientation.TOP);
+ templateSelect.setWidth(300);
ConfigurationDefinition definition = wizard.getConfigurationDefinition();
@@ -64,9 +72,14 @@ public class ConfigurationTemplateStep extends AbstractWizardStep {
templateSelect.setDisabled(true);
}
- form.setItems(nameItem, templateSelect);
+ if (null != nameItem) {
+ form.setItems(nameItem, templateSelect);
+ } else {
+ form.setItems(templateSelect);
+ }
}
+
return form;
}
@@ -75,7 +88,7 @@ public class ConfigurationTemplateStep extends AbstractWizardStep {
}
public String getName() {
- return "New Resource";
+ return "Resource Information";
}
public Configuration getConfiguration() {
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java
index bad2058..7968635 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/factory/ResourceFactoryCreateWizard.java
@@ -19,14 +19,9 @@
package org.rhq.enterprise.gui.coregui.client.inventory.resource.factory;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.EnumSet;
-import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.smartgwt.client.widgets.IButton;
-import com.smartgwt.client.widgets.events.ClickEvent;
-import com.smartgwt.client.widgets.events.ClickHandler;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
@@ -48,6 +43,7 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
private ConfigurationDefinition configurationDefinition;
private Resource parentResource;
private ResourceType createType;
+ private boolean isImport; // manual add vs. create new child
private WizardView view;
@@ -55,10 +51,11 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
private ConfigurationStep configurationStep;
public ResourceFactoryCreateWizard(Resource parentResource, ResourceType createType,
- ConfigurationDefinition configurationDefinition) {
+ ConfigurationDefinition configurationDefinition, boolean isImport) {
this.parentResource = parentResource;
this.createType = createType;
this.configurationDefinition = configurationDefinition;
+ this.isImport = isImport;
assert parentResource != null;
assert createType != null;
@@ -66,8 +63,12 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
ArrayList<WizardStep> steps = new ArrayList<WizardStep>();
- configurationTemplateStep = new ConfigurationTemplateStep(this);
- steps.add(configurationTemplateStep);
+ // skip the template step if this is an import (no resource name to be gathered) and the
+ // type has only the default template to offer for user selection.
+ if (!(this.isImport && this.configurationDefinition.getTemplates().size() < 2)) {
+ this.configurationTemplateStep = new ConfigurationTemplateStep(this);
+ steps.add(configurationTemplateStep);
+ }
configurationStep = new ConfigurationStep(this);
steps.add(configurationStep);
@@ -76,52 +77,57 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
}
public String getWindowTitle() {
- return "Resource Create Wizard";
+ return isImport() ? "Import Resource Wizard" : "Resource Create Wizard";
}
public String getTitle() {
- return "Create New " + createType.getName();
+ return (isImport() ? "Import Resource of Type: " : "Create New Resource of Type: ") + createType.getName();
}
public String getSubtitle() {
return null;
}
- public List<IButton> getCustomButtons(int step) {
- switch (step) {
- case 1:
- IButton createButton = new IButton("Create");
- createButton.addClickHandler(new ClickHandler() {
- public void onClick(ClickEvent clickEvent) {
- execute();
- }
- });
- return Collections.singletonList(createButton);
- }
- return null;
- }
-
- private void execute() {
+ public void execute() {
- int parentReourceId = parentResource.getId();
+ int parentResourceId = parentResource.getId();
int createTypeId = createType.getId();
- String newResourceName = configurationTemplateStep.getResourceName();
Configuration newConfiguration = configurationStep.getConfiguration();
- GWTServiceLookup.getResourceService().createResource(parentReourceId, createTypeId, newResourceName,
- newConfiguration, new AsyncCallback<Void>() {
- public void onFailure(Throwable caught) {
- CoreGUI.getErrorHandler().handleError("Failed to create new resource", caught);
- view.closeDialog();
- }
-
- public void onSuccess(Void result) {
- CoreGUI.getMessageCenter().notify(
- new Message("Submitted request to create new resource ["
- + configurationTemplateStep.getResourceName() + "]", Message.Severity.Info));
- view.closeDialog();
- }
- });
+ if (isImport) {
+ GWTServiceLookup.getResourceService().manuallyAddResource(createTypeId, parentResourceId, newConfiguration,
+ new AsyncCallback<Resource>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to manually add resource", caught);
+ view.closeDialog();
+ }
+
+ public void onSuccess(Resource result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message("Submitted request to manually add [" + createType.getName() + "]",
+ Message.Severity.Info));
+ view.closeDialog();
+ }
+ });
+
+ } else {
+ String newResourceName = configurationTemplateStep.getResourceName();
+
+ GWTServiceLookup.getResourceService().createResource(parentResourceId, createTypeId, newResourceName,
+ newConfiguration, new AsyncCallback<Void>() {
+ public void onFailure(Throwable caught) {
+ CoreGUI.getErrorHandler().handleError("Failed to create new resource", caught);
+ view.closeDialog();
+ }
+
+ public void onSuccess(Void result) {
+ CoreGUI.getMessageCenter().notify(
+ new Message("Submitted request to create new resource ["
+ + configurationTemplateStep.getResourceName() + "]", Message.Severity.Info));
+ view.closeDialog();
+ }
+ });
+ }
}
public void display() {
@@ -135,7 +141,19 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
new ResourceTypeRepository.TypeLoadedCallback() {
public void onTypesLoaded(ResourceType type) {
ResourceFactoryCreateWizard wizard = new ResourceFactoryCreateWizard(parentResource, type, type
- .getResourceConfigurationDefinition());
+ .getResourceConfigurationDefinition(), false);
+ wizard.display();
+ }
+ });
+ }
+
+ public static void showImportWizard(final Resource parentResource, ResourceType childType) {
+ ResourceTypeRepository.Cache.getInstance().getResourceTypes(childType.getId(),
+ EnumSet.of(ResourceTypeRepository.MetadataType.pluginConfigurationDefinition),
+ new ResourceTypeRepository.TypeLoadedCallback() {
+ public void onTypesLoaded(ResourceType type) {
+ ResourceFactoryCreateWizard wizard = new ResourceFactoryCreateWizard(parentResource, type, type
+ .getPluginConfigurationDefinition(), true);
wizard.display();
}
});
@@ -146,7 +164,8 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
}
public Configuration getConfiguration() {
- return configurationTemplateStep.getConfiguration();
+ return (null == configurationTemplateStep) ? this.configurationDefinition.getDefaultTemplate()
+ .createConfiguration() : configurationTemplateStep.getConfiguration();
}
public Resource getParentResource() {
@@ -157,6 +176,10 @@ public class ResourceFactoryCreateWizard extends AbstractWizard {
return createType;
}
+ public boolean isImport() {
+ return isImport;
+ }
+
public void cancel() {
// TODO: revert back to original state
}
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
index 071d45c..473a257 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -203,7 +203,7 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
platform.setChildren(servers);
}
- return platforms;
+ return SerialUtility.prepare(platforms, "ResourceService.findRecentlyAddedResources");
} catch (Exception e) {
throw new RuntimeException(ThrowableUtil.getAllMessages(e));
}
@@ -286,4 +286,14 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
return SerialUtility.prepare(resourceManager.findResourceErrors(getSessionSubject(), resourceId),
"ResourceService.getResourceErrors");
}
+
+ public Resource manuallyAddResource(int resourceTypeId, int parentResourceId, Configuration pluginConfiguration) {
+ try {
+ Resource result = discoveryBoss.manuallyAddResource(getSessionSubject(), resourceTypeId, parentResourceId,
+ pluginConfiguration);
+ return SerialUtility.prepare(result, "ResourceService.manuallyAddResource");
+ } catch (Exception e) {
+ throw new RuntimeException(ThrowableUtil.getAllMessages(e));
+ }
+ }
}
commit b7132dfd737d234ba5f72293ce12c720f769c77a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Oct 4 15:06:46 2010 -0400
Disable the experimental browser window logging out of the box
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
index ecfac0b..040fc16 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml
@@ -38,7 +38,8 @@
2. In hosted mode, the windows are not automatically closed,
although you can easily close them manually in the usual way
-->
- <!--
+ <!-- When enabled FireFox is hard to use due to excessive popup window generation
+
<set-property name="log_WindowLogger" value="ENABLED" />
-->
commit 65926cd08afe48d612622182e56aa2fe93e04f96
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Oct 1 09:57:45 2010 -0400
ResourceTree Authz work
- support for locked nodes
- support for autogroups for non-inventory managers. Now that AGs are
backed by compat groups it's necessary for non-inv-managers
to be able to create and access the private groups that they own. Private
groups (aka subject-owned groups) are new, they are basically groups
that are tagged with the creating subjectId. Those groups can be
created (via a new slsb call) and fetched (via a new ResourceGroupCriteria
filter) w/o inventory manager perms.
- note: i had to move rhq_subject to auth-schema from authz-schema and
slightly change the dbsetup order to make it ok for rhq_resource_group to
reference rhq_subject.
- schema spec bumped to 2.97
- added ResourceLineageComposite to combine Resource and locked/viewable
info.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
index a004680..071d45c 100644
--- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
+++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/server/gwt/ResourceGWTServiceImpl.java
@@ -281,7 +281,7 @@ public class ResourceGWTServiceImpl extends AbstractGWTServiceImpl implements Re
throw new RuntimeException(ThrowableUtil.getAllMessages(e));
}
}
-
+
public List<ResourceError> findResourceErrors(int resourceId) {
return SerialUtility.prepare(resourceManager.findResourceErrors(getSessionSubject(), resourceId),
"ResourceService.getResourceErrors");
1
0