Menu
▾
▴
[Rhq-commits] [rhq-project.org rhq] [1756] check-in problem, continuing...
|
From: <jsh...@rh...> - 2008-10-15 16:13:41
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><style type="text/css"><!-- #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } #msg DL { border : 1px #006 solid; background-color : #369; padding : 6px; color : #fff; } #msg DT { float : left; width : 6em; font-weight : bold; } #msg DL, #msg DT, #msg UL, #msg LI { font-family : arial,helvetica,sans-serif; font-size : 10pt; } h3 { font-family : arial,helvetica,sans-serif; font-size : 10pt; font-weight : bold; } #msg PRE { overflow : auto; white-space : normal; background-color : #ffc; border : 1px #fc0 solid; padding : 6px; } #msg UL, PRE, .diff { overflow : auto; } #patch h4 { font-family : arial,helvetica,sans-serif; font-size : 10pt; } #patch h4 { padding: 8px; background : #369; color : #fff; margin : 0; } #patch .propset h4, #patch .binary h4 {margin: 0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {background:#eeeeee;padding: 0 0 10px 0;} #patch .propset .diff, #patch .binary .diff {padding: 10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch .add {background:#ddffdd;} #patch .rem {background:#ffdddd;} #patch .lines, .info {color:#888888;background:#ffffff;} .diff { width : 100%; } --></style> <title>[rhq-project.org rhq] [1756] check-in problem, continuing...</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>1756</dd> <dt>Author</dt> <dd>jshaughn</dd> <dt>Date</dt> <dd>2008-10-15 11:11:01 -0500 (Wed, 15 Oct 2008)</dd> </dl> <h3>Log Message</h3> <pre>check-in problem, continuing... Add new profiles, "community" and "ojdbc-driver". These profiles support the addition of the community plugins in the RHQ build and the ability to include the oracle driver only when available and appropriate. Also updated various poms to get names and versions in line. A couple of code changes for out of date community plugins.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#rhqtrunkmodulespluginshudsonpomxml">rhq/trunk/modules/plugins/hudson/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginsjirapomxml">rhq/trunk/modules/plugins/jira/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginsmysqlpomxml">rhq/trunk/modules/plugins/mysql/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginsnetservicespomxml">rhq/trunk/modules/plugins/netservices/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginsoraclepomxml">rhq/trunk/modules/plugins/oracle/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginsoraclesrcmainresourcesMETAINFrhqpluginxml">rhq/trunk/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml</a></li> <li><a href="#rhqtrunkmodulespluginssnmptrapdpomxml">rhq/trunk/modules/plugins/snmptrapd/pom.xml</a></li> <li><a href="#rhqtrunkmodulespluginssnmptrapdsrcmainjavaorgrhqpluginssnmptrapdSnmpTrapEventPollerjava">rhq/trunk/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapEventPoller.java</a></li> <li><a href="#rhqtrunkmodulespluginsvirtpomxml">rhq/trunk/modules/plugins/virt/pom.xml</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="rhqtrunkmodulespluginshudsonpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/hudson/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/hudson/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/hudson/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -14,8 +14,8 @@ </span><span class="cx"> <version>1.2.0-SNAPSHOT</version> <packaging>jar</packaging> </span><span class="rem">- <name>hudson</name> - <description>RHQ Plugin</description> </span><span class="add">+ <name>RHQ Hudson Plugin</name> + <description>RHQ Hudson Plugin</description> </span><span class="cx"> <properties> <rhq.version>1.2.0-SNAPSHOT</rhq.version> </span><span class="lines">@@ -128,12 +128,6 @@ </span><span class="cx"> </configuration> </plugin> </span><span class="rem">- <plugin> - <groupId>org.rhq</groupId> - <artifactId>rhq-plugin-validator</artifactId> - <version>${rhq.version}</version> - </plugin> - </span><span class="cx"> <!-- If your plugin has third-party jar dependencies that are not already available when deployed in the plugin container, you can package these </span></pre></div> <a id="rhqtrunkmodulespluginsjirapomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/jira/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/jira/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/jira/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> </span><span class="rem">- <version>1.0.1-SNAPSHOT</version> </span><span class="add">+ <version>1.2.0-SNAPSHOT</version> </span><span class="cx"> </parent> <groupId>org.rhq</groupId> </span></pre></div> <a id="rhqtrunkmodulespluginsmysqlpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/mysql/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/mysql/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/mysql/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> </span><span class="rem">- <version>1.0.1-SNAPSHOT</version> </span><span class="add">+ <version>1.2.0-SNAPSHOT</version> </span><span class="cx"> </parent> <groupId>org.rhq</groupId> </span></pre></div> <a id="rhqtrunkmodulespluginsnetservicespomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/netservices/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/netservices/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/netservices/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -5,7 +5,7 @@ </span><span class="cx"> <parent> <groupId>org.rhq</groupId> <artifactId>rhq-plugins-parent</artifactId> </span><span class="rem">- <version>1.0.1-SNAPSHOT</version> </span><span class="add">+ <version>1.2.0-SNAPSHOT</version> </span><span class="cx"> </parent> <groupId>org.rhq</groupId> </span></pre></div> <a id="rhqtrunkmodulespluginsoraclepomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/oracle/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/oracle/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/oracle/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -26,14 +26,7 @@ </span><span class="cx"> <dependencies> </span><span class="rem">- <!-- Oracle JDBC driver - needed by both tests and runtime. --> </span><span class="cx"> <dependency> </span><span class="rem">- <groupId>ojdbc14</groupId> - <artifactId>ojdbc14</artifactId> - <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> - </dependency> - - <dependency> </span><span class="cx"> <groupId>org.hyperic</groupId> <artifactId>sigar</artifactId> <!-- NOTE: The version is defined in the root POM's dependencyManagement section. --> </span><span class="lines">@@ -49,38 +42,43 @@ </span><span class="cx"> </dependencies> </span><span class="rem">- <build> - <plugins> - - <!-- Make sure the Oracle JDBC jar gets included in the plugin jar's lib dir. --> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.0</version> - <executions> - <execution> - <id>copy-oracle-jar</id> - <phase>process-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>ojdbc14</groupId> - <artifactId>ojdbc14</artifactId> - </artifactItem> - </artifactItems> - <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - - - <profiles> </span><span class="add">+ <profiles> + <profile> + <id>ojdbc-driver</id> + + <!-- Make sure the Oracle JDBC jar gets included in the plugin jar's lib dir. --> + + <build> + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.0</version> + <executions> + <execution> + <id>copy-oracle-jar</id> + <phase>process-resources</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>ojdbc14</groupId> + <artifactId>ojdbc14</artifactId> + </artifactItem> + </artifactItems> + <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + + </profile> + </span><span class="cx"> <profile> <id>integration-tests</id> <activation> </span></pre></div> <a id="rhqtrunkmodulespluginsoraclesrcmainresourcesMETAINFrhqpluginxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/oracle/src/main/resources/META-INF/rhq-plugin.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -573,7 +573,7 @@ </span><span class="cx"> <service name="Oracle User" discovery="org.rhq.plugins.database.CustomTableRowDiscoveryComponent" </span><span class="rem">- class="org.rhq.plugins.database.OracleUserComponent"> </span><span class="add">+ class="org.rhq.plugins.oracle.OracleUserComponent"> </span><span class="cx"> <plugin-configuration> <c:simple-property name="table" default="DBA_USERS"/> </span></pre></div> <a id="rhqtrunkmodulespluginssnmptrapdpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/snmptrapd/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/snmptrapd/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/snmptrapd/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -9,8 +9,7 @@ </span><span class="cx"> <groupId>org.rhq</groupId> <artifactId>rhq-snmptrapd-plugin</artifactId> </span><span class="rem">- <name>snmptrapd</name> - <version>1.2.0-SNAPSHOT</version> </span><span class="add">+ <name>RHQ SnmpTrapd Plugin</name> </span><span class="cx"> <description>RHQ SnmpTrapd Plugin</description> <scm> </span><span class="lines">@@ -20,8 +19,6 @@ </span><span class="cx"> <properties> <scm.module.path>modules/plugins/snmptrapd/</scm.module.path> </span><span class="rem">- <!-- next is needed for the plugin validator --> - <rhq.version>1.0.0.GA</rhq.version> </span><span class="cx"> </properties> <build> </span><span class="lines">@@ -33,11 +30,6 @@ </span><span class="cx"> <target>1.5</target> </configuration> </plugin> </span><span class="rem">- <plugin> - <groupId>org.rhq</groupId> - <artifactId>rhq-plugin-validator</artifactId> - <version>${rhq.version}</version> - </plugin> </span><span class="cx"> <plugin> <artifactId>maven-dependency-plugin</artifactId> </span><span class="lines">@@ -187,19 +179,19 @@ </span><span class="cx"> <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-domain</artifactId> </span><span class="rem">- <version>${rhq.version}</version> </span><span class="add">+ <version>${project.version}</version> </span><span class="cx"> <scope>provided</scope> </dependency> <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-plugin-api</artifactId> </span><span class="rem">- <version>${rhq.version}</version> </span><span class="add">+ <version>${project.version}</version> </span><span class="cx"> <scope>provided</scope> </dependency> <dependency> <groupId>org.rhq</groupId> <artifactId>rhq-core-native-system</artifactId> </span><span class="rem">- <version>${rhq.version}</version> </span><span class="add">+ <version>${project.version}</version> </span><span class="cx"> <scope>provided</scope> </dependency> <dependency> </span></pre></div> <a id="rhqtrunkmodulespluginssnmptrapdsrcmainjavaorgrhqpluginssnmptrapdSnmpTrapEventPollerjava"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapEventPoller.java (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapEventPoller.java 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/snmptrapd/src/main/java/org/rhq/plugins/snmptrapd/SnmpTrapEventPoller.java 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -21,7 +21,6 @@ </span><span class="cx"> import java.io.IOException; import java.io.InputStream; </span><span class="rem">-import java.util.Date; </span><span class="cx"> import java.util.HashSet; import java.util.List; import java.util.Properties; </span><span class="lines">@@ -58,7 +57,7 @@ </span><span class="cx"> public SnmpTrapEventPoller() { severityOid = null; </span><span class="rem">- // Load proprties, that translate from oid strings (1.2.2...) to their name in the mib </span><span class="add">+ // Load properties, that translate from oid strings (1.2.2...) to their name in the mib </span><span class="cx"> // Should be done through a mib parser ClassLoader cl = getClass().getClassLoader(); InputStream in = cl.getResourceAsStream("MibTrans.properties"); </span><span class="lines">@@ -167,7 +166,8 @@ </span><span class="cx"> } } </span><span class="rem">- Event event = new Event(getEventType(), sourceAddr, new Date(), severity, payload.toString()); </span><span class="add">+ Event event = new Event(getEventType(), sourceAddr, System.currentTimeMillis(), severity, payload + .toString()); </span><span class="cx"> synchronized (events) { events.add(event); </span></pre></div> <a id="rhqtrunkmodulespluginsvirtpomxml"></a> <div class="modfile"><h4>Modified: rhq/trunk/modules/plugins/virt/pom.xml (1755 => 1756)</h4> <pre class="diff"> <span class="info">--- rhq/trunk/modules/plugins/virt/pom.xml 2008-10-15 16:09:43 UTC (rev 1755) +++ rhq/trunk/modules/plugins/virt/pom.xml 2008-10-15 16:11:01 UTC (rev 1756) </span><span class="lines">@@ -8,7 +8,7 @@ </span><span class="cx"> </parent> </span><span class="rem">- <groupId>org.jboss.on</groupId> </span><span class="add">+ <groupId>org.rhq</groupId> </span><span class="cx"> <artifactId>rhq-virt-plugin</artifactId> <packaging>jar</packaging> </span> </pre> </div> </div> </body> </html> |