Odysseus Incubation
  1. Odysseus Incubation

pubsub

Public
  1. Odysseus Incubation
  2. pubsub

Commits

AuthorCommitMessageCommit dateIssues
Marco GrawunderMarco Grawunder
d4ba7482a84MMerge branch 'development'
Marco GrawunderMarco Grawunder
949b8c03687batch updates
Marco GrawunderMarco Grawunder
cbad9cb21d2MMerge branch 'development'
Marco GrawunderMarco Grawunder
fca91c5a4c4Update of extension for tycho
Marco GrawunderMarco Grawunder
248e2c1b670Removed Exec Env
Marco GrawunderMarco Grawunder
b19716f9bb3MMerge branch 'development'
Marco GrawunderMarco Grawunder
94bf913ea4fRemovedWarnings
Marco GrawunderMarco Grawunder
8ef09ad0be8MMerge branch 'development'
Marco GrawunderMarco Grawunder
a6cfd9c4832added solobuild profile
Tobias BrandtTobias Brandt
835ca00164fMMerge pull request #2 in OI/pubsub from development to master* commit '2071bfd0146765dedfb4a3b63144900d80e0cd26': maven preparation
Tobias BrandtTobias Brandt
2071bfd0146maven preparation
Marco GrawunderMarco Grawunder
16ed21f8729odysseus_dev update
Marco GrawunderMarco Grawunder
42b0872fbd8MMerge branch 'maven' of https://git.swl.informatik.uni-oldenburg.de/scm/oi/pubsub
Marco GrawunderMarco Grawunder
6328501bf4cmaven buildable
Marco GrawunderMarco Grawunder
f723c431621maven preparations
Marco GrawunderMarco Grawunder
b16605980eamaven preparations
Marco GrawunderMarco Grawunder
1b50fe2408bmaven preparations
Marco GrawunderMarco Grawunder
a659a4f7a16Added submodules
Marco GrawunderMarco Grawunder
ed27eb0a16eInitial commit
Marco GrawunderMarco Grawunder
f4b94d2af23Commit removals
Marco GrawunderMarco Grawunder
6de859c021cMMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco GrawunderMarco Grawunder
ca2608601b9MMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco GrawunderMarco Grawunder
e5f0a88df48MMerge pull request #15 in ODY/odysseus from modules to development* commit 'a80919cfea85e983dd49eb45f47506967cf6fa83': Renamed folder for cache plugin ... Moved server projects to same level Moved bundles to module folders
Marco GrawunderMarco Grawunder
6ee6aac3f0dMoved bundles to module folders
Marco GrawunderMarco Grawunder
e3a834d1f1bMMerge pull request #3 in ODY/odysseus from feature/ODY-1631-totimestampfromstring to development* commit 'b8853c65eab722300f8d0c3f25f2a26dec3c61a7': ODY-1631: implemented functionODY-1631
Marco GrawunderMarco Grawunder
80610acc304removed version .qualifier --> manual update of version number required now
Marco GrawunderMarco Grawunder
cda132fd6dbMMerge pull request #421 in ODY/odysseus from bugfix/ODY-1620-xmlprocotolhandler-don-t-work-with-push to development* commit '83ba1bfdc434d40defbd7ce8943965e672cbfaef [formerly d54d760c11c516237b5cf9d85541bb4e210b974a]': ODY-1620: Always initialize result-list Former-commit-id: 813c98ca8c059813ac293ae0d087ab883056b107ODY-1620
Marco GrawunderMarco Grawunder
afb64130f88MMerge pull request #420 in ODY/odysseus from feature/digital-signal-processing to development* commit '4db06627db379dc6ae71ea3a47c66b27fd5df448 [formerly f08928cae80156a655ecc35c1e2b148a70beb0a6]': (33 commits) Rename InterpolationMethod interface to IInterpolationMethod Respect Base Time Improved Interpolation Documentation of abstract operators Output Schema of placeholder abstract operators FFT and Cross Correlation substitution rules Fir Filter Substitution First Ve...
Marco GrawunderMarco Grawunder
da39f47d5b2MMerge pull request #415 in ODY/odysseus from ODY-1627-anomaly-detection-output to development* commit 'b684bef96884542bc7c20b30c8be495f42e50007 [formerly f25bd300cc76a46d0d875d6ce4f484a5b23d2de2]': ODY-1627 Same changes for output on port 1 on master Former-commit-id: fc29aa6c65d6e97eeb51db9234c5f13bb03d6c2dODY-1627
Marco GrawunderMarco Grawunder
e84467cdb83MMerge pull request #407 in ODY/odysseus from bugfix/104-bugfixes to development* commit '38b115cb11e1d2ac47b364d6f66b40e6a1a4753a [formerly 53c38a2748ce62b06601a5cf6acb6de5e1ca6a91]': (44 commits) Removed resources Fixed manifest file after merge OJ104: Added dependency to slf4j again. Reviewer removed it, but it is needed. FIX: Wrong plugin reference in feature Renamed folders (same name as projects now) Some fixes for the reader. Renamed graph lib bundles ...2 Jira issues
Marco GrawunderMarco Grawunder
cb1c7cf8af4MMerge remote-tracking branch 'origin/development' into bugfix/104-bugfixesConflicts: common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: bc67c9019f0e7a381ed0283763ab99397bb649df
Tobias BrandtTobias Brandt
98306b6b83cMMerge pull request #408 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to development* commit 'ed208d4393ed8496de729571f4b6c721ec8cb59f [formerly 2ca0906c9126f51f7d001d59f451c78b42fb44a7]': Merge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundles Removed resources from main repo (again) Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for remove...ODY-1612
Marco GrawunderMarco Grawunder
cf78e761420MMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: common/resources/com.google.code.gson/.classpath common/resources/com.google.code.gson/META-INF/MANIFEST.MF common/resources/com.google.code.gson/build.properties server/spatiotemporal/de.uniol.inf.odysseus.spatiotemporal/META-INF/MANIFEST.MF Former-commit-id: 49a7c81f4eded682784dd0cb445f062fe6c6fe08ODY-1612
Marco GrawunderMarco Grawunder
6c867710524MMerge remote-tracking branch 'origin/development' into ODY-1612-create-feature-projects-for-resouces-bundlesConflicts: server/graph/de.uniol.inf.is.odysseus.graph.server.feature/feature.xml Former-commit-id: cd0052d9740d9d54d9776eee94c51aa81ad63ad1ODY-1612
Michael BrandMichael Brand
515f49c32cdMMerge branch 'development' into bugfix/104-bugfixes# Conflicts: # common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: c1fb50078fdfbb600b6b80e62c57505fefcafc57
Marco GrawunderMarco Grawunder
5baeab8d6b4MMerge pull request #406 in ODY/odysseus from test to ODY-1612-create-feature-projects-for-resouces-bundles* commit '0f03437aadc933ac89ab08af4d187c036fb0baad [formerly 9fcce41fe3e27a067d7f2143df220df455c4005d]': Lang3 dependency Updated reference to netzdatenstrom Updated feature refererence Updated plugin references tmp folder for removed src folders Updated target platform (new dropin location) GS-Stuff name update Former-commit-id: 13e82df37f3ff37e23fc19a8ce0d537b5efa107bODY-1612
Marco GrawunderMarco Grawunder
e0b16c54f9fMMerge pull request #405 in ODY/odysseus from ODY-1612-create-feature-projects-for-resouces-bundles to test* commit '5119ab0b34e3699de93799f6da19f60c3f89f5ca [formerly 8159b8de5b95fba80736a26cdc3696c8412286c1]': (77 commits) ODY-1612: Removed old restlet version ODY-1612: Removed merge conflicts ODY-1612: Working with new resources from update site ODY-1612: New target platform ODY-1612: Readmes for project changes ODY-1612: Removed Resources ODY-1612: Update to new target platform O...2 Jira issues
Marco GrawunderMarco Grawunder
f7c76dc6f9bMMerge pull request #389 in ODY/odysseus from development to master* commit 'b045ea0de337e579b1df3f1fd9fbc550848095bc [formerly 5c93028eb77f7b5978b8f548ea7d8b8b12c18f88]': ODY-1615: FIX for cases with no transport handler new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of IInformationObjects. new MEP function that puts together an ASDU object out of its to parts, an DataUnitIdentifier and a list of...ODY-1615
Philipp MudraPhilipp Mudra
992fa762b72MMerge remote-tracking branch 'origin/development' into feature/digital-signal-processing Former-commit-id: f08928cae80156a655ecc35c1e2b148a70beb0a6
Philipp MudraPhilipp Mudra
1fe2ce36e31MMerge remote-tracking branch 'origin/master' into feature/digital-signal-processing Former-commit-id: 5b8b4ac098db7f1cf26f6f91f49637ca5dc69a54
Tobias BrandtTobias Brandt
ff83e90dbfcMMerge pull request #380 in ODY/odysseus from toString-for-temporal-trust to development* commit '3b7c165c89238149f963d36a5825e958d076853a [formerly 7db834d0cdb05c464a918fc42d652c8ed35b04f0]': A simple toString method for the temporal trust Former-commit-id: 2eb9ea075d4cf75964e33c9970509c5ca3da6d29
Tobias BrandtTobias Brandt
bc2a14e6d02MMerge branch 'development' into toString-for-temporal-trust Former-commit-id: 7db834d0cdb05c464a918fc42d652c8ed35b04f0
Marco GrawunderMarco Grawunder
cd8e2911d4aMMerge pull request #379 in ODY/odysseus from master to development* commit 'fdf91a4fffa8bb47fefedb5c1b20179d674aa83f [formerly ec525e8d761e31923a26322a07a38b8c007e83c2]': Test for Jenkins Former-commit-id: 3bad8f078cd2ff423f7b6ffc47527b07f9db9f6e
Marco GrawunderMarco Grawunder
956bd95767aMMerge pull request #378 in ODY/odysseus from development to master* commit 'a1703e742905b7634df565a411253703a22cf70b [formerly a1d9f4d5b6067c7e331de61f7bd00e11c54506a4]': Netzdatenstrom update 104ProtocolHandler: Avoid multithreading OJ104: fixed ignore sending responses 104ProtocolHandler: synchronization of timestamp map OJ104: Fixed bug with bitshifting PcapFileHandler/104ProtocolHandler: Added the possibility to extract capture time from pcap ...
Marco GrawunderMarco Grawunder
561f63d7378MMerge pull request #377 in ODY/odysseus from feature/Adjust104TimeTagsToBaselineWithoutSleep to development* commit 'cff6b8acd53714aa8923161f443be15eb7452780 [formerly 40f192cd09ea32ad2235ef310b38684f6f222f51]': Netzdatenstrom update Former-commit-id: a1d9f4d5b6067c7e331de61f7bd00e11c54506a4
Michael BrandMichael Brand
3987f53892eMMerge remote-tracking branch 'origin/development' into feature/Adjust104TimeTagsToBaselineWithoutSleepFormer-commit-id: 40f192cd09ea32ad2235ef310b38684f6f222f51
Michael BrandMichael Brand
f8b763ec5c0MMerge pull request #374 in ODY/odysseus from feature/PcapFileTransportHandler-Timestamp-Handling to development* commit 'ac0e1cff2175ba1d52ba4d9a1a876c7be0c4667d [formerly b93e09116a9b201bea60a13739915f75dc9b30da]': 104ProtocolHandler: Avoid multithreading OJ104: fixed ignore sending responses 104ProtocolHandler: synchronization of timestamp map OJ104: Fixed bug with bitshifting PcapFileHandler/104ProtocolHandler: Added the possibility to extract capture time from pcap and pass it to tuple S...
Michael BrandMichael Brand
82d44742aebMMerge remote-tracking branch 'origin/development' into feature/Adjust104TimeTagsToBaselineWithoutSleepFormer-commit-id: 3cfd2aa45d1493d83faad7a70043e9a3f7e2cfac
Marco GrawunderMarco Grawunder
c7220e70679MMerge branch 'development' of https://mgrawunder@git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus.gitConflicts: README.md Former-commit-id: f2c671c7b10c44f1669a0d9fa30b6895d85d74c5
Marco GrawunderMarco Grawunder
183e4d5f9f2MMerge pull request #372 in ODY/odysseus from ignoreMe to development* commit '0ac9456be7786e4bb4cbf7f057e78ccbededac31 [formerly 82fda874b6797f2fcdcc9300fd9bfe36c7ff8e03]': target-platform.target online editiert mit Bitbucket Updated Links ODY-1609: Removed mirrorservice urls Former-commit-id: 58f2e25b1e5b433a10dc7dd0040d3804bce10654ODY-1609