Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Moved some classes around and deleted some unused classes to clean up

the org.opennms.netmgt package.
  • Loading branch information...
commit aeb7c6f48bf08f02c1603b3016957835e53f4e72 1 parent 2cb389d
@soleger soleger authored
View
82 opennms-services/src/main/java/org/opennms/netmgt/PropertyConstants.java
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2006-2011 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2011 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) 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, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) 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 OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing <license@opennms.org>
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.netmgt;
-
-/**
- * This class holds all OpenNMS related constants - has the property names to be
- * read from the config files, the various config file names etc.
- *
- * @author <A HREF="http://www.opennms.org/">OpenNMS </A>
- * @version 1.1.1.1
- */
-public final class PropertyConstants {
- /**
- * The property string in the properties file to get the XML configuration
- * files
- */
- public static final String PROP_XML_REPOSITORY = "org.opennms.bluebird.dp.xml.directory";
-
- /**
- * The property string in the properties file to get the Properties files
- * directory
- */
- public static final String PROP_PROPERTIES_REPOSITORY = "org.opennms.bluebird.dp.properties.directory";
-
- /**
- * The property string in the properties file which specifies the method to
- * use for determining which interface is primary on a multi-interface box.
- */
- public static final String PROP_PRIMARY_INTERFACE_SELECT_METHOD = "org.opennms.bluebird.dp.primaryInterfaceSelectMethod";
-
- /**
- * These properties control how blocking socket I/O is handled in OpenNMS
- * processes
- */
- public final static String PROP_SOCKET_TIMEOUT_REQUIRED = "org.opennms.bluebird.vmhacks.socketSoTimeoutRequired";
-
- /**
- * These properties control how blocking socket I/O is handled in OpenNMS
- * processes
- */
- public final static String PROP_SOCKET_TIMEOUT_PERIOD = "org.opennms.bluebird.vmhacks.socketSoTimeoutPeriod";
-
- /**
- * This is just a convience method that forwards the lookup of the property
- * to the {@link java.lang.System System}class. This method may be modified
- * in the furture to search additional property locations for the properties
- * defined in this class.
- *
- * @param property
- * The property key used to lookup the result.
- * @return The value that is mapped by the passed property key.
- */
- public static String lookup(String property) {
- return System.getProperty(property);
- }
-}
View
44 opennms-services/src/main/java/org/opennms/netmgt/RegularExpressionConstants.java
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2006-2011 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2011 The OpenNMS Group, Inc.
- *
- * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
- *
- * OpenNMS(R) 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, either version 3 of the License,
- * or (at your option) any later version.
- *
- * OpenNMS(R) 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 OpenNMS(R). If not, see:
- * http://www.gnu.org/licenses/
- *
- * For more information contact:
- * OpenNMS(R) Licensing <license@opennms.org>
- * http://www.opennms.org/
- * http://www.opennms.com/
- *******************************************************************************/
-
-package org.opennms.netmgt;
-
-/**
- * This class holds all OpenNMS regular expression related constants.
- *
- * @author <A HREF="http://www.opennms.org/">OpenNMS </A>
- * @version 1.2
- */
-public abstract class RegularExpressionConstants {
-
- /**
- * A regular expression for matching interface addresses. Will strictly
- * match 0-255 in all octets
- */
- public static final String INTERFACE_ADDRESS = "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])";
-}
View
9 opennms-services/src/main/java/org/opennms/netmgt/utils/NodeLabel.java
@@ -42,7 +42,6 @@
import org.opennms.core.utils.DBUtils;
import org.opennms.core.utils.InetAddressUtils;
import org.opennms.core.utils.ThreadCategory;
-import org.opennms.netmgt.PropertyConstants;
import org.opennms.netmgt.dao.NodeDao;
/**
@@ -161,6 +160,12 @@
private final char m_nodeLabelSource;
/**
+ * The property string in the properties file which specifies the method to
+ * use for determining which interface is primary on a multi-interface box.
+ */
+ public static final String PROP_PRIMARY_INTERFACE_SELECT_METHOD = "org.opennms.bluebird.dp.primaryInterfaceSelectMethod";
+
+ /**
* Default constructor
*/
public NodeLabel() {
@@ -476,7 +481,7 @@ public static NodeLabel computeLabel(int nodeID, Connection dbConnection) throws
// the method to use for determining which interface on a multi-interface
// system is to be deemed the primary interface. The primary interface
// will then determine what the node's label is.
- String method = System.getProperty(PropertyConstants.PROP_PRIMARY_INTERFACE_SELECT_METHOD);
+ String method = System.getProperty(NodeLabel.PROP_PRIMARY_INTERFACE_SELECT_METHOD);
if (method == null) {
method = DEFAULT_SELECT_METHOD;
}
View
2  .../OpenNmsDaemonApplicationContextTest.java → .../OpenNmsDaemonApplicationContextTest.java
@@ -26,7 +26,7 @@
* http://www.opennms.com/
*******************************************************************************/
-package org.opennms.netmgt;
+package org.opennms.netmgt.eventd;
import org.junit.Test;
import org.junit.runner.RunWith;
Please sign in to comment.
Something went wrong with that request. Please try again.