Commits

Anonymous committed 0f81343 Merge with conflicts

Merge remote-tracking branch 'origin/1.10' into space-integration-12.3-code-freeze-branch

Conflicts:
core/api/pom.xml
core/build/keystore/pom.xml
core/build/pom.xml
core/criteria/pom.xml
core/doc/pom.xml
core/icmp-jna/pom.xml
core/lib/pom.xml
core/pom.xml
core/runtime/pom.xml
core/schema/pom.xml
core/snmp/api/pom.xml
core/snmp/impl-joesnmp/pom.xml
core/snmp/impl-mock/pom.xml
core/snmp/impl-snmp4j/pom.xml
core/snmp/integration-tests/pom.xml
core/snmp/joesnmp/pom.xml
core/snmp/pom.xml
core/soa/pom.xml
core/tasks/pom.xml
core/test-api/dns/pom.xml
core/test-api/http/pom.xml
core/test-api/lib/pom.xml
core/test-api/pom.xml
core/test-api/schema/a/pom.xml
core/test-api/schema/b/pom.xml
core/test-api/schema/pom.xml
core/test-api/snmp/pom.xml
core/test-api/xml/pom.xml
core/web/pom.xml
core/xml/pom.xml
debian/changelog
dependencies/asterisk/pom.xml
dependencies/castor/pom.xml
dependencies/dbpool/pom.xml
dependencies/dnsjava/pom.xml
dependencies/drools/pom.xml
dependencies/gwt/pom.xml
dependencies/hibernate/pom.xml
dependencies/jasper/pom.xml
dependencies/javamail/pom.xml
dependencies/jaxb/pom.xml
dependencies/jcifs/pom.xml
dependencies/jdbc-pool/pom.xml
dependencies/jersey/pom.xml
dependencies/jfreechart/pom.xml
dependencies/jinterop/pom.xml
dependencies/jmdns/pom.xml
dependencies/jna/pom.xml
dependencies/jnlp/pom.xml
dependencies/jradius/pom.xml
dependencies/jrobin/pom.xml
dependencies/jrrd/pom.xml
dependencies/liquibase/pom.xml
dependencies/mina/pom.xml
dependencies/netty/pom.xml
dependencies/pom.xml
dependencies/quartz/pom.xml
dependencies/rancid/pom.xml
dependencies/rrd4j/pom.xml
dependencies/rxtx/pom.xml
dependencies/servlet/pom.xml
dependencies/snmp-test/pom.xml
dependencies/snmp/pom.xml
dependencies/snmp4j-agent/pom.xml
dependencies/snmp4j/pom.xml
dependencies/spring-security/pom.xml
dependencies/spring-test/pom.xml
dependencies/spring-web/pom.xml
dependencies/spring/pom.xml
dependencies/tracker/pom.xml
dependencies/twitter4j/pom.xml
extensions/pom.xml
features/acl/pom.xml
features/gwt-graph-resource-list/pom.xml
features/gwt-ksc-add/pom.xml
features/gwt-ksc-combobox/pom.xml
features/gwt-snmpselect-list/pom.xml
features/gwt-suggestion-combobox/pom.xml
features/gwt-tableresources/pom.xml
features/instrumentationLogReader/pom.xml
features/isoc-ipv6-gui/pom.xml
features/isoc-ipv6-participants/pom.xml
features/jdbc-collector/pom.xml
features/juniper-tca-collector/pom.xml
features/mdns/pom.xml
features/node-page-list/pom.xml
features/notifications/sms-strategy/pom.xml
features/opennms-gwt-theme/pom.xml
features/phonebook/pom.xml
features/poller/api/pom.xml
features/poller/pom.xml
features/poller/runtime/pom.xml
features/pom.xml
features/provisioning/api/pom.xml
features/provisioning/lib/pom.xml
features/provisioning/pom.xml
features/remote-poller-gwt/pom.xml
features/remote-poller-jnlp/pom.xml
features/remote-poller/pom.xml
features/reporting/api/pom.xml
features/reporting/availability/pom.xml
features/reporting/core/pom.xml
features/reporting/dao/pom.xml
features/reporting/jasper-reports/pom.xml
features/reporting/model/pom.xml
features/reporting/pom.xml
features/reporting/repository/pom.xml
features/reporting/sdo/pom.xml
features/request-tracker/pom.xml
features/root-webapp/pom.xml
features/sms-reflector/bundle-tests/pom.xml
features/sms-reflector/commands/pom.xml
features/sms-reflector/dist/pom.xml
features/sms-reflector/integration/pom.xml
features/sms-reflector/pom.xml
features/sms-reflector/poms/compiled/pom.xml
features/sms-reflector/poms/pom.xml
features/sms-reflector/poms/wrappers/pom.xml
features/sms-reflector/provision/pom.xml
features/sms-reflector/rxtx-commands/pom.xml
features/sms-reflector/sms-gateway/pom.xml
features/sms-reflector/sms-monitor/pom.xml
features/sms-reflector/sms-ping/pom.xml
features/sms-reflector/sms-service/pom.xml
features/springframework-security/pom.xml
features/system-report/pom.xml
features/ticketing/api/pom.xml
features/ticketing/pom.xml
integration-tests/pom.xml
integrations/opennms-dns-provisioning-adapter/pom.xml
integrations/opennms-integration-otrs/pom.xml
integrations/opennms-integration-rt/pom.xml
integrations/opennms-jasper-extensions/pom.xml
integrations/opennms-link-provisioning-adapter/pom.xml
integrations/opennms-map-provisioning-adapter/pom.xml
integrations/opennms-puppet-provisioning-adapter/pom.xml
integrations/opennms-rancid-provisioning-adapter/pom.xml
integrations/opennms-reverse-dns-provisioning-adapter/pom.xml
integrations/opennms-rws/pom.xml
integrations/opennms-snmp-asset-provisioning-adapter/pom.xml
integrations/pom.xml
opennms-ackd/pom.xml
opennms-alarms/api/pom.xml
opennms-alarms/daemon/pom.xml
opennms-alarms/http-northbounder/pom.xml
opennms-alarms/jms-northbounder/pom.xml
opennms-alarms/pom.xml
opennms-assemblies/http-remoting/pom.xml
opennms-assemblies/pom.xml
opennms-assemblies/remote-poller-onejar/pom.xml
opennms-assemblies/remote-poller-standalone/pom.xml
opennms-assemblies/rxtx-assembly/pom.xml
opennms-assemblies/system-report-onejar/pom.xml
opennms-assemblies/webapp-full/pom.xml
opennms-assemblies/xsds/pom.xml
opennms-asterisk/pom.xml
opennms-base-assembly/pom.xml
opennms-bootstrap/pom.xml
opennms-config-tester/pom.xml
opennms-config-utils/pom.xml
opennms-config/pom.xml
opennms-correlation/drools-correlation-engine/pom.xml
opennms-correlation/opennms-correlator/pom.xml
opennms-correlation/pom.xml
opennms-dao/pom.xml
opennms-doc/pom.xml
opennms-enterprise-reporting/opennms-reportd/pom.xml
opennms-enterprise-reporting/pom.xml
opennms-full-assembly/pom.xml
opennms-icmp/opennms-icmp-api/pom.xml
opennms-icmp/opennms-icmp-jna/pom.xml
opennms-icmp/opennms-icmp-jni/pom.xml
opennms-icmp/opennms-icmp-jni6/pom.xml
opennms-icmp/pom.xml
opennms-import/pom.xml
opennms-install/pom.xml
opennms-javamail/opennms-javamail-api/pom.xml
opennms-javamail/pom.xml
opennms-jetty/pom.xml
opennms-jetty/src/main/java/org/opennms/netmgt/jetty/JettyServer.java
opennms-model/pom.xml
opennms-provision/opennms-detector-bsf/pom.xml
opennms-provision/opennms-detector-datagram/pom.xml
opennms-provision/opennms-detector-generic/pom.xml
opennms-provision/opennms-detector-jdbc/pom.xml
opennms-provision/opennms-detector-jmx/pom.xml
opennms-provision/opennms-detector-lineoriented/pom.xml
opennms-provision/opennms-detector-simple/pom.xml
opennms-provision/opennms-detector-ssh/pom.xml
opennms-provision/opennms-detector-web/pom.xml
opennms-provision/opennms-mock-simpleserver/pom.xml
opennms-provision/opennms-provision-api/pom.xml
opennms-provision/opennms-provision-persistence/pom.xml
opennms-provision/opennms-provisiond/pom.xml
opennms-provision/opennms-snmp-scanners/pom.xml
opennms-provision/pom.xml
opennms-qosdaemon/pom.xml
opennms-reporting/pom.xml
opennms-rrd/opennms-rrd-api/pom.xml
opennms-rrd/opennms-rrd-jrobin/pom.xml
opennms-rrd/opennms-rrd-rrdtool/opennms-rrdtool-api/pom.xml
opennms-rrd/opennms-rrd-rrdtool/pom.xml
opennms-rrd/opennms-rrd-tcp/pom.xml
opennms-rrd/pom.xml
opennms-services/pom.xml
opennms-test/pom.xml
opennms-tools/centric-troubleticketer/pom.xml
opennms-tools/csv-requisitions/pom.xml
opennms-tools/groovy-tools/pom.xml
opennms-tools/ireport-jrobin-provider/pom.xml
opennms-tools/jira-troubleticketer/pom.xml
opennms-tools/jrobin-spike-hunter/pom.xml
opennms-tools/m2eclipse-integration/org.opennms.m2e.castor.tests/projects/castor/castor-p002/pom.xml
opennms-tools/mib2events/pom.xml
opennms-tools/opennms-rrd-converter/pom.xml
opennms-tools/opennms-rrd-stresser/pom.xml
opennms-tools/opennms-tip/cxf-dependencies/pom.xml
opennms-tools/opennms-tip/openejb-dependencies/pom.xml
opennms-tools/opennms-tip/opennms-tip-ram/pom.xml
opennms-tools/opennms-tip/pom.xml
opennms-tools/opennms-tip/tip-framework-dependencies/pom.xml
opennms-tools/perfdata-receiver/pom.xml
opennms-tools/pom.xml
opennms-tools/quickbase-troubleticketer/pom.xml
opennms-tools/remedy-troubleticketer/pom.xml
opennms-tools/scriptd-event-proxy/pom.xml
opennms-tools/selector-tracker/pom.xml
opennms-tools/spectrum-event-importer/pom.xml
opennms-util/pom.xml
opennms-web-api/pom.xml
opennms-web-dependencies/pom.xml
opennms-webapp/pom.xml
opennms-wmi/pom.xml
pom.xml
protocols/dhcp/pom.xml
protocols/nsclient/pom.xml
protocols/pom.xml
protocols/radius/pom.xml
protocols/selenium-monitor/pom.xml
protocols/xml/pom.xml
protocols/xmp/pom.xml
smoke-test/pom.xml
tests/mock-elements/pom.xml
tests/mock-snmp-agent/pom.xml
tests/pom.xml

Comments (0)

Files changed (21)

 
  -- OpenNMS Release Manager <opennms@opennms.org>  Mon, 07 May 2012 11:21:00 -0400
 
+opennms (1.10.8-1) stable; urgency=low
+
+  * New upstream release.  This release has a few bug fixes and enhancements.
+
+ -- OpenNMS Release Manager <opennms@opennms.org>  Wed, 23 Jan 2013 13:46:00 -0500
+
 opennms (1.10.7-1) stable; urgency=low
 
   * New upstream release.  This release has a few bug fixes and enhancements,

dependencies/jmdns/pom.xml

-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>dependencies</artifactId>
-    <groupId>org.opennms</groupId>
-    <version>1.11.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opennms.dependencies</groupId>
-  <artifactId>jmdns-dependencies</artifactId>
-  <packaging>pom</packaging>
-  <name>OpenNMS JMDNS Dependencies</name>
-  <dependencies>
-    <dependency>
-      <groupId>javax.jmdns</groupId>
-      <artifactId>jmdns</artifactId>
-      <version>3.4.0</version>
-    </dependency>
-  </dependencies>
-  <!--
-  <repositories>
-    <repository>
-      <snapshots><enabled>false</enabled><updatePolicy>${updatePolicy}</updatePolicy></snapshots>
-      <releases><enabled>true</enabled><updatePolicy>${updatePolicy}</updatePolicy></releases>
-      <id>opennms-repo</id>
-      <name>OpenNMS Maven Repository</name>
-      <url>http://maven.opennms.org/content/groups/opennms.org-release</url>
-    </repository>
-  </repositories>
-  -->
-</project>

dependencies/pom.xml

     <module>jersey</module>
     <module>jfreechart</module>
     <module>jinterop</module>
-    <module>jmdns</module>
     <module>jna</module>
     <module>jnlp</module>
     <module>jradius</module>

features/mdns/pom.xml

-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.opennms</groupId>
-    <artifactId>org.opennms.features</artifactId>
-    <version>1.11.4-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opennms.features</groupId>
-  <artifactId>org.opennms.features.mdns</artifactId>
-  <name>OpenNMS Multicast DNS Support</name>
-  <packaging>bundle</packaging>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Version>${project.version}</Bundle-Version>
-            <Export-Package>
-              org.opennms.serviceregistration.strategies.*;version="${project.version}",
-              org.opennms.serviceregistration.*;version="${project.version}"
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <!-- 
-    Only run the tests on this project if we're on Mac OS 
-    since com.apple:dnssd relies on platform libraries 
-  -->
-  <profiles>
-    <profile>
-      <id>org.opennms.features.mdns-run-tests</id>
-      <activation>
-        <os>
-          <family>!mac</family>
-        </os>
-      </activation>
-      <properties>
-        <maven.test.skip>true</maven.test.skip>
-      </properties>
-    </profile>
-  </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>com.apple</groupId>
-      <artifactId>dnssd</artifactId>
-      <version>108.6</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opennms.dependencies</groupId>
-      <artifactId>jmdns-dependencies</artifactId>
-      <type>pom</type>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-</project>

features/mdns/src/main/java/org/opennms/serviceregistration/ServiceRegistrationFactory.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration;
-
-public class ServiceRegistrationFactory {
-	private static ServiceRegistrationStrategy s;
-	private static final String CLASS_PROPERTY = "org.opennms.serviceregistration.strategy";
-    private static final String[] classes = {
-            "org.opennms.serviceregistration.strategies.AppleStrategy",
-            "org.opennms.serviceregistration.strategies.JMDNSStrategy",
-            "org.opennms.serviceregistration.strategies.NullStrategy"
-    };
-	
-	private ServiceRegistrationFactory() {
-	}
-
-	public static synchronized ServiceRegistrationStrategy getStrategy() throws Exception {
-		if (s == null) {
-		    if (System.getProperty(CLASS_PROPERTY) != null) {
-		        try {
-	                s = (ServiceRegistrationStrategy)(Class.forName(System.getProperty(CLASS_PROPERTY)).newInstance());
-		        } catch (NoClassDefFoundError e) {
-		            System.err.println("unable to load class specified in " + CLASS_PROPERTY + ": " + e.getMessage());
-		        }
-		    }
-            if (s == null) {
-                for (String className : classes) {
-		            try {
-		                s = (ServiceRegistrationStrategy)(Class.forName(className).newInstance());
-		            } catch (NoClassDefFoundError e) {
-		                // fall through silently for now
-		            } catch (UnsatisfiedLinkError e) {
-                        // fall through silently for now
-		            }
-		            if (s != null) {
-		                break;
-		            }
-		        }
-		    }
-		}
-		
-		if (s == null) {
-		    System.err.println("an error occurred finding any service registration strategy");
-		}
-		return s;
-	}
-	
-	public Object clone() throws CloneNotSupportedException {
-		throw new CloneNotSupportedException("Singletons cannot be cloned.");
-	}
-
-}

features/mdns/src/main/java/org/opennms/serviceregistration/ServiceRegistrationStrategy.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration;
-
-import java.util.Map;
-
-public interface ServiceRegistrationStrategy {
-
-	/**
-	 * Initialize the service registration strategy.
-	 * @param serviceType  the service type string (eg, "http")
-	 * @param serviceName  the name of the service (eg, "My Service")
-	 * @param port         the port the service is listening on
-	 * @throws Exception
-	 */
-	public void initialize(String serviceType, String serviceName, int port) throws Exception;
-	
-	/**
-	 * Initialize the service registration strategy.
-	 * 
-	 * @param serviceType   the service type string (eg, "http")
-	 * @param serviceName   the name of the service (eg, "My Service")
-	 * @param port          the port the service is listening on
-	 * @param properties    other properties (eg, path = "/opennms")
-	 * @throws Exception
-	 */
-	public void initialize(String serviceType, String serviceName, int port, Map<String,String> properties) throws Exception;
-
-	/**
-	 * Register the service.
-	 */
-	public void register() throws Exception;
-	
-	/**
-	 * Unregister the service.
-	 */
-	public void unregister() throws Exception;
-}

features/mdns/src/main/java/org/opennms/serviceregistration/strategies/AppleStrategy.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration.strategies;
-
-import java.util.Map;
-
-import org.opennms.serviceregistration.ServiceRegistrationStrategy;
-
-import com.apple.dnssd.DNSSD;
-import com.apple.dnssd.DNSSDRegistration;
-import com.apple.dnssd.DNSSDService;
-import com.apple.dnssd.RegisterListener;
-import com.apple.dnssd.TXTRecord;
-
-public class AppleStrategy implements ServiceRegistrationStrategy, RegisterListener {
-	private boolean m_registered = false;
-	private DNSSDRegistration m_registration;
-	private String m_serviceType;
-	private String m_serviceName;
-	private int m_port;
-	private Map<String,String> m_properties;
-
-	public AppleStrategy() throws Exception {
-	}
-
-	public void initialize(final String serviceType, final String serviceName, final int port) throws Exception {
-		initialize(serviceType, serviceName, port, null);
-	}
-	
-	public void initialize(final String serviceType, final String serviceName, final int port, final Map<String,String> properties) throws Exception {
-		if (m_registered == true) {
-			throw new Exception("You have already m_registered a service with this object!");
-		}
-		
-		m_serviceType   = "_" + serviceType.toLowerCase() + "._tcp";
-		m_serviceName   = serviceName;
-		m_port          = port;
-		m_properties    = properties;
-	}
-
-	public void register() throws Exception {
-		if (m_registered == false) {
-			final TXTRecord txt = new TXTRecord();
-			if (m_properties != null) {
-				for (final String key : m_properties.keySet()) {
-					txt.set(key, m_properties.get(key));
-				}
-			}
-			DNSSD.register(0, 0, m_serviceName, m_serviceType, null, null, m_port, txt, this);
-		} else {
-			System.err.println("WARNING: register() called but the service has already been m_registered!");
-		}
-	}
-
-	public void unregister() throws Exception {
-		if (m_registered == true) {
-			if (m_registration != null) {
-				m_registration.stop();
-				m_registration = null;
-			} else {
-				System.err.println("WARNING: unregister() has been called, but m_registration previously failed.");
-			}
-		} else {
-			System.err.println("WARNING: unregister() called but no service has been m_registered.");
-		}
-		
-	}
-
-	public void serviceRegistered(final DNSSDRegistration registration, final int flags, final String serviceName, final String regType, final String domain) {
-		m_registration = registration;
-		m_registered = true;
-	}
-
-	public void operationFailed(final DNSSDService service, final int errorCode) {
-		m_registered = false;
-		System.err.println("m_registration failed for service '" + service + "' with error code '" + errorCode + "'");
-	}
-
-}

features/mdns/src/main/java/org/opennms/serviceregistration/strategies/JMDNSStrategy.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration.strategies;
-
-import java.util.Map;
-
-import javax.jmdns.JmDNS;
-import javax.jmdns.ServiceInfo;
-
-import org.opennms.serviceregistration.ServiceRegistrationStrategy;
-
-public class JMDNSStrategy implements ServiceRegistrationStrategy {
-	private boolean m_registered = false;
-	private JmDNS m_jmdns;
-	private ServiceInfo m_si;
-
-	public JMDNSStrategy() throws Exception {
-	}
-
-	public void initialize(final String serviceType, final String serviceName, final int port) throws Exception {
-		initialize(serviceType, serviceName, port, null);
-	}
-	
-	public void initialize(final String serviceType, final String serviceName, final int port, final Map<String,String> properties) throws Exception {
-		if (m_registered == true) {
-			throw new Exception("You have already m_registered a service with this object!");
-		}
-		
-		final String serviceTypeName   = "_" + serviceType.toLowerCase() + "._tcp.local.";
-		m_jmdns = JmDNS.create();
-		m_si = ServiceInfo.create(serviceTypeName, serviceName, port, 0, 0, properties);
-	}
-
-	public void register() throws Exception {
-		if (m_registered == false) {
-			m_jmdns.registerService(m_si);
-			m_registered = true;
-		} else {
-			System.err.println("WARNING: register() called but the service has already been m_registered!");
-		}
-	}
-
-	public void unregister() throws Exception {
-		if (m_registered == true) {
-			if (m_jmdns != null && m_si != null) {
-				m_jmdns.unregisterService(m_si);
-				m_jmdns.close();
-				m_registered = false;
-			} else {
-				System.err.println("WARNING: unregister() has been called, but registration previously failed.");
-			}
-		} else {
-			System.err.println("WARNING: unregister() called but no service has been m_registered.");
-		}
-		
-	}
-
-}

features/mdns/src/main/java/org/opennms/serviceregistration/strategies/NullStrategy.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration.strategies;
-
-import java.util.Map;
-
-import org.opennms.serviceregistration.ServiceRegistrationStrategy;
-
-public class NullStrategy implements ServiceRegistrationStrategy {
-
-	public void initialize(final String serviceType, final String serviceName, final int port) throws Exception {
-	}
-
-	public void initialize(final String serviceType, final String serviceName, final int port, final Map<String, String> properties) throws Exception {
-	}
-
-	public void register() throws Exception {
-	}
-
-	public void unregister() throws Exception {
-	}
-
-}

features/mdns/src/test/java/org/opennms/serviceregistration/AppleRegistrationTest.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration;
-
-import java.util.Hashtable;
-
-import org.opennms.serviceregistration.strategies.AppleStrategy;
-
-import junit.framework.TestCase;
-
-public class AppleRegistrationTest extends TestCase {
-	private AppleStrategy a;
-	private static int timeout = 8000;
-	
-	public AppleRegistrationTest() throws Exception {
-		a = new AppleStrategy();
-	}
-	
-	public void testMdnsShort() throws Throwable {
-		a.initialize("http", "Short Test", 1010);
-		a.register();
-		Thread.sleep(timeout);
-		a.unregister();
-	}
-	
-	public void testMdnsLong() throws Throwable {
-		Hashtable<String,String> properties = new Hashtable<String,String>();
-		properties.put("path", "/opennms");
-		a.initialize("http", "Long Test", 1011, properties);
-		a.register();
-		Thread.sleep(timeout);
-		a.unregister();
-	}
-}

features/mdns/src/test/java/org/opennms/serviceregistration/JMDNSRegistrationTest.java

-/*******************************************************************************
- * This file is part of OpenNMS(R).
- *
- * Copyright (C) 2011-2012 The OpenNMS Group, Inc.
- * OpenNMS(R) is Copyright (C) 1999-2012 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.serviceregistration;
-
-import java.util.Hashtable;
-
-import junit.framework.TestCase;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.opennms.serviceregistration.strategies.JMDNSStrategy;
-
-public class JMDNSRegistrationTest extends TestCase {
-	private ServiceRegistrationStrategy a;
-	private static int timeout = 8000;
-
-	@Before
-	public void setUp() throws Exception {
-	    a = new JMDNSStrategy();
-	}
-
-	@Test
-	public void testMdnsShort() throws Exception {
-		a.initialize("http", "Short Test", 1010);
-		a.register();
-		Thread.sleep(timeout);
-		a.unregister();
-	}
-	
-    @Test
-	public void testMdnsLong() throws Exception {
-		Hashtable<String,String> properties = new Hashtable<String,String>();
-		properties.put("path", "/opennms");
-		a.initialize("http", "Long Test", 1011, properties);
-		a.register();
-		Thread.sleep(timeout);
-		a.unregister();
-	}
-}
     <module>instrumentationLogReader</module>
     <module>jdbc-collector</module>
     <module>juniper-tca-collector</module>
-    <module>mdns</module>
     <module>ncs</module>
     <module>poller</module>
     <module>provisioning</module>

opennms-doc/src/docbkx/common/copyright.xml

        
       It will almost always be used along with legalnotice.xml -->
 <copyright>
-  <year>2004-2012</year>
+  <year>2004-2013</year>
   <holder>The OpenNMS Group, Inc.</holder>
 </copyright>

opennms-doc/src/docbkx/common/preface.xml

 	<itemizedlist>
 		<listitem>
 			<para>
-				<trademark class="copyright">Copyright </trademark> 2002-2012
+				<trademark class="copyright">Copyright </trademark> 2002-2013
 				<ulink url="http://www.opennms.com">The OpenNMS Group, Inc.</ulink>
 			</para>
 		</listitem>

opennms-doc/src/docbkx/releasenotes/chap1.xml

 
 	<!-- Start 1.10 -->
 
+	<section id="introduction-1.10.8">
+		<title>Release 1.10.8</title>
+
+		<para>
+			Release 1.10.8 is the latest in the stable series of OpenNMS releases.
+			It contains a number of bugfixes and enhancements.
+		</para>
+		<para>
+			The codename for 1.10.8 is <emphasis>Trikiti</emphasis>
+		</para>
+	</section>
+
 	<section id="introduction-1.10.7">
 		<title>Release 1.10.7</title>
 

opennms-doc/src/docbkx/releasenotes/chap2.xml

 
 	<!-- Start 1.10 -->
 
+	<section id="opennms-1.10.8">
+		<title>Changes in OpenNMS 1.10.8</title>
+
+		<section id="opennms-1.10.8-bug">
+			<title>Bug</title>
+
+			<itemizedlist>
+				<listitem><para>NodeAvailabilityReport.jrxml doesn&#39;t work: PSQLException caused by date string in french locale (Issue <ulink url='http://issues.opennms.org/browse/NMS-5379'>NMS-5379</ulink>)</para></listitem>
+				<listitem><para>subreports/InterfaceAvailabilityReport_subreport1.jrxml doesn&#39;t work on my locale (Issue <ulink url='http://issues.opennms.org/browse/NMS-5457'>NMS-5457</ulink>)</para></listitem>
+				<listitem><para>SnmpMonitor is not able to manage &quot;OCTET STRING&quot; (Issue <ulink url='http://issues.opennms.org/browse/NMS-5563'>NMS-5563</ulink>)</para></listitem>
+				<listitem><para>Selecting Surveillance Categories Per Node Broken (Issue <ulink url='http://issues.opennms.org/browse/NMS-5609'>NMS-5609</ulink>)</para></listitem>
+				<listitem><para>Nodes with the same IP show up in the wrong categories (availability table on the index page) (Issue <ulink url='http://issues.opennms.org/browse/NMS-5611'>NMS-5611</ulink>)</para></listitem>
+				<listitem><para>JavaSendMailer throws NPE when no e-mail address configured for report (Issue <ulink url='http://issues.opennms.org/browse/NMS-5665'>NMS-5665</ulink>)</para></listitem>
+				<listitem><para>The search page is not displaying the services correctly if Capsd is disabled (Issue <ulink url='http://issues.opennms.org/browse/NMS-5669'>NMS-5669</ulink>)</para></listitem>
+				<listitem><para>The NTP Detector is broken (Issue <ulink url='http://issues.opennms.org/browse/NMS-5677'>NMS-5677</ulink>)</para></listitem>
+				<listitem><para>Add a way to use the IP address when building criteria selections for the SNMP interfaces on the SNMP Poller&#39;s configuration file. (Issue <ulink url='http://issues.opennms.org/browse/NMS-5683'>NMS-5683</ulink>)</para></listitem>
+				<listitem><para>The JRobin Converter doesn&#39;t work when the RRD Step is different than 5 minutes (Issue <ulink url='http://issues.opennms.org/browse/NMS-5685'>NMS-5685</ulink>)</para></listitem>
+				<listitem><para>The hover icon of the delete button from the Surveillance Categories Page is wrong. (Issue <ulink url='http://issues.opennms.org/browse/NMS-5693'>NMS-5693</ulink>)</para></listitem>
+				<listitem><para>Categories with spaces or non alphanumeric characters breaks the delete operation on the WebUI. (Issue <ulink url='http://issues.opennms.org/browse/NMS-5694'>NMS-5694</ulink>)</para></listitem>
+				<listitem><para>google-collections has been replaced with guava (Issue <ulink url='http://issues.opennms.org/browse/NMS-5695'>NMS-5695</ulink>)</para></listitem>
+				<listitem><para>HttpCollector doesn&#39;t detect response locale (PATCH INCLUDED) (Issue <ulink url='http://issues.opennms.org/browse/NMS-5701'>NMS-5701</ulink>)</para></listitem>
+				<listitem><para>Default poller-configuration.xml specifies timeout, retry, port for SNMP-based services (Issue <ulink url='http://issues.opennms.org/browse/NMS-5703'>NMS-5703</ulink>)</para></listitem>
+				<listitem><para>WMI Capsd plugin mixes up username, domain, and password (Issue <ulink url='http://issues.opennms.org/browse/NMS-5707'>NMS-5707</ulink>)</para></listitem>
+				<listitem><para>Wrong redirect after clicking on any ticket related button from the alarm details page (Issue <ulink url='http://issues.opennms.org/browse/NMS-5713'>NMS-5713</ulink>)</para></listitem>
+				<listitem><para>AssetRecordDao.findByNodeId is not working (Issue <ulink url='http://issues.opennms.org/browse/NMS-5714'>NMS-5714</ulink>)</para></listitem>
+			</itemizedlist>
+		</section>
+		<section id="opennms-1.10.8-enhancement">
+			<title>Enhancement</title>
+
+			<itemizedlist>
+				<listitem><para>Improve the ticketer API in order to access more information about the ticket&#39;s originator. (Issue <ulink url='http://issues.opennms.org/browse/NMS-5705'>NMS-5705</ulink>)</para></listitem>
+			</itemizedlist>
+		</section>
+	</section>
+
 	<section id="opennms-1.10.7">
 		<title>Changes in OpenNMS 1.10.7</title>
 

opennms-jetty/pom.xml

       <type>pom</type>
     </dependency>
     <dependency>
-      <groupId>org.opennms.features</groupId>
-      <artifactId>org.opennms.features.mdns</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
     </dependency>

opennms-jetty/src/main/java/org/opennms/netmgt/jetty/JettyServer.java

 import org.eclipse.jetty.server.ssl.SslSocketConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.opennms.netmgt.daemon.AbstractServiceDaemon;
-import org.opennms.serviceregistration.ServiceRegistrationFactory;
-import org.opennms.serviceregistration.ServiceRegistrationStrategy;
 
 /**
  * Implements Web Application within OpenNMS as a Service Daemon.
     int m_port = 8080;
 
     private Server m_server;
-    private Map<String,ServiceRegistrationStrategy> services = new ConcurrentHashMap<String,ServiceRegistrationStrategy>();
     
     /**
      * <p>Constructor for JettyServer.</p>
                         contextPath = "/" + file.getName();
                     }
                     addContext(handlers, file, contextPath);
-                    registerService(port, contextPath);
                 }
             }
             if (rootDir != null) {
                 // If we deferred a ROOT context, handle that now
                 addContext(handlers, rootDir, "/");
-                registerService(port, "/");
             }
         }
 
     }
 
     /**
-     * <p>registerService</p>
-     *
-     * @param port a {@link java.lang.Integer} object.
-     * @param contextPath a {@link java.lang.String} object.
-     */
-    protected void registerService(Integer port, String contextPath) {
-        String contextName = contextPath.replace("/", "");
-
-        try {
-            ServiceRegistrationStrategy srs = ServiceRegistrationFactory.getStrategy();
-            String host = InetAddress.getLocalHost().getHostName().replace(".local", "").replace(".", "-");
-            Map<String, String> properties = new ConcurrentHashMap<String, String>();
-            properties.put("path", contextPath);
-            
-            srs.initialize("HTTP", contextName + "-" + host, port, properties);
-            services.put(contextName, srs);
-        } catch (Throwable e) {
-            log().warn("unable to get a DNS-SD object for context '" + contextPath + "'", e);
-        }
-    }
-
-    /**
      * <p>excludeCipherSuites</p>
      * @param contextFactory 
      * @param https_port 
         } catch (Throwable e) {
             log().error("Error starting Jetty Server", e);
         }
-        for (String key: services.keySet()) {
-        	ServiceRegistrationStrategy srs = services.get(key);
-        	if (srs != null) {
-            	try {
-            		srs.register();
-            	} catch (Throwable e) {
-            		log().warn("unable to register a DNS-SD object for context '" + key + "'", e);
-            	}
-        	}
-        }
     }
 
     /** {@inheritDoc} */
     @Override
     protected void onStop() {
-        for (String key: services.keySet()) {
-        	ServiceRegistrationStrategy srs = services.get(key);
-        	if (srs != null) {
-            	try {
-            		srs.unregister();
-            	} catch (Throwable e) {
-            		log().warn("unable to unregister a DNS-SD object for context '" + key + "'", e);
-            	}
-        	}
-        }
         try {
             m_server.stop();
         } catch (Throwable e) {

opennms-services/src/main/java/org/opennms/netmgt/poller/monitors/HostResourceSwRunMonitor.java

 import java.io.IOException;
 import java.lang.reflect.UndeclaredThrowableException;
 import java.net.InetAddress;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.log4j.Level;
 import org.opennms.netmgt.poller.DistributionContext;
 import org.opennms.netmgt.poller.MonitoredService;
 import org.opennms.netmgt.poller.NetworkInterface;
+import org.opennms.netmgt.snmp.RowCallback;
 import org.opennms.netmgt.snmp.SnmpAgentConfig;
 import org.opennms.netmgt.snmp.SnmpInstId;
 import org.opennms.netmgt.snmp.SnmpObjId;
+import org.opennms.netmgt.snmp.SnmpRowResult;
 import org.opennms.netmgt.snmp.SnmpUtils;
 import org.opennms.netmgt.snmp.SnmpValue;
+import org.opennms.netmgt.snmp.SnmpWalker;
+import org.opennms.netmgt.snmp.TableTracker;
 
 import antlr.StringUtils;
 
  * This does SNMP and therefore relies on the SNMP configuration so it is not distributable.
  * </p>
  *
+ * Feature Added (2013-01-23):
+ *
+ * <p>This class uses TableTracker to request multiple columns at once and avoid possible problems,
+ * if the table is re-indexed at the moment is being collected, which is a problem with volatile
+ * services, or service with several forks like crond.</p>
+ *
  * @author <A HREF="mailto:tarus@opennms.org">Tarus Balog </A>
+ * @author <A HREF="mailto:agalue@opennms.org">Alejandro Galue </A>
  * @author <A HREF="http://www.opennms.org/">OpenNMS </A>
  */
 @Distributable(DistributionContext.DAEMON)
                 return status;
             }
 
-            // This returns two maps: one of instance and service name, and one of instance and status.
-            Map<SnmpInstId, SnmpValue> nameResults = SnmpUtils.getOidValues(agentConfig, "HostResourceSwRunMonitor", SnmpObjId.get(serviceNameOid));
-            Map<SnmpInstId, SnmpValue> statusResults = SnmpUtils.getOidValues(agentConfig, "HostResourceSwRunMonitor", SnmpObjId.get(serviceStatusOid));
+            // This updates two maps: one of instance and service name, and one of instance and status.
+            final SnmpObjId serviceNameOidId = SnmpObjId.get(serviceNameOid);
+            final SnmpObjId serviceStatusOidId = SnmpObjId.get(serviceStatusOid);
+            final Map<SnmpInstId, SnmpValue> nameResults = new HashMap<SnmpInstId, SnmpValue>();
+            final Map<SnmpInstId, SnmpValue> statusResults = new HashMap<SnmpInstId, SnmpValue>();
+            RowCallback callback = new RowCallback() {
+                @Override
+                public void rowCompleted(SnmpRowResult result) {
+                    nameResults.put(result.getInstance(), result.getValue(serviceNameOidId));
+                    statusResults.put(result.getInstance(), result.getValue(serviceStatusOidId));
+                }
+            };
+            TableTracker tracker = new TableTracker(callback, serviceNameOidId, serviceStatusOidId);
+            SnmpWalker walker = SnmpUtils.createWalker(agentConfig, "HostResourceSwRunMonitor", tracker);
+            walker.start();
+            walker.waitFor();
 
             // Iterate over the list of running services
             for(SnmpInstId nameInstance : nameResults.keySet()) {

opennms-webapp/src/main/java/org/opennms/web/element/NetworkElementFactory.java

             }
             intf.m_ipHostName = ipIface.getIpHostName();
             intf.m_ipAddr = InetAddressUtils.str(ipIface.getIpAddress());
+            intf.m_isSnmpPrimary = ipIface.getIsSnmpPrimary().getCode();
             intf.m_isManaged = ipIface.getIsManaged().charAt(0);
             if(ipIface.getIpLastCapsdPoll() != null) {
                 intf.m_ipLastCapsdPoll = Util.formatDateToUIString(ipIface.getIpLastCapsdPoll());
         <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opennms.features</groupId>
-        <artifactId>org.opennms.features.mdns</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.opennms.features.ncs</groupId>
         <artifactId>ncs-alarm-gui</artifactId>
         <version>${project.version}</version>