Marco Grawunder f62d280fcd2 Working with target platforms 29 Okt. 2019 Marco Grawunder 046b1fb8fc0 Fixed some dependencies 29 Okt. 2019 Marco Grawunder a57d7562c62 Moved to attic 29 Okt. 2019 Marco Grawunder bb918d5fe93 Added odysseus_dev, allow to set target platform needed by some plugins 29 Okt. 2019 Marco Grawunder d5e7839a135 Moved from main repo 19 Juni 2018 Marco Grawunder 08658113824 Removed old Fast Flower Delivery 13 Juni 2018 Michael Brand ab3400da644 M Merge branch 'development' into feature/ODY-1546-exchange-iec60870-5-104-library-and-protocol-handlers 07 Juni 2018 ODY-1546 Jens Plümer bd797e773ac Added licences and correct names to all feature.xml files. 05 Juni 2018 Marco Grawunder 8006fc0d1a5 Revert "Moved single class bundle logical operator builder (--> core.server)" This reverts commit 710cb0b5d354ec35f8f33a91506d893adf9af546. 05 Juni 2018 Marco Grawunder ffe4ee4a438 Moved single class bundle logical operator builder (--> core.server) 05 Juni 2018 Michael Brand 618db0c4652 M Merge remote-tracking branch 'origin/development' into NetzDatenStrom # Conflicts:
# common/resources/j60870/de.uniol.inf.is.odysseus.common.resources.j60870/META-INF/MANIFEST.MF
# wrapper/de.uniol.inf.is.odysseus.wrapper.iec60870-5-104/META-INF/MANIFEST.MF 25 Mai 2018 Marco Grawunder 23266cbdda9 Further dependency tests 17 Mai 2018 Marco Grawunder 994e6b3f12d Added automatic-module-name 17 Mai 2018 Michael Brand 9366caefbfb NetzDatenStrom: moved bundle and feature from application to add-on, because application folder is ignored for update site 06 Feb. 2018 Michael Brand 2724c78158a NetzDatenStrom: autostart bundle and feature for proxy product 06 Feb. 2018 Marco Grawunder eaa03c02b56 M Merge pull request #186 in ODY/odysseus from hotfix/ODY-1451-keyvalue-timestamp-ao-alllow-start to development I will need to merge this manually ...
* commit 'ba331a3aea233e82f1a9d5a98aa419fdd38fe7e8':
ODY-1451: Handle both cases (String and number)
ODY-1449: set done in case of ioexception 09 Dez. 2017 2 Jira-VorgängeMarco Grawunder 9aed31a6c1d Updated Feature descriptions 07 Dez. 2017 Marco Grawunder 66a96ec73aa M Merge pull request #181 in ODY/odysseus from bugfix/ODY-1441-studio-workspaces-are-not-changeable to development * commit 'a9bcd4e55186b9c8d28ca05a4fcf91700e0b2bdf':
ODY-1441: -data @noDefault again 07 Dez. 2017 ODY-1441 Marco Grawunder 15a19d8001f M Merge pull request #180 in ODY/odysseus from bugfix/ODY-1448-target-platform-not-working to master * commit 'c31dddeac329f62277c1e8f985eb04a224ea1fcb': (102 commits)
ODY-1448: Updated Target Platform
cleaned up logging, do not log per default to file
ODY-1440: Remove ToTupleAO when input is already Tuple
ODY-1440: Simplified isExecutable
ODY-1440: Remove ToKeyValue if already KeyValue
set state of target platform to state of development branch
ODY-1403 Use new index for extende... 07 Dez. 2017 3 Jira-VorgängeMarco Grawunder 1e675210769 ODY-1441: -data @noDefault again 05 Dez. 2017 ODY-1441 Marco Grawunder bcdf6da4169 Removed icons from odysseus core plugin --> client/server starter 30 Nov. 2017 Marco Grawunder b57ebec28c6 M Merge remote-tracking branch 'origin/development' into ODY-1341-redesign-subscriptions 07 Sept. 2017 ODY-1341 Marco Grawunder 725bd9714b7 ODY-1341: Logical Query Plan (not working now) 06 Sept. 2017 ODY-1341 Michael Brand 06f5396422e M Merge pull request #82 in ODY/odysseus from feature/securitypunctuations to development * commit 'cdd12c9204cf0b3fffb0e6a9fdebd99bc10d87f2':
SP: removed SP requirement from monolithic product
SP: removed and ignored .settings
SP: Added OSGI-INF to bin includes
SP: removed empty noop activator
exported package from de.uniol.inf.is.aggregation, commented code and fixed bug in intersection method
Cleaned up source code and added SAAggregation
improved SecurityShield an... 29 Aug. 2017 Michael Brand ce5dadfd862 M Merge branch 'master' into feature/securitypunctuations 29 Aug. 2017 Hendrik Müller 400aacacc33 M Merge branch 'development' into feature/static-to-service 23 Aug. 2017 Jens Plümer 5eb49014c10 M Merge branch 'development' into feature/CQLParser2 # Conflicts:
# client/client.console/.classpath
# client/cql/de.uniol.inf.is.odysseus.parser.cql2.ui.tests/.classpath
# common/Bugreport/.classpath
# common/core/src/de/uniol/inf/is/odysseus/core/physicaloperator/access/protocol/AbstractCSVHandler.java 21 Aug. 2017 Hendrik Müller c1ed878388f M Merge branch 'development' into feature/static-to-service 21 Aug. 2017 Marco Grawunder e8430bbe008 Merge development branch into feature/CQLParser2 03 Aug. 2017 Marco Grawunder 67346262b9a Removed Warnings "unused" 09 Aug. 2017 Marco Grawunder 182c68614e9 M Merge remote-tracking branch 'origin/development' into feature/CQLParser2 Conflicts:
.gitignore
client/cql/de.uniol.inf.is.odysseus.parser.cql2.ui.feature/.project
client/studio/rcp.editor.text.cql/src/de/uniol/inf/is/odysseus/rcp/editor/text/cql/CQLFileExecutor.java
server/product/de.uniol.inf.is.odysseus.server.starter/Odysseus
Server.product
server/relational/relational.base/src/de/uniol/inf/is/odysseus/relational/rewrite/rules/ROptimizeSelectionPredicate.java 03 Aug. 2017 Marco Grawunder 6f7cac073e3 Changed start param -data from @noDefault to @user.home 03 Aug. 2017 Marco Grawunder d9f95f3a809 Revert "Merge pull request #38 in ODY/odysseus from feature/CQLParser2 to master" This reverts commit be1ec546db338e22270df5a95827e76fda53625d, reversing
changes made to 02eab86f3fc3a1cd17e827d4008f0e0a5328ea81. 01 Aug. 2017 Lennart 739253824e0 Cleaned up source code and added SAAggregation 03 Juli 2017 Hendrik Müller ac8e58b1861 config via instance 28 Juni 2017 Lennart 47c014f9d58 Changed Join 15 Juni 2017 Lennart 5d67a739ad8 Fixed bug in join and changed intersect method 23 Mai 2017 Lennart f036a4f7589 SecurityPreTransformationHandler replaces normal operators with their security aware counterparts 17 Mai 2017 Lennart 624c04b8f80 added SAJoin 11 Mai 2017 Jens Plümer d69af27fe7a M Merge branch 'master' into feature/CQLParser2 09 Mai 2017 Lennart 52b43b8f58a Fixed SASelection and added SAProjection, SecurityShield 29 Apr. 2017 Lennart f57eaa49f93 Added SecurityShieldOperator 25 Apr. 2017 Marco Grawunder 157148b45ca M Merge branch 'master' of https://git.offis.uni-oldenburg.de/scm/ody/odysseus into feature/crypt # Conflicts:
# README.md
# server/core/core/src/de/uniol/inf/is/odysseus/core/server/OdysseusConfiguration.java
# server/core/core/src/de/uniol/inf/is/odysseus/core/server/logicaloperator/CoalesceAO.java
# server/crypt/de.uniol.inf.is.odysseus.incubation.crypt.keymanagement.server/src/de/uniol/inf/is/odysseus/incubation/crypt/keymanagement/server/KeyWebSocketServer.java
# server/keyvalue/keyval... 21 Apr. 2017 Jens Plümer 0d48cc13435 M Merge branch 'master' into feature/CQLParser2 27 März 2017 Jens Plümer abbbb349e45 M Merge branch 'master' into feature/CQLParser2
Former-commit-id: 2b6a3ee630b2b092d20175413388f919a3f88b09 25 März 2017 Tobias Brandt 1e283cf17e0 New feature: Convert to KeyValueObject with a template. Former-commit-id: 3752e184eb39a66debf940266a418a851f822102 24 März 2017 Marco Grawunder 6904305d713 ODY-1263: Changed addQuery method to new version in addQuery2 Former-commit-id: 44eb21091e6fea8ad7812e5afcbb4280c8e9ee22 24 März 2017 ODY-1263 Jens Plümer a878185b5ad M Merge branch 'master' into feature/CQLParser2
Former-commit-id: af7554c213600b9d7c90351962ac0c6813d8b215 12 Feb. 2017 Marco Grawunder 79be72c7e69 Nexmark default is fast. More output when starting nexmark Former-commit-id: 7d45e5110565b6e19dc903288233e5e5573ae9f7 03 Feb. 2017 Jens Plümer 6279bd055ba M Merge branch 'master' into feature/CQLParser2
Former-commit-id: e62e2ebc017859a64657dc838b521490ba40455c 17 Dez. 2016 
Marco Grawunder
Michael Brand
Jens Plümer