Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit bcef77d
Merge: 04d5d16 1149f0d
Author: Christian Pape <[email protected]>
Date:   Wed Jun 24 20:33:15 2015 -0500

    Merge branch 'develop' into feature-remove-linkd

commit 04d5d16
Author: Dustin Frisch <[email protected]>
Date:   Wed Jun 24 16:23:44 2015 +0200

    Removed linkd from logging

commit 6d0447e
Merge: d819b7d a0f2f19
Author: Christian Pape <[email protected]>
Date:   Wed Jun 24 00:06:56 2015 -0500

    Merged develop into feature-remove-linkd

commit d819b7d
Author: Christian Pape <[email protected]>
Date:   Tue Jun 23 16:33:36 2015 -0500

    Bazinga!

commit 8131667
Author: Dustin Frisch <[email protected]>
Date:   Tue Jun 23 21:04:43 2015 +0200

    Ah freddled gruntbuggly,
    Thy micturations are to me,
    As plurdled gabbleblotchits,
    On a lurgid bee,
    That mordiously hath blurted out,
    Its earted jurtles,
    Into a rancid festering confectious organ squealer. [drowned out by moaning and screaming]
    Now the jurpling slayjid agrocrustles,
    Are slurping hagrilly up the axlegrurts,
    And living glupules frart and slipulate,
    Like jowling meated liverslime,
    Groop, I implore thee, my foonting turling dromes,
    And hooptiously drangle me,
    With crinkly bindlewurdles,
    Or else I shall rend thee in the gobberwarts with my blurglecruncheon,
    See if I don't.

commit 50901e8
Author: Dustin Frisch <[email protected]>
Date:   Tue Jun 23 17:48:45 2015 +0200

    Blargh

commit 7eb7945
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 22 21:03:13 2015 +0200

    More cleanup for map removal

commit ac9f7dd
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 22 20:21:58 2015 +0200

    More cleanup for map removal

commit 48ec999
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 22 19:38:47 2015 +0200

    Removed map config files

commit 92add43
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 22 18:14:19 2015 +0200

    Remove map adapter configuration

commit 9610f14
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 22 17:18:37 2015 +0200

    Removed mpa adapter from packaging

commit e794b8d
Author: Dustin Frisch <[email protected]>
Date:   Thu Jun 18 10:52:38 2015 +0200

    Removed properties from test contexts

commit 5eb0a27
Author: Dustin Frisch <[email protected]>
Date:   Wed Jun 17 15:39:38 2015 +0200

    Removed properties from test contexts

commit 93a5039
Author: Dustin Frisch <[email protected]>
Date:   Wed Jun 17 14:43:49 2015 +0200

    Removed properties from test contexts

commit d8a0745
Author: Dustin Frisch <[email protected]>
Date:   Wed Jun 17 13:49:21 2015 +0200

    Removed properties from test contexts

commit ff8b92c
Author: Dustin Frisch <[email protected]>
Date:   Wed Jun 17 12:06:45 2015 +0200

    Removed properties from test contexts

commit f384421
Author: Christian Pape <[email protected]>
Date:   Tue Jun 16 15:14:39 2015 +0200

    Removed reference to arpInterface in node list

commit d80c319
Author: Christian Pape <[email protected]>
Date:   Tue Jun 16 14:59:42 2015 +0200

    Removed dependency to map-provisioning-adapter

commit 7a8160e
Author: Dustin Frisch <[email protected]>
Date:   Thu Jun 11 13:27:57 2015 +0200

    Context cleanup for LinkD removal

commit dd56116
Author: Christian Pape <[email protected]>
Date:   Tue Jun 9 16:50:12 2015 +0200

    Fixed order of tables to be removed

commit 184d335
Author: Christian Pape <[email protected]>
Date:   Tue Jun 9 16:29:40 2015 +0200

    Some more tables, dao and model classes removed

commit bbc1e76
Merge: dc9cbae 4c4d709
Author: Christian Pape <[email protected]>
Date:   Tue Jun 9 11:20:49 2015 +0200

    Merge branch 'develop' into feature-remove-linkd

commit dc9cbae
Merge: 11dc2ba 46a2762
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 1 15:09:30 2015 +0200

    Merge branch 'feature-remove-linkd' of github.com:OpenNMS/opennms into feature-remove-linkd

commit 11dc2ba
Merge: 6f73837 2d79b56
Author: Dustin Frisch <[email protected]>
Date:   Mon Jun 1 15:09:16 2015 +0200

    Merge branch 'develop' of github.com:OpenNMS/opennms into feature-remove-linkd

commit 46a2762
Author: Christian Pape <[email protected]>
Date:   Thu May 28 20:45:54 2015 +0200

    Migration of another test for enlinkd

commit 6f73837
Author: Christian Pape <[email protected]>
Date:   Wed May 27 15:51:47 2015 +0200

    Deleted old tests

commit 9455e21
Author: Christian Pape <[email protected]>
Date:   Wed May 27 15:50:28 2015 +0200

    Changes in helper class and first test migrated

commit 29e7a38
Merge: 0601fd9 2b70839
Author: Dustin Frisch <[email protected]>
Date:   Tue May 26 10:52:12 2015 +0200

    Merge remote-tracking branch 'origin/develop' into feature-remove-linkd

commit 0601fd9
Author: Dustin Frisch <[email protected]>
Date:   Fri May 22 09:49:49 2015 +0200

    Fixed tests after removing linkd service

commit af095bb
Author: Dustin Frisch <[email protected]>
Date:   Fri May 22 09:47:34 2015 +0200

    Removed packaging of link provisioning

commit a2944e7
Author: Dustin Frisch <[email protected]>
Date:   Thu May 21 23:26:21 2015 +0200

    Removed packaging of link provisioning

commit d9715f8
Author: Dustin Frisch <[email protected]>
Date:   Thu May 21 13:14:58 2015 +0200

    Removed linkd from service configuration

commit c2da793
Author: Dustin Frisch <[email protected]>
Date:   Thu May 21 11:49:43 2015 +0200

    Removed packaging of SVG map

commit 441f985
Author: Dustin Frisch <[email protected]>
Date:   Thu May 21 11:24:12 2015 +0200

    Removed packaging of link provisining adapter

commit a08c1c9
Author: Dustin Frisch <[email protected]>
Date:   Thu May 21 00:29:10 2015 +0200

    Removed packaging of link provisining adapter

commit dc3166a
Author: Dustin Frisch <[email protected]>
Date:   Wed May 20 23:33:47 2015 +0200

    Removed packaging of link provisining adapter

commit 4bf4bd7
Author: Dustin Frisch <[email protected]>
Date:   Wed May 20 19:49:21 2015 +0200

    Removed dependencies to link provisining adapter

commit f8be6f8
Author: Christian Pape <[email protected]>
Date:   Wed May 20 14:31:16 2015 +0200

    Awesome liquibase linkd removal

commit 043e50c
Author: Dustin Frisch <[email protected]>
Date:   Wed May 20 13:49:30 2015 +0200

    Removed LinkStatus and LinkInterface

commit 6291229
Author: Christian Pape <[email protected]>
Date:   Tue May 19 15:51:32 2015 +0200

    Removed legacy linkd stuff from linkednode.jsp page

commit 0698fb4
Author: Christian Pape <[email protected]>
Date:   Tue May 19 11:49:03 2015 +0200

    Changed title of former linkd table in linkednode.jsp

commit 9ce81f2
Author: Christian Pape <[email protected]>
Date:   Tue May 19 11:38:11 2015 +0200

    Fixed broken topology map

commit a41b163
Merge: b867aa6 dea41b5
Author: Christian Pape <[email protected]>
Date:   Wed May 13 15:01:13 2015 +0200

    Merge branch 'develop' into feature-remove-linkd

commit b867aa6
Author: Dustin Frisch <[email protected]>
Date:   Fri May 8 11:07:46 2015 +0200

    SVG map removed

commit 4955210
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 16 16:44:50 2015 +0100

    Removed linkd topology provider

commit bf0a719
Author: Dustin Frisch <[email protected]>
Date:   Wed Mar 11 23:07:18 2015 +0100

    Reverted ordering change as it's related to java-8 only and fixed in features/java-8

commit c16ccc0
Merge: c77b217 a5c1414
Author: Dustin Frisch <[email protected]>
Date:   Wed Mar 11 22:26:45 2015 +0100

    Merge remote-tracking branch 'origin/develop' into feature-remove-linkd

commit c77b217
Merge: b9c6d7f 378f30e
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 9 17:24:15 2015 +0100

    Merge remote-tracking branch 'origin/jira/NMS-7533' into feature-remove-linkd

commit b9c6d7f
Merge: 7909548 e3ebffc
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 9 17:02:12 2015 +0100

    Merge remote-tracking branch 'origin/develop' into feature-remove-linkd

commit 7909548
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 9 17:02:05 2015 +0100

    Removed old config files

commit 645ab1d
Merge: cf07210 7bad3bc
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 9 15:29:02 2015 +0100

    Merge remote-tracking branch 'origin/develop' into feature-remove-linkd

commit cf07210
Author: Dustin Frisch <[email protected]>
Date:   Sun Mar 8 04:18:47 2015 +0100

    Removed linkd bindings from topology map

commit 8e41c08
Merge: bfc5b93 51f6b97
Author: Dustin Frisch <[email protected]>
Date:   Sat Mar 7 00:44:10 2015 +0100

    Merge remote-tracking branch 'origin/develop' into feature-remove-linkd

commit bfc5b93
Author: Dustin Frisch <[email protected]>
Date:   Fri Mar 6 16:31:55 2015 +0100

    Fixed spring contexts

commit 1092214
Author: Dustin Frisch <[email protected]>
Date:   Tue Mar 3 12:24:45 2015 +0100

    Restored test data for transition

commit e10c16c
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 2 22:33:33 2015 +0100

    Restored events deleted by accident

commit a1dc27a
Merge: 0107bb6 d89addb
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 2 20:44:59 2015 +0100

    Merge remote-tracking branch 'origin/develop' into feature-remove-linkd

commit 0107bb6
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 2 20:44:02 2015 +0100

    Removed linkd configuration

commit 50e0d35
Author: Dustin Frisch <[email protected]>
Date:   Mon Mar 2 20:29:37 2015 +0100

    Removed linkd daemon
  • Loading branch information
fooker committed Jun 25, 2015
1 parent e675172 commit 6191861
Show file tree
Hide file tree
Showing 498 changed files with 1,090 additions and 83,479 deletions.
1 change: 0 additions & 1 deletion core/db/src/main/castor/castorbuilder.properties
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ http://xmlns.opennms.org/xsd/config/inventory=org.opennms.netmgt.config.inventor
http://xmlns.opennms.org/xsd/config/jasper-reports=org.opennms.netmgt.config.reporting.jasperReports,\
http://xmlns.opennms.org/xsd/config/javamail-configuration=org.opennms.netmgt.config.javamail,\
http://xmlns.opennms.org/xsd/config/kscReports=org.opennms.netmgt.config.kscReports,\
http://xmlns.opennms.org/xsd/config/linkd=org.opennms.netmgt.config.linkd,\
http://xmlns.opennms.org/xsd/config/localServer=org.opennms.netmgt.config.server,\
http://xmlns.opennms.org/xsd/config/map/adapter=org.opennms.netmgt.config.map.adapter, \
http://xmlns.opennms.org/xsd/config/microblog-configuration=org.opennms.netmgt.config.microblog, \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,11 +356,6 @@ public abstract class ConfigFileConstants {
*/
public static final int NOTIFY_REPORT;

/**
* The Linkd discovery configuration file
*/
public static final int LINKD_CONFIG_FILE_NAME;

/**
* The ENHANCED Linkd discovery configuration file
*/
Expand All @@ -370,11 +365,6 @@ public abstract class ConfigFileConstants {
* The OpenNMS DataSourceConfiguration file
*/
public static final int OPENNMS_DATASOURCE_CONFIG_FILE_NAME;

/**
* The map properties config file
*/
public static final int MAP_PROPERTIES_FILE_NAME;

//
// End XSL files used by reports
Expand Down Expand Up @@ -553,10 +543,6 @@ public abstract class ConfigFileConstants {

SYSLOGD_CONFIG_FILE_NAME = 58;

LINKD_CONFIG_FILE_NAME = 59;

MAP_PROPERTIES_FILE_NAME = 60;

SURVEILLANCE_VIEWS_FILE_NAME = 61;

SITE_STATUS_VIEWS_FILE_NAME = 62;
Expand Down Expand Up @@ -671,9 +657,7 @@ public abstract class ConfigFileConstants {
FILE_ID_TO_NAME[JMX_DATA_COLLECTION_CONF_FILE_NAME] = "jmx-datacollection-config.xml";
FILE_ID_TO_NAME[TRANSLATOR_CONFIG_FILE_NAME] = "translator-configuration.xml";
FILE_ID_TO_NAME[SYSLOGD_CONFIG_FILE_NAME] = "syslogd-configuration.xml";
FILE_ID_TO_NAME[LINKD_CONFIG_FILE_NAME] = "linkd-configuration.xml";
FILE_ID_TO_NAME[ENLINKD_CONFIG_FILE_NAME] = "enlinkd-configuration.xml";
FILE_ID_TO_NAME[MAP_PROPERTIES_FILE_NAME] = "map.properties";
FILE_ID_TO_NAME[SURVEILLANCE_VIEWS_FILE_NAME] = "surveillance-views.xml";
FILE_ID_TO_NAME[SITE_STATUS_VIEWS_FILE_NAME] = "site-status-views.xml";
FILE_ID_TO_NAME[HTTP_COLLECTION_CONFIG_FILE_NAME] = "http-datacollection-config.xml";
Expand Down
26 changes: 15 additions & 11 deletions core/schema/src/main/liquibase/17.0.0/changelog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
<changeSet author="seth" id="17.0.0-drop-vulnplugins-table">
<preConditions onFail="MARK_RAN">
<tableExists tableName="vulnplugins"/>
</preConditions>
</preConditions>
<dropTable tableName="vulnplugins" />
</changeSet>

<changeSet author="seth" id="17.0.0-drop-vulnerabilities-table">
<preConditions onFail="MARK_RAN">
<tableExists tableName="vulnerabilities"/>
</preConditions>
</preConditions>
<dropTable tableName="vulnerabilities" />
</changeSet>

Expand All @@ -30,7 +30,7 @@
<changeSet author="seth" id="17.0.0-remove-misspelled-outage-index">
<preConditions onFail="MARK_RAN">
<indexExists indexName="outages_ifservivceid_idx"/>
</preConditions>
</preConditions>
<dropIndex tableName="outages" indexName="outages_ifservivceid_idx"/>
</changeSet>

Expand All @@ -39,7 +39,7 @@
<not>
<indexExists indexName="outages_ifserviceid_idx"/>
</not>
</preConditions>
</preConditions>

<createIndex tableName="outages" indexName="outages_ifserviceid_idx" unique="false">
<column name="ifserviceid" type="INTEGER"/>
Expand Down Expand Up @@ -112,19 +112,23 @@
<dropColumn tableName="outages" columnName="serviceid"/>
</changeSet>

<!-- Drop unused servicemap table -->
<changeSet author="seth" id="17.0.0-drop-servicemap-table">
<preConditions onFail="MARK_RAN">
<tableExists tableName="servicemap"/>
</preConditions>
<dropTable tableName="servicemap" />
<changeSet author="cpape" id="1.17.0-linkd-removal">
<dropTable tableName="linkstate"/>
<dropTable tableName="datalinkinterface"/>
<dropTable tableName="vlan"/>
<dropTable tableName="stpnode"/>
<dropTable tableName="stpinterface"/>
<dropTable tableName="element"/>
<dropTable tableName="map"/>
<dropTable tableName="iprouteinterface"/>
<dropTable tableName="atinterface"/>
</changeSet>

<!-- Drop unused servermap table -->
<changeSet author="seth" id="17.0.0-drop-servermap-table">
<preConditions onFail="MARK_RAN">
<tableExists tableName="servermap"/>
</preConditions>
</preConditions>
<dropTable tableName="servermap" />
</changeSet>

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,6 @@
<invoke at="status" pass="0" method="status"/>
<invoke at="stop" pass="0" method="stop"/>
</service>
<service enabled="false">
<name>OpenNMS:Name=Linkd</name>
<class-name>org.opennms.netmgt.linkd.jmx.Linkd</class-name>
<invoke at="start" pass="0" method="init"/>
<invoke at="start" pass="1" method="start"/>
<invoke at="status" pass="0" method="status"/>
<invoke at="stop" pass="0" method="stop"/>
</service>
<service enabled="false">
<name>OpenNMS:Name=Correlator</name>
<class-name>org.opennms.netmgt.correlation.jmx.Correlator</class-name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void testFixingConfig() throws Exception {
// Checking parsing the fixed file (it should contain all the services)
File cfgFile = ConfigFileConstants.getFile(ConfigFileConstants.SERVICE_CONF_FILE_NAME);
ServiceConfiguration cfg = JaxbUtils.unmarshal(ServiceConfiguration.class, cfgFile);
Assert.assertEquals(36, cfg.getServiceCount());
Assert.assertEquals(35, cfg.getServiceCount());

// Checking Service Factory (it should return only the enabled services)
ServiceConfigFactory factory = new ServiceConfigFactory();
Expand Down
8 changes: 0 additions & 8 deletions core/upgrade/src/test/resources/etc/service-configuration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,6 @@
<invoke at="stop" pass="0" method="stop"/>
</service>
<!--
<service>
<name>OpenNMS:Name=Linkd</name>
<class-name>org.opennms.netmgt.linkd.jmx.Linkd</class-name>
<invoke at="start" pass="0" method="init"/>
<invoke at="start" pass="1" method="start"/>
<invoke at="status" pass="0" method="status"/>
<invoke at="stop" pass="0" method="stop"/>
</service>
<service>
<name>OpenNMS:Name=Importer</name>
<class-name>org.opennms.netmgt.importer.jmx.ImporterService</class-name>
Expand Down
2 changes: 0 additions & 2 deletions debian/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ opennms-jmx-config-generator
opennms-ncs
opennms-plugin-collector-juniper-tca
opennms-plugin-provisioning-dns
opennms-plugin-provisioning-link
opennms-plugin-provisioning-map
opennms-plugin-provisioning-rancid
opennms-plugin-provisioning-snmp-asset
opennms-plugin-protocol-cifs
Expand Down
Loading

0 comments on commit 6191861

Please sign in to comment.