AuthorCommitMessageCommit dateIssues
Marco Grawunder
554ef217482MPull request #2: DevelopmentMerge in ODY_WRAP/urg from development to master * commit '924663d38e4e1dfaeccbf2c825abbf2d64143ea8': Fixed dependencies UTF-8UTF-8
Marco Grawunder
924663d38e4Fixed dependencies
Marco Grawunder
a96fe742f91UTF-8UTF-8
Marco Grawunder
ed6006ed541MMerge branch 'development'
Marco Grawunder
629188ca40aUpdate of extension for tycho
Marco Grawunder
90ff4dd9abdRemoved Exec Env
Marco Grawunder
dccfcb63f8aMPull request #1: Removed component definitionMerge in ODY_WRAP/urg from development to master * commit 'af8981ebf7eb66295f055c50a069e6fee75662e6': Removed component definition
Marco Grawunder
af8981ebf7eRemoved component definition
Marco Grawunder
ecd91477c7fRemovedWarnings
Marco Grawunder
cd6cb6d7ca9added solobuild profile
Marco Grawunder
fa365b580b5global maven preps
Marco Grawunder
17a34119be4MMerge branch 'master' into development
Marco Grawunder
faeb63ee3c2odysseus_dev update
Marco Grawunder
e676866caa1odysseus_dev update
Marco Grawunder
a524fc56223Not feature, but plugin
Marco Grawunder
fe15a130c50features and manifest updates
Marco Grawunder
57c8dd94212plugin instead of wrapper
Marco Grawunder
4263da720dfjust a build trigger
Marco Grawunder
e14e16d2f9bMerge master with development
Marco Grawunder
ef9b4370fe8plugin
Marco Grawunder
86524ebefc8Maven buildable, category needs fix
Marco Grawunder
d007a826528No feature
Marco Grawunder
5ac53b2580dMaven buildable, category needs fix
Marco Grawunder
f21213a01c5Maven buildable, category needs fix
Marco Grawunder
91a5709b63dMaven buildable, category needs fix
Marco Grawunder
b1cbad79611odysseus_dev update
Marco Grawunder
21720816e92odysseus_dev update
Tobias Brandt
9ad70a24728Added submodules
Tobias Brandt
18c865bf57eInitial commit
Tobias Brandt
7389b7b38f4Commit removals
Marco Grawunder
3324d59d8a2MMerge branch 'development' of https://git.swl.informatik.uni-oldenburg.de/scm/ody/odysseus into development
Marco Grawunder
58927d078bcMMerge pull request #23 in ODY/odysseus from RemoveOutdatedProjects to development* commit '3d2fa6bc9c7a4d0bff86ff1fbdbb186c8995e011': Removed outdated projects
Marco Grawunder
84d60568167MMerge 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 Grawunder
290435e50abMoved bundles to module folders
Marco Grawunder
45cead87744MMerge 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 Grawunder
7d939222239MMerge 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 Grawunder
48574515745MMerge 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 Grawunder
f27eb5c94beMMerge 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 Grawunder
c32f1d4696fMMerge 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 Brandt
5f082f83239MMerge 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 Grawunder
9068a16dd85MMerge 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 Grawunder
e99bfded919MMerge 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 Brand
a5d94376f2bMMerge branch 'development' into bugfix/104-bugfixes# Conflicts: # common/resources/de.uniol.inf.ei.oj104/META-INF/MANIFEST.MF Former-commit-id: c1fb50078fdfbb600b6b80e62c57505fefcafc57
Marco Grawunder
64d7acd2244MMerge 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 Grawunder
a06b9988593MMerge 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 Grawunder
ee23c9ea254MMerge 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 Mudra
67537828522MMerge remote-tracking branch 'origin/development' into feature/digital-signal-processing Former-commit-id: f08928cae80156a655ecc35c1e2b148a70beb0a6
Philipp Mudra
f7f54d4662aMMerge remote-tracking branch 'origin/master' into feature/digital-signal-processing Former-commit-id: 5b8b4ac098db7f1cf26f6f91f49637ca5dc69a54
Tobias Brandt
bd99c079a34MMerge 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 Brandt
28774382050MMerge branch 'development' into toString-for-temporal-trust Former-commit-id: 7db834d0cdb05c464a918fc42d652c8ed35b04f0