1.10.2-SNAPSHOT -> 1.10.2
1.10.2 -> 1.10.3-SNAPSHOT
Fixed missing Socket.close() call inside SimpleServer. This will prevent
the class from leaking filehandles when under load by closing them
immediately instead of waiting for the garbage collector to close them.
Added constant value that is used to indicate that no banner was
received on the TCPDetector. Added log messages at every point that the
detectors mark the service as detected or not. Enhanced SimpleServer so
that it will keep connections alive for a timeout period so that we can
test timeouts during banner receipt.
Squashed commit of the following:

commit 8872d268c3f8b96361b037e3f78df11dd253d59a
Merge: 258a024 64b6589
Author: Seth Leger <seth@opennms.org>
Date:   Tue May 8 14:49:47 2012 -0400

    Merge branch '1.10' of ssh://opennms.git.sourceforge.net/gitroot/opennms/opennms into provisiond-netty

commit 258a024e63b8a8e34dce9ceb64300e38bfab7a70
Author: Seth Leger <seth@opennms.org>
Date:   Tue May 8 12:56:40 2012 -0400

    Added constant value that is used to indicate that no banner was
    received on the TCPDetector. Added log messages at every point that the
    detectors mark the service as detected or not. Enhanced SimpleServer so
    that it will keep connections alive for a timeout period so that we can
    test timeouts during banner receipt.

commit d9eac2f0dc3d80e51f68b98b1482ac020c212b5f
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 21:35:45 2012 -0400

    Refactored AsyncLineOrientedDetector and AsyncMultilineDetector to
    indicate that they are MINA-specific implementations.

commit ba20c3ae84350e4babeaafdf4df54862bbc481f6
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 21:31:21 2012 -0400

    Reenabled some tests inside LineDecoderTest that pass.

commit 0691b1b7b9a2c5d4c56558e6152f48d908ad7997
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 20:37:41 2012 -0400

    Fixed Socket.close() calls inside SSLServer.java.

commit 49f0f81a16808fd619be25db3bf6da66c5108ae3
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 20:01:31 2012 -0400

    Fixed missing Socket.close() call inside SimpleServer. This will prevent
    the class from leaking filehandles when under load by closing them
    immediately instead of waiting for the garbage collector to close them.

commit 618a9d8d3c2825b99f5b4511c183766c8c1d2615
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 14:35:31 2012 -0400

    Added new SyncAbstractDetector base class.

commit 5eb5f7d59550c79223d8b23c8fb76f056b4ce346
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 14:34:21 2012 -0400

    Refactored AbstractDetector so that it can share code between the sync
    and async detector abstract classes.

commit 7e4bec603a03a70306484ead326678b6805d5682
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 14:08:02 2012 -0400

    Minor refactoring in ServiceDetector, AbstractDetector and
    AsyncAbstractDetector to make the interfaces more alike.

commit a1831687c759084cf775f58a71d938fbf6d1204d
Author: Seth Leger <seth@opennms.org>
Date:   Mon May 7 14:03:42 2012 -0400

    Minor code cleanup. Removed some improperly overridden methods.

commit eb83748be853cf2e459bee0262c9893a1755d689
Author: Seth Leger <seth@opennms.org>
Date:   Thu May 3 11:23:49 2012 -0400

    Minor code cleanup.

commit 61a3c54dd453f7c62a280f1e5635bf38a32986d7
Author: Seth Leger <seth@opennms.org>
Date:   Thu Apr 26 17:03:51 2012 -0400

    @Override cleanup and added toString() methods to some conversation
    objects so that it's easier to track client-server exchanges inside the
    detectors.

commit be35f4b023ff3e8773224d938566d102402dd0c0
Author: Seth Leger <seth@opennms.org>
Date:   Thu Apr 26 15:50:44 2012 -0400

    Refactored ConversationExchangeDefaultImpl so that it can be reused by
    the sync and async classes.

commit 343a8285f4d3711f146f3a9e3a314a18d2b80246
Author: Seth Leger <seth@opennms.org>
Date:   Thu Apr 26 15:49:30 2012 -0400

    Logging tweaks for provisioning network conversations.

commit ca9d44687298d301166c104aea7b0ee5152820f1
Author: Seth Leger <seth@opennms.org>
Date:   Thu Apr 26 15:17:28 2012 -0400

    Refactored more API classes (ConversationExchange, RequestBuilder) so
    that they are reused by the async and sync provisioning classes.

commit 3cf4bc2f0907b3eb1340b64cd4bc941175ad87bf
Author: Seth Leger <seth@opennms.org>
Date:   Thu Apr 26 14:33:05 2012 -0400

    Refactored ResponseValidator out as a top-level interface.
Merge remote-tracking branch 'origin/1.10'

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
	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-link-provisioning-adapter/src/main/java/org/opennms/netmgt/provision/detector/endpoint/EndPointDetector.java
	integrations/opennms-map-provisioning-adapter/pom.xml
	integrations/opennms-puppet-provisioning-adapter/pom.xml
	integrations/opennms-rancid-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-daemon/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-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-simple/src/main/java/org/opennms/netmgt/provision/detector/snmp/SnmpDetector.java
	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/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
NMS-4757 fix spacing to avoid spurious error
fix bad merge, cannot override init()
Merge remote-tracking branch 'origin/1.10'