gCubeSystem
/
grsf-publisher-ws
Archived
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
183 Commits 11 Branches 12 Tags 693 KiB
Commit Graph

157 Commits

Author SHA1 Message Date
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 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 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 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 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