modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
| 46 +++-------
modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
| 6 -
2 files changed, 22 insertions(+), 30 deletions(-)
New commits:
commit b5ab75a28ec1a0bd62b914de1e52869f1bf6a9f1
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Jun 22 11:41:22 2012 -0400
get the as5 plugin descriptor generator compiling again
diff --git a/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
b/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
index 965002a..dbeec8f 100644
--- a/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
+++ b/modules/jopr/tools/jbas5-plugin-descriptor-gen/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.rhq</groupId>
<artifactId>rhq-parent</artifactId>
- <version>4.3.0-SNAPSHOT</version>
+ <version>4.5.0-SNAPSHOT</version>
<relativePath>../../../../pom.xml</relativePath>
</parent>
@@ -313,43 +313,33 @@ t section. -->
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- </configuration>
- </plugin>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ <archive>
+ <manifest>
+
<mainClass>org.jboss.jopr.tool.jbas5.PluginDescriptorGenerator</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
<executions>
<execution>
- <id>copy-dependencies</id>
+ <id>make-assembly</id>
+ <!-- this is used for inheritance merges -->
<phase>package</phase>
+ <!-- bind to the packaging phase -->
<goals>
- <goal>copy-dependencies</goal>
+ <goal>single</goal>
</goals>
- <configuration>
- <includeScope>runtime</includeScope>
- <excludeTransitive>true</excludeTransitive>
- <outputDirectory>target/lib</outputDirectory>
- </configuration>
</execution>
</executions>
</plugin>
-
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
-
<mainClass>org.jboss.jopr.tool.jbas5.PluginDescriptorGenerator</mainClass>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib</classpathPrefix>
- </manifest>
- </archive>
- </configuration>
- </plugin>
+
</plugins>
</build>
diff --git
a/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
b/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
index 5019fea..31de2a8 100644
---
a/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
+++
b/modules/jopr/tools/jbas5-plugin-descriptor-gen/src/main/java/org/jboss/jopr/tool/jbas5/PluginDescriptorGenerator.java
@@ -26,6 +26,8 @@ import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
+import java.lang.String;
+import java.math.BigInteger;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -232,7 +234,7 @@ public class PluginDescriptorGenerator
if (metricDef.getCategory() != null)
metricDescriptor.setCategory(metricDef.getCategory().name().toLowerCase());
metricDescriptor.setDataType(metricDef.getDataType().name().toLowerCase());
- metricDescriptor.setDefaultInterval((int)metricDef.getDefaultInterval());
+ metricDescriptor.setDefaultInterval(new
BigInteger(String.valueOf(metricDef.getDefaultInterval())));
metricDescriptor.setDefaultOn(metricDef.isDefaultOn());
metricDescriptor.setDescription(metricDef.getDescription());
metricDescriptor.setDestinationType(metricDef.getDestinationType());
@@ -312,7 +314,7 @@ public class PluginDescriptorGenerator
{
PropertyDefinitionMap propDefMap = (PropertyDefinitionMap)propDef;
MapProperty mapProp = new MapProperty();
- for (PropertyDefinition itemPropDef :
propDefMap.getPropertyDefinitions().values())
+ for (PropertyDefinition itemPropDef : propDefMap.getPropertyDefinitions())
{
ConfigurationProperty itemConfigProp =
convertPropertyDefinitionToConfigurationProperty(itemPropDef);
JAXBElement propElement = getJAXBElement(itemConfigProp);
Show replies by date