dhustace | 1 Mar 20:31 2009
Picon
Picon

SF.net SVN: opennms:[12459] opennms/trunk/opennms-base-assembly/src/main/ filtered/etc/ackd-configuration.xml

Revision: 12459
          http://opennms.svn.sourceforge.net/opennms/?rev=12459&view=rev
Author:   dhustace
Date:     2009-03-01 19:31:43 +0000 (Sun, 01 Mar 2009)

Log Message:
-----------
make notifyid expression match default notification config

Modified Paths:
--------------
    opennms/trunk/opennms-base-assembly/src/main/filtered/etc/ackd-configuration.xml

Modified: opennms/trunk/opennms-base-assembly/src/main/filtered/etc/ackd-configuration.xml
===================================================================
---
opennms/trunk/opennms-base-assembly/src/main/filtered/etc/ackd-configuration.xml	2009-02-28
00:04:28 UTC (rev 12458)
+++
opennms/trunk/opennms-base-assembly/src/main/filtered/etc/ackd-configuration.xml	2009-03-01
19:31:43 UTC (rev 12459)
 <at>  <at>  -8,6 +8,6  <at>  <at> 
   alarmid-match-expression="~.*alarmid:([0-9]+).*" 
   clear-expression="~^(resolve|clear)$"
   escalate-expression="~^ack$" 
-  notifyid-match-expression="~.*noticeid:([0-9]+).*" 
+  notifyid-match-expression="~.*Notice #([0-9]+).*" 
   unack-expression="~^ack$" >                       
 </ackd-configuration>

(Continue reading)

rangerrick | 2 Mar 17:34 2009
Picon
Picon

SF.net SVN: opennms:[12460] maven/trunk

Revision: 12460
          http://opennms.svn.sourceforge.net/opennms/?rev=12460&view=rev
Author:   rangerrick
Date:     2009-03-02 16:34:21 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
maven 2.0.10 works

Modified Paths:
--------------
    maven/trunk/bin/mvn.bat
    maven/trunk/conf/settings.xml

Added Paths:
-----------
    maven/trunk/lib/maven-2.0.10-uber.jar

Removed Paths:
-------------
    maven/trunk/lib/maven-2.0.9-uber.jar

Modified: maven/trunk/bin/mvn.bat
===================================================================
--- maven/trunk/bin/mvn.bat	2009-03-01 19:31:43 UTC (rev 12459)
+++ maven/trunk/bin/mvn.bat	2009-03-02 16:34:21 UTC (rev 12460)
 <at>  <at>  -184,5 +184,5  <at>  <at> 

 if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%

(Continue reading)

rssntn67 | 2 Mar 19:44 2009
Picon
Picon

SF.net SVN: opennms:[12461] opennms/trunk/integrations

Revision: 12461
          http://opennms.svn.sourceforge.net/opennms/?rev=12461&view=rev
Author:   rssntn67
Date:     2009-03-02 18:44:37 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Refactored the sendEvent method

Modified Paths:
--------------
    opennms/trunk/integrations/opennms-map-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/MapProvisioningAdapter.java
    opennms/trunk/integrations/opennms-rancid/src/main/java/org/opennms/netmgt/provision/RancidProvisioningAdapter.java

Modified: opennms/trunk/integrations/opennms-map-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/MapProvisioningAdapter.java
===================================================================
---
opennms/trunk/integrations/opennms-map-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/MapProvisioningAdapter.java	2009-03-02
16:34:21 UTC (rev 12460)
+++
opennms/trunk/integrations/opennms-map-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/MapProvisioningAdapter.java	2009-03-02
18:44:37 UTC (rev 12461)
 <at>  <at>  -58,6 +58,7  <at>  <at> 
 import org.opennms.netmgt.model.OnmsNode;
 import org.opennms.netmgt.model.events.EventBuilder;
 import org.opennms.netmgt.model.events.EventForwarder;
+import org.opennms.netmgt.xml.event.Event;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.transaction.annotation.Transactional;

(Continue reading)

rangerrick | 2 Mar 21:03 2009
Picon
Picon

SF.net SVN: opennms:[12462] opennms/trunk

Revision: 12462
          http://opennms.svn.sourceforge.net/opennms/?rev=12462&view=rev
Author:   rangerrick
Date:     2009-03-02 20:03:01 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
bug #2460, move importer files into their own directory

The model-importer configuration files are now in $OPENNMS_HOME/etc/imports instead of directly in $OPENNMS_HOME/etc.

The installer has been updated to move old files to the new location on "install -i".

Modified Paths:
--------------
    opennms/trunk/opennms-base-assembly/src/main/filtered/etc/opennms.properties
    opennms/trunk/opennms-install/src/main/java/org/opennms/install/Installer.java
    opennms/trunk/opennms-provision/opennms-provisiond/src/main/resources/META-INF/opennms/applicationContext-provisiond.xml
    opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/svclayer/dao/support/DefaultManualProvisioningDao.java
    opennms/trunk/opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml

Modified: opennms/trunk/opennms-base-assembly/src/main/filtered/etc/opennms.properties
===================================================================
--- opennms/trunk/opennms-base-assembly/src/main/filtered/etc/opennms.properties	2009-03-02
18:44:37 UTC (rev 12461)
+++ opennms/trunk/opennms-base-assembly/src/main/filtered/etc/opennms.properties	2009-03-02
20:03:01 UTC (rev 12462)
 <at>  <at>  -118,6 +118,7  <at>  <at> 
 distributed.layoutApplicationsVertically=false
 opennms.bin.dir= <at> install.bin.dir <at> 
(Continue reading)

rangerrick | 2 Mar 21:51 2009
Picon
Picon

SF.net SVN: opennms:[12463] opennms/trunk/opennms-dao/src/main/java/org/ opennms/netmgt/dao/support

Revision: 12463
          http://opennms.svn.sourceforge.net/opennms/?rev=12463&view=rev
Author:   rangerrick
Date:     2009-03-02 20:51:36 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
bug #2456, allow getting node resource graphs with a resourceId of
"nodeSource[foreignSource:foreignId]" instead of "node[nodeId]".

Modified Paths:
--------------
    opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/support/DefaultResourceDao.java
    opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/support/NodeResourceType.java

Modified: opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/support/DefaultResourceDao.java
===================================================================
---
opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/support/DefaultResourceDao.java	2009-03-02
20:03:01 UTC (rev 12462)
+++
opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/support/DefaultResourceDao.java	2009-03-02
20:51:36 UTC (rev 12463)
 <at>  <at>  -184,7 +184,7  <at>  <at> 
         Map<String, OnmsResourceType> resourceTypes;
         resourceTypes = new LinkedHashMap<String, OnmsResourceType>();
         OnmsResourceType resourceType;
-        
+
         resourceType = new NodeSnmpResourceType(this);
(Continue reading)

rangerrick | 2 Mar 22:49 2009
Picon
Picon

SF.net SVN: opennms:[12464] opennms/trunk

Revision: 12464
          http://opennms.svn.sourceforge.net/opennms/?rev=12464&view=rev
Author:   rangerrick
Date:     2009-03-02 21:49:25 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
fix the unit tests, and change slightly the way the property is set

Modified Paths:
--------------
    opennms/trunk/opennms-base-assembly/src/main/filtered/etc/model-importer.properties
    opennms/trunk/opennms-base-assembly/src/main/filtered/etc/opennms.properties
    opennms/trunk/opennms-install/src/main/java/org/opennms/install/Installer.java
    opennms/trunk/opennms-reporting/src/test/opennms-home/etc/model-importer.properties
    opennms/trunk/opennms-test/src/main/java/org/opennms/test/ConfigurationTestUtils.java
    opennms/trunk/opennms-test/src/main/java/org/opennms/test/DaoTestConfigBean.java
    opennms/trunk/opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml
    opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java
    opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/RequisitionRestServiceTest.java
    opennms/trunk/opennms-webapp/src/test/opennms-home/etc/model-importer.properties

Added Paths:
-----------
    opennms/trunk/opennms-webapp/src/test/resources/restServiceTest.xml

Removed Paths:
-------------
    opennms/trunk/opennms-webapp/src/test/resources/requisitionRestServiceTest.xml

(Continue reading)

rangerrick | 2 Mar 23:38 2009
Picon
Picon

SF.net SVN: opennms:[12466] opennms/trunk/opennms-webapp/src/main/java/org/ opennms/web/rest/ForeignSourceRestService.java

Revision: 12466
          http://opennms.svn.sourceforge.net/opennms/?rev=12466&view=rev
Author:   rangerrick
Date:     2009-03-02 22:38:30 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
add support for getting the list of nodes which are part of a given foreign source

Modified Paths:
--------------
    opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/rest/ForeignSourceRestService.java

Modified: opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/rest/ForeignSourceRestService.java
===================================================================
---
opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/rest/ForeignSourceRestService.java	2009-03-02
22:32:19 UTC (rev 12465)
+++
opennms/trunk/opennms-webapp/src/main/java/org/opennms/web/rest/ForeignSourceRestService.java	2009-03-02
22:38:30 UTC (rev 12466)
 <at>  <at>  -51,6 +51,8  <at>  <at> 
 import javax.ws.rs.core.UriInfo;

 import org.joda.time.Duration;
+import org.opennms.netmgt.dao.NodeDao;
+import org.opennms.netmgt.model.OnmsNodeList;
 import org.opennms.netmgt.provision.persist.ForeignSourceRepository;
 import org.opennms.netmgt.provision.persist.StringIntervalPropertyEditor;
 import org.opennms.netmgt.provision.persist.foreignsource.DetectorCollection;
(Continue reading)

brozow | 2 Mar 23:50 2009
Picon
Picon

SF.net SVN: opennms:[12467] opennms/trunk/opennms-webapp/src/main/webapp

Revision: 12467
          http://opennms.svn.sourceforge.net/opennms/?rev=12467&view=rev
Author:   brozow
Date:     2009-03-02 22:50:05 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
pair with Donald and get filtering working for node page grids

Modified Paths:
--------------
    opennms/trunk/opennms-webapp/src/main/webapp/element/node.jsp
    opennms/trunk/opennms-webapp/src/main/webapp/js/nodePageView.js
    opennms/trunk/opennms-webapp/src/main/webapp/js/opennms/ux/IPInterfaceGrid.js
    opennms/trunk/opennms-webapp/src/main/webapp/js/opennms/ux/PageableGrid.js
    opennms/trunk/opennms-webapp/src/main/webapp/js/opennms/ux/SNMPInterfaceGrid.js
    opennms/trunk/opennms-webapp/src/main/webapp/js/opennms/ux/SearchFilterGrid.js

Modified: opennms/trunk/opennms-webapp/src/main/webapp/element/node.jsp
===================================================================
--- opennms/trunk/opennms-webapp/src/main/webapp/element/node.jsp	2009-03-02 22:38:30 UTC (rev 12466)
+++ opennms/trunk/opennms-webapp/src/main/webapp/element/node.jsp	2009-03-02 22:50:05 UTC (rev 12467)
 <at>  <at>  -211,6 +211,8  <at>  <at> 
   <jsp:param name="breadcrumb" value="Node" />
   <jsp:param name="enableExtJS" value="true"/>
   <jsp:param name="script" value="<script type='text/javascript' src='js/opennms/ux/PageableGrid.js'></script>"/>
+  <jsp:param name="script" value="<script type='text/javascript' src='js/opennms/ux/SearchFilterLayout.js'></script>"/>
+  <jsp:param name="script" value="<script type='text/javascript' src='js/opennms/ux/SearchFilterGrid.js'></script>"/>
   <jsp:param name="script" value="<script type='text/javascript' src='js/opennms/ux/IPInterfaceGrid.js'></script>"/>
   <jsp:param name="script" value="<script type='text/javascript' src='js/opennms/ux/SNMPInterfaceGrid.js'></script>"/>
(Continue reading)

rangerrick | 2 Mar 23:32 2009
Picon
Picon

SF.net SVN: opennms:[12465] opennms/trunk/opennms-dao/src/main/java/org/ opennms/netmgt/dao

Revision: 12465
          http://opennms.svn.sourceforge.net/opennms/?rev=12465&view=rev
Author:   rangerrick
Date:     2009-03-02 22:32:19 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
allow finding all nodes by foreign source

Modified Paths:
--------------
    opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/NodeDao.java
    opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/hibernate/NodeDaoHibernate.java

Modified: opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/NodeDao.java
===================================================================
--- opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/NodeDao.java	2009-03-02
21:49:25 UTC (rev 12464)
+++ opennms/trunk/opennms-dao/src/main/java/org/opennms/netmgt/dao/NodeDao.java	2009-03-02
22:32:19 UTC (rev 12465)
 <at>  <at>  -68,6 +68,8  <at>  <at> 
      */
     public abstract List<OnmsNode> findAll();

+    public abstract List<OnmsNode> findByForeignSource(String foreignSource);
+    
     public abstract OnmsNode findByForeignId(String foreignSource, String foreignId);

     public abstract int getNodeCountForForeignSource(String groupName);

(Continue reading)

rangerrick | 3 Mar 00:09 2009
Picon
Picon

SF.net SVN: opennms:[12468] opennms/trunk/opennms-webapp/src/test/java/org/ opennms/web/rest

Revision: 12468
          http://opennms.svn.sourceforge.net/opennms/?rev=12468&view=rev
Author:   rangerrick
Date:     2009-03-02 23:09:46 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
listeners not necessary if the abstract test case uses DaoTestConfigBean to initialize

Modified Paths:
--------------
    opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java
    opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/NodeRestServiceTest.java

Modified: opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java
===================================================================
---
opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java	2009-03-02
22:50:05 UTC (rev 12467)
+++
opennms/trunk/opennms-webapp/src/test/java/org/opennms/web/rest/AbstractSpringJerseyRestTestCase.java	2009-03-02
23:09:46 UTC (rev 12468)
 <at>  <at>  -22,6 +22,7  <at>  <at> 
 import org.junit.Before;
 import org.opennms.netmgt.config.DataSourceFactory;
 import org.opennms.netmgt.mock.MockDatabase;
+import org.opennms.test.DaoTestConfigBean;
 import org.springframework.mock.web.MockFilterConfig;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
(Continue reading)


Gmane