commit | 518852cae96c3d19741d52b5450ec7766716eabf | [log] [tgz] |
---|---|---|
author | BOLLE Sebastien <sebastien.bolle@orange.com> | Fri Sep 29 14:01:36 2017 +0200 |
committer | BOLLE Sebastien <sebastien.bolle@orange.com> | Thu Nov 02 15:00:41 2017 +0100 |
tree | 06d6a744c91c44abf0f260352126f16aee30a076 | |
parent | c20eb857c58c91ba155c47f90dc9867eee2d1288 [diff] |
all: several fixes proposed by DT (Andreas KRAFT) # README 2017-09-27 This directory contains additional changes DT made to the om2m source files. The bases for the changes is the Orange distribution from 31.08.2017. ## org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/Util.java - Moved static configuration of date format to local methods. ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.java - Moved static configuration of "NB_OF_FAILED_NOTIFS_BEFORE_DELETION" to local methods. ## org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/Activator.java - corrected wrong registration of DBService service. ## org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBServiceImpl.java - Changed DB URL to use the "org.eclipse.om2m.dbUrl" environment variable. ## org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/Activator.java - Fixed wrong redirection. - Made statics instance local. ## ./org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/json/WelcomeServlet.java - Fixed wrong redirection. - Made statics instance local. ## org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/Activator.java - Fixed wrong redirection. - Made statics instance local. ## org.eclipse.om2m.webapp.resourcesbrowser.xml/src/main/java/org/eclipse/om2m/webapp/resourcesbrowser/xml/WelcomeServlet.java - Fixed wrong redirection. - Made statics instance local. ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerXMLValidator.java - Moved static configuration of "FLEXCONTAINER_XSD_FOLDER_PROPERTY_VALUE" to localmethods. ## org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Constants.java - Changed type of class to interface Usage: From now on, just inherite this interface and use the members. They are initialized whenever the derived class is instantiated. - Made all members non-static ## org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java - Now inherits from Constants ## org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/UriUtil.java - Now inherits from Constants ## org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/Util.java - Removed statics ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/announcer/Announcer.java - Now inherits from Constants ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AccessControlPolicyController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEAnncController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/AEController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContainerController.java - Uses new Pattern clainterfacess ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/ContentInstanceController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DiscoveryController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DynamicAuthorizationConsultationController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DynamicAuthorizationConsultationController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerAnncController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerController.java - Uses new Pattern interface - Changed static XML encoding to take (non-static) configuration into account (for payload encoding) ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/GroupController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/NodeController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/PollingChannelController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/RemoteCSEController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/SubscriptionController.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/CSEInitializer.java - Moved static configuration of date format to local methods. ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/flexcontainer/FlexContainerXMLValidator.java - Removed/changed static initialization. ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/nblocking/NonBlockingWorker.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.java - Changed static configurations ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/redirector/Redirector.java - Changed static determination of content format ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Patterns.java - Changed static setting of Patterns. Now an interface class. ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java - Uses new Pattern interface - Changed static determination of content format ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/urimapper/UriMapper.java - Uses new Pattern interface ## org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/util/GroupUtil.java - Uses new Pattern interface ## org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/Activator.java - Changed static configurations ## org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java - Changed static configurations - Changed static determination of content format (already included in last patch) ## org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java - Changed static configurations Conflicts: org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/Constants.java org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/notifier/Notifier.java org.eclipse.om2m.persistence.mongodb/src/main/java/org/eclipse/om2m/persistence/mongodb/DBServiceImpl.java Signed-off-by: BOLLE Sebastien <sebastien.bolle@orange.com> Signed-off-by: BONNARDEL Gregory <gbonnardel.ext@orange.com>
OM2M is an open source OSGi-based implementation of the ETSI M2M standard .
Prerequisites:
Building OM2M from sources using maven:
mvn clean install
Configure and Start the NSCL:
java -jar -ea -Declipse.ignoreApp=true -Dosgi.clean=true -Ddebug=true plugins/org.eclipse.equinox.launcher_1.3.0.v20140415-2008.jar -console -noExit
Configure and Start the GSCL:
For more details, see http://wiki.eclipse.org/OM2M