Commit Graph

245 Commits

Author SHA1 Message Date
Costantino Perciante 80f856af5e gcube-app version updated
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@148665 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-05-15 12:31:28 +00:00
Costantino Perciante cc787cf5e5 system:type added automatically
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@148277 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-05-03 15:22:19 +00:00
Costantino Perciante 54fa9cee82 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144756 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-03-08 16:09:34 +00:00
Costantino Perciante 1f761f5a42 minor fix for grsf-stock/fishery association group
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144356 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-27 12:36:04 +00:00
Costantino Perciante f7fe5453eb minor fix for csv creation on shared vre folder: the creation failed on too long name files
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144226 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-23 17:55:32 +00:00
Costantino Perciante 3c7eb108a9 let vreFolderCache expire after 2 hours
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144195 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-23 14:15:36 +00:00
Costantino Perciante 9a245922d4 fixed gcube-app xml version
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144177 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-23 10:37:57 +00:00
Costantino Perciante 14b1f1b984 minor fix: Resource changed to Marine_Resource
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144083 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-22 10:56:17 +00:00
Costantino Perciante f8e19fc73c minor fix on time series (when unit value is empty)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144059 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-22 10:19:44 +00:00
Costantino Perciante ea16b0efff fix for web.xml properties
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144050 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-22 09:22:18 +00:00
Costantino Perciante 58641a14b2 minor fix for csv
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144031 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-21 19:49:44 +00:00
Costantino Perciante 3233eba11c added fallback when retrieve gcore social endpoint -> search for service endpoint
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@144030 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-21 19:35:36 +00:00
Costantino Perciante a7003850ce Minor fixes for new model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142814 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-20 17:44:26 +00:00
Costantino Perciante ae05d37066 minor imports fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142738 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-20 08:43:46 +00:00
Costantino Perciante 076534d455 minor fix for stockId field/name
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142736 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-19 15:40:19 +00:00
Costantino Perciante 6b1e41d577 Added regular expression for paths of the services in order to ensure that it contains one among ram, fishsource, grsf, firms values. Update the methods to delete a stock/fishery by id (they checked the id actually belonged to a fishery/stock of a given group). The methods used to retrieve fishery/stock ids have been changed too: in case grsf source was used it is straightforward, in the other case the full set of records of the group needs to be scanned to separate stock and fishery ones.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142734 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-19 14:53:42 +00:00
Costantino Perciante 3c9b149d54 some minor changes: Product Type changed to GRSF Type, Record Type changed to Source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142718 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-17 17:05:41 +00:00
Costantino Perciante 90a19689f5 record url changed to item url
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142574 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-15 15:57:03 +00:00
Costantino Perciante 481feb093f @Tag annotation fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142570 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-15 15:34:49 +00:00
Costantino Perciante b0b56dc1a1 code changed to match the new hierarchy structure as well as tags and groups reported in ticket #7059
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142563 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-15 14:11:45 +00:00
Costantino Perciante 7f608a504f Merge with 1.0.1 branch version: products are always published as private in manage context; they are published as public in the public context
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@142375 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-02-08 11:56:26 +00:00
Costantino Perciante 28388712f1 social service method paths fixed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141921 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-01-30 17:17:07 +00:00
Costantino Perciante f14049cc36 imports changed due to updated ckan-library packages declaration. Social EndPoint is now switched to a GcoreEndpoint
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141920 82a268e6-3cf1-43bd-a215-b396298e98cf
2017-01-30 16:58:22 +00:00
Costantino Perciante 092cd2d4c2 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141266 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-20 10:05:33 +00:00
Costantino Perciante 516c2b4697 Changed the way the url of the product is generated (now it is no longer encrypted). The list of ids of products in a group is now returned (there is no longer the limit of the ckan api)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@141264 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-19 16:18:37 +00:00
Costantino Perciante bf3d0675ce added another cache for VRE catalogue folder
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140059 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 20:31:52 +00:00
Costantino Perciante ceca8a5497 minor fixes for the caches
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140058 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 18:00:54 +00:00
Costantino Perciante 5dfa58909a added cache for user'sfullname and email to speed up execution
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140057 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 17:53:08 +00:00
Costantino Perciante cd4a2ebe8f added url of the product to the result set of the methods get-catalogue-id-and-url-from-name (previously known as get-catalogue-id-from-name)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@140043 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-16 15:02:03 +00:00
Costantino Perciante a2fc076aa4 minor fix: Fishery_Activity changed to Fishing_Activity
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139975 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-13 13:14:36 +00:00
Costantino Perciante 487ba3a00c minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139877 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-10 10:24:47 +00:00
Costantino Perciante ae56c46861 database_sources is no longer a tag
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139876 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-10 10:01:43 +00:00
Costantino Perciante 01b08a10ba added methods to retrieve a catalogue identifier, given the product name (i.e., the knowledge base identifier)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139858 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 15:56:52 +00:00
Costantino Perciante 928b6dbabc hashtags are not used for writing product post in grsf case since the underneath regex of tags splits them
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139857 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 15:12:51 +00:00
Costantino Perciante dc9aedd214 minor fixes before branching
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139848 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:54:48 +00:00
Costantino Perciante a81d440671 management_entity generates tag for grsf records
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139847 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:44:15 +00:00
Costantino Perciante 3d3e7843fd minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139846 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:30:28 +00:00
Costantino Perciante df011a3669 minor fixes after some changes in the fishery record model. Added code to write a new post about the new available record in the public grsf vre
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139843 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-09 13:06:19 +00:00
Costantino Perciante 917fd74330 minor fixes. Abundance level and Exploration rate (standard) are used for tagging purposes only. The related groups will not be present
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139828 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-08 20:57:08 +00:00
Costantino Perciante 0ac739e926 minor fix on status enum
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139817 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-08 18:09:16 +00:00
Costantino Perciante 56f905c3c7 Updated exploitation rate/abundance level vocabularies
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139814 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-08 17:32:44 +00:00
Costantino Perciante 2cc81250cd minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139809 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-07 17:41:05 +00:00
Costantino Perciante 878a39cd57 changed the record_type from original to source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139782 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-07 13:45:22 +00:00
Costantino Perciante e69ba794f1 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139737 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 18:12:41 +00:00
Costantino Perciante b2c05a2641 minor fixes for url generation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139733 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 18:04:02 +00:00
Costantino Perciante d409a4dd10 added methods to retrieve products of type stock/fishery for the different sources. At most 1000 datasets'ids are returned
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139725 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 16:06:51 +00:00
Costantino Perciante d3f3eeddd9 Added the GRSF_Admin (manage context) and GRSF (public context) contexts in web.xml for production environment. Better checks for status field in manage context
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@139705 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-06 10:16:31 +00:00
Costantino Perciante 2df95eb79f minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135279 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 14:40:58 +00:00
Costantino Perciante 7baff1b51c added toString to Record_Type enum
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135278 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 14:12:29 +00:00
Costantino Perciante cb11117297 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135277 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 13:53:15 +00:00
Costantino Perciante b47e21b4f4 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135276 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-04 11:24:37 +00:00
Costantino Perciante 382e5fc2a7 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135269 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-03 16:28:58 +00:00
Costantino Perciante fbba9e2864 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135268 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-03 11:00:58 +00:00
Costantino Perciante be06481c8f made some optimizations to speed up the publication. Some minor changes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135267 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-03 10:50:38 +00:00
Costantino Perciante f076015318 added some chances to upload the resource on the ckan as time series. Added a new @TimeSeries annotation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135199 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 22:21:37 +00:00
Costantino Perciante 291b542d61 stock_name and fishery_name cannot be null
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135198 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 21:41:24 +00:00
Costantino Perciante 6a91d90023 Minor changes: added some check when the record type has source GRSF
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135197 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 21:20:46 +00:00
Costantino Perciante 1a0f61e437 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135192 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 18:27:40 +00:00
Costantino Perciante 40413be914 minor fix when reading from the path the type of source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135191 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 18:25:30 +00:00
Costantino Perciante c216799898 now the Source (Ram, GRSF, Fishsource, FIRMS) is specified in the path of the request. Other changes to help methods
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135190 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 18:19:22 +00:00
Costantino Perciante 62d111688e Several changes to the model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135170 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-12-01 14:37:26 +00:00
Costantino Perciante 41c877cda7 improved Group annotation with parent field: Indicator group can now be managed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135154 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 21:11:47 +00:00
Costantino Perciante ba87596f27 added @tag and @group annotations to the common field database_source
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135153 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 20:34:10 +00:00
Costantino Perciante 2a1dee01eb minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135152 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 18:05:32 +00:00
Costantino Perciante 78a6125c16 added log for generated group name
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135151 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 17:43:57 +00:00
Costantino Perciante d0f7e7a960 minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135150 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 17:43:24 +00:00
Costantino Perciante 35a7c82586 Fixed group association retrieval: also the enums have been annotated with the @Group annotation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135147 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 17:29:44 +00:00
Costantino Perciante 39b9131fa7 added @Group annotation to product type (i.e., stock, fishery)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135145 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 16:34:14 +00:00
Costantino Perciante 256e626827 fixed remove non ascii chars code
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135111 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 13:14:02 +00:00
Costantino Perciante 516d294635 minor check added when removing html code
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135102 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 10:50:47 +00:00
Costantino Perciante 1171a54f12 html tags are removed from extras as well as description field
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135101 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-30 10:43:30 +00:00
Costantino Perciante 26d4f35f5c moved again code to run on top of smartgears
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135053 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-29 16:18:13 +00:00
Costantino Perciante 4c740c7a95 minor fixes for tags generation (some urecognized chars are removed) and an exception is reported when creation fails
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135030 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-29 11:44:36 +00:00
Costantino Perciante 388206d5a7 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@135006 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 16:43:28 +00:00
Costantino Perciante 68998f3577 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134967 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 13:14:23 +00:00
Costantino Perciante 817eb34a01 minor fix to getFolderOrCreate
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134951 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 11:39:18 +00:00
Costantino Perciante 87ddadef7d minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134950 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 11:38:47 +00:00
Costantino Perciante f69d326145 minor fixes for files creation in shared folder
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134945 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-28 11:20:43 +00:00
Costantino Perciante 1894ed250c minor fix for checking type product in delete methods
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134922 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-27 11:37:44 +00:00
Costantino Perciante 64c9a8060b added code to copy files also under the .catalogue area of the shared folder.. needs to be tested
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134921 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-27 11:33:41 +00:00
Costantino Perciante 2c394704a5 separated types for stock and fishery. The main thread will wait for the groups association thread to finish before starting the one of the files
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134895 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 17:25:23 +00:00
Costantino Perciante 00b2442632 manager thread and groups thread cannot run concurrently... ckan loses some information
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134797 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 13:35:00 +00:00
Costantino Perciante fb2fbee11a fixed tags and fields generation
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134784 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 12:56:27 +00:00
Costantino Perciante 56165cbf42 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134749 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-25 09:16:14 +00:00
Costantino Perciante e399336c3f start managing time series. The missing part is the one related to the copy of the csv resource on the shared folder of the vre. The url of this folder needs to be used to replace the one attached by ckan
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134705 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-24 16:53:50 +00:00
Costantino Perciante 5ae34426be added log for user's current role
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@134518 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-22 11:54:41 +00:00
Costantino Perciante 32915d2e58 added status rejected in Status.java
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133969 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-08 17:00:31 +00:00
Costantino Perciante 6d9927196b Minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133931 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-06 20:21:11 +00:00
Costantino Perciante 6e1c4d3bac code has been updated to according the requests in ticket #5567, unfortunately ckan doesn't support extras with duplicated keys, as it is(the ticket #5650 has been opened for this issue)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133911 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-04 15:26:19 +00:00
Costantino Perciante f2b47b9e0a minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133817 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-02 15:02:28 +00:00
Costantino Perciante c5d9730ef5 Start adding code to handle resources and inspect them to extract groups/tags' names
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133782 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-11-01 21:35:52 +00:00
Costantino Perciante 08cbe4dee0 Added the following fields : short_title, uuid, traceability_flag, water_area (as list), stock_uri
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133639 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-27 09:40:19 +00:00
Costantino Perciante 33514c202a minor fixes and added some of the fields requested by forth (short_title, stock_uri, traceability_flag etc)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133611 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-26 16:40:10 +00:00
Costantino Perciante 30885e0361 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133557 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-26 08:12:47 +00:00
Costantino Perciante 55eac59040 minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133397 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-21 20:57:32 +00:00
Costantino Perciante 4b6d48850b added two more annotations (for ckan resource and simple field)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133393 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-21 20:33:38 +00:00
Costantino Perciante 584cac5372 dataset_url json property moved to product_url
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133366 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-20 08:40:52 +00:00
Costantino Perciante cf4b6bf37b minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133354 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-19 12:34:19 +00:00
Costantino Perciante 2940e9b9e5 added accounting features to the pom.xml and code but it doesn't work yet
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133351 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-19 12:26:26 +00:00
Costantino Perciante 095223c0d6 for checking user's token into the request, a set scope to the root is needed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133341 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-19 07:57:31 +00:00
Costantino Perciante 0a7bbeb5a6 on validation error message fixed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133339 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 21:57:27 +00:00
Costantino Perciante f37cdec985 Smartgears is now useless. Added a filter that intercepts requests and check the authorization token is available
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133337 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 21:31:04 +00:00
Costantino Perciante d422a97bc3 minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133334 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 19:42:26 +00:00
Costantino Perciante 493b4c27e9 stock and fishery in the curation area are published private. for publication purpose the role needed is the Catalogue-Admin one
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133321 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 09:51:55 +00:00
Costantino Perciante a03399fd53 product type (i.e., "Fishery" and "Stock") is added as field and tag
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133307 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-18 08:42:12 +00:00
Costantino Perciante e4f6b708fa minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133264 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-17 08:07:22 +00:00
Costantino Perciante 9bb23c991f Validation of input beans is now performed automatically
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133247 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-15 20:34:57 +00:00
Costantino Perciante f128ca18ab Added delete methods for stock and fishery products (both also purge the products ..). When a user is assigned to a group he has the role member if in the initial organization he was an editor, admin otherwise
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133218 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-14 16:44:34 +00:00
Costantino Perciante 8f8c0bbdd2 minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133202 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-14 13:20:10 +00:00
Costantino Perciante 92d8d0bc47 added <exclude> elements for hello methods (i.e. they no longer require the token to be used)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133198 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-14 12:44:38 +00:00
Costantino Perciante ab5371f97d fixed returned url (now use the portletUrl as base url)
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133193 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 16:51:34 +00:00
Costantino Perciante 40bcc5d462 Status in stockrecord is now a group too
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133192 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 16:48:18 +00:00
Costantino Perciante 7b347dd923 better check of version value provided
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133173 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 13:34:47 +00:00
Costantino Perciante e32ccbac4d minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133167 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 12:25:11 +00:00
Costantino Perciante da21b374aa publish-product methods publish private products
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133166 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 12:24:39 +00:00
Costantino Perciante a0a0dd48b5 Fields with @group annotation have also the @tag one.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133165 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 12:06:15 +00:00
Costantino Perciante 9f71232585 license can also be empty, in this case the default one is used
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133163 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 10:01:46 +00:00
Costantino Perciante 0c4f135002 Several improvements:
- added checks using annotations and validator for bean validations
- DatabaseSources and SourceOfInformation are now list of resources
- notations have been added according the model on the wiki page(GCube_Data_Catalogue_for_GRSF)

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133160 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-13 09:46:42 +00:00
Costantino Perciante 9d435d4f26 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133146 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 14:30:52 +00:00
Costantino Perciante 8c7684f587 added group annotation to Status in Fishery Record
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133125 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 12:53:51 +00:00
Costantino Perciante 24fc97c02d added 'envirnoment' property to Fishery model
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133122 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-12 12:49:27 +00:00
Costantino Perciante de77721aab fixed ignore json property for children of Common.class
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133088 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 17:51:35 +00:00
Costantino Perciante f4cd3ec722 some groups' names fixed
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133077 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 15:42:45 +00:00
Costantino Perciante 2871d57556 @JsonIgnoreProperties added also on the other beans
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133076 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 15:12:55 +00:00
Costantino Perciante 52e71736a8 minor fixes
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133068 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 14:06:22 +00:00
Costantino Perciante 87524d535f minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133040 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 10:01:43 +00:00
Costantino Perciante 37eccf53bf Group association now works. Added methods to retrieve licenses' ids. By default the license_id (if not specified ) is CC-BY-SA-4.0
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133037 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-11 09:39:25 +00:00
Costantino Perciante 9fb01322c0 Methods for publishing stock or fishery records added. The association thread that should associate the product to the groups fails. This needs to be fixed. Target selected as folder to be ignored
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@133011 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-10 16:50:11 +00:00
Costantino Perciante 1c2d7f0246 excluded author and author_contact from serialization/deserialization
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132964 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 14:28:24 +00:00
Costantino Perciante 45ac9feb0b added tests for testing with jetty and junit
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132963 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 14:06:45 +00:00
Costantino Perciante a2a00e0d8a there is no need to create groups. Just check the user has enough privileges to associate it to the group
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132962 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 11:04:03 +00:00
Costantino Perciante 91f56dca42 added junit test
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132961 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 10:52:57 +00:00
Costantino Perciante 3104372ed3 removed useless group name fields in enumerators. Fixed common class and helper method
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132960 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 10:52:33 +00:00
Costantino Perciante 0d27ef2e17 minor fixes: added super.toString() to print common fields for fishery and stock. Added more junit tests
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132959 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-09 10:36:25 +00:00
Costantino Perciante d665ab0d5a fixed some serializers
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132958 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 21:18:45 +00:00
Costantino Perciante f7aad87f3b minor fix
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132957 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 21:12:29 +00:00
Costantino Perciante b7f35033c9 Defined new annotation for custom fields to map them in extras fields. Defined methods to retrieve custom fields, tags and groups at run time.
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132956 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 21:10:25 +00:00
Costantino Perciante e940cb5abb added tag and group annotations
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132954 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 20:16:59 +00:00
Costantino Perciante b06538e94f added getDataCatalogue method
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132953 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 20:16:31 +00:00
Costantino Perciante 11ab8b15eb added json serializers and deserializers
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132952 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 20:16:08 +00:00
Costantino Perciante 34aabbcf27 created package for input and output json. Created response bean and resource bean. Common has been extended with spatial, extras and resources fields
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132951 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-08 18:46:17 +00:00
Costantino Perciante 79d1ebd486 Created Tag and Group annotation. Created junit test to read tagged fields at run time
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132950 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-07 19:50:21 +00:00
Costantino Perciante 0ee6f5aa6b fixed web.xml
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132943 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-07 16:44:55 +00:00
Costantino Perciante 9b773e29ca Added web.xml and gcube-app.xml
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132942 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-07 16:43:48 +00:00
Costantino Perciante f60226a244 First import of the web service
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-catalogue/grsf-publisher-ws@132940 82a268e6-3cf1-43bd-a215-b396298e98cf
2016-10-07 16:23:23 +00:00