User feedback and tests updated after bug #2096
- Moved a bunch of GUI specfific code out of UserFeedback and into its own class - this is partly to increase encapsulation and partly to move non-unit-testable code into a separate file
- Moved tests into user-agent-bundle because they require dependencies (namely Hibernate files) which are only available in the bundle
Adding some error handling so the controller ignores the database if it's not playing nice
Adding a truncate method to aid in unit tests
Adding IDs to components to aid integration tests
Tidying code and display a little
Split this method into two so that a consumer can easily do things like "click button X, wait for X to become stale", etc
Adding integration tests around PPN to test case #2077
Exposing more UF methods to the rest of the program to aid integration tests
mock user feedback, BIT 2103, priv pref webapp
Merge branch 'eliza_privacy' into development

Conflicts:
	privacy-trust/java/privacy-protection/privacy-negotiation-management/src/main/java/org/societies/privacytrust/privacyprotection/privacynegotiation/comms/PrivacyNegotiationManagerCommClient.java
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	api/java/internal/src/main/java/org/societies/api/internal/useragent/feedback/IUserFeedback.java
	integration-tests/BIT/webapp-test-suite/t65-webapp-test-api/src/main/java/org/societies/integration/api/selenium/AbstractSeleniumComponent.java
	integration-tests/BIT/webapp-test-suite/t65-webapp-test-api/src/main/java/org/societies/integration/api/selenium/components/UFNotificationPopup.java
	integration-tests/BIT/webapp-test-suite/webapp-userfeedback-test-2077/src/main/java/org/societies/integration/tests/bit/webapp/UFTestInit.java
	integration-tests/BIT/webapp-test-suite/webapp-userfeedback-test-2077/src/main/resources/META-INF/spring/bundle-context.xml
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/NotificationsController.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/entity/NotificationQueueItem.java
	platform-infrastructure/web-app/src/main/webapp/includes/notifications.xhtml
	platform-infrastructure/web-app/src/main/webapp/notification_history.xhtml
	platform-infrastructure/web-app/src/main/webapp/privacy_policy_negotiation.xhtml
	user-agent/user-feedback/src/main/java/org/societies/useragent/feedback/UserFeedback.java
Amalgamation of the previous week's work - an earlier commit was rolled back deleting all my changes - this has been pieced together from local history
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	api/java/external/src/main/java/org/societies/api/context/model/CtxAssociationTypes.java
	api/java/external/src/main/java/org/societies/api/privacytrust/trust/model/util/TrustedEntityIdFactory.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/security/CtxAccessController.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/privacy/prefs/PrivacyPreferencesController.java
	platform-infrastructure/web-app/src/main/webapp/privacypreferences.xhtml
	privacy-trust/java/trust/trust-cloud-bundle/src/main/java/org/societies/privacytrust/trust/impl/evidence/monitor/CtxTrustEvidenceMonitor.java
Merge remote-tracking branch 'origin/development' into paddy_userfeedback_mods

Conflicts:
	api/java/external/src/main/java/org/societies/api/context/model/CtxAssociationTypes.java
	api/java/external/src/main/java/org/societies/api/privacytrust/trust/model/util/TrustedEntityIdFactory.java
	context-management/ContextBroker/src/main/java/org/societies/context/broker/impl/security/CtxAccessController.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/privacy/prefs/PrivacyPreferencesController.java
	platform-infrastructure/web-app/src/main/webapp/privacypreferences.xhtml
	privacy-trust/java/privacy-protection/privacy-negotiation-management/src/main/java/org/societies/privacytrust/privacyprotection/privacynegotiation/comms/PrivacyNegotiationManagerCommClient.java
	privacy-trust/java/trust/trust-cloud-bundle/src/main/java/org/societies/privacytrust/trust/impl/evidence/monitor/CtxTrustEvidenceMonitor.java
Updated to latest version of Selenium - most notable change is the lack of many thousands of unnecessary System.err statements (which weren't actually errors)
Finished test #2116 - Automated testing of CIS join via the T65 webapp (although the actual 'join' page isn't complete yet, so this is simulated via the ICisManager, and the test only tests the UserFeedback GUI components)
This is just an API so should really be a JAR
Missing dependency has just appeared?
I hate OSGi...
Added a test which was duplicate of existing test, except tests cancelling  a PPN
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	android/client-frwk/SocietiesLibraries/trust/trust-apklib/src/org/societies/android/privacytrust/trust/TrustClientBase.java
	api/schema/external/src/main/resources/org.societies.api.schema.privacytrust.trust.broker.xsd
	api/schema/external/src/main/resources/org.societies.api.schema.privacytrust.trust.model.xsd
	cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/Cis.java
	cis-modules/cis-management/cis-manager/cis-manager/src/main/java/org/societies/cis/manager/CisManager.java
	cis-modules/cis-management/cisMgmtTester/pom.xml
	context-management/CommunityContextEstimation/src/main/java/org/societies/context/community/estimation/impl/CommunityMembershipChangeListener.java
	css-modules/device-mgmt/DisplayDriver/HWUDisplayPortalServer/src/main/java/org/societies/display/server/DisplayPortalServer.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/CAUIController.java
	privacy-trust/java/trust/trust-api/src/main/java/org/societies/privacytrust/trust/api/broker/remote/ITrustBrokerRemoteClientCallback.java
	privacy-trust/java/trust/trust-api/src/main/java/org/societies/privacytrust/trust/api/repo/ITrustRepository.java
	privacy-trust/java/trust/trust-api/src/main/java/org/societies/privacytrust/trust/api/util/MathUtils.java
	privacy-trust/java/trust/trust-cloud-bundle/src/main/java/org/societies/privacytrust/trust/impl/InternalTrustBroker.java
	privacy-trust/java/trust/trust-cloud-bundle/src/main/java/org/societies/privacytrust/trust/impl/engine/IndirectTrustEngine.java
	privacy-trust/java/trust/trust-cloud-bundle/src/main/java/org/societies/privacytrust/trust/impl/repo/TrustRepository.java
	privacy-trust/java/trust/trust-cloud-bundle/src/main/resources/META-INF/spring/bundle-context-osgi.xml
	privacy-trust/java/trust/trust-cloud-bundle/src/test/java/org/societies/privacytrust/trust/test/AdvancedTrustRepositoryTest.java
	privacy-trust/java/trust/trust-cloud-bundle/src/test/java/org/societies/privacytrust/trust/test/InternalTrustBrokerTest.java
	privacy-trust/java/trust/trust-cloud-bundle/src/test/java/org/societies/privacytrust/trust/test/TrustBrokerTest.java
	privacy-trust/java/trust/trust-cloud-bundle/src/test/java/org/societies/privacytrust/trust/test/TrustRepositoryTest.java
	privacy-trust/java/trust/trust-comms/src/main/java/org/societies/privacytrust/trust/impl/broker/remote/TrustBrokerRemoteClientCallback.java
	privacy-trust/java/trust/trust-comms/src/main/java/org/societies/privacytrust/trust/impl/evidence/remote/TrustEvidenceCollectorRemoteClient.java
Merge branch 'paddy_userfeedback_mods' into development

Conflicts:
	api/java/internal/src/main/java/org/societies/api/internal/useragent/feedback/IUserFeedback.java
	integration-tests/BIT/webapp-test-suite/t65-webapp-test-api/src/main/java/org/societies/integration/api/selenium/components/UFNotificationPopup.java
	integration-tests/BIT/webapp-test-suite/webapp-userfeedback-test-2077/src/main/java/org/societies/integration/tests/bit/webapp/TestWebappPrivacyNegotiation.java
	integration-tests/BIT/webapp-test-suite/webapp-userfeedback-test-2077/src/main/java/org/societies/integration/tests/bit/webapp/UFTestInit.java
	integration-tests/BIT/webapp-test-suite/webapp-userfeedback-test-2077/src/main/resources/META-INF/spring/bundle-context.xml
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/NotificationsController.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/controller/privacy/prefs/PrivacyPreferencesController.java
	platform-infrastructure/web-app/src/main/java/org/societies/webapp/entity/NotificationQueueItem.java
	platform-infrastructure/web-app/src/main/webapp/includes/notifications.xhtml
	platform-infrastructure/web-app/src/main/webapp/notification_history.xhtml
	platform-infrastructure/web-app/src/main/webapp/privacy_policy_negotiation.xhtml
	user-agent/user-feedback/src/main/java/org/societies/useragent/feedback/UserFeedback.java