diff --git a/.idea/artifacts/admin_war.xml b/.idea/artifacts/admin_war.xml new file mode 100644 index 00000000..aaf6b694 --- /dev/null +++ b/.idea/artifacts/admin_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/admin/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/admin_war_exploded.xml b/.idea/artifacts/admin_war_exploded.xml new file mode 100644 index 00000000..01af5d58 --- /dev/null +++ b/.idea/artifacts/admin_war_exploded.xml @@ -0,0 +1,180 @@ + + + $PROJECT_DIR$/admin/target/admin-2.6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/deegree_webservices_cds_war.xml b/.idea/artifacts/deegree_webservices_cds_war.xml new file mode 100644 index 00000000..949a87a3 --- /dev/null +++ b/.idea/artifacts/deegree_webservices_cds_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/deegree-webservices-cds/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/deegree_webservices_cds_war_exploded.xml b/.idea/artifacts/deegree_webservices_cds_war_exploded.xml new file mode 100644 index 00000000..de655ad4 --- /dev/null +++ b/.idea/artifacts/deegree_webservices_cds_war_exploded.xml @@ -0,0 +1,181 @@ + + + $PROJECT_DIR$/deegree-webservices-cds/target/deegree-webservices-cds-2.6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 00000000..d5254ec9 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,111 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 00000000..e7bedf33 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 00000000..c9ac43e3 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/1_0rc3.xml b/.idea/libraries/1_0rc3.xml new file mode 100644 index 00000000..c3e9df52 --- /dev/null +++ b/.idea/libraries/1_0rc3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_2.xml b/.idea/libraries/Maven__antlr_antlr_2_7_2.xml new file mode 100644 index 00000000..76a587b8 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_6.xml b/.idea/libraries/Maven__antlr_antlr_2_7_6.xml new file mode 100644 index 00000000..c8d18a73 --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__antlr_antlr_2_7_7.xml b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml new file mode 100644 index 00000000..b8d93d8e --- /dev/null +++ b/.idea/libraries/Maven__antlr_antlr_2_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 00000000..30ff5cb7 --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__args4j_args4j_2_0_16.xml b/.idea/libraries/Maven__args4j_args4j_2_0_16.xml new file mode 100644 index 00000000..7b003a8c --- /dev/null +++ b/.idea/libraries/Maven__args4j_args4j_2_0_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__asm_asm_3_1.xml b/.idea/libraries/Maven__asm_asm_3_1.xml new file mode 100644 index 00000000..3386f109 --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_2_2.xml b/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_2_2.xml new file mode 100644 index 00000000..562f4ce2 --- /dev/null +++ b/.idea/libraries/Maven__backport_util_concurrent_backport_util_concurrent_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__cglib_cglib_2_2.xml b/.idea/libraries/Maven__cglib_cglib_2_2.xml new file mode 100644 index 00000000..01d9b10a --- /dev/null +++ b/.idea/libraries/Maven__cglib_cglib_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__cglib_cglib_nodep_2_2_2.xml b/.idea/libraries/Maven__cglib_cglib_nodep_2_2_2.xml new file mode 100644 index 00000000..5145a35f --- /dev/null +++ b/.idea/libraries/Maven__cglib_cglib_nodep_2_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml new file mode 100644 index 00000000..0e668241 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_findbugs_jsr305_1_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_1.xml new file mode 100644 index 00000000..24ff77f5 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml new file mode 100644 index 00000000..b6113ec4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_typica_typica_1_3.xml b/.idea/libraries/Maven__com_google_code_typica_typica_1_3.xml new file mode 100644 index 00000000..187be1d4 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_typica_typica_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_10_0.xml b/.idea/libraries/Maven__com_google_guava_guava_10_0.xml new file mode 100644 index 00000000..9c2b6a60 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml b/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml new file mode 100644 index 00000000..01a573a0 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_11_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_14_0.xml b/.idea/libraries/Maven__com_google_guava_guava_14_0.xml new file mode 100644 index 00000000..86eb63f3 --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_14_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_javascript_closure_compiler_v20130227.xml b/.idea/libraries/Maven__com_google_javascript_closure_compiler_v20130227.xml new file mode 100644 index 00000000..4347c749 --- /dev/null +++ b/.idea/libraries/Maven__com_google_javascript_closure_compiler_v20130227.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_4_1.xml b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_4_1.xml new file mode 100644 index 00000000..0e950a53 --- /dev/null +++ b/.idea/libraries/Maven__com_google_protobuf_protobuf_java_2_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_gentyref_gentyref_1_1_0.xml b/.idea/libraries/Maven__com_googlecode_gentyref_gentyref_1_1_0.xml new file mode 100644 index 00000000..37eb4098 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_gentyref_gentyref_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_jarjar_jarjar_1_1.xml b/.idea/libraries/Maven__com_googlecode_jarjar_jarjar_1_1.xml new file mode 100644 index 00000000..8fa2030e --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_jarjar_jarjar_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_h2database_h2_1_2_140.xml b/.idea/libraries/Maven__com_h2database_h2_1_2_140.xml new file mode 100644 index 00000000..12a88d30 --- /dev/null +++ b/.idea/libraries/Maven__com_h2database_h2_1_2_140.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_h2database_h2_1_3_171.xml b/.idea/libraries/Maven__com_h2database_h2_1_3_171.xml new file mode 100644 index 00000000..61bd00f7 --- /dev/null +++ b/.idea/libraries/Maven__com_h2database_h2_1_3_171.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_17_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_17_1.xml new file mode 100644 index 00000000..45672aaf --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_17_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_17_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_17_1.xml new file mode 100644 index 00000000..2bd1249b --- /dev/null +++ b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_17_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_12.xml b/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_12.xml new file mode 100644 index 00000000..13841560 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_7.xml b/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_7.xml new file mode 100644 index 00000000..0a135902 --- /dev/null +++ b/.idea/libraries/Maven__com_sun_xml_fastinfoset_FastInfoset_1_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml b/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml new file mode 100644 index 00000000..b7e360b8 --- /dev/null +++ b/.idea/libraries/Maven__com_vividsolutions_jts_1_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml new file mode 100644 index 00000000..1cb64edf --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_chain_commons_chain_1_1.xml b/.idea/libraries/Maven__commons_chain_commons_chain_1_1.xml new file mode 100644 index 00000000..38653c20 --- /dev/null +++ b/.idea/libraries/Maven__commons_chain_commons_chain_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml new file mode 100644 index 00000000..cec24931 --- /dev/null +++ b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml new file mode 100644 index 00000000..2b149c4d --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml new file mode 100644 index 00000000..d0e20adb --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml new file mode 100644 index 00000000..e8a6a9f9 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_7.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_7.xml new file mode 100644 index 00000000..5acf3f63 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 00000000..3caee7e5 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_daemon_commons_daemon_1_0_1.xml b/.idea/libraries/Maven__commons_daemon_commons_daemon_1_0_1.xml new file mode 100644 index 00000000..c8855ddc --- /dev/null +++ b/.idea/libraries/Maven__commons_daemon_commons_daemon_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml new file mode 100644 index 00000000..49c39ce8 --- /dev/null +++ b/.idea/libraries/Maven__commons_dbcp_commons_dbcp_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml new file mode 100644 index 00000000..49f1defe --- /dev/null +++ b/.idea/libraries/Maven__commons_digester_commons_digester_1_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml new file mode 100644 index 00000000..7439141e --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3.xml b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3.xml new file mode 100644 index 00000000..e72e8610 --- /dev/null +++ b/.idea/libraries/Maven__commons_fileupload_commons_fileupload_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml new file mode 100644 index 00000000..66e65371 --- /dev/null +++ b/.idea/libraries/Maven__commons_httpclient_commons_httpclient_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_1_4.xml b/.idea/libraries/Maven__commons_io_commons_io_1_4.xml new file mode 100644 index 00000000..054eda88 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_0_1.xml b/.idea/libraries/Maven__commons_io_commons_io_2_0_1.xml new file mode 100644 index 00000000..3133c0d4 --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_3.xml b/.idea/libraries/Maven__commons_io_commons_io_2_3.xml new file mode 100644 index 00000000..df8396dd --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 00000000..bc2aad0e --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml new file mode 100644 index 00000000..5e8b8d33 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml new file mode 100644 index 00000000..2ec83767 --- /dev/null +++ b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml new file mode 100644 index 00000000..217d6e0a --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 00000000..b770f56a --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_4.xml new file mode 100644 index 00000000..79d3dff6 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml new file mode 100644 index 00000000..ab207212 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_5_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_pool_commons_pool_1_6.xml b/.idea/libraries/Maven__commons_pool_commons_pool_1_6.xml new file mode 100644 index 00000000..83936486 --- /dev/null +++ b/.idea/libraries/Maven__commons_pool_commons_pool_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml b/.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml new file mode 100644 index 00000000..476d18d8 --- /dev/null +++ b/.idea/libraries/Maven__commons_validator_commons_validator_1_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml new file mode 100644 index 00000000..14681ee8 --- /dev/null +++ b/.idea/libraries/Maven__dom4j_dom4j_1_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__hsqldb_hsqldb_1_8_0_7.xml b/.idea/libraries/Maven__hsqldb_hsqldb_1_8_0_7.xml new file mode 100644 index 00000000..d9358a27 --- /dev/null +++ b/.idea/libraries/Maven__hsqldb_hsqldb_1_8_0_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_tiff_1_1_0.xml b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_tiff_1_1_0.xml new file mode 100644 index 00000000..709957ea --- /dev/null +++ b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_tiff_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_tiff_1_1_7.xml b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_tiff_1_1_7.xml new file mode 100644 index 00000000..9597212b --- /dev/null +++ b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_tiff_1_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_utilities_1_1_0.xml b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_utilities_1_1_0.xml new file mode 100644 index 00000000..4479792b --- /dev/null +++ b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_utilities_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_utilities_1_1_7.xml b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_utilities_1_1_7.xml new file mode 100644 index 00000000..904a2047 --- /dev/null +++ b/.idea/libraries/Maven__it_geosolutions_imageio_ext_imageio_ext_utilities_1_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jai_jai_codec_1_1_3.xml b/.idea/libraries/Maven__jai_jai_codec_1_1_3.xml new file mode 100644 index 00000000..84cee209 --- /dev/null +++ b/.idea/libraries/Maven__jai_jai_codec_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jai_jai_core_1_1_3.xml b/.idea/libraries/Maven__jai_jai_core_1_1_3.xml new file mode 100644 index 00000000..e7e03702 --- /dev/null +++ b/.idea/libraries/Maven__jai_jai_core_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jai_jai_imageio_1_1_3.xml b/.idea/libraries/Maven__jai_jai_imageio_1_1_3.xml new file mode 100644 index 00000000..b451dd93 --- /dev/null +++ b/.idea/libraries/Maven__jai_jai_imageio_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jai_jai_mlibwrapper_1_1_3.xml b/.idea/libraries/Maven__jai_jai_mlibwrapper_1_1_3.xml new file mode 100644 index 00000000..69647900 --- /dev/null +++ b/.idea/libraries/Maven__jai_jai_mlibwrapper_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml b/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml new file mode 100644 index 00000000..1eebe0af --- /dev/null +++ b/.idea/libraries/Maven__java3d_vecmath_1_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__java3d_vecmath_1_5_2.xml b/.idea/libraries/Maven__java3d_vecmath_1_5_2.xml new file mode 100644 index 00000000..0a63668d --- /dev/null +++ b/.idea/libraries/Maven__java3d_vecmath_1_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml b/.idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml new file mode 100644 index 00000000..05eb56af --- /dev/null +++ b/.idea/libraries/Maven__javassist_javassist_3_12_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javassist_javassist_3_12_1_GA.xml b/.idea/libraries/Maven__javassist_javassist_3_12_1_GA.xml new file mode 100644 index 00000000..e5be13ee --- /dev/null +++ b/.idea/libraries/Maven__javassist_javassist_3_12_1_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_activation_activation_1_1.xml b/.idea/libraries/Maven__javax_activation_activation_1_1.xml new file mode 100644 index 00000000..180d5875 --- /dev/null +++ b/.idea/libraries/Maven__javax_activation_activation_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml new file mode 100644 index 00000000..93cf65ab --- /dev/null +++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4.xml b/.idea/libraries/Maven__javax_mail_mail_1_4.xml new file mode 100644 index 00000000..ead2b381 --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml b/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml new file mode 100644 index 00000000..2c155f3a --- /dev/null +++ b/.idea/libraries/Maven__javax_mail_mail_1_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml new file mode 100644 index 00000000..63d10f64 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_transaction_jta_1_1.xml b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml new file mode 100644 index 00000000..30472437 --- /dev/null +++ b/.idea/libraries/Maven__javax_transaction_jta_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml new file mode 100644 index 00000000..940ce73c --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_1.xml b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_1.xml new file mode 100644 index 00000000..da3d0bf3 --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_bind_jaxb_api_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_bind_jsr173_api_1_0.xml b/.idea/libraries/Maven__javax_xml_bind_jsr173_api_1_0.xml new file mode 100644 index 00000000..9eb99280 --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_bind_jsr173_api_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_jaxb_impl_2_1.xml b/.idea/libraries/Maven__javax_xml_jaxb_impl_2_1.xml new file mode 100644 index 00000000..40d77cb6 --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_jaxb_impl_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_jsr173_1_0.xml b/.idea/libraries/Maven__javax_xml_jsr173_1_0.xml new file mode 100644 index 00000000..e47e4ebc --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_jsr173_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml new file mode 100644 index 00000000..2a4dd7a2 --- /dev/null +++ b/.idea/libraries/Maven__javax_xml_stream_stax_api_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jaxen_jaxen_1_1_1.xml b/.idea/libraries/Maven__jaxen_jaxen_1_1_1.xml new file mode 100644 index 00000000..7472164b --- /dev/null +++ b/.idea/libraries/Maven__jaxen_jaxen_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jaxen_jaxen_1_1_4.xml b/.idea/libraries/Maven__jaxen_jaxen_1_1_4.xml new file mode 100644 index 00000000..d84dbcf7 --- /dev/null +++ b/.idea/libraries/Maven__jaxen_jaxen_1_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jboss_jbossall_client_3_2_3.xml b/.idea/libraries/Maven__jboss_jbossall_client_3_2_3.xml new file mode 100644 index 00000000..84029e66 --- /dev/null +++ b/.idea/libraries/Maven__jboss_jbossall_client_3_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jdbm_jdbm_1_0.xml b/.idea/libraries/Maven__jdbm_jdbm_1_0.xml new file mode 100644 index 00000000..b0ade864 --- /dev/null +++ b/.idea/libraries/Maven__jdbm_jdbm_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jdom_jdom_1_0.xml b/.idea/libraries/Maven__jdom_jdom_1_0.xml new file mode 100644 index 00000000..3349d675 --- /dev/null +++ b/.idea/libraries/Maven__jdom_jdom_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jgridshift_jgridshift_1_0_deegreeversion.xml b/.idea/libraries/Maven__jgridshift_jgridshift_1_0_deegreeversion.xml new file mode 100644 index 00000000..2b6a6b7e --- /dev/null +++ b/.idea/libraries/Maven__jgridshift_jgridshift_1_0_deegreeversion.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_1.xml b/.idea/libraries/Maven__joda_time_joda_time_2_1.xml new file mode 100644 index 00000000..2646c870 --- /dev/null +++ b/.idea/libraries/Maven__joda_time_joda_time_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__jogl_jogl_1_1_2.xml b/.idea/libraries/Maven__jogl_jogl_1_1_2.xml new file mode 100644 index 00000000..8ef60a95 --- /dev/null +++ b/.idea/libraries/Maven__jogl_jogl_1_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml new file mode 100644 index 00000000..f33320d8 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_9.xml b/.idea/libraries/Maven__junit_junit_4_9.xml new file mode 100644 index 00000000..c42d5abd --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_15.xml b/.idea/libraries/Maven__log4j_log4j_1_2_15.xml new file mode 100644 index 00000000..c6024af8 --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_15.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_16.xml b/.idea/libraries/Maven__log4j_log4j_1_2_16.xml new file mode 100644 index 00000000..11837b5f --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__log4j_log4j_1_2_17.xml b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml new file mode 100644 index 00000000..e383c1bf --- /dev/null +++ b/.idea/libraries/Maven__log4j_log4j_1_2_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml b/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml new file mode 100644 index 00000000..bf5f49be --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jsr_275_jsr_275_1_0_beta_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_rome_rome_1_0_0.xml b/.idea/libraries/Maven__net_java_dev_rome_rome_1_0_0.xml new file mode 100644 index 00000000..a868a06d --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_rome_rome_1_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_5_1.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_5_1.xml new file mode 100644 index 00000000..eedc23ca --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_5.xml b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_5.xml new file mode 100644 index 00000000..61c3972f --- /dev/null +++ b/.idea/libraries/Maven__net_sf_ehcache_ehcache_core_2_6_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__nl_idgis_commons_commons_deegree_0_1_9.xml b/.idea/libraries/Maven__nl_idgis_commons_commons_deegree_0_1_9.xml new file mode 100644 index 00000000..ed70b48b --- /dev/null +++ b/.idea/libraries/Maven__nl_idgis_commons_commons_deegree_0_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__nl_idgis_commons_commons_jobexecutor_0_1_9.xml b/.idea/libraries/Maven__nl_idgis_commons_commons_jobexecutor_0_1_9.xml new file mode 100644 index 00000000..06cb281b --- /dev/null +++ b/.idea/libraries/Maven__nl_idgis_commons_commons_jobexecutor_0_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__nl_idgis_commons_commons_mvc_0_1_9.xml b/.idea/libraries/Maven__nl_idgis_commons_commons_mvc_0_1_9.xml new file mode 100644 index 00000000..3c22919d --- /dev/null +++ b/.idea/libraries/Maven__nl_idgis_commons_commons_mvc_0_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__nl_idgis_commons_commons_utils_0_1_9.xml b/.idea/libraries/Maven__nl_idgis_commons_commons_utils_0_1_9.xml new file mode 100644 index 00000000..918371c0 --- /dev/null +++ b/.idea/libraries/Maven__nl_idgis_commons_commons_utils_0_1_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_2.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_2.xml new file mode 100644 index 00000000..899879a7 --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml new file mode 100644 index 00000000..fd0779a3 --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2.xml new file mode 100644 index 00000000..d3e1ac9f --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml new file mode 100644 index 00000000..6998bac1 --- /dev/null +++ b/.idea/libraries/Maven__org_antlr_stringtemplate_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml b/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml new file mode 100644 index 00000000..5bdad071 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_1_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_2.xml b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_2.xml new file mode 100644 index 00000000..b810f735 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_api_4_3_1.xml b/.idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_api_4_3_1.xml new file mode 100644 index 00000000..69f4d92a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_api_4_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_impl_4_3_1.xml b/.idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_impl_4_3_1.xml new file mode 100644 index 00000000..7b79fa57 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_avalon_framework_avalon_framework_impl_4_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml new file mode 100644 index 00000000..9ae605be --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_email_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math_2_0.xml b/.idea/libraries/Maven__org_apache_commons_commons_math_2_0.xml new file mode 100644 index 00000000..7c0f484f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_math_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml new file mode 100644 index 00000000..8f3e3159 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_math_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_daemon_daemon_bootstrappers_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_daemon_daemon_bootstrappers_1_0_2.xml new file mode 100644 index 00000000..9b756190 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_daemon_daemon_bootstrappers_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_core_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_core_1_0_2.xml new file mode 100644 index 00000000..5a066ac8 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_core_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_core_shared_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_core_shared_1_0_2.xml new file mode 100644 index 00000000..f7f6f379 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_core_shared_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_shared_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_shared_1_0_2.xml new file mode 100644 index 00000000..c9c47493 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_kerberos_shared_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_changepw_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_changepw_1_0_2.xml new file mode 100644 index 00000000..a954524e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_changepw_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_kerberos_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_kerberos_1_0_2.xml new file mode 100644 index 00000000..ce204f5e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_kerberos_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_ldap_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_ldap_1_0_2.xml new file mode 100644 index 00000000..586fdd5c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_ldap_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_ntp_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_ntp_1_0_2.xml new file mode 100644 index 00000000..905e7f86 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_ntp_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_shared_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_shared_1_0_2.xml new file mode 100644 index 00000000..04b09bc9 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_protocol_shared_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_jndi_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_jndi_1_0_2.xml new file mode 100644 index 00000000..d7b2c12c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_jndi_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_main_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_main_1_0_2.xml new file mode 100644 index 00000000..0b774e7f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_main_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_ssl_1_0_2.xml b/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_ssl_1_0_2.xml new file mode 100644 index 00000000..9f83a3ac --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_server_apacheds_server_ssl_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_shared_shared_asn1_0_9_5_5.xml b/.idea/libraries/Maven__org_apache_directory_shared_shared_asn1_0_9_5_5.xml new file mode 100644 index 00000000..7d8911ad --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_shared_shared_asn1_0_9_5_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_shared_shared_asn1_codec_0_9_5_5.xml b/.idea/libraries/Maven__org_apache_directory_shared_shared_asn1_codec_0_9_5_5.xml new file mode 100644 index 00000000..d55b00c2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_shared_shared_asn1_codec_0_9_5_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_directory_shared_shared_ldap_0_9_5_5.xml b/.idea/libraries/Maven__org_apache_directory_shared_shared_ldap_0_9_5_5.xml new file mode 100644 index 00000000..40cb8e5f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_directory_shared_shared_ldap_0_9_5_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_activation_1_1_spec_1_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_activation_1_1_spec_1_1.xml new file mode 100644 index 00000000..fbda8696 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_activation_1_1_spec_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7_1.xml new file mode 100644 index 00000000..ea18758f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_javamail_1_4_spec_1_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_stax_api_1_0_spec_1_0_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_stax_api_1_0_spec_1_0_1.xml new file mode 100644 index 00000000..d76c7ab7 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_stax_api_1_0_spec_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_2.xml new file mode 100644 index 00000000..1e5c3b5b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_3.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_3.xml new file mode 100644 index 00000000..1e69f7e1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_2.xml new file mode 100644 index 00000000..9548c492 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_2_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_2_2.xml new file mode 100644 index 00000000..2dcdea6e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_james_apache_mime4j_core_0_7_2.xml b/.idea/libraries/Maven__org_apache_james_apache_mime4j_core_0_7_2.xml new file mode 100644 index 00000000..0a58b81c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_james_apache_mime4j_core_0_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_mina_mina_core_1_0_2.xml b/.idea/libraries/Maven__org_apache_mina_mina_core_1_0_2.xml new file mode 100644 index 00000000..8cdbc25a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_mina_mina_core_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_mina_mina_filter_ssl_1_0_2.xml b/.idea/libraries/Maven__org_apache_mina_mina_filter_ssl_1_0_2.xml new file mode 100644 index 00000000..1c23017c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_mina_mina_filter_ssl_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml new file mode 100644 index 00000000..072320e0 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_core_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml new file mode 100644 index 00000000..9674c05e --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_taglib_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml b/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml new file mode 100644 index 00000000..e4c6c813 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_struts_struts_tiles_1_3_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml new file mode 100644 index 00000000..7a2914a6 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml b/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml new file mode 100644 index 00000000..2e6b0aaf --- /dev/null +++ b/.idea/libraries/Maven__org_apache_velocity_velocity_tools_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_api_1_2_13.xml b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_api_1_2_13.xml new file mode 100644 index 00000000..4fb25c29 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_api_1_2_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_api_1_2_14.xml b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_api_1_2_14.xml new file mode 100644 index 00000000..307187ac --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_api_1_2_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_impl_1_2_13.xml b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_impl_1_2_13.xml new file mode 100644 index 00000000..342b6e4a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_impl_1_2_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_impl_1_2_14.xml b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_impl_1_2_14.xml new file mode 100644 index 00000000..bb68d343 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ws_commons_axiom_axiom_impl_1_2_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_7.xml new file mode 100644 index 00000000..0cd2ef1d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_anim_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_7.xml new file mode 100644 index 00000000..2e7275f1 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_awt_util_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_7.xml new file mode 100644 index 00000000..f9b48c0d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_bridge_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_7.xml new file mode 100644 index 00000000..bbbdd35a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_codec_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_7.xml new file mode 100644 index 00000000..ca535c95 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_css_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_7.xml new file mode 100644 index 00000000..3c131e5f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_dom_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_7.xml new file mode 100644 index 00000000..8a22bc71 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_ext_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_7.xml new file mode 100644 index 00000000..84227452 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_gvt_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_js_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_js_1_7.xml new file mode 100644 index 00000000..2d617a35 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_js_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_7.xml new file mode 100644 index 00000000..1e8816a5 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_parser_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_7.xml new file mode 100644 index 00000000..73ca6d44 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_script_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_7.xml new file mode 100644 index 00000000..8e6d3ade --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svg_dom_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_7.xml new file mode 100644 index 00000000..dcdf6721 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_svggen_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_7.xml new file mode 100644 index 00000000..f8eab0a4 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_transcoder_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_7.xml new file mode 100644 index 00000000..8a6a7895 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_util_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_7.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_7.xml new file mode 100644 index 00000000..3fa5ec4d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_batik_xml_1_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_fop_0_94.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_fop_0_94.xml new file mode 100644 index 00000000..817f4e59 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_fop_0_94.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_1_2.xml b/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_1_2.xml new file mode 100644 index 00000000..fc09bd51 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_xmlgraphics_xmlgraphics_commons_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_11.xml b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_11.xml new file mode 100644 index 00000000..6950ca2b --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjrt_1_6_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_7_2.xml b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_7_2.xml new file mode 100644 index 00000000..5ccf29b2 --- /dev/null +++ b/.idea/libraries/Maven__org_aspectj_aspectjweaver_1_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_12.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_12.xml new file mode 100644 index 00000000..394c81d3 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_lgpl_1_9_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_12.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_12.xml new file mode 100644 index 00000000..fe0c916f --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_lgpl_1_9_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_0_3.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_0_3.xml new file mode 100644 index 00000000..fff16055 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_0_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml new file mode 100644 index 00000000..3182f887 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_stax2_api_3_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml new file mode 100644 index 00000000..e14901f0 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_asl_4_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_lgpl_4_0_9.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_lgpl_4_0_9.xml new file mode 100644 index 00000000..5222620b --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_lgpl_4_0_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_lgpl_4_2_0.xml b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_lgpl_4_2_0.xml new file mode 100644 index 00000000..6579eac7 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_woodstox_core_lgpl_4_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_9.xml b/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_9.xml new file mode 100644 index 00000000..61cc605f --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_woodstox_wstx_asl_3_2_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree2_base_2_5.xml b/.idea/libraries/Maven__org_deegree_deegree2_base_2_5.xml new file mode 100644 index 00000000..c87317e6 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree2_base_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_2_pre12.xml b/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_2_pre12.xml new file mode 100644 index 00000000..ea651270 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_2_pre12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..e6fa020e --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_4_pre9.xml new file mode 100644 index 00000000..f03e79be --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_annotations_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_base_3_2_pre12.xml b/.idea/libraries/Maven__org_deegree_deegree_core_base_3_2_pre12.xml new file mode 100644 index 00000000..1b6adaec --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_base_3_2_pre12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_base_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_base_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..b4acf4fd --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_base_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_base_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_base_3_4_pre9.xml new file mode 100644 index 00000000..49ef6a62 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_base_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_2_pre12.xml b/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_2_pre12.xml new file mode 100644 index 00000000..fd7c8598 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_2_pre12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..7b04ded4 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_4_pre9.xml new file mode 100644 index 00000000..d3d83f21 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_commons_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_2_pre12.xml b/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_2_pre12.xml new file mode 100644 index 00000000..40dc1f04 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_2_pre12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..cc4fe310 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_4_pre9.xml new file mode 100644 index 00000000..921db7c1 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_coverage_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_2_pre12.xml b/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_2_pre12.xml new file mode 100644 index 00000000..4615dda2 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_2_pre12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..e1d610c0 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_4_pre9.xml new file mode 100644 index 00000000..739c302a --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_cs_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_db_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_db_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..6ea1b9cf --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_db_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_db_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_db_3_4_pre9.xml new file mode 100644 index 00000000..a569f7bc --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_db_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_featureinfo_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_featureinfo_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..6f3322ef --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_featureinfo_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_filterfunctions_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_filterfunctions_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..8b2f7be1 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_filterfunctions_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_filterfunctions_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_filterfunctions_3_4_pre9.xml new file mode 100644 index 00000000..3d5e1c62 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_filterfunctions_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_2_pre12.xml b/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_2_pre12.xml new file mode 100644 index 00000000..758292a2 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_2_pre12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..69ec759b --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_4_pre9.xml new file mode 100644 index 00000000..8b98e780 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_geometry_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_layer_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_layer_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..09569ed9 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_layer_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_layer_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_layer_3_4_pre9.xml new file mode 100644 index 00000000..32457bb9 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_layer_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_metadata_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_metadata_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..2855cf5f --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_metadata_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_rendering_2d_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_rendering_2d_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..61e8a4ef --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_rendering_2d_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_rendering_2d_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_rendering_2d_3_4_pre9.xml new file mode 100644 index 00000000..2774cdde --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_rendering_2d_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_style_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_style_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..c1788be2 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_style_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_style_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_style_3_4_pre9.xml new file mode 100644 index 00000000..b26fa6d2 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_style_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_theme_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_theme_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..0267047c --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_theme_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_tile_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_tile_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..ca99b3cb --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_tile_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_tile_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_tile_3_4_pre9.xml new file mode 100644 index 00000000..04fa5f58 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_tile_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_workspace_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_core_workspace_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..7781391a --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_workspace_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_core_workspace_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_core_workspace_3_4_pre9.xml new file mode 100644 index 00000000..9c955507 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_core_workspace_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_featurestore_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_featurestore_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..f0982c42 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_featurestore_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_featurestore_commons_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_featurestore_commons_3_4_pre9.xml new file mode 100644 index 00000000..7126b254 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_featurestore_commons_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_featurestore_shape_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_featurestore_shape_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..727d0aff --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_featurestore_shape_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_featurestore_simplesql_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_featurestore_simplesql_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..d51e60ba --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_featurestore_simplesql_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_featurestore_sql_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_featurestore_sql_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..ba6ae170 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_featurestore_sql_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_layers_feature_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_layers_feature_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..9bfce7f7 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_layers_feature_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_layers_remotewms_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_layers_remotewms_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..b25a4e8b --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_layers_remotewms_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_layers_tile_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_layers_tile_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..89842673 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_layers_tile_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_mdstore_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_mdstore_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..a1e1a89f --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_mdstore_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_ogcschemas_20120804.xml b/.idea/libraries/Maven__org_deegree_deegree_ogcschemas_20120804.xml new file mode 100644 index 00000000..9e82a2b0 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_ogcschemas_20120804.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_protocol_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_protocol_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..0f351f76 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_protocol_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_protocol_commons_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_protocol_commons_3_4_pre9.xml new file mode 100644 index 00000000..88619220 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_protocol_commons_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_protocol_wfs_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_protocol_wfs_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..1ecd8676 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_protocol_wfs_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_protocol_wfs_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_protocol_wfs_3_4_pre9.xml new file mode 100644 index 00000000..5c26941f --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_protocol_wfs_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_protocol_wms_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_protocol_wms_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..0c00505b --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_protocol_wms_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_protocol_wmts_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_protocol_wmts_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..3b208e5e --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_protocol_wmts_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_remoteows_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_remoteows_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..a280b584 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_remoteows_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_remoteows_wms_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_remoteows_wms_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..a800fe4a --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_remoteows_wms_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_services_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_services_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..a4df61c8 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_services_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_services_commons_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_services_commons_3_4_pre9.xml new file mode 100644 index 00000000..d7f60765 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_services_commons_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_services_config_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_services_config_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..baab4bec --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_services_config_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_services_wfs_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_services_wfs_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..17da55e6 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_services_wfs_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_services_wms_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_services_wms_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..85c7f53a --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_services_wms_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_services_wmts_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_services_wmts_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..10b24797 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_services_wmts_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_spring_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_spring_3_4_pre9.xml new file mode 100644 index 00000000..888200b8 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_spring_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_sqldialect_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..891f9322 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_sqldialect_commons_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_commons_3_4_pre9.xml new file mode 100644 index 00000000..d9e6debd --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_commons_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_sqldialect_postgis_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_postgis_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..206d6f6b --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_postgis_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_sqldialect_postgis_3_4_pre9.xml b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_postgis_3_4_pre9.xml new file mode 100644 index 00000000..13854ef6 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_sqldialect_postgis_3_4_pre9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_themes_remotewms_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_themes_remotewms_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..11b43d86 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_themes_remotewms_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_tilestore_cache_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_tilestore_cache_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..66d62eb4 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_tilestore_cache_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_tilestore_commons_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_tilestore_commons_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..5dcb3281 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_tilestore_commons_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_deegree_deegree_tilestore_filesystem_3_4_pre10_SNAPSHOT_cds1.xml b/.idea/libraries/Maven__org_deegree_deegree_tilestore_filesystem_3_4_pre10_SNAPSHOT_cds1.xml new file mode 100644 index 00000000..2d71a4e9 --- /dev/null +++ b/.idea/libraries/Maven__org_deegree_deegree_tilestore_filesystem_3_4_pre10_SNAPSHOT_cds1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_dojotoolkit_dojo_shrinksafe_1_8_3.xml b/.idea/libraries/Maven__org_dojotoolkit_dojo_shrinksafe_1_8_3.xml new file mode 100644 index 00000000..d6bd0f76 --- /dev/null +++ b/.idea/libraries/Maven__org_dojotoolkit_dojo_shrinksafe_1_8_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_easymock_easymock_3_1.xml b/.idea/libraries/Maven__org_easymock_easymock_3_1.xml new file mode 100644 index 00000000..9b490f46 --- /dev/null +++ b/.idea/libraries/Maven__org_easymock_easymock_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_freemarker_freemarker_2_3_9.xml b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_9.xml new file mode 100644 index 00000000..80a77d92 --- /dev/null +++ b/.idea/libraries/Maven__org_freemarker_freemarker_2_3_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_api_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_api_2_7_0.xml new file mode 100644 index 00000000..f7790993 --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_api_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_data_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_data_2_7_0.xml new file mode 100644 index 00000000..61c4ce1e --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_data_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_epsg_hsql_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_epsg_hsql_2_7_0.xml new file mode 100644 index 00000000..48a46653 --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_epsg_hsql_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_main_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_main_2_7_0.xml new file mode 100644 index 00000000..a1a72c29 --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_main_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_metadata_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_metadata_2_7_0.xml new file mode 100644 index 00000000..22dab84f --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_metadata_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_opengis_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_opengis_2_7_0.xml new file mode 100644 index 00000000..80f2dc02 --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_opengis_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_referencing_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_referencing_2_7_0.xml new file mode 100644 index 00000000..cc345c78 --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_referencing_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_geotools_gt_shapefile_2_7_0.xml b/.idea/libraries/Maven__org_geotools_gt_shapefile_2_7_0.xml new file mode 100644 index 00000000..95f4b027 --- /dev/null +++ b/.idea/libraries/Maven__org_geotools_gt_shapefile_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 00000000..acdf4430 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 00000000..f58bbc11 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml new file mode 100644 index 00000000..010812ae --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml new file mode 100644 index 00000000..dbb890ef --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_commons_annotations_3_2_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml new file mode 100644 index 00000000..ba3f118a --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_7_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_7_Final.xml new file mode 100644 index 00000000..3822e5b9 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_core_3_6_7_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml new file mode 100644 index 00000000..6715eeb6 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_7_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_7_Final.xml new file mode 100644 index 00000000..05cdc7be --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_entitymanager_3_6_7_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_2_0_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_2_0_Final.xml new file mode 100644 index 00000000..efa6acb0 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_4_2_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml new file mode 100644 index 00000000..6b42b8a5 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_0_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml new file mode 100644 index 00000000..352de380 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_javax_persistence_hibernate_jpa_2_0_api_1_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jmock_jmock_2_5_1.xml b/.idea/libraries/Maven__org_jmock_jmock_2_5_1.xml new file mode 100644 index 00000000..9c7483fd --- /dev/null +++ b/.idea/libraries/Maven__org_jmock_jmock_2_5_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20090211.xml b/.idea/libraries/Maven__org_json_json_20090211.xml new file mode 100644 index 00000000..e57dc0ae --- /dev/null +++ b/.idea/libraries/Maven__org_json_json_20090211.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml new file mode 100644 index 00000000..74d2abc6 --- /dev/null +++ b/.idea/libraries/Maven__org_objenesis_objenesis_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_postgis_postgis_jdbc_1_3_3.xml b/.idea/libraries/Maven__org_postgis_postgis_jdbc_1_3_3.xml new file mode 100644 index 00000000..b840f869 --- /dev/null +++ b/.idea/libraries/Maven__org_postgis_postgis_jdbc_1_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_6.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_6.xml new file mode 100644 index 00000000..ddd1f35c --- /dev/null +++ b/.idea/libraries/Maven__org_reflections_reflections_0_9_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_reflections_reflections_0_9_8.xml b/.idea/libraries/Maven__org_reflections_reflections_0_9_8.xml new file mode 100644 index 00000000..5b96f30e --- /dev/null +++ b/.idea/libraries/Maven__org_reflections_reflections_0_9_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_2.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_2.xml new file mode 100644 index 00000000..b121e9d1 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml new file mode 100644 index 00000000..8872ae75 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_2.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_2.xml new file mode 100644 index 00000000..3aae0d07 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml new file mode 100644 index 00000000..6f808f14 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_2.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_2.xml new file mode 100644 index 00000000..532713e5 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml new file mode 100644 index 00000000..df1d3833 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_log4j12_1_7_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_1_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_1_3_1_RELEASE.xml new file mode 100644 index 00000000..fa2c76ae --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_1_3_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_tiger_1_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_tiger_1_3_1_RELEASE.xml new file mode 100644 index 00000000..90a0b957 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_core_tiger_1_3_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_odm_1_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_odm_1_3_1_RELEASE.xml new file mode 100644 index 00000000..a10b6a8a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_odm_1_3_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_test_1_3_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_test_1_3_1_RELEASE.xml new file mode 100644 index 00000000..30979754 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_ldap_spring_ldap_test_1_3_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_acl_3_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_acl_3_1_3_RELEASE.xml new file mode 100644 index 00000000..ed5d5862 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_acl_3_1_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_config_3_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_config_3_1_3_RELEASE.xml new file mode 100644 index 00000000..b7cf48e2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_config_3_1_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_core_3_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_core_3_1_3_RELEASE.xml new file mode 100644 index 00000000..4e5186b6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_core_3_1_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_ldap_3_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_ldap_3_1_3_RELEASE.xml new file mode 100644 index 00000000..1a87cb14 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_ldap_3_1_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_taglibs_3_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_taglibs_3_1_3_RELEASE.xml new file mode 100644 index 00000000..06ce16aa --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_taglibs_3_1_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_security_spring_security_web_3_1_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_security_spring_security_web_3_1_3_RELEASE.xml new file mode 100644 index 00000000..5b2c3e83 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_security_spring_security_web_3_1_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_3_2_2_RELEASE.xml new file mode 100644 index 00000000..48ecb4e6 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aspects_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aspects_3_2_2_RELEASE.xml new file mode 100644 index 00000000..9b311083 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aspects_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_3_2_2_RELEASE.xml new file mode 100644 index 00000000..68610c25 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_3_2_2_RELEASE.xml new file mode 100644 index 00000000..b1fbd948 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_support_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_support_3_2_2_RELEASE.xml new file mode 100644 index 00000000..88754b7d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_support_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_3_2_2_RELEASE.xml new file mode 100644 index 00000000..4ce94f8d --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_3_2_2_RELEASE.xml new file mode 100644 index 00000000..a545973b --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_2_RELEASE.xml new file mode 100644 index 00000000..e7d61327 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_3_RELEASE.xml new file mode 100644 index 00000000..82b0f30f --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_jdbc_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_orm_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_orm_3_2_2_RELEASE.xml new file mode 100644 index 00000000..daee99f2 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_orm_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_remoting_2_0_8.xml b/.idea/libraries/Maven__org_springframework_spring_remoting_2_0_8.xml new file mode 100644 index 00000000..f3f14132 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_remoting_2_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_3_2_1_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_3_2_1_RELEASE.xml new file mode 100644 index 00000000..ff93e793 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_3_2_1_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_3_2_2_RELEASE.xml new file mode 100644 index 00000000..d64cb7e7 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_web_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_web_3_2_2_RELEASE.xml new file mode 100644 index 00000000..c369292c --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_web_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_2_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_2_RELEASE.xml new file mode 100644 index 00000000..221256e3 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_webmvc_3_2_2_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__oro_oro_2_0_8.xml b/.idea/libraries/Maven__oro_oro_2_0_8.xml new file mode 100644 index 00000000..25203a04 --- /dev/null +++ b/.idea/libraries/Maven__oro_oro_2_0_8.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__postgresql_postgresql_9_0_801_jdbc4.xml b/.idea/libraries/Maven__postgresql_postgresql_9_0_801_jdbc4.xml new file mode 100644 index 00000000..8c4abe4b --- /dev/null +++ b/.idea/libraries/Maven__postgresql_postgresql_9_0_801_jdbc4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__postgresql_postgresql_9_1_901_1_jdbc4.xml b/.idea/libraries/Maven__postgresql_postgresql_9_1_901_1_jdbc4.xml new file mode 100644 index 00000000..b79d6840 --- /dev/null +++ b/.idea/libraries/Maven__postgresql_postgresql_9_1_901_1_jdbc4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__rhino_js_1_7R1.xml b/.idea/libraries/Maven__rhino_js_1_7R1.xml new file mode 100644 index 00000000..f01dbf8e --- /dev/null +++ b/.idea/libraries/Maven__rhino_js_1_7R1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__sslext_sslext_1_2_0.xml b/.idea/libraries/Maven__sslext_sslext_1_2_0.xml new file mode 100644 index 00000000..e8c78314 --- /dev/null +++ b/.idea/libraries/Maven__sslext_sslext_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xalan_serializer_2_7_1.xml b/.idea/libraries/Maven__xalan_serializer_2_7_1.xml new file mode 100644 index 00000000..8891e3c1 --- /dev/null +++ b/.idea/libraries/Maven__xalan_serializer_2_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xalan_xalan_2_7_1.xml b/.idea/libraries/Maven__xalan_xalan_2_7_1.xml new file mode 100644 index 00000000..4149f4f6 --- /dev/null +++ b/.idea/libraries/Maven__xalan_xalan_2_7_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml new file mode 100644 index 00000000..133d4d65 --- /dev/null +++ b/.idea/libraries/Maven__xerces_xercesImpl_2_10_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml new file mode 100644 index 00000000..285d5e89 --- /dev/null +++ b/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml new file mode 100644 index 00000000..9aadd291 --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml b/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml new file mode 100644 index 00000000..6baf5e01 --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_ext_1_3_04.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/ad.xml b/.idea/libraries/ad.xml new file mode 100644 index 00000000..6bdac6d3 --- /dev/null +++ b/.idea/libraries/ad.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/au_3_0_0.xml b/.idea/libraries/au_3_0_0.xml new file mode 100644 index 00000000..fae6a8a4 --- /dev/null +++ b/.idea/libraries/au_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/base_3_2_0.xml b/.idea/libraries/base_3_2_0.xml new file mode 100644 index 00000000..d3bbe411 --- /dev/null +++ b/.idea/libraries/base_3_2_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/bu_0_0_0.xml b/.idea/libraries/bu_0_0_0.xml new file mode 100644 index 00000000..7ffad2b9 --- /dev/null +++ b/.idea/libraries/bu_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/common.xml b/.idea/libraries/common.xml new file mode 100644 index 00000000..4eed249d --- /dev/null +++ b/.idea/libraries/common.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/cp_3_0_0.xml b/.idea/libraries/cp_3_0_0.xml new file mode 100644 index 00000000..a68d4a34 --- /dev/null +++ b/.idea/libraries/cp_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/dojo_release_1_8_3_src.xml b/.idea/libraries/dojo_release_1_8_3_src.xml new file mode 100644 index 00000000..e9be59a5 --- /dev/null +++ b/.idea/libraries/dojo_release_1_8_3_src.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/er_0_0_0.xml b/.idea/libraries/er_0_0_0.xml new file mode 100644 index 00000000..2720a543 --- /dev/null +++ b/.idea/libraries/er_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/gaz_3_2_0.xml b/.idea/libraries/gaz_3_2_0.xml new file mode 100644 index 00000000..6186455f --- /dev/null +++ b/.idea/libraries/gaz_3_2_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/ge_0_0_0.xml b/.idea/libraries/ge_0_0_0.xml new file mode 100644 index 00000000..02746206 --- /dev/null +++ b/.idea/libraries/ge_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/geoportal.xml b/.idea/libraries/geoportal.xml new file mode 100644 index 00000000..aa5671bc --- /dev/null +++ b/.idea/libraries/geoportal.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/gn_3_0_0.xml b/.idea/libraries/gn_3_0_0.xml new file mode 100644 index 00000000..1f3e6702 --- /dev/null +++ b/.idea/libraries/gn_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hy_3_0_0.xml b/.idea/libraries/hy_3_0_0.xml new file mode 100644 index 00000000..e895585f --- /dev/null +++ b/.idea/libraries/hy_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hy_n_3_0_0.xml b/.idea/libraries/hy_n_3_0_0.xml new file mode 100644 index 00000000..4e04b9fd --- /dev/null +++ b/.idea/libraries/hy_n_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hy_p_3_0_0.xml b/.idea/libraries/hy_p_3_0_0.xml new file mode 100644 index 00000000..790bb5f7 --- /dev/null +++ b/.idea/libraries/hy_p_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hy_r_3_0_0.xml b/.idea/libraries/hy_r_3_0_0.xml new file mode 100644 index 00000000..0650f16c --- /dev/null +++ b/.idea/libraries/hy_r_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/inspire_dls.xml b/.idea/libraries/inspire_dls.xml new file mode 100644 index 00000000..bd688340 --- /dev/null +++ b/.idea/libraries/inspire_dls.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/inspire_ds.xml b/.idea/libraries/inspire_ds.xml new file mode 100644 index 00000000..cbe658e8 --- /dev/null +++ b/.idea/libraries/inspire_ds.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/inspire_vs.xml b/.idea/libraries/inspire_vs.xml new file mode 100644 index 00000000..b1e87d05 --- /dev/null +++ b/.idea/libraries/inspire_vs.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/inspire_vs_ows11.xml b/.idea/libraries/inspire_vs_ows11.xml new file mode 100644 index 00000000..bb0947cd --- /dev/null +++ b/.idea/libraries/inspire_vs_ows11.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/lc_0_0_0.xml b/.idea/libraries/lc_0_0_0.xml new file mode 100644 index 00000000..18adf797 --- /dev/null +++ b/.idea/libraries/lc_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/net_3_2_0.xml b/.idea/libraries/net_3_2_0.xml new file mode 100644 index 00000000..447c0fab --- /dev/null +++ b/.idea/libraries/net_3_2_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/nz_0_0_0.xml b/.idea/libraries/nz_0_0_0.xml new file mode 100644 index 00000000..e2da8407 --- /dev/null +++ b/.idea/libraries/nz_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/ps_3_0_0.xml b/.idea/libraries/ps_3_0_0.xml new file mode 100644 index 00000000..c4457468 --- /dev/null +++ b/.idea/libraries/ps_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/sr_0_0_0.xml b/.idea/libraries/sr_0_0_0.xml new file mode 100644 index 00000000..47553aa7 --- /dev/null +++ b/.idea/libraries/sr_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/su_0_0_0.xml b/.idea/libraries/su_0_0_0.xml new file mode 100644 index 00000000..9d789057 --- /dev/null +++ b/.idea/libraries/su_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/tn_3_0_0.xml b/.idea/libraries/tn_3_0_0.xml new file mode 100644 index 00000000..9d20e19d --- /dev/null +++ b/.idea/libraries/tn_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/tn_a_3_0_0.xml b/.idea/libraries/tn_a_3_0_0.xml new file mode 100644 index 00000000..9088eafc --- /dev/null +++ b/.idea/libraries/tn_a_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/tn_c_3_0_0.xml b/.idea/libraries/tn_c_3_0_0.xml new file mode 100644 index 00000000..fc98fa98 --- /dev/null +++ b/.idea/libraries/tn_c_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/tn_ra_3_0_0.xml b/.idea/libraries/tn_ra_3_0_0.xml new file mode 100644 index 00000000..e68f3853 --- /dev/null +++ b/.idea/libraries/tn_ra_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/tn_ro_3_0_0.xml b/.idea/libraries/tn_ro_3_0_0.xml new file mode 100644 index 00000000..b0980ec7 --- /dev/null +++ b/.idea/libraries/tn_ro_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/tn_w_3_0_0.xml b/.idea/libraries/tn_w_3_0_0.xml new file mode 100644 index 00000000..77da0d13 --- /dev/null +++ b/.idea/libraries/tn_w_3_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/ugs_0_0_0.xml b/.idea/libraries/ugs_0_0_0.xml new file mode 100644 index 00000000..9a85f6a1 --- /dev/null +++ b/.idea/libraries/ugs_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/wfd_0_0_0.xml b/.idea/libraries/wfd_0_0_0.xml new file mode 100644 index 00000000..c9a0b92c --- /dev/null +++ b/.idea/libraries/wfd_0_0_0.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..cbed9f33 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..224dca9e --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/admin/admin.iml b/admin/admin.iml new file mode 100644 index 00000000..100f8a26 --- /dev/null +++ b/admin/admin.iml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/pom.xml b/admin/pom.xml index bd311bbf..22ce27e7 100644 --- a/admin/pom.xml +++ b/admin/pom.xml @@ -4,7 +4,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml @@ -385,7 +385,7 @@ nl.ipo.cds themes - 2.5 + 2.6 pom diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/EmailTekstenController.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/EmailTekstenController.java new file mode 100644 index 00000000..9ab7d8bb --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/EmailTekstenController.java @@ -0,0 +1,61 @@ +package nl.ipo.cds.admin.ba.controller; + +import java.security.Principal; +import java.util.List; + +import nl.ipo.cds.dao.ManagerDao; +import nl.ipo.cds.domain.Thema; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + + +@Controller +public class EmailTekstenController { + + @Autowired + private ManagerDao managerDao; + + @ModelAttribute("roleFunction") + String getRoleFunction(){ + return "beheerder"; + } + + @ModelAttribute("thema") + public Thema populateThema (@PathVariable long themaId, Principal principal) { + final Thema thema = managerDao.getThema(themaId); + return thema; + } + + @RequestMapping(value ="/ba/emailteksten/{themaId}", method = RequestMethod.GET) + public String updateThemaForm(@ModelAttribute Thema thema, Model model, final Principal principal) { + if (thema == null) { + return "redirect:/ba"; + } + + model.addAttribute("updateThemaForm", new ThemaForm (thema)); + final List themas = managerDao.getAllThemas (); + model.addAttribute("themas", themas); + model.addAttribute("thema", thema); + + return "/ba/emailteksten"; + } + + @RequestMapping(value ="/ba/emailteksten/{themaId}", method = RequestMethod.POST) + public String updateThema(@ModelAttribute Thema thema, Model model) { + if (thema == null) { + return "redirect:/ba"; + } + + this.managerDao.update(thema); + model.addAttribute("updateThemaForm", new ThemaForm (thema)); + final List themas = managerDao.getAllThemas (); + model.addAttribute ("themas", themas); + return "redirect:/ba/emailteksten/" + thema.getId(); + } +} diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/TagDatasetController.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/TagDatasetController.java new file mode 100644 index 00000000..2550b4f5 --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/TagDatasetController.java @@ -0,0 +1,114 @@ +package nl.ipo.cds.admin.ba.controller; + +import nl.idgis.commons.jobexecutor.JobCreator; +import nl.ipo.cds.admin.reporting.ReportConfiguration; +import nl.ipo.cds.dao.ManagerDao; +import nl.ipo.cds.dao.TagDao; +import nl.ipo.cds.domain.*; +import nl.ipo.cds.etl.db.annotation.Table; +import nl.ipo.cds.etl.theme.ThemeConfig; +import nl.ipo.cds.etl.theme.ThemeDiscoverer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.ui.Model; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +import javax.inject.Inject; +import javax.validation.Valid; +import java.security.Principal; +import java.util.ArrayList; +import java.util.List; + +@Controller +@RequestMapping("/ba/vaststellen") +public class TagDatasetController { + + @Autowired + private ManagerDao managerDao; + + @Autowired + private TagDao tagDao; + + @Autowired + private ReportConfiguration reportConfiguration; + + @Inject + private ThemeDiscoverer themeDiscoverer; + + @Autowired + private JobCreator jobCreator; + + @RequestMapping(method = RequestMethod.GET) + public String Index(Model model) { + model.addAttribute("themas", getVaststelThemas()); + return "/ba/vaststellen"; + } + + private List getVaststelThemas() { + ArrayList taggableThemes = new ArrayList(); + for (Thema thema : this.managerDao.getAllThemas()) { + if (this.themeDiscoverer.getThemeConfiguration(thema.getNaam()).isTaggable()) { + taggableThemes.add(thema); + } + } + return taggableThemes; + + } + + @Transactional + @RequestMapping(method = RequestMethod.POST) + public String tagTheme(@Valid @ModelAttribute("dto") TagDTO dto, Model model, final Principal principal) { + model.addAttribute("themas", getVaststelThemas()); + + // check if thema is taggable + ThemeConfig themeConfig = themeDiscoverer.getThemeConfiguration(dto.getThema()); + Assert.notNull(themeConfig, "Theme with name " + dto.getThema() + " does not exist."); + if(!themeConfig.isTaggable()){ + model.addAttribute("themaError", "Thema " + themeConfig.getThemeName() + " kan niet worden vastgesteld!"); + return "/ba/vaststellen"; + } + + // check that user is authorized to tag this thema (check typeGebruik and Thema authorisatie) + Gebruiker gebruiker = managerDao.getGebruiker(principal.getName()); + if (!gebruiker.isSuperuser()) { + boolean authorized = false; + Thema thema = managerDao.getThemaByName(dto.getThema()); + List listAuthorisatie = managerDao.getGebruikerThemaAutorisatie(gebruiker); + for (GebruikerThemaAutorisatie gebruikerThemaAutorisatie : listAuthorisatie) { + if (gebruikerThemaAutorisatie.getBronhouderThema().getThema().equals(thema) && + gebruikerThemaAutorisatie.getTypeGebruik().isAllowed(TypeGebruik.VASTSTELLER)) { + authorized = true; + break; // Short-circuit. + } + } + if (!authorized) { + model.addAttribute("authError", "Deze gebruiker heeft niet de rechten om dit thema vast te stellen"); + return "/ba/vaststellen"; + } + } + + // check if there is a job with the same tag already + // Also check in manager.job (joined with manager.etljob) table for a job that has the chosen tag in its parameters + //and does have either one of the following status: CREATED, PREPARED, STARTED. (FINISHED and ABORTED jobs can be ignored). + Table table = themeConfig.getFeatureTypeClass().getAnnotation(Table.class); + Assert.notNull(table, "table Annotation could not be determined for thema " + themeConfig.getFeatureTypeClass()); + if(tagDao.doesTagExist(dto.tagId, table.schema(), table.name())|| tagDao.doesTagJobWithIdExist(dto.getTagId() + , dto.getThema())){ + model.addAttribute("tagIdError", "Het vaststel id " + dto.getTagId()+ " bestaat al!"); + return "/ba/vaststellen"; + } + + final TagJob tagJob = new TagJob(); + tagJob.setTag(dto.getTagId()); + tagJob.setThema(dto.getThema()); + jobCreator.putJob(tagJob); + model.addAttribute("success", "Het thema " + dto.getThema() + " zal worden vastgesteld met id " + dto.getTagId()); + return "/ba/vaststellen"; + + } + +} diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/ThemaForm.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/ThemaForm.java new file mode 100644 index 00000000..5c88882f --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/ThemaForm.java @@ -0,0 +1,36 @@ +package nl.ipo.cds.admin.ba.controller; + +import nl.ipo.cds.domain.Thema; + +public class ThemaForm { + + private Thema thema; + + public ThemaForm(Thema thema){ + this.thema = thema; + } + + public Long getId() { + return this.thema.getId(); + } + + public void setId(Long id) { + this.thema.setId(id); + } + + public String getNaam() { + return this.thema.getNaam(); + } + + public void setNaam(String naam) { + this.thema.setNaam(naam); + } + + public String getEmailteksten() { + return this.thema.getEmailteksten(); + } + + public void setEmailteksten(String emailteksten) { + this.thema.setEmailteksten(emailteksten); + } +} diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/AutorisatieController.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/AutorisatieController.java new file mode 100644 index 00000000..ec5cdee9 --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/AutorisatieController.java @@ -0,0 +1,344 @@ +package nl.ipo.cds.admin.ba.controller.gebruikersbeheer; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.inject.Inject; +import javax.validation.Valid; + +import nl.ipo.cds.admin.ba.controller.gebruikersbeheer.beans.BronhouderThemas; +import nl.ipo.cds.admin.ba.controller.gebruikersbeheer.beans.GebruikerThemas; +import nl.ipo.cds.dao.ManagerDao; +import nl.ipo.cds.domain.Bronhouder; +import nl.ipo.cds.domain.BronhouderThema; +import nl.ipo.cds.domain.Gebruiker; +import nl.ipo.cds.domain.GebruikerThemaAutorisatie; +import nl.ipo.cds.domain.Thema; +import nl.ipo.cds.domain.TypeGebruik; + +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * Controller for displaying and managing the authorization relationships between + * bronhouders and themes and between users and themes. + */ +@Controller +@RequestMapping ("/ba/gebruikersbeheer/autorisatie") +public class AutorisatieController { + + @Inject + private ManagerDao managerDao; + + /** + * Displays authorization between bronhouders and themes. + */ + @RequestMapping (value = "bronhouders", method = RequestMethod.GET) + public String showBronhouderThemaAutorisatie (final Model model) { + model.addAttribute ("bronhouderThemas", getBronhouderThemas ()); + return "/ba/gebruikersbeheer/bronhouder-autorisatie"; + } + + /** + * Displays a form to edit the authorization between a single bronhouder and the available themes. + * Redirects back to {@link AutorisatieController#showBronhouderThemaAutorisatie(Model)} when the + * bronhouder can't be found. + */ + @RequestMapping (value = "bronhouders/{bronhouderId}/edit", method = RequestMethod.GET) + public String showBronhouderThemaAutorisatieForm (final @PathVariable("bronhouderId") long bronhouderId, final Model model) { + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + if (bronhouder == null) { + return "redirect:/ba/gebruikersbeheer/autorisatie/bronhouders"; + } + + model.addAttribute ("bronhouder", bronhouder); + model.addAttribute ("themas", managerDao.getAllThemas ()); + model.addAttribute ("selectedThemas", new HashSet (managerDao.getAllThemas (bronhouder))); + + return "/ba/gebruikersbeheer/bronhouder-autorisatie-edit"; + } + + /** + * Processes the authorization form for a bronhouder. Redirects back to {@link AutorisatieController#showBronhouderThemaAutorisatie(Model)} + * after completing or when the bronhouder can't be found. + */ + @RequestMapping (value = "bronhouders/{bronhouderId}/edit", method = RequestMethod.POST) + @Transactional + public String processBronhouderThemaAutorisatieForm ( + final @PathVariable("bronhouderId") long bronhouderId, + final Model model, + final @Valid IdSet idSet, + final BindingResult bindingResult) { + + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + + // Redirect immediately in case of an error: + if (bronhouder == null || bindingResult.hasErrors ()) { + return "redirect:/ba/gebruikersbeheer/autorisatie/bronhouders"; + } + + final Set ids = idSet.getIds ().keySet (); + final Map bronhouderThemas = new HashMap (); + + // Create a map of BronhouderThemas for convenient lookups: + for (final BronhouderThema bronhouderThema: managerDao.getBronhouderThemas (bronhouder)) { + bronhouderThemas.put (bronhouderThema.getThema ().getId (), bronhouderThema); + } + + // Insert new BronhouderThema instances: + for (final Long id: ids) { + if (bronhouderThemas.containsKey (id)) { + // An entry already exists: remove from the map and skip. + bronhouderThemas.remove (id); + continue; + } + + final Thema thema = managerDao.getThema (id); + if (thema == null) { + continue; + } + + managerDao.create (new BronhouderThema (thema, bronhouder)); + } + + // Remove bronhouder themas that are no longer relevant: + for (final BronhouderThema bronhouderThema: bronhouderThemas.values ()) { + managerDao.delete (bronhouderThema); + } + + return "redirect:/ba/gebruikersbeheer/autorisatie/bronhouders"; + } + + /** + * Displays the authorization between users and themes. + */ + @RequestMapping (value = "gebruikers", method = RequestMethod.GET) + public String showGebruikerThemaAutorisatie (final Model model) { + + model.addAttribute ("gebruikerThemas", getGebruikerThemas ()); + + return "/ba/gebruikersbeheer/gebruiker-autorisatie"; + } + + /** + * Displays a form to edit the authorization between a single user and all available themes. + * Redirects to {@link AutorisatieController#showGebruikerThemaAutorisatie(Model)} if the user + * can't be found. + */ + @RequestMapping (value = "gebruikers/{username}/edit", method = RequestMethod.GET) + public String showGebruikerThemaAutorisatieForm (final @PathVariable("username") String username, final Model model) { + final Gebruiker gebruiker = managerDao.getGebruiker (username); + if (gebruiker == null) { + return "redirect:/ba/gebruikersbeheer/autorisatie/gebruikers"; + } + + model.addAttribute ("gebruiker", gebruiker); + model.addAttribute ("bronhouderThemas", managerDao.getBronhouderThemas ()); + + final Map autorisatie = new HashMap (); + for (final GebruikerThemaAutorisatie gta: managerDao.getGebruikerThemaAutorisatie (gebruiker)) { + autorisatie.put (gta.getBronhouderThema (), gta); + } + + model.addAttribute ("autorisatie", autorisatie); + + return "/ba/gebruikersbeheer/gebruiker-autorisatie-edit"; + } + + /** + * Processes the authorization between a single user and all available themes. + * Redirects to {@link AutorisatieController#showGebruikerThemaAutorisatie(Model)} upon completion or if the user + * can't be found. + */ + @RequestMapping (value = "gebruikers/{username}/edit", method = RequestMethod.POST) + @Transactional + public String processGebruikerThemaAutorisatieForm ( + final @PathVariable("username") String username, + final Model model, + final @Valid AutorisatieMap autorisatieMap, + final BindingResult bindingResult) { + + final Gebruiker gebruiker = managerDao.getGebruiker (username); + + // Redirect back to the list in case of error: + if (gebruiker == null || bindingResult.hasErrors ()) { + return "redirect:/ba/gebruikersbeheer/autorisatie/gebruikers"; + } + + // Delete all current authorization for the user: + final List currentGtas = new ArrayList (managerDao.getGebruikerThemaAutorisatie (gebruiker)); + for (final GebruikerThemaAutorisatie gta: currentGtas) { + managerDao.delete (gta); + } + + // Insert new authorization for the user: + for (final Map.Entry entry: autorisatieMap.getAutorisatie ().entrySet ()) { + if (entry.getValue () == null || entry.getValue ().isEmpty ()) { + continue; + } + + // Decode the typeGebruik value: + final TypeGebruik typeGebruik; + try { + typeGebruik = TypeGebruik.valueOf (entry.getValue ()); + } catch (IllegalArgumentException e) { + continue; + } + + // Decode the ids and locate thema and bronhouder: + final String[] parts = entry.getKey ().split ("\\-"); + if (parts.length != 2) { + continue; + } + + final Bronhouder bronhouder; + final Thema thema; + + try { + bronhouder = managerDao.getBronhouder (Long.parseLong (parts[0])); + thema = managerDao.getThema (Long.parseLong (parts[1])); + } catch (NumberFormatException e) { + continue; + } + + if (bronhouder == null || thema == null) { + continue; + } + + // Locate the appropriate BronhouderThema instance: + final BronhouderThema bronhouderThema = managerDao.getBronhouderThema (bronhouder, thema); + if (bronhouderThema == null) { + continue; + } + + // Create the GebruikerThemaAutorisatie relation: + managerDao.createGebruikerThemaAutorisatie (gebruiker, bronhouderThema, typeGebruik); + } + + return "redirect:/ba/gebruikersbeheer/autorisatie/gebruikers"; + } + + /** + * Combines the list of all users with all {@link GebruikerThemaAutorisatie} associations. + * + * @return A list of {@link GebruikerThemas} instances each containing a user and associated + * {@link GebruikerThemaAutorisatie}'s. + */ + private List getGebruikerThemas () { + final List gebruikers = new ArrayList (managerDao.getAllGebruikers ()); + final List gtas = new ArrayList (managerDao.getGebruikerThemaAutorisatie ()); + + // Sort both lists on gebruikersnaam: + Collections.sort (gebruikers, new Comparator () { + @Override + public int compare (final Gebruiker o1, final Gebruiker o2) { + return o1.getGebruikersnaam ().compareTo (o2.getGebruikersnaam ()); + } + }); + Collections.sort (gtas, new Comparator () { + @Override + public int compare (final GebruikerThemaAutorisatie o1, final GebruikerThemaAutorisatie o2) { + return o1.getGebruiker ().getGebruikersnaam ().compareTo (o2.getGebruiker ().getGebruikersnaam ()); + } + }); + + final Set usernames = new HashSet (); + for (final Gebruiker gebruiker: gebruikers) { + usernames.add (gebruiker.getGebruikersnaam ()); + } + + // Merge the two lists: + int i = 0; + final List result = new ArrayList (); + for (final Gebruiker gebruiker: gebruikers) { + final List gebruikerGtas = new ArrayList (); + + while (i < gtas.size () && !usernames.contains (gtas.get (i).getGebruiker ().getGebruikersnaam ())) { + ++ i; + } + + while (i < gtas.size () && gebruiker.getGebruikersnaam ().equals (gtas.get (i).getGebruiker ().getGebruikersnaam ())) { + gebruikerGtas.add (gtas.get (i)); + ++ i; + } + + result.add (new GebruikerThemas (gebruiker, gebruikerGtas)); + } + + return Collections.unmodifiableList (result); + } + + /** + * Combines the list of all bronhouders with all {@link BronhouderThema} assosications. + * + * @return A list of {@link BronhouderThemas} instances each containing a bronhouder and + * associated {@link Thema}'s. + */ + private List getBronhouderThemas () { + final List bronhouderThemas = managerDao.getBronhouderThemas (); + final List bronhouders = new ArrayList (managerDao.getAllBronhouders ()); + final List result = new ArrayList (); + + // Make sure the bronhouder list is ordered by name: + Collections.sort (bronhouders, new Comparator () { + @Override + public int compare (Bronhouder o1, Bronhouder o2) { + return o1.getNaam ().compareTo (o2.getNaam ()); + } + }); + + int i = 0; + + for (final Bronhouder bronhouder: bronhouders) { + final List themas = new ArrayList (); + + while (i < bronhouderThemas.size () && bronhouderThemas.get (i).getBronhouder ().getId ().equals (bronhouder.getId ())) { + themas.add (bronhouderThemas.get (i).getThema ()); + ++ i; + } + + result.add (new BronhouderThemas (bronhouder, themas)); + } + + return Collections.unmodifiableList (result); + } + + private static class IdSet { + @Valid + private Map ids = new HashMap (); + + public Map getIds () { + return ids; + } + + @SuppressWarnings("unused") + public void setIds (final Map ids) { + this.ids = ids; + } + } + + private static class AutorisatieMap { + @Valid + private Map autorisatie = new HashMap (); + + public Map getAutorisatie () { + return autorisatie; + } + + @SuppressWarnings("unused") + public void setAutorisatie (final Map autorisatie) { + this.autorisatie = autorisatie; + } + } +} \ No newline at end of file diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/BronhouderController.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/BronhouderController.java new file mode 100644 index 00000000..13858a55 --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/BronhouderController.java @@ -0,0 +1,228 @@ +package nl.ipo.cds.admin.ba.controller.gebruikersbeheer; + +import java.util.List; + +import javax.inject.Inject; +import javax.validation.Valid; + +import nl.ipo.cds.admin.ba.controller.gebruikersbeheer.beans.BronhouderForm; +import nl.ipo.cds.dao.ManagerDao; +import nl.ipo.cds.domain.Bronhouder; +import nl.ipo.cds.domain.Dataset; + +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; + +/** + * Controller to support CRUD operations on "Bronhouders" in the admin. + */ +@Controller +@RequestMapping ("/ba/gebruikersbeheer/bronhouders") +public final class BronhouderController { + + @Inject + private ManagerDao managerDao; + + /** + * Index page: lists bronhouders. + */ + @RequestMapping (method = RequestMethod.GET) + public String listBronhouders (final Model model) { + final List bronhouders = managerDao.getAllBronhouders (); + + model.addAttribute ("bronhouders", bronhouders); + + return "/ba/gebruikersbeheer/bronhouders"; + } + + /** + * Displays the form for creating a new bronhouder. + */ + @RequestMapping (value = "/-/create", method = RequestMethod.GET) + public String createBronhouderForm (final Model model) { + model.addAttribute ("bronhouderForm", new BronhouderForm ()); + return "/ba/gebruikersbeheer/edit-bronhouder"; + } + + /** + * Processes a POST of the create bronhouder form. + */ + @RequestMapping (value = "/-/create", method = RequestMethod.POST) + @Transactional + public String processCreateBronhouderForm ( + final @Valid BronhouderForm bronhouderForm, + final BindingResult bindingResult, + final Model model) { + + // Run additional validations: + validateBronhouderForm (bindingResult, null); + + // Show the form again if it has errors: + if (bindingResult.hasErrors ()) { + return "/ba/gebruikersbeheer/edit-bronhouder"; + } + + // Save the bronhouder: + managerDao.create (copyBronhouderForm (bronhouderForm, new Bronhouder ())); + + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + /** + * Displays the form for editing bronhouders. + * + * @param bronhouderId The ID of the bronhouder to edit. + */ + @RequestMapping (value = "/{bronhouderId}/edit", method = RequestMethod.GET) + public String editBronhouderForm (final @PathVariable("bronhouderId") long bronhouderId, final Model model) { + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + if (bronhouder == null) { + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + model.addAttribute ("bronhouderForm", new BronhouderForm (bronhouder)); + + return "/ba/gebruikersbeheer/edit-bronhouder"; + } + + /** + * Processes a POST of the bronhouder edit form. + * + * @param bronhouderId The ID of the bronhouder to save. + */ + @RequestMapping (value = "/{bronhouderId}/edit", method = RequestMethod.POST) + @Transactional + public String processEditBronhouderForm ( + final @PathVariable ("bronhouderId") long bronhouderId, + final @Valid BronhouderForm bronhouderForm, + final BindingResult bindingResult) { + + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + if (bronhouder == null) { + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + // Run additional validations on the bronhouder form: + validateBronhouderForm (bindingResult, bronhouder); + + // Display the form again in case of errors: + if (bindingResult.hasErrors ()) { + return "/ba/gebruikersbeheer/edit-bronhouder"; + } + + // Save the bronhouder: + managerDao.update (copyBronhouderForm (bronhouderForm, bronhouder)); + + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + /** + * Displays the form for deleting a bronhouder. + * + * @param bronhouderId The ID of the bronhouder to delete. + */ + @RequestMapping (value = "/{bronhouderId}/delete", method = RequestMethod.GET) + public String deleteBronhouderForm (final @PathVariable("bronhouderId") long bronhouderId, final Model model) { + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + if (bronhouder == null) { + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + // Test whether the bronhouder can be deleted: + model.addAttribute ("bronhouderDatasets", managerDao.getDatasetsByBronhouder (bronhouder)); + model.addAttribute ("bronhouder", bronhouder); + + return "/ba/gebruikersbeheer/delete-bronhouder"; + } + + /** + * Processes a POST of the bronhouder delete form. + * + * @param bronhouderId + */ + @RequestMapping (value = "/{bronhouderId}/delete", method = RequestMethod.POST) + @Transactional + public String processDeleteBronhouderForm (final @PathVariable("bronhouderId") long bronhouderId, final Model model) { + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + if (bronhouder == null) { + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + final List bronhouderDatasets = managerDao.getDatasetsByBronhouder (bronhouder); + if (!bronhouderDatasets.isEmpty ()) { + model.addAttribute ("bronhouderDatasets", bronhouderDatasets); + model.addAttribute ("bronhouder", bronhouder); + return "/ba/gebruikersbeheer/delete-bronhouder"; + } + + // Delete the bronhouder and related jobs: + managerDao.delete (bronhouder); + + return "redirect:/ba/gebruikersbeheer/bronhouders"; + } + + /** + * Peforms additional validations on the given form that are not easily tested using validation + * annotations. Checks for uniqueness of the code, name and common name properties. + * + * Properties that have errors are rejected on the binding result. + * + * @param bindingResult The binding result that contains the current (unvalidated) values of the form. + * @param bronhouder The original bronhouder, or null if there is no original (in case of a create action). + */ + private void validateBronhouderForm (final BindingResult bindingResult, final Bronhouder bronhouder) { + final String code = (String) bindingResult.getFieldValue ("code"); + final String naam = (String) bindingResult.getFieldValue ("naam"); + final String commonName = (String) bindingResult.getFieldValue ("commonName"); + + // Check the code for uniqueness: + if (code != null && !code.isEmpty ()) { + final Bronhouder duplicateCode = managerDao.getBronhouderByCode (code); + if (duplicateCode != null && !(bronhouder != null && bronhouder.getId ().equals (duplicateCode.getId ()))) { + bindingResult.rejectValue ("code", "CODE_DUPLICATE", String.format ("De code %s is al in gebruik bij een andere bronhouder", code)); + } + } + + // Check the name for uniqueness: + if (naam != null && !naam.isEmpty ()) { + final Bronhouder duplicateNaam = managerDao.getBronhouderByNaam (naam); + if (duplicateNaam != null && !(bronhouder != null && bronhouder.getId ().equals (duplicateNaam.getId ()))) { + bindingResult.rejectValue ("naam", "NAAM_DUPLICATE", String.format ("De naam %s is al in gebruik bij een andere bronhouder", naam)); + } + } + + // Check the common name for uniqueness: + if (commonName != null && !commonName.isEmpty ()) { + final Bronhouder duplicateCommonName = managerDao.getBronhouderByCommonName (commonName); + if (duplicateCommonName != null && !(bronhouder != null && bronhouder.getId ().equals (duplicateCommonName.getId ()))) { + bindingResult.rejectValue ("commonName", "COMMON_NAME_DUPLICATE", String.format ("De identificatie %s is al in gebruik bij een andere bronhouder", commonName)); + } + } + } + + /** + * Copies the properties of the given form to the given bronhouder instance. + * + * @param form The source form. + * @param bronhouder The destination bronhouder. + * @return The destination bronhouder. + */ + private Bronhouder copyBronhouderForm (final BronhouderForm form, final Bronhouder bronhouder) { + bronhouder.setCode (form.getCode ()); + bronhouder.setCommonName (form.getCommonName ()); + bronhouder.setContactAdres (form.getContactAdres ()); + bronhouder.setContactEmailadres (form.getContactEmailadres ()); + bronhouder.setContactNaam (form.getContactNaam ()); + bronhouder.setContactPlaats (form.getContactPlaats ()); + bronhouder.setContactPostcode (form.getContactPostcode ()); + bronhouder.setContactTelefoonnummer (form.getContactTelefoonnummer ()); + bronhouder.setNaam (form.getNaam ()); + + return bronhouder; + } +} \ No newline at end of file diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/BronhouderForm.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/BronhouderForm.java new file mode 100644 index 00000000..2845530c --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/BronhouderForm.java @@ -0,0 +1,154 @@ +package nl.ipo.cds.admin.ba.controller.gebruikersbeheer.beans; + +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + +import org.hibernate.validator.constraints.Email; + +import nl.ipo.cds.domain.Bronhouder; + +/** + * Form bean class for editing "bronhouders". Contains the editable properties of the {@link Bronhouder} + * class and adds validation constraints. + */ +public class BronhouderForm { + + @NotNull(message = "Er moet een code worden ingevuld voor deze bronhouder") + @Size (min = 1, message = "De code dient uit tenminste 1 karakter te bestaan") + @Pattern (regexp = "[a-z0-9\\-_]+", flags = Pattern.Flag.CASE_INSENSITIVE, message = "De code dient te bestaan uit een combinatie van letters, cijfers, - en _") + private String code = ""; + + @NotNull(message = "Er dient een bronhoudernaam ingevuld te worden") + @Size (min = 2, message = "De bronhoudernaam dient uit tenminste 2 karakters te bestaan") + private String naam = ""; + + private String contactNaam; + + private String contactAdres; + + private String contactPlaats; + + private String contactPostcode; + + private String contactTelefoonnummer; + + @Email + private String contactEmailadres; + + @Email + private String contactExtraEmailadres; + + @NotNull(message = "Er dient een unieke identificatie voor de bronhouder te worden ingevuld") + @Size (min = 2, message = "De identificatie dient uit tenminste 2 karakters te bestaan") + @Pattern (regexp = "[a-z0-9\\-_]+", flags = Pattern.Flag.CASE_INSENSITIVE, message = "De identificatie dient te bestaan uit een combinatie van letters, cijfers, - en _") + private String commonName = ""; + + /** + * Creates a new, empty, bronhouder form. + */ + public BronhouderForm () { + } + + /** + * Creates a new bronhouder form by copying the properties of the given existing bronhouder. + * + * @param bronhouder The bronhouder whose properties are to be copied. + */ + public BronhouderForm (final Bronhouder bronhouder) { + if (bronhouder == null) { + throw new NullPointerException ("bronhouder cannot be null"); + } + + setCode (bronhouder.getCode ()); + setNaam (bronhouder.getNaam ()); + setCommonName (bronhouder.getCommonName ()); + setContactNaam (bronhouder.getContactNaam ()); + setContactAdres (bronhouder.getContactAdres ()); + setContactPlaats (bronhouder.getContactPlaats ()); + setContactPostcode (bronhouder.getContactPostcode ()); + setContactTelefoonnummer (bronhouder.getContactTelefoonnummer ()); + setContactEmailadres (bronhouder.getContactEmailadres ()); + setContactExtraEmailadres(bronhouder.getContactExtraEmailadres ()); + } + + public String getCode () { + return code; + } + + public void setCode (final String code) { + this.code = code; + } + + public String getNaam () { + return naam; + } + + public void setNaam (final String naam) { + this.naam = naam; + } + + public String getContactNaam () { + return contactNaam; + } + + public void setContactNaam (final String contactNaam) { + this.contactNaam = contactNaam; + } + + public String getContactAdres () { + return contactAdres; + } + + public void setContactAdres (final String contactAdres) { + this.contactAdres = contactAdres; + } + + public String getContactPlaats () { + return contactPlaats; + } + + public void setContactPlaats (final String contactPlaats) { + this.contactPlaats = contactPlaats; + } + + public String getContactPostcode () { + return contactPostcode; + } + + public void setContactPostcode (final String contactPostcode) { + this.contactPostcode = contactPostcode; + } + + public String getContactTelefoonnummer () { + return contactTelefoonnummer; + } + + public void setContactTelefoonnummer (final String contactTelefoonnummer) { + this.contactTelefoonnummer = contactTelefoonnummer; + } + + public String getContactEmailadres () { + return contactEmailadres; + } + + public void setContactEmailadres (final String contactEmailadres) { + this.contactEmailadres = contactEmailadres; + } + + public String getCommonName() { + return commonName; + } + + public void setCommonName(String commonName) { + this.commonName = commonName; + } + + public String getContactExtraEmailadres() { + return contactExtraEmailadres; + } + + public void setContactExtraEmailadres(String contactExtraEmailadres) { + this.contactExtraEmailadres = contactExtraEmailadres; + } +} diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/BronhouderThemas.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/BronhouderThemas.java new file mode 100644 index 00000000..b586ef0a --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/BronhouderThemas.java @@ -0,0 +1,44 @@ +package nl.ipo.cds.admin.ba.controller.gebruikersbeheer.beans; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import nl.ipo.cds.domain.Bronhouder; +import nl.ipo.cds.domain.Thema; + +/** + * Container bean for a bronhouder and associated themas (from the BronhouderThema entity). + */ +public class BronhouderThemas { + private final Bronhouder bronhouder; + private final List themas; + + /** + * @param bronhouder The bronhouder. + * @param themas All themes that are associated with the bronhouder. + */ + public BronhouderThemas (final Bronhouder bronhouder, final List themas) { + if (bronhouder == null) { + throw new NullPointerException ("bronhouder cannot be null"); + } + + this.bronhouder = bronhouder; + this.themas = themas == null || themas.isEmpty () ? Collections.emptyList () : new ArrayList (themas); + } + + /** + * @return The bronhouder + */ + public Bronhouder getBronhouder () { + return bronhouder; + } + + /** + * + * @return All themes associated with the bronhouder. + */ + public List getThemas () { + return Collections.unmodifiableList (themas); + } +} diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/GebruikerThemas.java b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/GebruikerThemas.java new file mode 100644 index 00000000..50c21527 --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/controller/gebruikersbeheer/beans/GebruikerThemas.java @@ -0,0 +1,53 @@ +package nl.ipo.cds.admin.ba.controller.gebruikersbeheer.beans; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import nl.ipo.cds.domain.Gebruiker; +import nl.ipo.cds.domain.GebruikerThemaAutorisatie; + +/** + * Container bean for {@link Gebruiker} and an associated list of {@link GebruikerThemaAutorisatie} for that user. Represents + * the themes that the given user is authorized to use, and the permissions that apply. + * Used to pass data between controller and view. + */ +public final class GebruikerThemas { + + private final Gebruiker gebruiker; + private final List gebruikerThemas; + + /** + * Constructs a new GebruikerThemas by providing a user and associated authorization of that user on themes. + * + * @param gebruiker + * @param bronhouderThemas + */ + public GebruikerThemas (final Gebruiker gebruiker, final List gebruikerThemas) { + if (gebruiker == null) { + throw new NullPointerException ("gebruiker cannot be null"); + } + + this.gebruiker = gebruiker; + this.gebruikerThemas = gebruikerThemas == null || gebruikerThemas.isEmpty () ? Collections.emptyList () : new ArrayList (gebruikerThemas); + } + + /** + * Returns the user. + * + * @return The user for which this object containts the authorization. + */ + public Gebruiker getGebruiker () { + return gebruiker; + } + + /** + * Returns the list of {@link GebruikerThemaAutorisatie} describing the authorization of + * this user. + * + * @return The authorization for this user. + */ + public List getGebruikerThemas () { + return Collections.unmodifiableList (gebruikerThemas); + } +} diff --git a/admin/src/main/java/nl/ipo/cds/admin/ba/util/GebruikerAuthorization.java b/admin/src/main/java/nl/ipo/cds/admin/ba/util/GebruikerAuthorization.java new file mode 100644 index 00000000..16beecaa --- /dev/null +++ b/admin/src/main/java/nl/ipo/cds/admin/ba/util/GebruikerAuthorization.java @@ -0,0 +1,220 @@ +package nl.ipo.cds.admin.ba.util; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.SortedSet; +import java.util.TreeSet; + +import nl.ipo.cds.dao.ManagerDao; +import nl.ipo.cds.domain.Bronhouder; +import nl.ipo.cds.domain.Gebruiker; +import nl.ipo.cds.domain.GebruikerThemaAutorisatie; +import nl.ipo.cds.domain.Thema; +import nl.ipo.cds.domain.TypeGebruik; + +/** + * Utility class to fetch various properties of the given user: authorized bronhouders, authorized + * themes, etc. + */ +public class GebruikerAuthorization { + + private final Gebruiker gebruiker; + private final TypeGebruik typeGebruik; + private final ManagerDao managerDao; + + public GebruikerAuthorization (final Gebruiker gebruiker, final TypeGebruik typeGebruik, final ManagerDao managerDao) { + if (gebruiker == null) { + throw new NullPointerException ("gebruiker cannot be null"); + } + if (typeGebruik == null) { + throw new NullPointerException ("typeGebruik cannot be null"); + } + if (managerDao == null) { + throw new NullPointerException ("managerDao cannot be null"); + } + + this.gebruiker = gebruiker; + this.typeGebruik = typeGebruik; + this.managerDao = managerDao; + } + + /** + * Returns the user in this GebruikerAuthorization. + * + * @return The user. + */ + public Gebruiker getGebruiker () { + return gebruiker; + } + + /** + * Returns all bronhouders for which this user has the given permissions. + * + * @return An ordered collection of all bronhouders matching the given permission. Ordered by name. + */ + public Collection getAuthorizedBronhouders () { + final SortedSet authorizedBronhouders = new TreeSet (new Comparator () { + @Override + public int compare (final Bronhouder o1, final Bronhouder o2) { + return o1.getNaam ().compareTo (o2.getNaam ()); + } + }); + + // Superusers always have access to all bronhouders: + if (gebruiker.isSuperuser ()) { + authorizedBronhouders.addAll (managerDao.getAllBronhouders ()); + return Collections.unmodifiableCollection (authorizedBronhouders); + } + + // Lookup authorized bronhouders: + for (final GebruikerThemaAutorisatie gta: managerDao.getGebruikerThemaAutorisatie (gebruiker)) { + if (!gta.getTypeGebruik ().isAllowed (typeGebruik)) { + continue; + } + + authorizedBronhouders.add (gta.getBronhouderThema ().getBronhouder ()); + } + + return Collections.unmodifiableCollection (authorizedBronhouders); + } + + /** + * Returns all themes for which this user has the given permission. + * + * @return An ordered collection of all bronhouders matching the given permission. Ordered by name. + */ + public Collection getAuthorizedThemas () { + final SortedSet authorizedThemes = new TreeSet (new Comparator () { + @Override + public int compare (final Thema o1, final Thema o2) { + return o1.getNaam ().compareTo (o2.getNaam ()); + } + }); + + // Superusers have access to all themes: + if (gebruiker.isSuperuser ()) { + authorizedThemes.addAll (managerDao.getAllThemas ()); + return Collections.unmodifiableCollection (authorizedThemes); + } + + // Locate authorized themes: + for (final GebruikerThemaAutorisatie gta: managerDao.getGebruikerThemaAutorisatie (gebruiker)) { + if (!gta.getTypeGebruik ().isAllowed (typeGebruik)) { + continue; + } + + authorizedThemes.add (gta.getBronhouderThema ().getThema ()); + } + + return Collections.unmodifiableCollection (authorizedThemes); + } + + /** + * Looks up the bronhouder identified by the given ID and returns it if it + * exists and if the user has permissions to use it. If the user has no permissions, + * a default bronhouder is returned. If that doesn't exist, null is returned. + * + * @param bronhouderId The ID of the bronhouder, or null. + * @return The bronhouder, or null if it doesn't exist or if the user has no permissions. + */ + public Bronhouder getAuthorizedBronhouder (final Long bronhouderId) { + final Collection authorizedBronhouders = getAuthorizedBronhouders (); + final Bronhouder defaultBronhouder = authorizedBronhouders.isEmpty () ? null : authorizedBronhouders.iterator ().next (); + + if (bronhouderId == null) { + return defaultBronhouder; + } + + final Bronhouder bronhouder = managerDao.getBronhouder (bronhouderId); + if (bronhouder == null) { + return defaultBronhouder; + } + + // Test whether the user is authorized for this bronhouder: + if (gebruiker.isSuperuser ()) { + return bronhouder; + } + + return authorizedBronhouders.contains (bronhouder) ? bronhouder : defaultBronhouder; + } + + /** + * Looks up the theme identified by the given ID and returns it if it exists + * and if the user has permissions to use it. + * + * @param themaId The ID of the theme, or null. + * @return The theme, or null if it doesn't exist or if the user has no permissions. + */ + public Thema getAuthorizedThema (final Long themaId) { + final Collection authorizedThemas = getAuthorizedThemas (); + final Thema defaultThema = authorizedThemas.isEmpty () ? null : authorizedThemas.iterator ().next (); + + if (themaId == null) { + return defaultThema; + } + + final Thema thema = managerDao.getThema (themaId); + if (thema == null) { + return defaultThema; + } + + // Test whether the user is authorized for this theme: + if (gebruiker.isSuperuser ()) { + return thema; + } + + return getAuthorizedThemas ().contains (thema) ? thema : null; + } + + /** + * Returns a list of all authorized themes for the current user that are associated with the given + * bronhouder. + * + * @param bronhouder The bronhouder instance to use as a filter. + * @return A collection of authorized themes, associated with the given bronhouder. + */ + public Collection getAuthorizedThemas (final Bronhouder bronhouder) { + // Superusers have access to all themes linked to the given bronhouder: + if (gebruiker.isSuperuser ()) { + return Collections.unmodifiableCollection (managerDao.getAllThemas (bronhouder)); + } + + final List result = new ArrayList (); + + for (final GebruikerThemaAutorisatie gta: managerDao.getGebruikerThemaAutorisatie (bronhouder)) { + if (gta.getGebruiker ().getGebruikersnaam ().equals (getGebruiker ().getGebruikersnaam ()) && gta.getTypeGebruik ().isAllowed (typeGebruik)) { + result.add (gta.getBronhouderThema ().getThema ()); + } + } + + return Collections.unmodifiableCollection (result); + } + + /** + * Returns a specific theme identified by themeName and associated with bronhouder, for which the current + * user has permissions. + * + * @param themaName The theme name to use as a filter, or null. + * @param bronhouder The bronhouder to use as a filter. + * @return The theme identified by name, or the default theme, or null if there are no themes. + */ + public Thema getAuthorizedThemaByName (final String themaName, final Bronhouder bronhouder) { + final Collection authorizedThemas = getAuthorizedThemas (bronhouder); + final Thema defaultTheme = authorizedThemas.isEmpty () ? null : authorizedThemas.iterator ().next (); + + if (themaName == null) { + return defaultTheme; + } + + for (final Thema thema: authorizedThemas) { + if (thema.getNaam ().equals (themaName)) { + return thema; + } + } + + return defaultTheme; + } +} diff --git a/admin/src/main/main20.iml b/admin/src/main/main20.iml new file mode 100644 index 00000000..fe8b9cd5 --- /dev/null +++ b/admin/src/main/main20.iml @@ -0,0 +1,41 @@ + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/admin/admin-securityContext.xml + file://$MODULE_DIR$/resources/nl/ipo/cds/admin/admin-applicationContext.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/webapp/TR.html b/admin/src/main/webapp/TR.html new file mode 100644 index 00000000..4a09ead2 --- /dev/null +++ b/admin/src/main/webapp/TR.html @@ -0,0 +1,108 @@ + + +AWStats Themes + + + + + + +
+
+ + + + + + + + + + + + \ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/emailteksten.vm b/admin/src/main/webapp/WEB-INF/views/ba/emailteksten.vm new file mode 100644 index 00000000..19e0f8eb --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/emailteksten.vm @@ -0,0 +1,119 @@ +#set($layerName='emailteksten') +#set($title = 'Thema - ' + $thema.naam) + +
+ + + + + +
+ + + +

+ + + + + + + + + + + + + + + + + + + +
Email teksten #e($updateThemaForm.naam)
+ +
Toegestane velden: [DATUM/TIJD],[NAAM-DATASET],[BRONHOUDER],[TYPE],[THEMA],[NAW],[URL]
+
+ +
+ 		+
+ +
+
+ +
+ + \ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouder-autorisatie-edit.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouder-autorisatie-edit.vm new file mode 100644 index 00000000..737058b7 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouder-autorisatie-edit.vm @@ -0,0 +1,39 @@ +#set($viewName = '_ba_gebruikersbeheer_gebruikers') + +
+ + + + + + + + + #foreach($thema in $themas) + + + + #end + + + + + + +
+ Beschikbare thema's voor bronhouder #e($bronhouder.naam) +
+ +
+
+ + +
+
+ +
+ +#cancelButtonScript() \ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouder-autorisatie.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouder-autorisatie.vm new file mode 100644 index 00000000..7fe5cca7 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouder-autorisatie.vm @@ -0,0 +1,47 @@ +#set($viewName = '_ba_gebruikersbeheer_gebruikers') + +
+ + +
+ + + + + + + + + + #foreach($bronhouderThema in $bronhouderThemas) + + + + #end + +
BronhouderThema's
+ + #e($bronhouderThema.bronhouder.naam) + + +
    + #foreach ($thema in $bronhouderThema.themas) +
  • #e($thema.naam)
    • + #end +
+
+
+
\ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouders.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouders.vm new file mode 100644 index 00000000..5d43e737 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/bronhouders.vm @@ -0,0 +1,66 @@ +#set($viewName = '_ba_gebruikersbeheer_gebruikers') + +
+ + +
+ +

+ #buttonLink('Nieuwe bronhouder toevoegen', "#springUrl('/ba/gebruikersbeheer/bronhouders/-/create')") +

+ + + + + + + + + + + + + + + + + + + #foreach($bronhouder in $bronhouders) + + + + + + + #end + +
NaamCodeContactgegevensActies
+ #e($bronhouders.size()) bronhouder#if($bronhouders.size() != 1)s#end gevonden +
#e($bronhouder.naam)#if($bronhouder.core) - #else #e($bronhouder.code) #end +
+ #if($bronhouder.contactNaam)#e($bronhouder.contactNaam)
#end + #if($bronhouder.contactAdres)#e($bronhouder.contactAdres)
#end + #if($bronhouder.contactPostcode)#e($bronhouder.contactPostcode) #end #if($bronhouder.contactPlaats)#e($bronhouder.contactPlaats) #end + #e($bronhouder.contactEmailadres) +
+ 		+ #buttonLink("Bewerken", "#springUrl('/ba/gebruikersbeheer/bronhouders/')$bronhouder.id/edit") + #buttonLink("Verwijderen", "#springUrl('/ba/gebruikersbeheer/bronhouders/')$bronhouder.id/delete") +
+ +
+
\ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/delete-bronhouder.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/delete-bronhouder.vm new file mode 100644 index 00000000..081c15e9 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/delete-bronhouder.vm @@ -0,0 +1,43 @@ +

Bronhouder verwijderen: #e($bronhouder.naam)

+ +#if(!$bronhouderDatasets.isEmpty()) +

+ De bronhouder kan niet worden verwijderd omdat deze nog is gekoppeld aan de volgende datasets: +

+
    + #foreach($dataset in $bronhouderDatasets) +
  • + #e($dataset.datasetType.thema.naam): #e($dataset.datasetType.naam) + #if($dataset.naam && !$dataset.naam.isEmpty()) + (#e($dataset.naam)) + #end +
    • + #end +
+ +

+ Deze datasets dienen eerst verwijderd te worden voordat de bronhouder kan worden verwijderd. +

+#else +
+

+ Bij het verwijderen van een bronhouder worden de volgende gerelateerde zaken ook verwijderd: +

+
    +
  • Geometrie behorende bij de bronhouder
    • +
  • Koppelingen tussen deze bronhouder en thema's
    • +
  • Resultaten van valideer- en importeertaken behorende bij deze bronhouder
    • +
  • Autorisatie tussen gebruikers en deze bronhouder
    • +
+

+ Druk op verwijderen om deze bronhouder en bovengenoemde gegevens definitief te verwijderen. +

+ +

+ + +

+
+ + #cancelButtonScript() +#end \ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/edit-bronhouder.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/edit-bronhouder.vm new file mode 100644 index 00000000..1e062454 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/edit-bronhouder.vm @@ -0,0 +1,119 @@ + +
+ + + + + + + + #springBind("bronhouderForm") + #if($status.errors.hasErrors()) + + + + #end + + #springBind("bronhouderForm.naam") + + + + + + #springBind("bronhouderForm.code") + + + + + + #springBind("bronhouderForm.commonName") + + + + + + #springBind("bronhouderForm.contactNaam") + + + + + + #springBind("bronhouderForm.contactAdres") + + + + + + #springBind("bronhouderForm.contactPostcode") + + + + + + #springBind("bronhouderForm.contactPlaats") + + + + + + #springBind("bronhouderForm.contactEmailadres") + + + + + + #springBind("bronhouderForm.contactTelefoonnummer") + + + + + + + + + + +
+ #if($bronhouderId) + Gegevens bewerken voor bronhouder #e($bronhouder.naam) + #else + Nieuwe bronhouder toevoegen + #end +
+ De bronhouder kon niet worden opgeslagen omdat niet alle velden juist zijn ingevuld. +
Bronhoudernaam + + #errors($status) +
Bronhoudercode + + #errors($status) +
Identificatie + + #errors($status) +
Contactpersoon naam + + #errors($status) +
Contactpersoon adres + + #errors($status) +
Contactpersoon postcode + + #errors($status) +
Contactpersoon plaats + + #errors($status) +
Contactpersoon e-mail + + #errors($status) +
Contactpersoon telefoonnummer + + #errors($status) +
+
+ + +
+
+
+ +#cancelButtonScript() \ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/gebruiker-autorisatie-edit.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/gebruiker-autorisatie-edit.vm new file mode 100644 index 00000000..acf9c872 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/gebruiker-autorisatie-edit.vm @@ -0,0 +1,56 @@ +#set($viewName = '_ba_gebruikersbeheer_gebruikers') + +
+ + + + + + + + + + + #foreach($bronhouderThema in $bronhouderThemas) + + + + + + #end + + + + + + +
+ Bronhouder + + Thema + + Autorisatie +
+ #if($autorisatie.containsKey($bronhouderThema))#end + #e($bronhouderThema.bronhouder.naam) + #if($autorisatie.containsKey($bronhouderThema))#end + + #if($autorisatie.containsKey($bronhouderThema))#end + #e($bronhouderThema.thema.naam) + #if($autorisatie.containsKey($bronhouderThema))#end + + +
+
+ + +
+
+
+ +#cancelButtonScript() \ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/gebruiker-autorisatie.vm b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/gebruiker-autorisatie.vm new file mode 100644 index 00000000..e7d12672 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/gebruikersbeheer/gebruiker-autorisatie.vm @@ -0,0 +1,57 @@ +#set($viewName = '_ba_gebruikersbeheer_gebruikers') + +
+ + +
+ + + + + + + + + + #foreach($gtas in $gebruikerThemas) + + + + + #end + +
GebruikerAutorisatie op thema's
+ + #e($gtas.gebruiker.gebruikersnaam) + + + #if(!$gtas.gebruikerThemas.isEmpty()) +
    + #foreach($gta in $gtas.gebruikerThemas) +
  • + #e($gta.bronhouderThema.thema.naam) voor bronhouder #e($gta.bronhouderThema.bronhouder.naam): #e($gta.typeGebruik) +
    • + #end +
+ #else + (geen) + #end +
+
    +
+ +
+
\ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/ba/vaststellen.vm b/admin/src/main/webapp/WEB-INF/views/ba/vaststellen.vm new file mode 100644 index 00000000..1c410156 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/ba/vaststellen.vm @@ -0,0 +1,51 @@ +#set($layerName='vaststellen') + + +
+ +
+ #if($tagIdError) #e($tagIdError) #end + #if($themaError) #e($themaError) #end + #if($authError) #e($authError) #end +
+
+ #if($success) #e($success) #end +
+ +
+ + + + +        + + +
+ +
+
\ No newline at end of file diff --git a/admin/src/main/webapp/WEB-INF/views/no-access.vm b/admin/src/main/webapp/WEB-INF/views/no-access.vm new file mode 100644 index 00000000..7feacef9 --- /dev/null +++ b/admin/src/main/webapp/WEB-INF/views/no-access.vm @@ -0,0 +1,5 @@ +#set($showTabs = false) + +

+ U bent aangemeld bij de Centrale Data- en Services. Vanaf deze pagina kun u uw wachtwoord wijzigen middels bovenstaande link. +

\ No newline at end of file diff --git a/admin/src/test/test9.iml b/admin/src/test/test9.iml new file mode 100644 index 00000000..9d8516c2 --- /dev/null +++ b/admin/src/test/test9.iml @@ -0,0 +1,26 @@ + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/admin/ba/controller/admin-applicationContext-test.xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/attributemapping/attributemapping.iml b/attributemapping/attributemapping.iml new file mode 100644 index 00000000..ddec82bc --- /dev/null +++ b/attributemapping/attributemapping.iml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/attributemapping/pom.xml b/attributemapping/pom.xml index c663fb65..c10fec91 100644 --- a/attributemapping/pom.xml +++ b/attributemapping/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 attributemapping CDS Inspire - Attributemapping diff --git a/attributemapping/src/main/main25.iml b/attributemapping/src/main/main25.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/attributemapping/src/main/main25.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/attributemapping/src/test/test3.iml b/attributemapping/src/test/test3.iml new file mode 100644 index 00000000..171174aa --- /dev/null +++ b/attributemapping/src/test/test3.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-metadata/catalog-metadata.iml b/catalog-metadata/catalog-metadata.iml new file mode 100644 index 00000000..eb3b2ad9 --- /dev/null +++ b/catalog-metadata/catalog-metadata.iml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-metadata/pom.xml b/catalog-metadata/pom.xml index 50b3d2ef..2fd11dc6 100644 --- a/catalog-metadata/pom.xml +++ b/catalog-metadata/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 catalog-metadata diff --git a/catalog-metadata/src/main/main1.iml b/catalog-metadata/src/main/main1.iml new file mode 100644 index 00000000..d724191e --- /dev/null +++ b/catalog-metadata/src/main/main1.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-metadata/src/test/test18.iml b/catalog-metadata/src/test/test18.iml new file mode 100644 index 00000000..68bef2a9 --- /dev/null +++ b/catalog-metadata/src/test/test18.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/cds-deegree-extension/cds-deegree-extension.iml b/cds-deegree-extension/cds-deegree-extension.iml new file mode 100644 index 00000000..1c294980 --- /dev/null +++ b/cds-deegree-extension/cds-deegree-extension.iml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cds-deegree-extension/pom.xml b/cds-deegree-extension/pom.xml index d41ae9e5..1c347a89 100644 --- a/cds-deegree-extension/pom.xml +++ b/cds-deegree-extension/pom.xml @@ -4,7 +4,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 cds-deegree-extension diff --git a/cds-deegree-extension/src/main/main27.iml b/cds-deegree-extension/src/main/main27.iml new file mode 100644 index 00000000..16277980 --- /dev/null +++ b/cds-deegree-extension/src/main/main27.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cds-parent.iml b/cds-parent.iml new file mode 100644 index 00000000..aa5a7423 --- /dev/null +++ b/cds-parent.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cds-test/cds-test.iml b/cds-test/cds-test.iml new file mode 100644 index 00000000..9cd58ad5 --- /dev/null +++ b/cds-test/cds-test.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cds-test/pom.xml b/cds-test/pom.xml index b80bed1e..eb6fff95 100644 --- a/cds-test/pom.xml +++ b/cds-test/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 cds-test diff --git a/cds-test/src/main/main5.iml b/cds-test/src/main/main5.iml new file mode 100644 index 00000000..a6e1176f --- /dev/null +++ b/cds-test/src/main/main5.iml @@ -0,0 +1,25 @@ + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/webservices/webservices-applicationContext.xml + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cds-test/src/test/test19.iml b/cds-test/src/test/test19.iml new file mode 100644 index 00000000..a0e49a3b --- /dev/null +++ b/cds-test/src/test/test19.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/commons/commons.iml b/commons/commons.iml new file mode 100644 index 00000000..28a4cdbf --- /dev/null +++ b/commons/commons.iml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/commons/pom.xml b/commons/pom.xml index 6fc601ac..ed313547 100644 --- a/commons/pom.xml +++ b/commons/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml commons diff --git a/commons/src/main/java/nl/ipo/cds/categories/IntegrationTests.java b/commons/src/main/java/nl/ipo/cds/categories/IntegrationTests.java new file mode 100644 index 00000000..9b2af565 --- /dev/null +++ b/commons/src/main/java/nl/ipo/cds/categories/IntegrationTests.java @@ -0,0 +1,13 @@ +/** + * + */ +package nl.ipo.cds.categories; + +/** + * Used as Junit Category to indicate Integration tests that are dependent on a remote (db) server. + * @author reinoldp + * + */ +public interface IntegrationTests { + +} diff --git a/commons/src/main/java/nl/ipo/cds/categories/package-info.java b/commons/src/main/java/nl/ipo/cds/categories/package-info.java new file mode 100644 index 00000000..f1682ea3 --- /dev/null +++ b/commons/src/main/java/nl/ipo/cds/categories/package-info.java @@ -0,0 +1,7 @@ + +/** + * Package contains interfaces used in Junit @Categories annotation to be able to exclude certain tests. + * @author reinoldp + * + */ +package nl.ipo.cds.categories; \ No newline at end of file diff --git a/commons/src/main/main17.iml b/commons/src/main/main17.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/commons/src/main/main17.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/deegree-webservices-cds/deegree-webservices-cds.iml b/deegree-webservices-cds/deegree-webservices-cds.iml new file mode 100644 index 00000000..b59d9349 --- /dev/null +++ b/deegree-webservices-cds/deegree-webservices-cds.iml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/deegree-webservices-cds/pom.xml b/deegree-webservices-cds/pom.xml index f6328d44..eae8555d 100644 --- a/deegree-webservices-cds/pom.xml +++ b/deegree-webservices-cds/pom.xml @@ -5,7 +5,7 @@ war deegree-webservices-cds WAR that includes deegree WFS, WMS, WMTS and common datastore modules - 2.5 + 2.6 3.4-pre10-SNAPSHOT-cds1 diff --git a/deegree-workspaces/AreaManagement/layers/lyrAM.xml b/deegree-workspaces/AreaManagement/layers/lyrAM.xml new file mode 100644 index 00000000..c2dc9b8a --- /dev/null +++ b/deegree-workspaces/AreaManagement/layers/lyrAM.xml @@ -0,0 +1,537 @@ + + fdsAM + + + myapp:ManagementRestrictionOrRegulationZone_NL + + + + myapp:zonetype_code + bathingWaters + + + + AM.BathingWaters + Bathing Waters, NL structure + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + stlAM + + AM.BathingWaters.Default + AM.BathingWaters + AM.BathingWaters.Default + + + + 0 + + + + + myapp:ManagementRestrictionOrRegulationZone_NL + + + + myapp:zonetype_code + drinkingWaterProtectionArea + + + + AM.DrinkingWaterProtectionArea + Drinking Water Protection Area, NL structure + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + stlAM + + AM.DrinkingWaterProtectionArea.Default + AM.DrinkingWaterProtectionArea + AM.DrinkingWaterProtectionArea.Default + + + + 0 + + + + + myapp:ManagementRestrictionOrRegulationZone_NL + + + + myapp:zonetype_code + noiseRestrictionZone + + + + AM.NoiseRestrictionZone + Noise Restriction Zone, NL structure + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + stlAM + + AM.NoiseRestrictionZone.Default + AM.NoiseRestrictionZone + AM.NoiseRestrictionZone.Default + + + + 0 + + + + + myapp:ManagementRestrictionOrRegulationZone_NL + + + + myapp:zonetype_code + prospectingAndMiningPermitArea + + + + AM.ProspectingAndMiningPermitArea + Prospecting And Mining Permit Area, NL structure + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + stlAM + + AM.ProspectingAndMiningPermitArea.Default + AM.ProspectingAndMiningPermitArea + AM.ProspectingAndMiningPermitArea.Default + + + + 0 + + + + + \ No newline at end of file diff --git a/deegree-workspaces/AreaManagement/queries/GetSpatialDataset.xml b/deegree-workspaces/AreaManagement/queries/GetSpatialDataset.xml new file mode 100644 index 00000000..acb26452 --- /dev/null +++ b/deegree-workspaces/AreaManagement/queries/GetSpatialDataset.xml @@ -0,0 +1,34 @@ + + + Inspire Get Spatial Dataset + Returns a complete dataset based on its DataSetIdCode, DataSetIdNamespace, CRS, and Language + + + + + + + + + + am:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + am:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/AreaManagement/themes/thmAM.xml b/deegree-workspaces/AreaManagement/themes/thmAM.xml new file mode 100644 index 00000000..fa94f8b0 --- /dev/null +++ b/deegree-workspaces/AreaManagement/themes/thmAM.xml @@ -0,0 +1,39 @@ + + + lyrAM + + + AreaManagement + EPSG:28992 + + + AM.BathingWaters + Bathing Waters + EPSG:28992 + AM.BathingWaters + + + + AM.DrinkingWaterProtectionArea + Drinking Water Protection Area + EPSG:28992 + AM.DrinkingWaterProtectionArea + + + + AM.NoiseRestrictionZone + Noise Restriction Zone + EPSG:28992 + AM.NoiseRestrictionZone + + + + AM.ProspectingAndMiningPermitArea + Prospecting And Mining Permit Area + EPSG:28992 + AM.ProspectingAndMiningPermitArea + + + + + \ No newline at end of file diff --git a/deegree-workspaces/HabitatsAndBiotopes/layers/lyrHB.xml b/deegree-workspaces/HabitatsAndBiotopes/layers/lyrHB.xml new file mode 100644 index 00000000..6cb5d1e0 --- /dev/null +++ b/deegree-workspaces/HabitatsAndBiotopes/layers/lyrHB.xml @@ -0,0 +1,31 @@ + + fdsHB + + myapp:Habitat_NL + + HB.Habitat + Habitat + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + + stlHB + + HB.Habitat.Default + HB.Habitat + HB.Habitat.Default + + + + 0 + + + + \ No newline at end of file diff --git a/deegree-workspaces/HabitatsAndBiotopes/queries/GetSpatialDataset.xml b/deegree-workspaces/HabitatsAndBiotopes/queries/GetSpatialDataset.xml new file mode 100644 index 00000000..51983778 --- /dev/null +++ b/deegree-workspaces/HabitatsAndBiotopes/queries/GetSpatialDataset.xml @@ -0,0 +1,34 @@ + + + Inspire Get Spatial Dataset + Returns a complete dataset based on its DataSetIdCode, DataSetIdNamespace, CRS, and Language + + + + + + + + + + hb:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + hb:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/HabitatsAndBiotopes/themes/thmHB.xml b/deegree-workspaces/HabitatsAndBiotopes/themes/thmHB.xml new file mode 100644 index 00000000..7a4881b5 --- /dev/null +++ b/deegree-workspaces/HabitatsAndBiotopes/themes/thmHB.xml @@ -0,0 +1,16 @@ + + + lyrHB + + + HabitatsAndBiotopes + EPSG:28992 + + HB.Habitat + Habitat NL structure + EPSG:28992 + HB.Habitat + + + + \ No newline at end of file diff --git a/deegree-workspaces/NaturalRiskZones/queries/GetSpatialDataset.xml b/deegree-workspaces/NaturalRiskZones/queries/GetSpatialDataset.xml new file mode 100644 index 00000000..55f02a36 --- /dev/null +++ b/deegree-workspaces/NaturalRiskZones/queries/GetSpatialDataset.xml @@ -0,0 +1,33 @@ + + + Inspire Get Spatial Dataset + Returns a complete dataset based on its DataSetIdCode, DataSetIdNamespace, CRS, and Language + + + + + + + + + + app:downloadable_dataset_code + ${DataSetIdCode} + + + app:downloadable_dataset_namespace + ${DataSetIdNamespace} + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/ProductionAndIndustrialFacilities/layers/lyrPF.xml b/deegree-workspaces/ProductionAndIndustrialFacilities/layers/lyrPF.xml new file mode 100644 index 00000000..87d7ad80 --- /dev/null +++ b/deegree-workspaces/ProductionAndIndustrialFacilities/layers/lyrPF.xml @@ -0,0 +1,73 @@ + + fdsPF + + + myapp:ProductionFacility_NL + + PF.ProductionFacility + Production Facility + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + + + stlPF + + PF.ProductionFacility.Default + PF.ProductionFacility + PF.ProductionFacility.Default + + + + 0 + + + + + myapp:ProductionInstallation_NL + + PF.ProductionInstallation + Production Installation + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + + + stlPF + + PF.ProductionInstallation.Default + PF.ProductionInstallation + PF.ProductionInstallation.Default + + + + 0 + + + + + myapp:ProductionInstallationPart_NL + + PF.ProductionInstallationPart + Production Installation Part + + EPSG:28992 EPSG:4326 EPSG:4258 EPSG:3035 EPSG:3034 EPSG:25830 EPSG:25831 EPSG:25832 urn:ogc:def:crs:EPSG::28992 urn:ogc:def:crs:EPSG::4326 urn:ogc:def:crs:EPSG::4258 urn:ogc:def:crs:EPSG::3035 urn:ogc:def:crs:EPSG::3034 urn:ogc:def:crs:EPSG::25830 urn:ogc:def:crs:EPSG::25831 urn:ogc:def:crs:EPSG::25832 + + + + + stlPF + + PF.ProductionInstallationPart.Default + PF.ProductionInstallationPart + PF.ProductionInstallationPart.Default + + + + 0 + + + + \ No newline at end of file diff --git a/deegree-workspaces/ProductionAndIndustrialFacilities/queries/GetSpatialDataset.xml b/deegree-workspaces/ProductionAndIndustrialFacilities/queries/GetSpatialDataset.xml new file mode 100644 index 00000000..2fb78775 --- /dev/null +++ b/deegree-workspaces/ProductionAndIndustrialFacilities/queries/GetSpatialDataset.xml @@ -0,0 +1,70 @@ + + + Inspire Get Spatial Dataset + Returns a complete dataset based on its DataSetIdCode, DataSetIdNamespace, CRS, and Language + + + + + + + + + + pf:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + pf:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + + + + pf:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + pf:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + + + + pf:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + pf:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/ProductionAndIndustrialFacilities/themes/thmPF.xml b/deegree-workspaces/ProductionAndIndustrialFacilities/themes/thmPF.xml new file mode 100644 index 00000000..c6bededd --- /dev/null +++ b/deegree-workspaces/ProductionAndIndustrialFacilities/themes/thmPF.xml @@ -0,0 +1,32 @@ + + + lyrPF + + + ProductionAndIndustrialFacilities + EPSG:28992 + + + PF.ProductionFacility + Production Facility + EPSG:28992 + PF.ProductionFacility + + + + PF.ProductionInstallation + Production Installation + EPSG:28992 + PF.ProductionInstallation + + + + PF.ProductionInstallationPart + Production Installation Part + EPSG:28992 + PF.ProductionInstallationPart + + + + + \ No newline at end of file diff --git a/deegree-workspaces/ProtectedSites/datasources/feature/protectedSite_NL.xml b/deegree-workspaces/ProtectedSites/datasources/feature/protectedSite_NL.xml new file mode 100644 index 00000000..92955277 --- /dev/null +++ b/deegree-workspaces/ProtectedSites/datasources/feature/protectedSite_NL.xml @@ -0,0 +1,44 @@ + + + + cds-inspire + + + + + + + + + + + + + + + EPSG:28992 + + + + + + + + + + + + + + + + + + EPSG:28992 + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/ProtectedSites/queries/GetSpatialDataset.xml b/deegree-workspaces/ProtectedSites/queries/GetSpatialDataset.xml new file mode 100644 index 00000000..6b18e5fa --- /dev/null +++ b/deegree-workspaces/ProtectedSites/queries/GetSpatialDataset.xml @@ -0,0 +1,52 @@ + + + Inspire Get Spatial Dataset + Returns a complete dataset based on its DataSetIdCode, DataSetIdNamespace, CRS, and Language + + + + + + + + + + gn:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + gn:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + + + + ps:downloadableDataset/inspire_common:Code + ${DataSetIdCode} + + + ps:downloadableDataset/inspire_common:Namespace + ${DataSetIdNamespace} + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/ProtectedSites/services/wfs_PS_NL.xml b/deegree-workspaces/ProtectedSites/services/wfs_PS_NL.xml new file mode 100644 index 00000000..d5dc1892 --- /dev/null +++ b/deegree-workspaces/ProtectedSites/services/wfs_PS_NL.xml @@ -0,0 +1,28 @@ + + + + 1.0.0 + 1.1.0 + 2.0.0 + + + protectedSite_NL + + false + true + + urn:ogc:def:crs:EPSG::28992 + urn:ogc:def:crs:EPSG::4326 + urn:ogc:def:crs:EPSG::4258 + urn:ogc:def:crs:EPSG::900913 + urn:ogc:def:crs:EPSG::3035 + urn:ogc:def:crs:EPSG::3034 + urn:ogc:def:crs:EPSG::25830 + urn:ogc:def:crs:EPSG::25831 + urn:ogc:def:crs:EPSG::25832 + + + + diff --git a/deegree-workspaces/ProtectedSites/services/wfs_PS_NL_metadata.xml b/deegree-workspaces/ProtectedSites/services/wfs_PS_NL_metadata.xml new file mode 100644 index 00000000..94fdb187 --- /dev/null +++ b/deegree-workspaces/ProtectedSites/services/wfs_PS_NL_metadata.xml @@ -0,0 +1,58 @@ + + + cds-inspire + + + + + + To be replaced by the DatabaseMetadataProvider + application/vnd.iso.19139+xml + + + + dut + + + + dut + + + To be replaced by the DatabaseMetadataProvider + To be replaced by the DatabaseMetadataProvider + + + + + + + + + + To be replaced by the DatabaseMetadataProvider + application/vnd.iso.19139+xml + + + + dut + + + + dut + + + To be replaced by the DatabaseMetadataProvider + To be replaced by the DatabaseMetadataProvider + + + + + + diff --git a/deegree-workspaces/ProtectedSites/services/wms_PS_NL.xml b/deegree-workspaces/ProtectedSites/services/wms_PS_NL.xml new file mode 100644 index 00000000..23a7104b --- /dev/null +++ b/deegree-workspaces/ProtectedSites/services/wms_PS_NL.xml @@ -0,0 +1,15 @@ + + + + 1.1.1 + 1.3.0 + + + + simplifiedProtectedSite + + diff --git a/deegree-workspaces/ProtectedSites/services/wms_PS_NL_metadata.xml b/deegree-workspaces/ProtectedSites/services/wms_PS_NL_metadata.xml new file mode 100644 index 00000000..e34067f7 --- /dev/null +++ b/deegree-workspaces/ProtectedSites/services/wms_PS_NL_metadata.xml @@ -0,0 +1,28 @@ + + + cds-inspire + + + + + To be replaced by the + DatabaseMetadataProvider + application/vnd.iso.19139+xml + + + + dut + + + + dut + + + + + diff --git a/deegree-workspaces/build.xml b/deegree-workspaces/build.xml new file mode 100644 index 00000000..3d0dc9fa --- /dev/null +++ b/deegree-workspaces/build.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/deegree-workspaces/inspire-schemas/customizedSchemas/am/3.0rc2/AreaManagementRestrictionRegulationZone.xsd b/deegree-workspaces/inspire-schemas/customizedSchemas/am/3.0rc2/AreaManagementRestrictionRegulationZone.xsd new file mode 100644 index 00000000..66a4f8a3 --- /dev/null +++ b/deegree-workspaces/inspire-schemas/customizedSchemas/am/3.0rc2/AreaManagementRestrictionRegulationZone.xsd @@ -0,0 +1,282 @@ + + + + -- Name -- +area management restriction and regulation zones + +-- Definition -- +The Area Management Restriction and Regulation Zones application schema contains the spatial object that represents zones or areas established to protect the environment via management, restriction or regulation. + + + + + + + + + + + + -- Name -- +management restriction or regulation zone + +-- Definition -- +Area managed, restricted or regulated in accordance with a legal requirement related to an environmental policy or a policy or activity that may have an impact on the environment at any level of administration (or used for reporting at international, European, national, regional and local) levels. + + + + + + + + + -- Name -- +inspireID + +-- Definition -- +External object identifier of the spatial object. + +-- Description -- +An external object identifier is a unique object identifier published by the responsible body, which may be used by external application to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon. + +NOTE: ManagementRestrictionOrRegulationZone spatial objects commonly perform the role/function of <i>"Reporting Unit"</i> for non-spatial reported data. The reported data shall contain object references to ManagementRestrictionOrRegulationZones. Therefore, all spatial objects shall be assigned an inspireID. + + + + + -- Name -- +thematic identifier + +-- Definition -- +Descriptive unique object identifier applied to spatial objects in a defined information theme. + +-- Description -- +Some management, restriction or regulation zones may be assigned multiple thematic identifiers. These may have been established to meet the reporting requirements of different legislative instruments at International, European or at Member State levels. + +Where multiple thematicIDs exist all should be provided. This shall allow any external dataset that uses thematicIDs to referencing to the zone to continue to be linked to the spatial object. + + + + + + + + + + + -- Name -- +name + +-- Definition -- +A geographical name that is used to identify the management, restriction or regulation zone in the real world. It provides a 'key' for implicitly associating different representations of the object. + + + + + + + + + + + -- Name +geometry + +-- Definition -- +The geometry representing the spatial extent of the spatial object. + +-- Description -- +The geometry of a Management Area, Restriction or Regulation Zone can be defined using any geometry representation. Typically this shall be either a GM_Surface or GM_MultiSurface. + +NOTE: Where a zone forms as a polygon, this should be encoded as a GM_Surface or GM_MultiSurface not a GM_Curve. + + + + + -- Name -- +zone type + +-- Definition -- +High level classification defining the type of management, restriction or regulation zone. + + implementingRule + + + + + + -- Name -- +specialised zone type + +-- Definition -- +Additional classification value which further specialises the type of management, regulation or restriction zone relevant to the domain. + +-- Description -- +NOTE: This value should be derived from a relevant domain-specific controlled vocabulary, where available. + +EXAMPLE 1: A ManagementRestrictionOrRegulationZone where the zoneType value = airQualityManagementZone could be further classified as either: +<ul> + <li> specialisedZoneType = agglomeration or </li> + <li> specialisedZoneType =nonAgglomeration</li> +</ul> + +EXAMPLE 2: A ManagementRestrictionOrRegulationZone where the zoneType value = sensitiveArea could be further classified as either: + specialisedZoneType = lessSensitiveArea + specialisedZoneType = lessSensitiveNitrates + specialisedZoneType = lessSensitiveEutrophic + specialisedZoneType = lessSensitiveShellfish + + technicalGuidance + + + + + + + + + + + + + -- Name -- +designation period + +-- Definition -- +Time period defining when the management, restriction or regulation zone was legally designated or became effective in the real world. + +-- Description -- +NOTE: designationPeriod uses the ISO 19108 TM_Period which is comprised of two properties - gml:beginPosition and gml:endPosition. +If the zone shall remain in force for an indeterminate period of time then the endPosition/indeterminatePosition="unknown" can be used to state that the zone is still effective. + + + + + -- Name -- +competent authority + +-- Definition -- +Description of the organisation(s) responsible for managing, restricting or regulating measures or activities within the zone. + + + + + + + + + + + + + + + -- Name -- +begin lifespan version + +-- Definition -- +Date and time at which this version of the spatial object was inserted or changed in the spatial data set. + + + + + + + + + + + + -- Name -- +end lifespan version + +-- Definition -- +Date and time at which this version of the spatial object was superseded or retired in the spatial data set. + + + + + + + + + + + + -- Name -- +environmental domain + +-- Definition -- +Classification of the environment domain(s) for which, through the establishment of the zone, certain environmental objectives shall be reached. + +-- Description -- +A zone may be established within one environmental domain (e.g. water) or may to cover a wide range of environmental objectives that cross-cut several domains. For example, Marine Regions may relate to water, land use, sustainable development. + + implementingRule + + + + + + -- Definition -- +Reference to, or citation of the legal instrument or document that required the establishment of the zone. + + + + + + + + + + + + -- Definition -- +Reference to, or citation of a plan (management or action plan) that describes the environmental objectives and measures that shall be undertaken in the zone to protect the environment. + + + + + + + + + + + + -- Definition -- +Reference to a related management, regulation or restriction zone. + +-- Description -- +EXAMPLE 1: River basin districts (RBD) exist at three levels: +1) International River Basin District +2) National River Basin District +3) River Basin District Sub units. + +An international RBD may contain one or more national RBD and/or River Basin Sub Units. + +A national RBD may be related to an International RBD and one or more RBD sub-units. + +EXAMPLE 2: A WFDWaterBody may be related to a River Basin District. + + am:ManagementRestrictionOrRegulationZone + + + + + + Unique identifier for getting the individual downloadset from the download service + + + + + + + + + + + + + + diff --git a/deegree-workspaces/inspire-schemas/customizedSchemas/hb/3.0rc3/HabitatsAndBiotopes.xsd b/deegree-workspaces/inspire-schemas/customizedSchemas/hb/3.0rc3/HabitatsAndBiotopes.xsd new file mode 100644 index 00000000..daeb03e8 --- /dev/null +++ b/deegree-workspaces/inspire-schemas/customizedSchemas/hb/3.0rc3/HabitatsAndBiotopes.xsd @@ -0,0 +1,459 @@ + + + Application schema for Habitats and Biotopes + + + + + + + + + -- Name -- +habitat type cover type + +-- Definition -- +Habitat type according to an international, national or local habitat classifications scheme. + +-- Description -- +Includes additional information on covered area, covered length, or containing volume. + + + + + + + + -- Name -- +reference habitat type id + +-- Definition -- +Habitat type unique identifier (code) according to one Pan-European classification scheme. + +-- Description -- +EXAMPLE "1110", "40C0", "95A0", etc., if the referenceHabitatScheme is "habitatsDirective", or "A1.111", "A1.1121", "G1.1111", "X34", etc., if the ReferenceHabitatScheme is "eunis". + + implementingRule + + + + + + + -- Name -- +reference habitat type scheme + +-- Definition -- +One of the Pan-European classification schemes, that are widely used in Europe. + +-- Description -- +The list includes at least the classification of the natural habitat types of community interest listed in Annex I of the Habitats Directive, as well as the hierarchic classification of the habitat types of interest for biodiversity and nature protection listed in the EUNIS database, which is maintained by the EEA. + + implementingRule + + + + + + -- Name -- +reference habitat type name + +-- Definition -- +Name of a habitat type according to one Pan-European classification scheme. + +-- Description -- +In the given Pan-European habitat classification systems, the habitat types can be identified by both: a short "identifier" (code) and a name in natural language, which is meant in this attribute. + +EXAMPLE Habitats Directive habitat type 3260 (code) "Floating vegetation of Ranunculus" or "Chenopodietum rubri of submountainous rivers" (name). + + + + + + + + + + + + -- Name -- +local habitat name + +-- Definition -- +Habitat type according to a local habitat classification scheme. + +-- Description -- +Habitat types used in a certain area (e.g. Mediterranean Sea), or in a certain country, or even more restricted in a certain region, county or any other local level. + +It is strongly recommended to register the local classification scheme from which the local habitat names are taken + +EXAMPLE Classification of Benthic Marine Habitat Types for the Mediterranean Region, Habitats of Romania, German Biotoptypen, Nordic Vegetation types, UK National Vegetation Classification, etc. + + + + + + + + + + + -- Name -- +area covered + +-- Definition -- +The area covered by a certain habitat type within the provided geometry of the habitat spatial object. + +-- Description -- +The surface area should be expressed in square meters. + +It can be used only in the case that the geometry provided in the Habitat feature represents an area in which more than one habitat type exists in other words a complex of different habitat types. In this case, for each habitat type the surface of the covered area can be provided within this attribute. + +Since the geometry provided in the Habitat feature can be larger than the total surface of the habitat types listed within that geometry, the total surface of the habitat types can be smaller than the surface of the provided geometry. On the other hand, since some habitat types may overlap (e.g. subterranean caves / habitat type on the surface) or may cover a steep inclination (cliff) the total area of the habitat types can be bigger than the area of the provided geometry. + +EXAMPLE Within a given habitat geometry of 30.2 hectares there are several habitat types, out of which two are natural habitat types of community interest, &rdquo;91D0&rdquo; covering 22.5 hectares and &rdquo;7110&rdquo; covering 5.3 hectares, thus in total are smaller than the total area. + + + + + + + + + + + + -- Name -- +length covered + +-- Definition -- +The length covered by a certain habitat type within the provided geometry of the habitat spatial object. + +-- Description -- +The length should be expressed in meters. + +EXAMPLE Within a given habitat geometry of 300 square meters there are several habitat types. Two natural habitat types of community interest, &rdquo;91F0&rdquo; and &rdquo;9160&rdquo; cover this total area. However, a third natural habitat types of community interest &rdquo;3260&rdquo; is listed, which is a linear feature and thus expressed in meters of its length (e.g. 120 m). + + + + + + + + + + + + -- Name -- +volume covered + +-- Definition -- +The volume covered by a certain habitat type within the provided geometry of the habitat spatial object. + +-- Description -- +The volume should be expressed in cubic meters. + + + + + + + + + + + + + + + + + + + -- Name -- +habitat species type + +-- Definition -- +Species which occurs in a certain habitat at the time of mapping. + + + + + + + -- Name -- +reference species id + +-- Definition -- +Identifier of one of the reference lists given by the referenceSpeciesScheme. + + implementingRule + + + + + + -- Name -- +reference species scheme + +-- Definition -- +Reference list defining a nomenclatural and taxonomical standard to which all local species names and taxonomic concepts shall be mapped to. + +-- Description -- +Closed codelist of accepted PAN-european taxonomical reference lists defining the nomenclature and taxonomical concept of a given species name. This must not be regarded as the ultimate taxonomic truth: this will always change. It serves as a definition of a taxonomic concept described by systematic and synonym relations where other names and there inherent taxonomic concepts can be mapped to. The code list comprises of Eu-Nomen, EUNIS and Natura2000. In these sources harmonized species GUIDs and names are maintained by institutions with an assignment outside INSPIRE and the species names are to be retrieved through webservices using GUIDs. Only one of these list must be used for one taxon. The priority is as follows: 1) EU-Nomen, 2) EUNIS, 3) NatureDirectives. This implies: if a taxon is listed in EU-Nomen, this reference must be used as first choice. If it is not listed in EU-Nomen, the second choice is EUNIS, if not in EUNIS, NatureDirectives can be used. + + implementingRule + + + + + + -- Name -- +local species name + +-- Definition -- +Scientific name plus author used in national nomenclature with its national taxonomic concept. + +-- Description -- +The LocalSpeciesName provides nomenclatural and taxonomical information about the locally used species name and the taxonomic concepts implied by the use of this name according to a given reference. If omitted the name and concept given by the referenceSpeciesId according to the referenceSpeciesScheme has been used locally. + + + + + + + + + + + + + + + + + + -- Name -- +habitat vegetation type + +-- Definition -- +Vegetation type which occurs in a certain habitat. + + + + + + + -- Name -- +local vegetation name + +-- Definition -- +Natural language name of a vegetation class (vegetation type) according to a local vegetation classification scheme. + +-- Description -- +For better understanding it is strongly recommended to give the full name of the vegetation type rather than any abbreviation or code used in the local scheme. + +EXAMPLE "Stellario alsines &ndash; Montietum rivularis (Franzi 1984)". + + + + + + + + + + + + -- Name -- +habitat + +-- Definition -- +Geographical areas characterised by specific ecological conditions, processes, structure, and functions that physically support the organisms that live there. + +-- Description -- +Includes terrestrial and aquatic areas distinguished by geographical, abiotic and biotic features, whether entirely natural or semi-natural [Directive 2007/2/EC]. + +A Habitat area, line or point may comprise one or more HabitatTypesCoverTypes according to one or more habitat classification schemes, often depending on the data capture process or related to the scale of a map. So a habitat feature might represent a complex of different HabitatTypesCoverTypes. + +NOTE Although habitats in principle are geographical areas, they may also be depicted as lines or points. + + + + + + + + + -- Name -- +inspire id + +-- Definition -- +External object identifier of the spatial object. + +-- Description -- +An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon. + + + + + -- Name -- +geometry + +-- Definition -- +The extent of the habitat based on natural boundaries. + +-- Description -- +NOTE 1 Can be polygons, lines or points. +NOTE 2 Can also support 3-dimensional features. + + + + + -- Name -- +habitat type + +-- Definition -- +The identifier for a habitat class, defined and described in an international, national or local habitat classification scheme. + +-- Description -- +Habitats and biotopes may be common in some characteristics on a certain level of detail and may thus be classified as abstract types: e.g. as woodland, pastures, heathland &ndash; referring to their vegetation structure - or as running waters, limestone rocks or sand dunes - referring to abiotic features - but also as wintering areas, nesting areas or wandering corridors etc. - referring to relevant phases for the life-cycle of a certain species or ecological guild. These typological classes are usually organised in classification systems (e.g. EUNIS habitat classification). + + + + + -- Name -- +habitat species + +-- Definition -- +List of species which occur in or constitute a certain habitat at the time of mapping. + + + + + + + + + + + -- Name -- +habitat vegetation + +-- Definition -- +List of vegetation types which constitute a certain habitat. + +-- Description -- +The cover of plants may be common in some characteristics on a certain level of detail and may thus be classified by vegetation science as abstract types. + +E.g. vegetation may be classified as Tundra or Mediterranean Deciduous Forests &ndash; referring to their structure and their bio-geographic formations - or as Nordic vegetation type 5141 Koeleria glauca-Typ or Ranunculetum fluitantis - referring to their floristic composition - or as chamaephytes or hemi-cryptophytes - referring to structural traits etc. + +Many vegetation type classification systems exist all over Europe. Some of these systems have a deep hierarchical structure. Therefore it is recommended to register the vegetation type scheme which was used. + + + + + + + + + + + Unique identifier for getting the individual downloadset from the download service + + + + + + + + + + + + + + + + -- Name -- +local name type + +-- Definition -- +Name according to a local classification scheme. + + + + + + + -- Name -- +local scheme + +-- Definition -- +Uniform resource identifier of a local classification scheme. + +-- Description -- +Classification scheme, which is used locally and contains all classification types, their codes and/or very often their names in natural language. + +EXAMPLE "http://www.rac-spa.org/sites/default/files/doc_fsd/lchm_en.pdf", for the Classification of Benthic Marine Habitat Types for the Mediterranean Region or "http://www.lifenatura2000.ro/doc/Habitatele din Romania.pdf", for the Romanian habitats classification. + + + + + + -- Name -- +local name code + +-- Definition -- +Natural language name according to a local classification scheme. + +-- Description -- +EXAMPLE: "Comunitati vest-pontice cu Camphosma annua si Kochia laniflora" for the habitat &bdquo;R1508" from the Romanian habitat classification or &bdquo;Biocenosis of abyssal muds" for the habitat &bdquo;VI.1.1." from the Classification of Benthic Marine Habitat Types for the Mediterranean Region or "Stellario alsines &ndash; Montietum rivularis (Franzi 1984)" for a vegetation type. + + technicalGuidance + + + + + + -- Name -- +local name + +-- Definition -- +Name according to a local classification scheme. + +-- Description -- +Name according to local classification scheme. It is strongly recommended take all local names from a registered classification scheme. + + + + + + + + + + + + + -- Name -- +qualifier local name + +-- Definition -- +The relation between the local name and the corresponding name in the Pan-European schema. + +-- Description -- +EXAMPLE The local habitat type can be conceptually the same as the related Pan-European habitat type, the relationship then is called &ldquo;congruent&rdquo; or the local habitat type may be a subtype of the Pan-European habitat type, therefore the relationship should be "includedIn", etc. + + implementingRule + + + + + + + + + + + diff --git a/deegree-workspaces/inspire-schemas/customizedSchemas/pf/3.0rc3/ProductionAndIndustrialFacilities.xsd b/deegree-workspaces/inspire-schemas/customizedSchemas/pf/3.0rc3/ProductionAndIndustrialFacilities.xsd new file mode 100644 index 00000000..730b45f2 --- /dev/null +++ b/deegree-workspaces/inspire-schemas/customizedSchemas/pf/3.0rc3/ProductionAndIndustrialFacilities.xsd @@ -0,0 +1,817 @@ + + + + -- Name -- +Production And Industrial Facilities - Core + + + + + + + + + + + + + any + http://inspire.ec.europa.eu/code List/TypeOfProductionBuildingType + + + + + + + + + + + + + + + + + + + + -- Name -- +production installation part + +-- Definition -- +A single engineered facility that performs specific functionalities related with a production activity. + +--Description -- + +This level of description covers specific parts of the Production Installation which must be registered by the legal mandate of the competent authorities. Points of emission as chimneys (for pollutants) or tanks (for special products), will be included in this definition. + + + + + + + + + -- Definition -- +External object identifier of the spatial object. + +-- Description -- +NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon. + + + + + -- Definition -- +Thematic object identifier (e.g. ICAO location identifiers for airports or NUTS codes for administrative areas). + +-- Description -- +It may be the identification code provided by the Member States to identify the object on their own databases. + + + + + -- Definition -- +Spatial property of the spatial object with a value that is a vector geometry type from ISO 19107. + +-- Description -- +This is the basic geometry property for the Production Installation Part and it is set as an optional property to identify the location point for the Installation Part. It is intended, if available, to furnish an additional spatial information beside the basic mandatory geometry fixed for the Production Facility. + + + + + -- Definition -- +Spatial property of the spatial object with a value that is a vector geometry type from ISO 19107. + +-- Description -- +This is the secondary geometry property for the Production Installation Part and it is set as an optional property to identify the location area for the Installation Part. It is intended, if available, to furnish a detailed spatial information beside the basic mandatory geometry fixed for the Production Facility. + + + + + -- Definition -- +Official denomination or proper or conventional name of the installation part. + + + + + + + + + + + + -- Definition -- +Descriptive statement about the installation part. + + + + + + + + + + + + -- Definition -- +The state or condition of the installation part, with regard to the functional and operational order, in which it is arranged for a limited or extended time period. + + + + + + + + + + + -- Definition -- +Special kind of an installation part, denoting the operative function which has to be performed. + +-- Description -- +EXAMPLE Chimney, pump. + + + + + + -- Definition -- +Method to reduce pollutant concentration due to the emissions of a technical component, tipically a chimney. + +-- Description -- +This information is referring to a list of predefined potential values. +The reference values are holded in the PollutionAbatementTechnique code list. + + IR + + + + + + + + + + + + + Unique identifier for getting the individual downloadset from the download service + + + + + + + + + + + + + + + + -- Definition -- +The state or condition of a technical component, with regard to the functional and operational order, in which it is arranged for a limited or extended time period. + +-- Description -- +It applies equally to the technical unit (facility, installation or installation part), to the production site, to the parcel and to the production building. + + + + + + + + -- Definition -- +The state or condition of a technical component referring to a list of predefined potential values. + +-- Description -- +The reference values are holded in the StatusListValue code list. + + IR + + + + + + -- Definition -- +Descriptive statement about the declared status. + + + + + + + + + + + + -- Definition -- +The starting time of validity for a status type. + +-- Description -- +A date gives values for year, month and day. + + + + + + + + + + + + -- Definition -- +The ending time of validity for a status type. + +-- Description -- +A date gives values for year, month and day. + + + + + + + + + + + + + + + + + + + -- Name -- +production facility + +-- Definition -- + +One or more installations on the same site operated by the same natural or legal person, +designed, built or installed to serve specific production or industrial purposes, comprehending +all infrastructure, equipment and materials. + +-- Description -- +A production facility groups together a single installation, set of installations or production processes (stationary or mobile), which can be defined within a single geographical boundary, organizational unit or production process. A production facility can also be identified as one or more installations located on the same site that are operated by the same natural or legal person and in which production activities are being carried out. Such a facility groups potentially the land, buildings, and equipment used in carrying on an industrial business or other undertaking or service. + + + + + + + + + + -- Definition -- Spatial property of the + spatial object with a value that is a + vector geometry type from ISO 19107. + + -- Description -- This is the secondary + geometry property for the Production + Facility and it is set as an optional + property to identify the location area + for the Facility. It is intended, if + available, to furnish a more detailed + spatial information in addition to the + basic mandatory geometry. + + + + + + + -- Definition -- Code identifier and/or + name assigned to the basin district of a + watercourse. + + -- Description -- NOTE Information + required (not registered in the + Hydrography Theme) according to Article + 3(1) of Directive 2000/60/EC of the + European Parliament and of the Council + of 23 October 2000 establishing a + framework for Community action in the + field of water policy (OJ L 327, + 22.12.2000, p. 1). Directive as amended + by Decision No 2455/2001/EC (OJ L 331, + 15.12.2001, p. 1). + + + + + + + -- Definition -- The state or condition + of the facility, with regard to the + functional and operational order, in + which it is arranged for a limited or + extended time period. + + + + + + + + + + + + + An AbstractConstruction may be grouped + by one or more Facilities (this means an + AbstractConstruction may be shared by + different Facilities) + + + + + + + An Installation is grouped by one + Facility + + + + + + + + + + + + + + + + + A Site hosts one or more Facilities + + + + + + + + + + + + + + A Plot is grouped by one or more + Facilities (this means a Plot may be + shared by different Facilities) + + + + + + + + + + + + + + + + Unique identifier for getting the individual downloadset from the download service + + + + + + + + + + + + + + + + -- Name -- +production building + +-- Definition -- +Artificial construction, part of the production facility that are useful to host or provide shelter to activity development. + +-- Description -- +Inside a facility, and in relation with the definition of building, this entity should represent a construction under responsibility of the facility, either as an independent unit or as a functional infrastructure for an installation. + + + + + + + + + -- Definition -- +Thematic object identifier (e.g. ICAO location identifiers for airports or NUTS codes for administrative areas). + +-- Description -- +It may be the identification code provided by the Member States to identify the object on their own databases. + + + + + -- Definition -- +Descriptive classification about the production and industrial building. + + + + + + + + + + + + + + + -- Definition -- +The state or condition of the production and industrial building, with regard to the functional and operational order, in which it is arranged for a limited or extended time period. + + + + + + + + + + + + + + + + + + + + + + + + + -- Name -- +Production Plot + +-- Definition -- +A portion of land or water part of a production facility destined to functional purposes. +-- Description -- +A potential sub-division of a major site as delimited extension of land in which are performed extensive operations related with the activity or one of the activities performed by a facility. + + + + + + + + + -- Definition -- +External object identifier of the spatial object. + +-- Description -- +NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon. + + + + + -- Definition -- +Thematic object identifier (e.g. ICAO location identifiers for airports or NUTS codes for administrative areas). + +-- Description -- +It may be the identification code provided by the Member States to identify the object on their own databases. + + + + + -- Definition -- +Spatial property of the spatial object with a value that is a vector geometry type from ISO 19107. + +-- Description -- +This is the geometry property for the Parcel and it is set as a optional property to identify the location area for the Parcel. It is intended, if available, to furnish a detailed spatial information beside the basic mandatory geometry fixed for the Production Facility. + + + + + -- Definition -- +The state or condition of the plot, with regard to the functional and operational order, in which it is arranged for a limited or extended time period. + + + + + + + + + + + + + + + + + + + + + + -- Name -- +technical unit + +-- Definition -- +Represents the common "abstract level" for production infrastructures: facilities, installations, installation parts. + + +-- Description -- +It applies since the production infrastructures (facility, installation, installation part) may have an UML "equivalent behaviour": this means they have properties in common and the same associations to be reused. + + + + + + + + + + + + + + + + + + + -- Name -- +production installation + +-- Definition -- +A technical unit, such as machinery, apparatus, devices or equipment placed in position or connected for use. + +-- Description -- +Stationary technical unit part of a facility where one or more activities are carried out, and any other directly associated activities which have a technical connection to the activities carried out on that site and which could have an effect on the environment. +May be a technical unit within an establishment in which dangerous substances are produced, used, handled or stored. + + + + + + + + + -- Definition -- +External object identifier of the spatial object. + +-- Description -- +NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon. + + + + + -- Definition -- +Thematic object identifier (e.g. ICAO location identifiers for airports or NUTS codes for administrative areas). + +-- Description -- +It may be the identification code provided by the Member States to identify the object on their own databases. + + + + + -- Definition -- +Spatial property of the spatial object with a value that is a vector geometry type from ISO 19107. + +-- Description -- +This is the basic geometry property for the Production Installation and it is set as an optional property to identify the location point for the Installation. It is intended, if available, to furnish an additional spatial information beside the basic mandatory geometry fixed for the Production Facility. + + + + + -- Definition -- +Spatial property of the spatial object with a value that is a vector geometry type from ISO 19107. + +-- Description -- +This is the secondary geometry property for the Production Installation and it is set as an optional property to identify the location area for the Installation. It is intended, if available, to furnish a detailed spatial information beside the basic mandatory geometry fixed for the Production Facility. + + + + + -- Definition -- +Official denomination or proper or conventional name of the installation. + + + + + + + + + + + + -- Definition -- +Descriptive statement about the installation. + + + + + + + + + + + + -- Definition -- +The state or condition of the installation, with regard to its functional and operational order, in which it is arranged for a limited or extended time period. + + + + + + + + + + + -- Definition -- +Special kind of an installation, denoting the operative function which has to be performed. + +-- Description -- +EXAMPLE Radiological installation, containing radiological equipment. + + + + + An InstallationPart is grouped by one Installation + + + + + + + + + + + + + + + Unique identifier for getting the individual downloadset from the download service + + + + + + + + + + + + + + + + -- Name -- +production site + +-- Definition -- +All land at a distinct geographic location where the production facility was, is, or is intended to be located. This includes all infrastructure, equipment and materials; + +-- Description -- +An area of land or water that one or more process plants is or may be situated on, or else a single location, in which, if there is more than one manufacturer of (a) substance(s), certain infrastructure and facilities are shared. +A continuous surface, maritime or terrestrial in which production facilities have been already implanted or urban and/or engineering activities have been developed for production purposes. The location will be defined by means of geographical boundaries within which activities under the control of an organization may be carried out. The geographical boundaries may be on land and in water, and include above and below surface structures, both natural and man-made. + + + + + + + + + -- Definition -- +External object identifier of the spatial object. + +-- Description -- +NOTE An external object identifier is a unique object identifier published by the responsible body, which may be used by external applications to reference the spatial object. The identifier is an identifier of the spatial object, not an identifier of the real-world phenomenon. + + + + + -- Definition -- +Thematic object identifier (e.g. ICAO location identifiers for airports or NUTS codes for administrative areas). + +-- Description -- +It may be the identification code provided by the Member States to identify the object on their own databases. + + + + + -- Definition -- +Spatial property of the spatial object with a value that is a vector geometry type from ISO 19107. + +-- Description -- +This is the geometry property for the Production Site and it is set as an optional property to identify the location area for the Site. It is intended, if available, to furnish a detailed spatial information beside the basic mandatory geometry fixed for the Production Facility. + + + + + -- Definition -- +External reference to documentation concerning the configuration and organisation of the site ((Site Plans, technical descriptions, ...). + + + + + + + + + + + + + + + -- Definition -- +Official denomination or proper or conventional name of the site. + + + + + + + + + + + + -- Definition -- +Descriptive statement about the site. + + + + + + + + + + + + -- Definition -- +The state or condition of the site, with regard to the functional and operational order, in which it is arranged for a limited or extended time period. + + + + + + + + + + + + + + + + + + + + diff --git a/domain-metadata/domain-metadata.iml b/domain-metadata/domain-metadata.iml new file mode 100644 index 00000000..17eedd50 --- /dev/null +++ b/domain-metadata/domain-metadata.iml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/domain-metadata/pom.xml b/domain-metadata/pom.xml index f5526a9c..78431c6e 100644 --- a/domain-metadata/pom.xml +++ b/domain-metadata/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 domain-metadata diff --git a/domain-metadata/src/main/java/nl/ipo/cds/domain/metadata/SpatialDatasetinfo.java b/domain-metadata/src/main/java/nl/ipo/cds/domain/metadata/SpatialDatasetinfo.java new file mode 100644 index 00000000..983f0b6e --- /dev/null +++ b/domain-metadata/src/main/java/nl/ipo/cds/domain/metadata/SpatialDatasetinfo.java @@ -0,0 +1,61 @@ +package nl.ipo.cds.domain.metadata; + +import javax.persistence.Column; +import javax.persistence.Embeddable; +import javax.persistence.Table; +import javax.persistence.Entity; + + +@Embeddable +public class SpatialDatasetinfo { + + @Column(columnDefinition="text") + private String type; + + @Column(columnDefinition="text") + private String name; + + @Column(columnDefinition="text") + private String code; + + @Column(columnDefinition="text") + private String namespace; + + public SpatialDatasetinfo() { + super(); + } + + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getName () { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getNamespace() { + return namespace; + } + + public void setNamespace(String namespace) { + this.namespace = namespace; + } + +} diff --git a/domain-metadata/src/main/main4.iml b/domain-metadata/src/main/main4.iml new file mode 100644 index 00000000..1b21765e --- /dev/null +++ b/domain-metadata/src/main/main4.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/domain/domain.iml b/domain/domain.iml new file mode 100644 index 00000000..5e38bee6 --- /dev/null +++ b/domain/domain.iml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/domain/pom.xml b/domain/pom.xml index bd1b2fd3..f2954f8e 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml domain @@ -59,7 +59,7 @@ nl.ipo.cds job-executor-api - 2.5 + 2.6 nl.idgis.commons diff --git a/domain/src/main/java/nl/ipo/cds/domain/BronhouderThema.java b/domain/src/main/java/nl/ipo/cds/domain/BronhouderThema.java new file mode 100644 index 00000000..6d49da61 --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/BronhouderThema.java @@ -0,0 +1,84 @@ +package nl.ipo.cds.domain; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.validation.constraints.NotNull; + +/** + * BronhouderThema links a {@link Bronhouder} to a {@link Thema}. + */ +@Entity +public class BronhouderThema implements Serializable { + + private static final long serialVersionUID = 7722858810254006319L; + + @Id + @NotNull + @ManyToOne + private Thema thema; + + @Id + @NotNull + @ManyToOne + private Bronhouder bronhouder; + + BronhouderThema () { + } + + public BronhouderThema (final Thema thema, final Bronhouder bronhouder) { + assert (thema != null); + assert (bronhouder != null); + + this.thema = thema; + this.bronhouder = bronhouder; + } + + /** + * @return The theme associated with this link. + */ + public Thema getThema() { + return thema; + } + + /** + * @return The bronhouder associated with this link. + */ + public Bronhouder getBronhouder() { + return bronhouder; + } + + @Override + public int hashCode () { + final int prime = 31; + int result = 1; + result = prime * result + + ((bronhouder == null) ? 0 : bronhouder.hashCode()); + result = prime * result + ((thema == null) ? 0 : thema.hashCode()); + return result; + } + + @Override + public boolean equals (final Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + BronhouderThema other = (BronhouderThema) obj; + if (bronhouder == null) { + if (other.bronhouder != null) + return false; + } else if (!bronhouder.equals(other.bronhouder)) + return false; + if (thema == null) { + if (other.thema != null) + return false; + } else if (!thema.equals(other.thema)) + return false; + return true; + } +} diff --git a/domain/src/main/java/nl/ipo/cds/domain/DbGebruiker.java b/domain/src/main/java/nl/ipo/cds/domain/DbGebruiker.java new file mode 100644 index 00000000..89299389 --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/DbGebruiker.java @@ -0,0 +1,41 @@ +package nl.ipo.cds.domain; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; + +@Entity +@Table (name = "gebruiker") +public final class DbGebruiker { + + @Id + @NotNull + private String gebruikersnaam; + + private boolean superuser; + + DbGebruiker () { + this.gebruikersnaam = null; + } + + public DbGebruiker (final String gebruikersnaam) { + this.gebruikersnaam = gebruikersnaam; + } + + public String getGebruikersnaam () { + return gebruikersnaam; + } + + public void setGebruikersnaam (final String gebruikersnaam) { + this.gebruikersnaam = gebruikersnaam; + } + + public boolean isSuperuser () { + return superuser; + } + + public void setSuperuser (final boolean superuser) { + this.superuser = superuser; + } +} diff --git a/domain/src/main/java/nl/ipo/cds/domain/GebruikerThemaAutorisatie.java b/domain/src/main/java/nl/ipo/cds/domain/GebruikerThemaAutorisatie.java new file mode 100644 index 00000000..cb85fe58 --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/GebruikerThemaAutorisatie.java @@ -0,0 +1,78 @@ +package nl.ipo.cds.domain; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.validation.constraints.NotNull; + +/** + * This entity authorizes a {@link DbGebruiker} to access a {@link Thema} on behalf of a + * {@link Bronhouder}. A user is authorized on a {@link BronhouderThema}, which associates a bronhouder + * with a theme. + */ +@Entity +public final class GebruikerThemaAutorisatie implements Serializable { + private static final long serialVersionUID = -7678955695408667947L; + + @NotNull + @Id + @ManyToOne + private DbGebruiker gebruiker; + + @NotNull + @Id + @ManyToOne + private BronhouderThema bronhouderThema; + + @NotNull + private TypeGebruik typeGebruik; + + GebruikerThemaAutorisatie () { + } + + /** + * Constructs a new authorization by providing the user, the bronhouder and theme. + * + * @param gebruiker The user for the relation. + * @param bronhouder Thema Provides the relation between bronhouder and thema + * @param typeGebruik The type of authorization. + */ + public GebruikerThemaAutorisatie (final DbGebruiker gebruiker, final BronhouderThema bronhouderThema, final TypeGebruik typeGebruik) { + if (gebruiker == null) { + throw new NullPointerException ("gebruiker cannot be null"); + } + if (bronhouderThema == null) { + throw new NullPointerException ("bronhouderThema cannot be null"); + } + if (typeGebruik == null) { + throw new NullPointerException ("typeGebruik cannot be null"); + } + + this.gebruiker = gebruiker; + this.bronhouderThema = bronhouderThema; + this.typeGebruik = typeGebruik; + } + + /** + * @return The {@link DbGebruiker} associated with this authorization. + */ + public DbGebruiker getGebruiker () { + return gebruiker; + } + + /** + * @return The {@link BronhouderThema} associated with this authorization. + */ + public BronhouderThema getBronhouderThema () { + return bronhouderThema; + } + + /** + * @return The type of authorization. + */ + public TypeGebruik getTypeGebruik () { + return typeGebruik; + } +} diff --git a/domain/src/main/java/nl/ipo/cds/domain/LdapGebruiker.java b/domain/src/main/java/nl/ipo/cds/domain/LdapGebruiker.java new file mode 100644 index 00000000..ae5f6ac7 --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/LdapGebruiker.java @@ -0,0 +1,197 @@ +/** + * + */ +package nl.ipo.cds.domain; + +import java.io.UnsupportedEncodingException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.hibernate.validator.constraints.Email; +import org.hibernate.validator.constraints.NotBlank; + +/** + * @author Rob + * + */ +public class LdapGebruiker { + + private final String distinguishedName; + + @NotBlank(message="Verplicht") + private String gebruikersnaam; + + @NotBlank(message="Verplicht") + @Email(message="Geen geldig emailadres") + private String email; + + private String mobile; + + @NotBlank(message="Verplicht") + private String wachtwoordHash; + + /** + * Creates a new LDAP user without distinguished name. The DN is created when the user is + * first persisted to the database. + */ + public LdapGebruiker () { + this (null); + } + + /** + * Creates an LDAP user with a specific, distinguished name. Passing null as a DN + * indicates this is a new user, the DN is created when the user is first persisted. + * + * @param distinguishedName the DN of this user. + */ + public LdapGebruiker (final String distinguishedName) { + this.distinguishedName = distinguishedName; + } + + /** + * Returns the distinguished name of this user, or null if the user has no DN yet. + * If a user has no DN, the DN is created when the user is first persisted. + * + * @return + */ + public String getDistinguishedName () { + return distinguishedName; + } + + /** + * Returns the username of this user. The username also corresponds with the 'uid' attribute in LDAP. + * + * @return The username. + */ + public String getGebruikersnaam() { + return gebruikersnaam; + } + + /** + * Sets the username of this user. The username corresponds with the 'uid' attribute in LDAP. + * + * @param gebruikersnaam + */ + public void setGebruikersnaam(String gebruikersnaam) { + this.gebruikersnaam = gebruikersnaam; + } + + /** + * Returns the e-mail address of this user. + * + * @return This user's e-mail address + */ + public String getEmail() { + return email; + } + + /** + * Sets the e-mail address of this user. + * + * @param email The user's new e-mail address. + */ + public void setEmail(String email) { + this.email = email; + } + + /** + * Returns the optional mobile phone number of this user, or null if no number is set. Phone numbers must be specified + * in ITU format. + * + * @return This users mobile phone number in ITU format, or null. + */ + public String getMobile() { + return mobile; + } + + /** + * Sets the optional mobile phone number of this user, or null if no number is set. Phone numbers must be specified + * in ITU format. + * + * @param mobile This user's mobile phone number in ITU format, or null. + */ + public void setMobile(String mobile) { + this.mobile = mobile; + } + + /** + * Returns the SHA hashed password for this user. + * + * @return The password hash as a base64 encoded string. + */ + public String getWachtwoordHash() { + return wachtwoordHash; + } + + /** + * Sets the SHA hashed password for this user. + * + * @param wachtwoordHash as a base64 encoded string. + */ + public void setWachtwoordHash(String wachtwoordHash) { + this.wachtwoordHash = wachtwoordHash; + } + + /** + * Sets the password for this user. The password is hashed, base64 encoded and stored + * using setWachtwoordHash + * + * @param wachtwoord + */ + public void setWachtwoord (String wachtwoord) { + this.setWachtwoordHash (hashWachtwoord (wachtwoord)); + } + + /** + * Hashes a plaintext password and encodes it as base64. + * + * @param plaintext The plaintext password. + * @return The base64 encoded hash of the plaintext password. + */ + private String hashWachtwoord(final String plaintext) { + final MessageDigest md; + + try { + md = MessageDigest.getInstance("SHA"); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(e.getMessage()); + } + + try { + md.update(plaintext.getBytes("UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new RuntimeException (e.getMessage()); + } + + return Base64.encodeBase64String(md.digest ()); + } + + @Override + public int hashCode() { + return new HashCodeBuilder(). + append(this.getGebruikersnaam()). + toHashCode(); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (! (obj instanceof LdapGebruiker)) + return false; + + final LdapGebruiker other = (LdapGebruiker) obj; + + return new EqualsBuilder(). + append(this.getGebruikersnaam(), other.getGebruikersnaam()). + isEquals(); + + } + + +} diff --git a/domain/src/main/java/nl/ipo/cds/domain/TagDTO.java b/domain/src/main/java/nl/ipo/cds/domain/TagDTO.java new file mode 100644 index 00000000..d8bd966d --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/TagDTO.java @@ -0,0 +1,40 @@ +/** + * + */ +package nl.ipo.cds.domain; + +import org.hibernate.validator.constraints.NotEmpty; + +/** + * @author annes + * + */ + +public class TagDTO { + + @NotEmpty + public String thema; + + @NotEmpty + public String tagId; + + public String getThema() { + return thema; + } + + public void setThema(String thema) { + this.thema = thema; + } + + public String getTagId() { + return tagId; + } + + public void setTagId(String tagId) { + this.tagId = tagId; + } + + + + +} diff --git a/domain/src/main/java/nl/ipo/cds/domain/TagJob.java b/domain/src/main/java/nl/ipo/cds/domain/TagJob.java new file mode 100644 index 00000000..93801c96 --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/TagJob.java @@ -0,0 +1,53 @@ +package nl.ipo.cds.domain; + +import javax.persistence.DiscriminatorValue; +import javax.persistence.Entity; + +/** + * Tags a dataset with a certain label. This copies the dataset into a separate table. + * This functionality is only enabled for datasets that have can be tagged (Determined by ThemeConfig#isTaggable()). + */ +@Entity +@DiscriminatorValue ("TAG") +public class TagJob extends EtlJob { + + private final static int PRIORITY = 200; + + + /** + * Utility getter to retrieve the tag from the job parameters. + * @return The tag label. + */ + public String getTag() { + return (String)getParameter("tag"); + } + + /** + * Utility setter to set the tag in the job parameters. + * @param tag A string representing the tag label. + */ + public void setTag(String tag) { + setParameter("tag", tag); + } + + + /** + * theme that need to be tagged. + * @return thema The name of the theme. + */ + public String getThema() { + return (String)getParameter("thema"); + } + + /** + * Set the theme name of the table that need to be tagged from. + * @param thema The name of the theme. + */ + public void setThema(String thema) { + setParameter("thema", thema); + } + + public TagJob() { + super (PRIORITY); + } +} diff --git a/domain/src/main/java/nl/ipo/cds/domain/TypeGebruik.java b/domain/src/main/java/nl/ipo/cds/domain/TypeGebruik.java new file mode 100644 index 00000000..20501027 --- /dev/null +++ b/domain/src/main/java/nl/ipo/cds/domain/TypeGebruik.java @@ -0,0 +1,56 @@ +package nl.ipo.cds.domain; + +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +/** + * Describes the type of authorization when authorizing a {@link DbGebruiker} with a {@link BronhouderThema}. + */ +public enum TypeGebruik { + /** + * The user can access data in datasets belonging to a theme through the services. + */ + RAADPLEGER, + + /** + * The user can manage the data in datasets belonging to a theme. + */ + DATABEHEERDER (TypeGebruik.RAADPLEGER), + + /** + * The user can publish a dataset. + */ + VASTSTELLER (TypeGebruik.RAADPLEGER); + + private final Set permissions; + + TypeGebruik () { + this (new TypeGebruik[0]); + } + + TypeGebruik (final TypeGebruik ... otherPermissions) { + final Set permissions = new HashSet<> (); + + permissions.add (this); + for (final TypeGebruik other: otherPermissions) { + permissions.add (other); + } + + this.permissions = Collections.unmodifiableSet (permissions); + } + + /** + * Returns true if the given typeGebruik is either equal to or implied by this type gebruik. + * + * @param typeGebruik The type gebruik to test. + * @return True if "this" equals typeGebruik, or if typeGebruik is implied by this. + */ + public boolean isAllowed (final TypeGebruik typeGebruik) { + return permissions.contains (typeGebruik); + } + + public Set getPermissions () { + return Collections.unmodifiableSet (permissions); + } +} diff --git a/domain/src/main/main29.iml b/domain/src/main/main29.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/domain/src/main/main29.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/etl-attributemapping/etl-attributemapping.iml b/etl-attributemapping/etl-attributemapping.iml new file mode 100644 index 00000000..233c593a --- /dev/null +++ b/etl-attributemapping/etl-attributemapping.iml @@ -0,0 +1,104 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-attributemapping/pom.xml b/etl-attributemapping/pom.xml index abca8b67..19e06222 100644 --- a/etl-attributemapping/pom.xml +++ b/etl-attributemapping/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 etl-attributemapping CDS - ETL - Attributemapping @@ -11,7 +11,7 @@ nl.ipo.cds attributemapping - 2.5 + 2.6 nl.ipo.cds diff --git a/etl-attributemapping/src/main/main3.iml b/etl-attributemapping/src/main/main3.iml new file mode 100644 index 00000000..0f16b0c3 --- /dev/null +++ b/etl-attributemapping/src/main/main3.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-operations/etl-operations.iml b/etl-operations/etl-operations.iml new file mode 100644 index 00000000..51d8e481 --- /dev/null +++ b/etl-operations/etl-operations.iml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-operations/pom.xml b/etl-operations/pom.xml index ee62f622..2ff81bfe 100644 --- a/etl-operations/pom.xml +++ b/etl-operations/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 etl-operations CDS Inspire - ETL - Transform operations @@ -11,7 +11,7 @@ nl.ipo.cds attributemapping - 2.5 + 2.6 junit diff --git a/etl-operations/src/main/main10.iml b/etl-operations/src/main/main10.iml new file mode 100644 index 00000000..f9b132ab --- /dev/null +++ b/etl-operations/src/main/main10.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-operations/src/test/test2.iml b/etl-operations/src/test/test2.iml new file mode 100644 index 00000000..bcb85b15 --- /dev/null +++ b/etl-operations/src/test/test2.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-proces/etl-proces.iml b/etl-proces/etl-proces.iml new file mode 100644 index 00000000..d299254c --- /dev/null +++ b/etl-proces/etl-proces.iml @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-proces/pom.xml b/etl-proces/pom.xml index 3e9dfb1d..8b058ca3 100644 --- a/etl-proces/pom.xml +++ b/etl-proces/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml etl-proces @@ -287,12 +287,12 @@ nl.ipo.cds attributemapping - 2.5 + 2.6 nl.ipo.cds etl-operations - 2.5 + 2.6 nl.idgis.commons diff --git a/etl-proces/src/main/java/nl/ipo/cds/etl/process/TagProcess.java b/etl-proces/src/main/java/nl/ipo/cds/etl/process/TagProcess.java new file mode 100644 index 00000000..9d803ab8 --- /dev/null +++ b/etl-proces/src/main/java/nl/ipo/cds/etl/process/TagProcess.java @@ -0,0 +1,108 @@ +package nl.ipo.cds.etl.process; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; + +import javax.sql.DataSource; + +import nl.idgis.commons.jobexecutor.Job; +import nl.idgis.commons.jobexecutor.JobLogger; +import nl.idgis.commons.jobexecutor.Process; +import nl.ipo.cds.domain.TagJob; +import nl.ipo.cds.etl.db.annotation.Table; +import nl.ipo.cds.etl.theme.ThemeDiscoverer; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.jdbc.support.rowset.SqlRowSet; +import org.springframework.transaction.annotation.Transactional; + +import com.google.common.base.Joiner; + +@Transactional +public class TagProcess implements Process { + + private static final Log log = LogFactory.getLog(TagProcess.class); + + private final DataSource dataSource; + + private ThemeDiscoverer themeDiscoverer; + + public TagProcess(final DataSource dataSource, final ThemeDiscoverer themeDiscoverer) { + this.dataSource = dataSource; + this.themeDiscoverer = themeDiscoverer; + } + + @Override + public boolean process(TagJob job, JobLogger logger) { + log.debug("tagging dataset started"); + + final Table table = themeDiscoverer.getThemeConfiguration(job.getThema()).getFeatureTypeClass().getAnnotation(Table.class); + + log.debug("bronhouder: " + job.getBronhouder()); + log.debug("datasetType: " + job.getDatasetType()); + log.debug("uuid: " + job.getUuid()); + log.debug("schema name: " + table.schema()); + log.debug("tag: " + job.getTag()); + log.debug("table: " + table.name()); + + + // Now return all columns for the features in the table. + Set columnNames = retrieveColumns(table); + + // Actually copy the data. + copyData(job, table, columnNames); + + log.debug("tagging dataset finished"); + + return false; + } + + private void copyData(TagJob job, Table table, Set columnNames) { + + String colStr = Joiner.on(',').join(columnNames); + String srcTable = String.format("%s.%s", table.schema(), table.name()); + String destTable = String.format("%s_tagged", srcTable); + + NamedParameterJdbcTemplate jdbc = new NamedParameterJdbcTemplate(dataSource); + MapSqlParameterSource namedParams = new MapSqlParameterSource(); + namedParams.addValue("tag", job.getTag()); + int numRecords = jdbc.queryForObject(String.format("select count(*) from %s", srcTable), new MapSqlParameterSource(), Integer.class); + + int numCopied = jdbc.update(String.format("insert into %s (tag, %s) select :tag, %s from %s", destTable, colStr, colStr, srcTable), namedParams); + + if (numCopied != numRecords) { + throw new RuntimeException(String.format("Not all records where correctly copied to the _tagged table. Expected number of records: %d, actual: %d.", numRecords, numCopied)); + } + } + + /** + * Retrieve a set of columns for a table in a certain schema. + */ + private Set retrieveColumns(Table table) { + NamedParameterJdbcTemplate jdbc = new NamedParameterJdbcTemplate(dataSource); + Map params = new HashMap(); + params.put("schema_name", table.schema()); + params.put("table_name", table.name()); + + SqlRowSet columnResultSet = jdbc.queryForRowSet("select column_name from information_schema.columns where table_schema=:schema_name and table_name=:table_name", params); + SortedSet columnNames = new TreeSet(); + while (columnResultSet.next()) { + String columnName = columnResultSet.getString("column_name"); + if (!columnName.equals("id")) { + columnNames.add(columnName); + } + } + return columnNames; + } + + @Override + public Class getJobType() { + return TagJob.class; + } +} diff --git a/etl-proces/src/main/main24.iml b/etl-proces/src/main/main24.iml new file mode 100644 index 00000000..0597218d --- /dev/null +++ b/etl-proces/src/main/main24.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-proces/src/test/test1.iml b/etl-proces/src/test/test1.iml new file mode 100644 index 00000000..f2f65775 --- /dev/null +++ b/etl-proces/src/test/test1.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-reporting/etl-reporting.iml b/etl-reporting/etl-reporting.iml new file mode 100644 index 00000000..18521089 --- /dev/null +++ b/etl-reporting/etl-reporting.iml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-reporting/pom.xml b/etl-reporting/pom.xml index 5cc0d4b8..01aec8e8 100644 --- a/etl-reporting/pom.xml +++ b/etl-reporting/pom.xml @@ -40,7 +40,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml etl-reporting diff --git a/etl-reporting/src/main/main14.iml b/etl-reporting/src/main/main14.iml new file mode 100644 index 00000000..05ecc27b --- /dev/null +++ b/etl-reporting/src/main/main14.iml @@ -0,0 +1,25 @@ + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/etl/reporting/geom/geometry-applicationContext.xml + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-reporting/src/test/test15.iml b/etl-reporting/src/test/test15.iml new file mode 100644 index 00000000..d9272e86 --- /dev/null +++ b/etl-reporting/src/test/test15.iml @@ -0,0 +1,26 @@ + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/dao/dao-applicationContext-test.xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-test/etl-test.iml b/etl-test/etl-test.iml new file mode 100644 index 00000000..811741ce --- /dev/null +++ b/etl-test/etl-test.iml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/etl-test/pom.xml b/etl-test/pom.xml index 1db1a3fc..54cbc9b2 100644 --- a/etl-test/pom.xml +++ b/etl-test/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 etl-test CDS - ETL test diff --git a/etl-test/src/main/main9.iml b/etl-test/src/main/main9.iml new file mode 100644 index 00000000..10520115 --- /dev/null +++ b/etl-test/src/main/main9.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jndi-client/pom.xml b/jndi-client/pom.xml index 8fae6f65..5bf733b2 100644 --- a/jndi-client/pom.xml +++ b/jndi-client/pom.xml @@ -3,11 +3,11 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 nl.ipo.cds jndi-client - 2.5 + 2.6 jboss diff --git a/jndi-client/src/main/main7.iml b/jndi-client/src/main/main7.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/jndi-client/src/main/main7.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/jndi-server/src/main/main12.iml b/jndi-server/src/main/main12.iml new file mode 100644 index 00000000..1b21765e --- /dev/null +++ b/jndi-server/src/main/main12.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/job-executor-api/job-executor-api.iml b/job-executor/job-executor-api/job-executor-api.iml new file mode 100644 index 00000000..79b97adc --- /dev/null +++ b/job-executor/job-executor-api/job-executor-api.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/job-executor-api/pom.xml b/job-executor/job-executor-api/pom.xml index 601b72ff..e77e3e55 100644 --- a/job-executor/job-executor-api/pom.xml +++ b/job-executor/job-executor-api/pom.xml @@ -5,7 +5,7 @@ nl.ipo.cds job-executor - 2.5 + 2.6 jar diff --git a/job-executor/job-executor-api/src/main/main19.iml b/job-executor/job-executor-api/src/main/main19.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/job-executor/job-executor-api/src/main/main19.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/job-executor-exec/job-executor-exec.iml b/job-executor/job-executor-exec/job-executor-exec.iml new file mode 100644 index 00000000..58e972e5 --- /dev/null +++ b/job-executor/job-executor-exec/job-executor-exec.iml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/job-executor-exec/pom.xml b/job-executor/job-executor-exec/pom.xml index ce48f208..35499b2f 100644 --- a/job-executor/job-executor-exec/pom.xml +++ b/job-executor/job-executor-exec/pom.xml @@ -5,7 +5,7 @@ nl.ipo.cds job-executor - 2.5 + 2.6 jar @@ -42,13 +42,13 @@ nl.ipo.cds themes - 2.5 + 2.6 pom nl.ipo.cds catalog-metadata - 2.5 + 2.6 diff --git a/job-executor/job-executor-exec/src/main/main11.iml b/job-executor/job-executor-exec/src/main/main11.iml new file mode 100644 index 00000000..0c9e0d0a --- /dev/null +++ b/job-executor/job-executor-exec/src/main/main11.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/job-executor-exec/src/test/test10.iml b/job-executor/job-executor-exec/src/test/test10.iml new file mode 100644 index 00000000..b57fed55 --- /dev/null +++ b/job-executor/job-executor-exec/src/test/test10.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/job-executor.iml b/job-executor/job-executor.iml new file mode 100644 index 00000000..467c235d --- /dev/null +++ b/job-executor/job-executor.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/job-executor/pom.xml b/job-executor/pom.xml index 7489d0cc..4c63dc7c 100644 --- a/job-executor/pom.xml +++ b/job-executor/pom.xml @@ -5,7 +5,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 ../pom.xml pom diff --git a/managerDB/managerDB.iml b/managerDB/managerDB.iml new file mode 100644 index 00000000..9bf881dc --- /dev/null +++ b/managerDB/managerDB.iml @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/managerDB/pom.xml b/managerDB/pom.xml index bc9c42f2..fbf4829b 100644 --- a/managerDB/pom.xml +++ b/managerDB/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml managerDB @@ -388,12 +388,12 @@ nl.ipo.cds attributemapping - 2.5 + 2.6 nl.ipo.cds etl-attributemapping - 2.5 + 2.6 \ No newline at end of file diff --git a/managerDB/src/main/java/nl/ipo/cds/dao/ManagerDaoAuthenticationProvider.java b/managerDB/src/main/java/nl/ipo/cds/dao/ManagerDaoAuthenticationProvider.java new file mode 100644 index 00000000..7718c3cd --- /dev/null +++ b/managerDB/src/main/java/nl/ipo/cds/dao/ManagerDaoAuthenticationProvider.java @@ -0,0 +1,128 @@ +package nl.ipo.cds.dao; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import nl.ipo.cds.domain.Gebruiker; +import nl.ipo.cds.domain.GebruikerThemaAutorisatie; +import nl.ipo.cds.domain.TypeGebruik; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; + +/** + * {@link AuthenticationProvider} for Spring security that uses the {@link ManagerDao} to + * provide users and roles. + * + * Adds one or more of the following roles to the resulting authentication token upon success: + * - ROLE_USER: all users have this role. + * - ROLE_SUPERUSER: superusers/admins. These users have the superuser flag set to true. + * - The constants in {@link TypeGebruik}, prefixed with ROLE_: ROLE_RAADPLEGER, ROLE_DATABEHEERDER and ROLE_VASTSTELLER. + */ +public class ManagerDaoAuthenticationProvider implements AuthenticationProvider { + + private final static Logger logger = LoggerFactory.getLogger (ManagerDaoAuthenticationProvider.class); + + private final ManagerDao managerDao; + + /** + * Creates a {@link ManagerDaoAuthenticationProvider} by providing the DAO instance to use. + * + * @param managerDao The {@link ManagerDao} instance to use. Cannot be null. + */ + public ManagerDaoAuthenticationProvider (final ManagerDao managerDao) { + if (managerDao == null) { + throw new NullPointerException ("managerDao cannot be null"); + } + + this.managerDao = managerDao; + } + + /** + * {@inheritDoc} + */ + @Override + public Authentication authenticate (final Authentication authentication) throws AuthenticationException { + if (!(authentication instanceof UsernamePasswordAuthenticationToken)) { + throw new IllegalArgumentException ("Only UsernamePasswordAuthenticationToken is supported"); + } + + final UsernamePasswordAuthenticationToken token = (UsernamePasswordAuthenticationToken) authentication; + + final String username = token.getName (); + final String password = (String) authentication.getCredentials(); + + if (username == null || username.isEmpty ()) { + logger.error ("Failed to authenticate: empty username"); + throw new BadCredentialsException ("Empty username"); + } + if (password == null) { + logger.error ("Failed to authenticate user " + username + ": null password was provided"); + throw new BadCredentialsException ("null password was provided"); + } + + // Attempt to authenticate: + if (!managerDao.authenticate (username, password)) { + logger.error ("Failed to authenticate user " + username + ": bad credentials"); + throw new BadCredentialsException ("Bad credentials"); + } + + // Create user details: + final List grantedAuthorities = getGrantedAuthorities (username); + + logger.info ("User " + username + " successfully authenticated (" + grantedAuthorities.toString () + ")"); + + return new UsernamePasswordAuthenticationToken (username, password, grantedAuthorities); + } + + private List getGrantedAuthorities (final String username) { + final Gebruiker gebruiker = managerDao.getGebruiker (username); + if (gebruiker == null) { + return Collections.emptyList (); + } + + final List authorities = new ArrayList (); + + authorities.add (new SimpleGrantedAuthority ("ROLE_USER")); + + final Set typeGebruik = new HashSet (); + + if (gebruiker.isSuperuser ()) { + authorities.add (new SimpleGrantedAuthority ("ROLE_SUPERUSER")); + if (!managerDao.getBronhouderThemas ().isEmpty ()) { + typeGebruik.addAll (Arrays.asList (TypeGebruik.values ())); + } + } else { + for (final GebruikerThemaAutorisatie gta: managerDao.getGebruikerThemaAutorisatie (gebruiker)) { + for (final TypeGebruik permission: gta.getTypeGebruik ().getPermissions ()) { + typeGebruik.add (permission); + } + } + } + + for (final TypeGebruik tg: typeGebruik) { + authorities.add (new SimpleGrantedAuthority ("ROLE_" + tg.toString().toUpperCase ())); + } + + return Collections.unmodifiableList (authorities); + } + + /** + * {@inheritDoc} + */ + @Override + public boolean supports (final Class authentication) { + return UsernamePasswordAuthenticationToken.class.isAssignableFrom (authentication); + } +} diff --git a/managerDB/src/main/java/nl/ipo/cds/dao/TagDao.java b/managerDB/src/main/java/nl/ipo/cds/dao/TagDao.java new file mode 100644 index 00000000..68f75090 --- /dev/null +++ b/managerDB/src/main/java/nl/ipo/cds/dao/TagDao.java @@ -0,0 +1,19 @@ +/** + * + */ +package nl.ipo.cds.dao; + + +/** + * @author annes + * + * DAO for methods that concern the tag functionality + * + */ +public interface TagDao { + + Boolean doesTagExist(String tag, String schemaName, String tableName); + + Boolean doesTagJobWithIdExist(String tag, String thema); + +} diff --git a/managerDB/src/main/java/nl/ipo/cds/dao/impl/TagDaoImpl.java b/managerDB/src/main/java/nl/ipo/cds/dao/impl/TagDaoImpl.java new file mode 100644 index 00000000..3d040d03 --- /dev/null +++ b/managerDB/src/main/java/nl/ipo/cds/dao/impl/TagDaoImpl.java @@ -0,0 +1,76 @@ +/** + * + */ +package nl.ipo.cds.dao.impl; + +import nl.ipo.cds.dao.TagDao; +import nl.ipo.cds.domain.TagJob; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.transaction.annotation.Transactional; + +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; +import javax.persistence.TypedQuery; +import javax.sql.DataSource; + +/** + * @author annes + * + */ +@Transactional +public class TagDaoImpl implements TagDao { + + private static final Log log = LogFactory.getLog(TagDaoImpl.class); + + private EntityManager entityManager; + + private JdbcTemplate jdbcTemplate; + + @PersistenceContext(unitName = "cds") + public void setEntityManager(EntityManager entityManager) { + this.entityManager = entityManager; + } + + public EntityManager getEntityManager () { + return entityManager; + } + + @Inject + public void setDataSource(DataSource dataSource) { + jdbcTemplate = new JdbcTemplate(dataSource); + } + + /* + * This method checks if the given tag already exists in the _tagged table from that theme. + * + * @see nl.ipo.cds.dao.TagDao#doesTagExist(java.lang.String) + */ + @Override + public Boolean doesTagExist(String tag, String schemaName, String tableName) { + log.debug("entered method doesTagExist"); + String sql = "select count(tag) from " + schemaName + "." + tableName + "_tagged where tag= ?"; + log.debug("query" + sql + " will be executed"); + Integer res = jdbcTemplate.queryForObject(sql, Integer.class, tag); + return res > 0; + } + + + /* This method checks if the given tag already exists in the etljob table joined with the job table. + * @see nl.ipo.cds.dao.TagDao#doesTagJobWithIdExist(java.lang.String) + */ + @Override + public Boolean doesTagJobWithIdExist(String tag, String thema) { + final TypedQuery jobQuery; + jobQuery = entityManager.createQuery("from TagJob as job where job.status = 'PREPARED' or job.status='CREATED' or job.status='STARTED'", TagJob.class); + for (TagJob job : jobQuery.getResultList()) { + if (job.getTag().equals(tag) && job.getThema().equals(thema)) { + return true; + } + } + return false; + } + +} diff --git a/managerDB/src/main/java/nl/ipo/cds/dao/impl/ldap/GebruikerContextMapper.java b/managerDB/src/main/java/nl/ipo/cds/dao/impl/ldap/GebruikerContextMapper.java new file mode 100644 index 00000000..130899fb --- /dev/null +++ b/managerDB/src/main/java/nl/ipo/cds/dao/impl/ldap/GebruikerContextMapper.java @@ -0,0 +1,26 @@ +package nl.ipo.cds.dao.impl.ldap; + +import javax.naming.NamingException; +import javax.naming.directory.Attributes; + +import org.springframework.ldap.core.ContextMapper; +import org.springframework.ldap.core.DirContextAdapter; + +public class GebruikerContextMapper implements ContextMapper { + + private final GebruikerAttributesMapper mapper = new GebruikerAttributesMapper (); + + @Override + public Object mapFromContext (final Object ctx) { + final DirContextAdapter context = (DirContextAdapter) ctx; + final Attributes attributes = context.getAttributes (); + + attributes.put ("dn", context.getDn ().toString ()); + + try { + return mapper.fromAttributes (attributes); + } catch (NamingException e) { + return null; + } + } +} diff --git a/managerDB/src/main/main22.iml b/managerDB/src/main/main22.iml new file mode 100644 index 00000000..e423df14 --- /dev/null +++ b/managerDB/src/main/main22.iml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/dao/initDB.xml + file://$MODULE_DIR$/resources/nl/ipo/cds/dao/dao-applicationContext.xml + file://$MODULE_DIR$/resources/nl/ipo/cds/dao/dataSource-applicationContext.xml + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.2_to_2.2-vrn-0.5.1_00.sql b/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.2_to_2.2-vrn-0.5.1_00.sql new file mode 100644 index 00000000..92f9834f --- /dev/null +++ b/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.2_to_2.2-vrn-0.5.1_00.sql @@ -0,0 +1 @@ +-- This file is intentionally left blank (to bridge the gap between the previous and the next update). \ No newline at end of file diff --git a/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.5.1_to_2.2-vrn-0.5.2_00.sql b/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.5.1_to_2.2-vrn-0.5.2_00.sql new file mode 100644 index 00000000..3cb39995 --- /dev/null +++ b/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.5.1_to_2.2-vrn-0.5.2_00.sql @@ -0,0 +1,2 @@ +create view manager.themabronhouderauthorization as select * from manager.bronhouderthema; +grant select on manager.themabronhouderauthorization to inspire; \ No newline at end of file diff --git a/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.5.2_to_2.2-vrn-0.5.3_00.sql b/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.5.2_to_2.2-vrn-0.5.3_00.sql new file mode 100644 index 00000000..e77a5eb5 --- /dev/null +++ b/managerDB/src/main/sql/updates/inspider_2.2-vrn-0.5.2_to_2.2-vrn-0.5.3_00.sql @@ -0,0 +1,3 @@ +-- The production database apparently uses TEXT, which causes jobs not being able to be created since the UUID does not fit in their database column. +-- If this statement fails to execute, make sure your do not have manager.dataset.uuid values that are longer than 255 characters. +alter table manager.dataset alter column uuid set data type varchar(255); diff --git a/managerDB/src/main/sql/updates/inspider_2.2_to_2.2-vrn-0.2_00.sql b/managerDB/src/main/sql/updates/inspider_2.2_to_2.2-vrn-0.2_00.sql new file mode 100644 index 00000000..bbd1d4b3 --- /dev/null +++ b/managerDB/src/main/sql/updates/inspider_2.2_to_2.2-vrn-0.2_00.sql @@ -0,0 +1,35 @@ + +-- Authorization changes. +ALTER TABLE manager.themabronhouderauthorization RENAME TO BronhouderThema; + +create table manager.gebruiker ( + gebruikersnaam varchar(255) not null, + superuser bool not null, + primary key (gebruikersnaam) +); + + +create table manager.GebruikerThemaAutorisatie ( + typeGebruik int4 not null, + gebruiker_gebruikersnaam varchar(255) not null, + bronhouderThema_thema_id int8 not null, + bronhouderThema_bronhouder_id int8 not null, + primary key (gebruiker_gebruikersnaam, bronhouderThema_thema_id, bronhouderThema_bronhouder_id) +); + + + +alter table manager.GebruikerThemaAutorisatie + add constraint GebruikerThemaAutorisatie_Gebruiker + foreign key (gebruiker_gebruikersnaam) + references manager.gebruiker; + + alter table manager.GebruikerThemaAutorisatie + add constraint GebruikerThemaAutorisatie_BronhouderThema + foreign key (bronhouderThema_thema_id, bronhouderThema_bronhouder_id) + references manager.BronhouderThema; + +-- Add parameters column to etljob for storing job parameters (used by TagJob for example). +ALTER TABLE manager.etljob ADD COLUMN parameters TEXT; + +insert into manager.jobtype (id, naam, prioriteit) select nextval('manager.hibernate_sequence'), 'TAG', '200'; diff --git a/managerDB/src/test/java/nl/ipo/cds/dao/BaseLdapManagerDaoTest.java b/managerDB/src/test/java/nl/ipo/cds/dao/BaseLdapManagerDaoTest.java new file mode 100644 index 00000000..b9b92c7f --- /dev/null +++ b/managerDB/src/test/java/nl/ipo/cds/dao/BaseLdapManagerDaoTest.java @@ -0,0 +1,102 @@ +package nl.ipo.cds.dao; + +import nl.ipo.cds.dao.impl.ManagerDaoImpl; +import nl.ipo.cds.domain.BronhouderThema; +import nl.ipo.cds.domain.Gebruiker; +import nl.ipo.cds.domain.GebruikerThemaAutorisatie; +import nl.ipo.cds.domain.TypeGebruik; + +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.springframework.core.io.ClassPathResource; +import org.springframework.ldap.core.DistinguishedName; +import org.springframework.ldap.core.LdapTemplate; +import org.springframework.ldap.core.support.LdapContextSource; +import org.springframework.ldap.test.LdapTestUtils; + +public abstract class BaseLdapManagerDaoTest extends BaseManagerDaoTest { + + protected static final DistinguishedName BASE_NAME = new DistinguishedName ("dc=inspire,dc=idgis,dc=eu"); + protected static final String PRINCIPAL = "uid=admin,ou=system"; + protected static final String CREDENTIALS = "secret"; + protected static final int PORT = 10389; + protected static final String[] gebruikers = { + "brabant", + "drenthe", + "flevoland", + "fryslan", + "gelderland", + "groningen", + "limburg", + "noord-holland", + "overijssel", + "utrecht", + "zeeland", + "zuid-holland" + }; + + protected LdapTemplate ldapTemplate; + + @BeforeClass + public static void setUpClass () throws Exception { + LdapTestUtils.startApacheDirectoryServer (PORT, BASE_NAME.toString (), "odm-test", PRINCIPAL, CREDENTIALS); + } + + @AfterClass + public static void tearDownClass () throws Exception { + LdapTestUtils.destroyApacheDirectoryServer (PRINCIPAL, CREDENTIALS); + } + + @Before @Override + public void buildDB() throws Exception { + super.buildDB (); + + + // Bind to the LDAP directory: + final LdapContextSource contextSource = new LdapContextSource (); + contextSource.setUrl ("ldap://127.0.0.1:" + PORT + "/dc=inspire,dc=idgis,dc=eu"); + contextSource.setUserDn (PRINCIPAL); + contextSource.setPassword (CREDENTIALS); + contextSource.setPooled (false); + contextSource.afterPropertiesSet (); + + // Create an LDAP template: + ldapTemplate = new LdapTemplate (contextSource); + + LdapTestUtils.cleanAndSetup (ldapTemplate.getContextSource (), new DistinguishedName (), new ClassPathResource ("nl/ipo/cds/dao/testdata.ldif")); + + ((ManagerDaoImpl)managerDao).setLdapTemplate (ldapTemplate); + + entityManager.flush (); + } + + protected void createGebruikerThemaAutorisatie () { + // Create GebruikerThemaAutorisatie instances for testing: + createGebruikerThemaAutorisatie ("Thema 2", "Overijssel", "overijssel", TypeGebruik.RAADPLEGER); + createGebruikerThemaAutorisatie ("Protected sites", "Limburg", "limburg", TypeGebruik.RAADPLEGER); + createGebruikerThemaAutorisatie ("Thema 2", "Noord-Holland", "noord-holland", TypeGebruik.RAADPLEGER); + createGebruikerThemaAutorisatie ("Protected sites", "Drenthe", "drenthe", TypeGebruik.RAADPLEGER); + + entityManager.flush (); + } + + protected GebruikerThemaAutorisatie createGebruikerThemaAutorisatie (final String themeName, final String bronhouderName, final String gebruikerName, final TypeGebruik typeGebruik) { + final Gebruiker gebruiker = managerDao.getGebruiker (gebruikerName); + + // Create database backing for the user: + managerDao.update (gebruiker); + + final BronhouderThema bronhouderThema = entityManager + .createQuery ("from BronhouderThema bt where bt.bronhouder.naam = ?1 and bt.thema.naam = ?2", BronhouderThema.class) + .setParameter (1, bronhouderName) + .setParameter (2, themeName) + .getSingleResult (); + + final GebruikerThemaAutorisatie gta = new GebruikerThemaAutorisatie (gebruiker.getDbGebruiker (), bronhouderThema, typeGebruik); + + entityManager.persist (gta); + + return gta; + } +} diff --git a/managerDB/src/test/java/nl/ipo/cds/dao/ManagerDaoAuthenticationProviderTest.java b/managerDB/src/test/java/nl/ipo/cds/dao/ManagerDaoAuthenticationProviderTest.java new file mode 100644 index 00000000..98d2643e --- /dev/null +++ b/managerDB/src/test/java/nl/ipo/cds/dao/ManagerDaoAuthenticationProviderTest.java @@ -0,0 +1,211 @@ +package nl.ipo.cds.dao; + +import static org.junit.Assert.fail; +import nl.ipo.cds.categories.IntegrationTests; +import nl.ipo.cds.domain.BronhouderThema; +import nl.ipo.cds.domain.Gebruiker; +import nl.ipo.cds.domain.TypeGebruik; + +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; + +/** + * Test cases for the {@link ManagerDaoAuthenticationProvider}. Tests whether authentication succeeds + * for various types of users and whether the correct roles are assigned. + */ +@Category(IntegrationTests.class) +public class ManagerDaoAuthenticationProviderTest extends BaseLdapManagerDaoTest { + + private ManagerDaoAuthenticationProvider provider; + + /** + * Overriden to create a {@link ManagerDaoAuthenticationProvider} instance. + */ + @Override + public void buildDB() throws Exception { + super.buildDB (); + + provider = new ManagerDaoAuthenticationProvider (managerDao); + } + + /** + * Test whether a superuser can authenticate and has the correct roles. + */ + @Test + public void testAuthenticateSuperuser () { + createUser ("test-admin", "test", true); + + final Authentication authentication = authenticate ("test-admin", "test"); + + assertAuthority (authentication, "ROLE_USER"); + assertAuthority (authentication, "ROLE_SUPERUSER"); + assertAuthority (authentication, "ROLE_RAADPLEGER"); + assertAuthority (authentication, "ROLE_DATABEHEERDER"); + assertAuthority (authentication, "ROLE_VASTSTELLER"); + } + + /** + * Test whether providing a bad password for a superuser causes authentication to fail. + */ + @Test (expected = BadCredentialsException.class) + public void testAuthenticateSuperuserFail () { + createUser ("test-admin", "test", true); + authenticate ("test-admin", "tset"); + } + + /** + * Test whether a normal can authenticate and has the correct roles. + */ + @Test + public void testAuthenticateUser () { + createUser ("test-user", "test", false); + + final Authentication authentication = authenticate ("test-user", "test"); + + assertAuthority (authentication, "ROLE_USER"); + assertNotAuthority (authentication, "ROLE_SUPERUSER"); + assertNotAuthority (authentication, "ROLE_RAADPLEGER"); + assertNotAuthority (authentication, "ROLE_DATABEHEERDER"); + assertNotAuthority (authentication, "ROLE_VASTSTELLER"); + } + + /** + * Test whether providing a bad password for a normal user causes authentication to fail. + */ + @Test (expected = BadCredentialsException.class) + public void testAuthenticateUserFail () { + createUser ("test-user", "test", false); + authenticate ("test-user", "tset"); + } + + /** + * Test whether a normal user with additiona authorization can authenticate and has the correct roles. + */ + @Test + public void testAuthenticateDatabeheerder () { + createUser ("test-user", "test", false); + + createGebruikerThemaAutorisatie ("Protected sites", "Limburg", "test-user", TypeGebruik.DATABEHEERDER); + + final Authentication authentication = authenticate ("test-user", "test"); + + assertAuthority (authentication, "ROLE_USER"); + assertNotAuthority (authentication, "ROLE_SUPERUSER"); + assertAuthority (authentication, "ROLE_RAADPLEGER"); + assertAuthority (authentication, "ROLE_DATABEHEERDER"); + assertNotAuthority (authentication, "ROLE_VASTSTELLER"); + } + + /** + * Asserts that when a superuser is authenticated and there are no bronhouder-thema relations + * stored the superuser shouldn't be assigned the RAADPLEGER, DATABEHEERDER or VASTSTELLER roles. + */ + @Test + public void testAuthenticateSuperuserWithoutBronhouderThema () { + // Delete all BronhouderThema instances: + for (final BronhouderThema bt: managerDao.getBronhouderThemas ()) { + managerDao.delete (bt); + } + + entityManager.flush (); + + createUser ("test-admin", "test", true); + + final Authentication authentication = authenticate ("test-admin", "test"); + + assertAuthority (authentication, "ROLE_USER"); + assertAuthority (authentication, "ROLE_SUPERUSER"); + assertNotAuthority (authentication, "ROLE_RAADPLEGER"); + assertNotAuthority (authentication, "ROLE_DATABEHEERDER"); + assertNotAuthority (authentication, "ROLE_VASTSTELLER"); + } + + /** + * Asserts that the user can login using the same credentials after saving the user. + */ + @Test + public void testPasswordAfterSave () { + createUser ("test-admin", "test", true); + + final Authentication authentication = authenticate ("test-admin", "test"); + + assertAuthority (authentication, "ROLE_VASTSTELLER"); + + final Gebruiker user = managerDao.getGebruiker ("test-admin"); + managerDao.update (user); + + entityManager.flush (); + + final Authentication authentication2 = authenticate ("test-admin", "test"); + + assertAuthority (authentication2, "ROLE_VASTSTELLER"); + + } + + + /** + * Asserts whether the given authentication token doesn't have the provided authority. + * + * @param authentication The authentication token to test. + * @param authority The authority to look for. + */ + private static void assertNotAuthority (final Authentication authentication, final String authority) { + for (final GrantedAuthority ga: authentication.getAuthorities ()) { + if (ga.getAuthority ().equals (authority)) { + fail ("Unexpected authority: " + authority); + } + } + } + + /** + * Asserts whether the given authentication token has the provided authority. + * + * @param authentication The authentication token to test. + * @param authority The authority to look for. + */ + private static void assertAuthority (final Authentication authentication, final String authority) { + for (final GrantedAuthority ga: authentication.getAuthorities ()) { + if (ga.getAuthority ().equals (authority)) { + return; + } + } + + fail ("Missing authority: " + authority); + } + + /** + * Convenience method to perform authentication on the authentication provider. + * + * @param username The username + * @param password The password + * @return The resulting authentication token. + */ + private Authentication authenticate (final String username, final String password) { + return provider.authenticate (new UsernamePasswordAuthenticationToken (username, password)); + } + + /** + * Convenience helper for creating users. + * + * @param username The username of the user to create. + * @param superuser Set to true if this user must have the superuser flag. + */ + private Gebruiker createUser (final String username, final String password, final boolean superuser) { + final Gebruiker gebruiker = new Gebruiker (); + + gebruiker.setGebruikersnaam (username); + gebruiker.setEmail ("mail@mail.local"); + gebruiker.setSuperuser (superuser); + gebruiker.setWachtwoord (password); + + managerDao.create (gebruiker); + + entityManager.flush (); + + return gebruiker; + } +} diff --git a/managerDB/src/test/java/nl/ipo/cds/dao/impl/TagDaoImplTest.java b/managerDB/src/test/java/nl/ipo/cds/dao/impl/TagDaoImplTest.java new file mode 100644 index 00000000..301a26ef --- /dev/null +++ b/managerDB/src/test/java/nl/ipo/cds/dao/impl/TagDaoImplTest.java @@ -0,0 +1,49 @@ +/** + * + */ +package nl.ipo.cds.dao.impl; + +import nl.ipo.cds.dao.TagDao; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; + +/** + * @author annes + * + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration({ "classpath:/nl/ipo/cds/dao/dao-applicationContext-test-h2.xml" }) +public class TagDaoImplTest { + + + @Autowired + private TagDao tagDao; + + /** + * Test method for {@link nl.ipo.cds.dao.impl.TagDaoImpl#doesTagExist(java.lang.String, nl.ipo.cds.domain.Thema, java.lang.String)}. + */ + @Test + @Transactional + public void testDoesTagExist() { + boolean doesExist = tagDao.doesTagExist("TestTag", "vrn", "gebiedbeheer_landelijk"); + Assert.assertTrue(doesExist); + boolean doesNotExist = tagDao.doesTagExist("TestTagNotPresent", "vrn", "gebiedbeheer_landelijk"); + Assert.assertTrue(!doesNotExist); + } + + + @Test + @Transactional + public void testDoesTagJobWithIdExist() { + boolean doesExist = tagDao.doesTagJobWithIdExist("testTag", "LandelijkGebiedBeheer"); + Assert.assertTrue(doesExist); + boolean doesNotExist = tagDao.doesTagJobWithIdExist("Deze niet", "LandelijkGebiedBeheer"); + Assert.assertTrue(!doesNotExist); + + } +} diff --git a/managerDB/src/test/resources/nl/ipo/cds/dao/dao-applicationContext-test-h2.xml b/managerDB/src/test/resources/nl/ipo/cds/dao/dao-applicationContext-test-h2.xml new file mode 100644 index 00000000..e8d46fe3 --- /dev/null +++ b/managerDB/src/test/resources/nl/ipo/cds/dao/dao-applicationContext-test-h2.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + validate + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/managerDB/src/test/resources/nl/ipo/cds/dao/h2-test-data.sql b/managerDB/src/test/resources/nl/ipo/cds/dao/h2-test-data.sql new file mode 100644 index 00000000..2f0c8fc2 --- /dev/null +++ b/managerDB/src/test/resources/nl/ipo/cds/dao/h2-test-data.sql @@ -0,0 +1,82 @@ +DROP ALL OBJECTS; +-- CREATE VRN SCHEMA +create schema vrn; + + +-- Create simplified table, geometry can not be inserted in H2, so complete table will not work anyway +CREATE TABLE vrn.gebiedbeheer_landelijk_tagged ( + id serial NOT NULL, + identificatie text NOT NULL, + tag text NOT NULL, + job_id bigint +) +; + +INSERT INTO vrn.gebiedbeheer_landelijk_tagged + (id, + identificatie, + tag, + job_id) +VALUES ('1', + 'landelijkGebiedBeheer', + 'TestTag', + 1 ) +; + +create schema manager; + + create table manager.job ( + job_type varchar(20) not null, + id int8 not null, + createTime timestamp, + finishTime timestamp, + priority int4 not null, + result text, + startTime timestamp, + status varchar(255), + primary key (id) + ); + + create table manager.etljob ( + dataset_url varchar(255), + feature_count int4, + force_execution bool default false , + geometry_error_count int4, + metadata_update_datum timestamp, + metadata_url varchar(255), + parameters TEXT, + uuid varchar(255), + verversen bool default false , + wfsUrl varchar(255), + bronhouder_id int8, + datasettype_id int8, + id int8 not null, + primary key (id) + ); + +INSERT INTO manager.job( + job_type, + id, + priority, + result, + status) +VALUES ('TAG', + 12, + 200, + 'result', + 'PREPARED' +); + +INSERT INTO manager.etljob( + id, + parameters) +VALUES (12, + '{"tag":"testTag","thema":"LandelijkGebiedBeheer"}' +); + + + + + + + diff --git a/managerDB/src/test/test6.iml b/managerDB/src/test/test6.iml new file mode 100644 index 00000000..f51b6ca5 --- /dev/null +++ b/managerDB/src/test/test6.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappings/mappings.iml b/mappings/mappings.iml new file mode 100644 index 00000000..608be348 --- /dev/null +++ b/mappings/mappings.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mappings/pom.xml b/mappings/pom.xml new file mode 100644 index 00000000..15d1d381 --- /dev/null +++ b/mappings/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + nl.ipo.cds + cds-parent + 2.6 + + mappings + mappings + mapping and operation DTO types + + + org.codehaus.jackson + jackson-mapper-lgpl + jar + + + \ No newline at end of file diff --git a/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/ConditionOperation.java b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/ConditionOperation.java new file mode 100644 index 00000000..184f6930 --- /dev/null +++ b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/ConditionOperation.java @@ -0,0 +1,5 @@ +package nl.ipo.cds.admin.ba.controller.beans.mapping; + +public final class ConditionOperation extends TransformOperation { + +} diff --git a/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/InputAttribute.java b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/InputAttribute.java new file mode 100644 index 00000000..df162f31 --- /dev/null +++ b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/InputAttribute.java @@ -0,0 +1,27 @@ +package nl.ipo.cds.admin.ba.controller.beans.mapping; + +import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + +@JsonSerialize (include = Inclusion.ALWAYS) +public final class InputAttribute extends Operation { + + private String inputAttributeNamespace; + private String inputAttributeType; + + public String getInputAttributeNamespace () { + return inputAttributeNamespace; + } + + public void setInputAttributeNamespace (final String inputAttributeNamespace) { + this.inputAttributeNamespace = inputAttributeNamespace; + } + + public String getInputAttributeType () { + return inputAttributeType; + } + + public void setInputAttributeType (final String inputAttributeType) { + this.inputAttributeType = inputAttributeType; + } +} diff --git a/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Mapping.java b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Mapping.java new file mode 100644 index 00000000..7fdaaaeb --- /dev/null +++ b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Mapping.java @@ -0,0 +1,48 @@ +package nl.ipo.cds.admin.ba.controller.beans.mapping; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize +public final class Mapping { + + private String featureTypeNamespace; + private String featureTypeName; + private String attributeName; + private List operations = new ArrayList (); + + public String getFeatureTypeNamespace () { + return featureTypeNamespace; + } + + public void setFeatureTypeNamespace (final String featureTypeNamespace) { + this.featureTypeNamespace = featureTypeNamespace; + } + + public String getFeatureTypeName () { + return featureTypeName; + } + + public void setFeatureTypeName (final String featureTypeName) { + this.featureTypeName = featureTypeName; + } + + public String getAttributeName () { + return attributeName; + } + + public void setAttributeName (final String attributeName) { + this.attributeName = attributeName; + } + + public List getOperations () { + return Collections.unmodifiableList (operations); + } + + public void setOperations (final List operations) { + this.operations = new ArrayList (operations); + } +} \ No newline at end of file diff --git a/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Mappings.java b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Mappings.java new file mode 100644 index 00000000..66d6fe75 --- /dev/null +++ b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Mappings.java @@ -0,0 +1,21 @@ +package nl.ipo.cds.admin.ba.controller.beans.mapping; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.codehaus.jackson.map.annotate.JsonSerialize; + +@JsonSerialize +public class Mappings { + + private List mappings; + + public List getMappings () { + return Collections.unmodifiableList (mappings); + } + + public void setMappings (final List mappings) { + this.mappings = new ArrayList (mappings); + } +} diff --git a/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Operation.java b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Operation.java new file mode 100644 index 00000000..bc523d32 --- /dev/null +++ b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/Operation.java @@ -0,0 +1,33 @@ +package nl.ipo.cds.admin.ba.controller.beans.mapping; + +import org.codehaus.jackson.annotate.JsonSubTypes; +import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import org.codehaus.jackson.annotate.JsonTypeInfo; +import org.codehaus.jackson.annotate.JsonTypeInfo.As; +import org.codehaus.jackson.annotate.JsonTypeInfo.Id; +import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + +@JsonTypeInfo ( + use = Id.NAME, + include = As.PROPERTY, + property = "type" +) +@JsonSubTypes ({ + @Type (value = TransformOperation.class, name = "operation"), + @Type (value = InputAttribute.class, name = "input"), + @Type (value = ConditionOperation.class, name = "condition") +}) +@JsonSerialize (include = Inclusion.ALWAYS) +public abstract class Operation { + + private String name; + + public String getName () { + return name; + } + + public void setName (final String name) { + this.name = name; + } +} diff --git a/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/TransformOperation.java b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/TransformOperation.java new file mode 100644 index 00000000..3135f191 --- /dev/null +++ b/mappings/src/main/java/nl/ipo/cds/admin/ba/controller/beans/mapping/TransformOperation.java @@ -0,0 +1,33 @@ +package nl.ipo.cds.admin.ba.controller.beans.mapping; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + +@JsonSerialize (include = Inclusion.ALWAYS) +public class TransformOperation extends Operation { + + private List operationInputs = new ArrayList (); + private Map settings = new HashMap (); + + public List getOperationInputs () { + return Collections.unmodifiableList (operationInputs); + } + + public void setOperationInputs (final List operationInputs) { + this.operationInputs = new ArrayList (operationInputs); + } + + public Map getSettings () { + return Collections.unmodifiableMap (settings); + } + + public void setSettings (final Map settings) { + this.settings = new HashMap (settings); + } +} diff --git a/metadataDB/metadataDB.iml b/metadataDB/metadataDB.iml new file mode 100644 index 00000000..a2eb3ba8 --- /dev/null +++ b/metadataDB/metadataDB.iml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/metadataDB/pom.xml b/metadataDB/pom.xml index 60baf665..118df42d 100644 --- a/metadataDB/pom.xml +++ b/metadataDB/pom.xml @@ -3,7 +3,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 metadataDB diff --git a/metadataDB/src/main/main2.iml b/metadataDB/src/main/main2.iml new file mode 100644 index 00000000..168ebeb9 --- /dev/null +++ b/metadataDB/src/main/main2.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/dao/metadata/dao-applicationContext.xml + file://$MODULE_DIR$/resources/nl/ipo/cds/dao/metadata/dataSource-applicationContext.xml + + + + + + + + + + + + + + \ No newline at end of file diff --git a/metadataDB/src/main/sql/create-insert-metadata-spatial-datasetinfo.sql b/metadataDB/src/main/sql/create-insert-metadata-spatial-datasetinfo.sql new file mode 100644 index 00000000..97dde7aa --- /dev/null +++ b/metadataDB/src/main/sql/create-insert-metadata-spatial-datasetinfo.sql @@ -0,0 +1,140 @@ +-- Table: metadata.spatial_datasetinfo + +DROP TABLE IF EXISTS metadata.spatial_datasetinfo; + +CREATE TABLE metadata.spatial_datasetinfo +( + id bigint NOT NULL, + type character varying, + service_id bigint NOT NULL, + name character varying, + code character varying, + namespace character varying, + index integer NOT NULL, + CONSTRAINT spatial_datasetinfo_pkey PRIMARY KEY (id), + CONSTRAINT spatial_datasetinfo_service_id_fkey FOREIGN KEY (service_id) + REFERENCES metadata.service (id) MATCH SIMPLE + ON UPDATE NO ACTION ON DELETE NO ACTION, + CONSTRAINT check_type CHECK (type::text = 'WFS'::text OR type::text = 'WMS'::text) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE metadata.spatial_datasetinfo + OWNER TO postgres; + + GRANT SELECT, INSERT, UPDATE, DELETE, TRIGGER ON metadata.spatial_datasetinfo TO inspire; + +-- Index: metadata.spatial_datasetinfo_id_index + +-- DROP INDEX metadata.spatial_datasetinfo_id_index; + +CREATE UNIQUE INDEX spatial_datasetinfo_id_index + ON metadata.spatial_datasetinfo + USING btree + (id); + +-- Index: metadata.spatial_datasetinfo_name_idx + +-- DROP INDEX metadata.spatial_datasetinfo_name_idx; + +CREATE INDEX spatial_datasetinfo_name_idx + ON metadata.spatial_datasetinfo + USING btree + (name COLLATE pg_catalog."default"); + +-- Index: metadata.spatial_datasetinfo_serviceid_index + +-- DROP INDEX metadata.spatial_datasetinfo_serviceid_index; + +CREATE INDEX spatial_datasetinfo_serviceid_index + ON metadata.spatial_datasetinfo + USING btree + (service_id); + + + + +-- Table: metadata.spatial_datasetinfotemp + +DROP TABLE IF EXISTS metadata.spatial_datasetinfotemp; + +CREATE TABLE metadata.spatial_datasetinfotemp +( + id bigint NOT NULL, + service_type character varying, + service_name character varying, + feature_name character varying, + code character varying, + namespace character varying, + xml_namespace character varying, + url text, + index integer NOT NULL, + CONSTRAINT spatial_datasetinfotemp_pkey PRIMARY KEY (id), + CONSTRAINT check_type CHECK (service_type::text = 'WFS'::text OR service_type::text = 'WMS'::text) +) +WITH ( + OIDS=FALSE +); +ALTER TABLE metadata.spatial_datasetinfotemp + OWNER TO postgres; + +GRANT SELECT, INSERT, UPDATE, DELETE, TRIGGER ON metadata.spatial_datasetinfotemp TO inspire; + +INSERT INTO metadata.spatial_datasetinfotemp (id ,service_type, service_name, feature_name, code, namespace, xml_namespace, url, index) VALUES +(1,'WFS','download_AM','am:ManagementRestrictionOrRegulationZone','dummy','dummy','http://inspire.ec.europa.eu/schemas/am/3.0rc2', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=071a5652-c513-4722-bb45-bf522bb4349f&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(2,'WFS','download_AF','app:Stalgroep','dummy','dummy','http://www.ipo.nl/InSpider', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=4784dc9b-62bf-4c2a-a25c-b59b049b4956&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(3,'WFS','download_EF','app:Monsterpunt','dummy','dummy','http://www.ipo.nl/InSpider', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=ebd6ea46-ee7b-432f-83c4-058c889a790d&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(4,'WFS','download_EF','app:Monster','dummy','dummy','http://www.ipo.nl/InSpider', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=ebd6ea46-ee7b-432f-83c4-058c889a790d&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 1), +(5,'WFS','download_EF','app:Monsterresultaat','dummy','dummy','http://www.ipo.nl/InSpider', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=ebd6ea46-ee7b-432f-83c4-058c889a790d&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 2), +(6,'WFS','download_HB','hb:Habitat','dummy','dummy', 'http://inspire.ec.europa.eu/schemas/hb/3.0rc3', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=702060c1-b3fd-44ec-8cc6-d4249d150110&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(7,'WFS','download_NZ','app:HazardArea_NL','dummy','dummy','http://www.ipo.nl/InSpider', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=00e8746f-5031-413e-8343-9203c8ea82ee&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(8,'WFS','download_PF','pf:ProductionFacility','dummy','dummy', 'http://inspire.ec.europa.eu/schemas/pf/3.0rc3', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=3094a1c4-3dd6-4e8e-9929-4a63dd66992e&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(9,'WFS','download_PF','pf:ProductionInstallation','dummy','dummy','http://inspire.ec.europa.eu/schemas/pf/3.0rc3', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=3094a1c4-3dd6-4e8e-9929-4a63dd66992e&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 1), +(10,'WFS','download_PF','pf:ProductionInstallationPart','dummy','dummy','http://inspire.ec.europa.eu/schemas/pf/3.0rc3', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=3094a1c4-3dd6-4e8e-9929-4a63dd66992e&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 2), +(11,'WFS','download_PS','gn:NamedPlace','dummy','dummy','urn:x-inspire:specification:gmlas:GeographicalNames:3.0', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=c04fc102-1bb3-497f-83b2-427ddca70cff&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 0), +(12,'WFS','download_PS','ps:ProtectedSite','dummy','dummy', 'urn:x-inspire:specification:gmlas:ProtectedSites:3.0', 'http://www.nationaalgeoregister.nl/geonetwork/srv/dut/csw?Service=CSW&Request=GetRecordById&Version=2.0.2&id=c04fc102-1bb3-497f-83b2-427ddca70cff&outputSchema=http://www.isotc211.org/2005/gmd&elementSetName=full', 1), +(13,'WMS','view_AM','AM.BathingWaters','dummy','dummy','','',1), +(14,'WMS','view_AM','AM.DrinkingWaterProtectionArea','dummy','dummy','','',2), +(15,'WMS','view_AM','AM.NoiseRestrictionZone','dummy','dummy','','',0), +(16,'WMS','view_AM','AM.ProspectingAndMiningPermitArea','dummy','dummy','','',3), +(17,'WMS','view_AF','AF.BestandVeehouderijbedrijven.bedrijf','dummy','dummy','','',1), +(18,'WMS','view_AF','AF.BestandVeehouderijbedrijven.gebouw','dummy','dummy','','',0), +(19,'WMS','view_AF','AF.BestandVeehouderijbedrijven.emissiepunt','dummy','dummy','','',2), +(20,'WMS','view_EF','EF.Monsterpunt','dummy','dummy','','',0), +(21,'WMS','view_HB','HB.Habitat','dummy','dummy','','',0), +(22,'WMS','view_NZ','NZ.HazardArea','dummy','dummy','','',0), +(23,'WMS','view_PF','PF.ProductionFacility','dummy','dummy','','',0), +(24,'WMS','view_PF','PF.ProductionInstallation','dummy','dummy','','',2), +(25,'WMS','view_PF','PF.ProductionInstallationPart','dummy','dummy','','',1), +(26,'WMS','view_PS','PS.ProtectedSite','dummy','dummy','','',7), +(27,'WMS','view_PS','PS.ProtectedSiteNatureConservation','dummy','dummy','','',8), +(28,'WMS','view_PS','PS.ProtectedSiteArchaeological','dummy','dummy','','',9), +(29,'WMS','view_PS','PS.ProtectedSiteCultural','dummy','dummy','','',10), +(30,'WMS','view_PS','PS.ProtectedSiteEcological','dummy','dummy','','',11), +(31,'WMS','view_PS','PS.ProtectedSiteLandscape','dummy','dummy','','',12), +(32,'WMS','view_PS','PS.ProtectedSiteEnvironment','dummy','dummy','','',13), +(33,'WMS','view_PS','PS.ProtectedSiteGeological','dummy','dummy','','',0), +(34,'WMS','view_PS','PS.ProtectedSiteAardkundigeWaarden','dummy','dummy','','',6), +(35,'WMS','view_PS','PS.ProtectedSiteEcologischeHoofdstructuur','dummy','dummy','','',5), +(36,'WMS','view_PS','PS.ProtectedSiteNationaleLandschappen','dummy','dummy','','',4), +(37,'WMS','view_PS','PS.ProtectedSiteProvincialeMonumenten','dummy','dummy','','',3), +(38,'WMS','view_PS','PS.ProtectedSiteStilteGebieden','dummy','dummy','','',2), +(39,'WMS','view_PS','PS.ProtectedSiteWAVGebieden','dummy','dummy','','',1); + + +INSERT INTO metadata.spatial_datasetinfo (id, type, service_id, name, code, namespace, index) +SELECT sdt.id, sdt.service_type, s.id, sdt.feature_name, sdt.code, sdt.namespace, sdt.index FROM metadata.service as s +INNER JOIN metadata.spatial_datasetinfotemp as sdt on sdt.service_name = s.name; + +DELETE FROM metadata.service_datasetmetadata as sdm1 +WHERE sdm1.service_id IN (SELECT DISTINCT sdm2.service_id FROM metadata.service_datasetmetadata as sdm2 +INNER JOIN metadata.spatial_datasetinfotemp as sdt on sdm2.namespace = sdt.xml_namespace +WHERE sdt.service_type = 'WFS'); + +INSERT INTO metadata.service_datasetmetadata(service_id, name, namespace, url, index) +SELECT s.id, sdt.feature_name, sdt.xml_namespace, sdt.url, sdt.index FROM metadata.service as s +INNER JOIN metadata.spatial_datasetinfotemp as sdt on sdt.service_name = s.name +Where sdt.service_type = 'WFS'; + +DROP TABLE IF EXISTS metadata.spatial_datasetinfotemp; \ No newline at end of file diff --git a/metadataDB/src/test/test11.iml b/metadataDB/src/test/test11.iml new file mode 100644 index 00000000..94979de1 --- /dev/null +++ b/metadataDB/src/test/test11.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/nagios-status/nagios-status.iml b/nagios-status/nagios-status.iml new file mode 100644 index 00000000..fe1324ed --- /dev/null +++ b/nagios-status/nagios-status.iml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nagios-status/pom.xml b/nagios-status/pom.xml index 3c60bc60..8b8924e9 100644 --- a/nagios-status/pom.xml +++ b/nagios-status/pom.xml @@ -2,7 +2,7 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 ../pom.xml 4.0.0 diff --git a/nagios-status/src/main/main13.iml b/nagios-status/src/main/main13.iml new file mode 100644 index 00000000..4f57d49b --- /dev/null +++ b/nagios-status/src/main/main13.iml @@ -0,0 +1,21 @@ + + + + + + + file://$MODULE_DIR$/resources/nl/ipo/cds/nagios/nagios-status-client.xml + file://$MODULE_DIR$/resources/nl/ipo/cds/nagios/nagios-status-server.xml + + + + + + + + + + + + + \ No newline at end of file diff --git a/nagios-status/src/test/test7.iml b/nagios-status/src/test/test7.iml new file mode 100644 index 00000000..e72596a1 --- /dev/null +++ b/nagios-status/src/test/test7.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 082eab62..5e528e0b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 nl.ipo.cds cds-parent - 2.5 + 2.6 pom @@ -285,7 +285,7 @@ nl.ipo.cds postgresql - 2.5 + 2.6 compile @@ -296,7 +296,7 @@ nl.ipo.cds admin - 2.5 + 2.6 war compile @@ -310,14 +310,14 @@ nl.ipo.cds cds-test - 2.5 + 2.6 jar compile nl.ipo.cds commons - 2.5 + 2.6 jar compile @@ -331,48 +331,48 @@ nl.ipo.cds domain - 2.5 + 2.6 jar compile nl.ipo.cds mappings - 2.5 + 2.6 jar nl.ipo.cds catalog-metadata - 2.5 + 2.6 jar compile nl.ipo.cds domain-metadata - 2.5 + 2.6 jar compile nl.ipo.cds etl-proces - 2.5 + 2.6 jar compile nl.ipo.cds etl-reporting - 2.5 + 2.6 jar compile nl.ipo.cds etl-reporting - 2.5 + 2.6 tests jar test @@ -380,21 +380,21 @@ nl.ipo.cds managerDB - 2.5 + 2.6 jar compile nl.ipo.cds metadataDB - 2.5 + 2.6 jar compile nl.ipo.cds resources - 2.5 + 2.6 jar compile @@ -408,7 +408,7 @@ nl.ipo.cds managerDB - 2.5 + 2.6 zip sql compile @@ -416,21 +416,21 @@ nl.ipo.cds resources - 2.5 + 2.6 tst compile nl.ipo.cds resources - 2.5 + 2.6 prod compile nl.ipo.cds etl-proces - 2.5 + 2.6 jar manager compile @@ -438,7 +438,7 @@ nl.ipo.cds job-executor - 2.5 + 2.6 jar manager compile @@ -446,7 +446,7 @@ nl.ipo.cds etl-proces - 2.5 + 2.6 zip sql compile @@ -462,7 +462,7 @@ nl.ipo.cds resources - 2.5 + 2.6 jar tests compile @@ -470,28 +470,28 @@ nl.ipo.cds nagios-status - 2.5 + 2.6 jar compile nl.ipo.cds validation - 2.5 + 2.6 jar compile nl.ipo.cds etl-test - 2.5 + 2.6 jar compile nl.ipo.cds post-validation - 2.5 + 2.6 jar compile diff --git a/post-validation/pom.xml b/post-validation/pom.xml new file mode 100644 index 00000000..d4440f16 --- /dev/null +++ b/post-validation/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + cds-parent + nl.ipo.cds + 2.6 + + + post-validation + post-validation + + + + org.opengeo + geodb + 0.7 + + + org.springframework + spring-test + test + + + junit + junit + test + + + org.springframework + spring-context + + + org.springframework + spring-jdbc + + + nl.ipo.cds + etl-proces + + + + + \ No newline at end of file diff --git a/post-validation/post-validation.iml b/post-validation/post-validation.iml new file mode 100644 index 00000000..b6900e02 --- /dev/null +++ b/post-validation/post-validation.iml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/post-validation/src/main/java/nl/ipo/cds/etl/postvalidation/H2GeometryStore.java b/post-validation/src/main/java/nl/ipo/cds/etl/postvalidation/H2GeometryStore.java new file mode 100644 index 00000000..48505d00 --- /dev/null +++ b/post-validation/src/main/java/nl/ipo/cds/etl/postvalidation/H2GeometryStore.java @@ -0,0 +1,87 @@ +package nl.ipo.cds.etl.postvalidation; + +import com.vividsolutions.jts.io.ParseException; +import geodb.GeoDB; +import org.apache.commons.dbcp.BasicDataSource; +import org.deegree.geometry.Geometry; +import org.deegree.geometry.io.WKBWriter; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Service; + +import javax.sql.DataSource; +import java.io.IOException; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; + +/** + * H2 Geometry Store implementation. + */ +@Service +public class H2GeometryStore implements IGeometryStore { + + + @Value("${bulkValidator.jdbcUrlFormat:jdbc\\:h2\\:%s}") + private String JDBC_URL_FORMAT; + + @Value("${bulkValidator.jdbcDriverClassName:org.h2.Driver}") + private String driverClassName; + + + + + + @Override + public DataSource createStore(final String uuId) throws SQLException { + DataSource dataSource = loadStore(uuId); + GeoDB.InitGeoDB(dataSource.getConnection()); + JdbcTemplate t = new JdbcTemplate(dataSource); + t.execute("CREATE TABLE geometries (id INT AUTO_INCREMENT PRIMARY KEY, geometry BLOB, feature_identifier VARCHAR, feature_local_id VARCHAR);"); + GeoDB.CreateSpatialIndex(dataSource.getConnection(), "PUBLIC", "GEOMETRIES", "GEOMETRY", "28992"); + return dataSource; + } + + @Override + public DataSource loadStore(final String uuId) throws SQLException { + BasicDataSource d = new BasicDataSource(); + d.setUrl(String.format(JDBC_URL_FORMAT, uuId)); + d.setDriverClassName(driverClassName); + // Initialize the DataSource. + d.getConnection(); + return d; + } + + @Override + public void addToStore(final DataSource dataSource, final Geometry geometry, String identifier, String localId) throws + SQLException, + ParseException, IOException { + final NamedParameterJdbcTemplate t = new NamedParameterJdbcTemplate(dataSource); + final String insertStatement = "INSERT INTO geometries (geometry, feature_identifier, feature_local_id) VALUES (:geometry, :identifier, :local_id)"; + final Map params = new HashMap<>(); + + // srid=28992 + params.put("geometry", GeoDB.ST_GeomFromWKB(WKBWriter.write(geometry), 28992)); //geometry.getCoordinateSystem().) + params.put("identifier", identifier); + params.put("local_id", localId); + t.update(insertStatement, params); + } + + @Override + public void destroyStore(final DataSource dataSource) { + // Delete all objects, and delete the file when all connections close. + JdbcTemplate t = new JdbcTemplate(dataSource); + + // This does not work on Windows since the .lobs.db and .trace.db are still in use somehow. Also using SHUTDOWN and deleting the files manually does not work. + // Production environment is Linux however. + try { + t.execute("DROP ALL OBJECTS DELETE FILES;"); + t.execute("SHUTDOWN IMMEDIATELY;"); + } catch (Exception e) { + System.err.print(e.getMessage()); + + } + + } +} diff --git a/post-validation/src/main/java/nl/ipo/cds/etl/postvalidation/IGeometryStore.java b/post-validation/src/main/java/nl/ipo/cds/etl/postvalidation/IGeometryStore.java new file mode 100644 index 00000000..8cfa7370 --- /dev/null +++ b/post-validation/src/main/java/nl/ipo/cds/etl/postvalidation/IGeometryStore.java @@ -0,0 +1,25 @@ +package nl.ipo.cds.etl.postvalidation; + +import com.vividsolutions.jts.io.ParseException; +import org.deegree.geometry.Geometry; + +import javax.sql.DataSource; +import java.io.IOException; +import java.sql.SQLException; + +/** + * Geometry Store to temporarily store possible overlapping geometries. + */ +public interface IGeometryStore { + + DataSource createStore(final String uuId) throws SQLException; + + DataSource loadStore(final String uuId) throws SQLException; + + void addToStore(final DataSource dataSource, Geometry geometry, String identifier, String localId) throws + SQLException, + ParseException, IOException; + + void destroyStore(final DataSource dataSource); + +} diff --git a/post-validation/src/test/java/nl/ipo/cds/etl/postvalidation/H2GeometryStoreTest.java b/post-validation/src/test/java/nl/ipo/cds/etl/postvalidation/H2GeometryStoreTest.java new file mode 100644 index 00000000..e1701aaf --- /dev/null +++ b/post-validation/src/test/java/nl/ipo/cds/etl/postvalidation/H2GeometryStoreTest.java @@ -0,0 +1,92 @@ +package nl.ipo.cds.etl.postvalidation; + +import geodb.GeoDB; +import org.apache.commons.dbcp.BasicDataSource; +import org.deegree.geometry.Geometry; +import org.deegree.geometry.io.WKTReader; +import org.deegree.geometry.primitive.Polygon; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.springframework.jdbc.core.JdbcTemplate; + +import javax.sql.DataSource; +import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Paths; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + + +public class H2GeometryStoreTest { + + + + private H2GeometryStore h2GeometryStore; + private BasicDataSource dataSource; + private final static String DB_NAME = "test-db-1337"; + + @Rule + public final TemporaryFolder testFolder = new TemporaryFolder(); + + @Before + public void setUp() throws Exception { + h2GeometryStore = new H2GeometryStore(); + Field field = H2GeometryStore.class.getDeclaredField("JDBC_URL_FORMAT"); + field.setAccessible(true); + field.set(h2GeometryStore, String.format("jdbc:h2:%s/", testFolder.getRoot()) + "%s"); + dataSource = (BasicDataSource)h2GeometryStore.createStore(DB_NAME); + + } + + @After + public void tearDown() throws Exception { + h2GeometryStore.destroyStore(dataSource); + } + + + + + @Test + public void testCreateStore() throws Exception { + String dbName = "test"; + DataSource d = h2GeometryStore.createStore(dbName); + assertTrue(Files.exists(Paths.get(testFolder.getRoot().getPath(), dbName + ".data.db"))); + assertTrue(Files.exists(Paths.get(testFolder.getRoot().getPath(), dbName + ".index.db"))); + h2GeometryStore.destroyStore(d); + + } + + @Test + public void testAddToStore() throws Exception { + WKTReader reader = new WKTReader(null); + Geometry g = reader.read("SRID=28992;POLYGON((111446.5 566602,112035.5 566602,112035.5 566886,111446.5 566886,111446.5 566602))"); + TestPersistableFeature tpf = new TestPersistableFeature(); + tpf.setGeometry(g); + tpf.setId("test-feature"); + + h2GeometryStore.addToStore(dataSource, g, tpf.getId(), tpf.getId() ); + + JdbcTemplate t = new JdbcTemplate(dataSource); + + // Test if the Geometry can properly get stored/retrieved. + Geometry g2 = (Polygon) reader.read(GeoDB.ST_AsText(t.queryForObject("SELECT geometry FROM geometries LIMIT 1", byte[].class))); + assertEquals(g.toString(), g2.toString()); + + + + + } + + @Test + public void testDestroyStore() throws Exception { + h2GeometryStore.destroyStore(dataSource); + // TODO: Add proper checking. Problem is that the H2 database files are only removed after the last connection closes. + // This cleanup apparently occurs after this test code is run. + //assertFalse(Files.exists(Paths.get(testFolder.getRoot().getPath(), DB_NAME + ".data.db"))); + //assertFalse(Files.exists(Paths.get(testFolder.getRoot().getPath(), DB_NAME + ".index.db"))); + } +} \ No newline at end of file diff --git a/post-validation/src/test/java/nl/ipo/cds/etl/postvalidation/TestPersistableFeature.java b/post-validation/src/test/java/nl/ipo/cds/etl/postvalidation/TestPersistableFeature.java new file mode 100644 index 00000000..a92bdb8d --- /dev/null +++ b/post-validation/src/test/java/nl/ipo/cds/etl/postvalidation/TestPersistableFeature.java @@ -0,0 +1,74 @@ +package nl.ipo.cds.etl.postvalidation; + +import com.vividsolutions.jts.io.ParseException; +import nl.ipo.cds.etl.PersistableFeature; +import nl.ipo.cds.etl.xml.bind.GmlElement; +import org.deegree.cs.coordinatesystems.ICRS; +import org.deegree.geometry.Geometry; +import org.deegree.geometry.io.WKBReader; +import org.deegree.geometry.io.WKBWriter; + +import javax.xml.bind.annotation.XmlRootElement; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; + +@XmlRootElement(name="testPersistableFeature") +public class TestPersistableFeature extends PersistableFeature implements Serializable { + + @GmlElement + private transient Geometry geometry; + + /** + * Custom deserialization because Geometry type is not serializable by default, nor is CodeType. + * @param ois The input stream. + */ + private void readObject(ObjectInputStream ois) throws IOException, ClassNotFoundException, ParseException { + // Read default serializable properties. + ois.defaultReadObject(); + + + // Also serialize ID since this is not serializable from PersistentFeature. This is a hack. + setId(ois.readUTF()); + + // Read the Geometry with corresponding coordinate system. + ICRS icrs = (ICRS)ois.readObject(); + geometry = WKBReader.read(ois, icrs); + } + + /** + * Custom serialization because deegree types are not serializable. + * @param oos The output stream. + * @throws IOException + */ + private void writeObject(ObjectOutputStream oos) throws IOException, ParseException { + // Write default serializable properties. + oos.defaultWriteObject(); + + oos.writeUTF(getId()); + // Write Geometry and its coordinate system. + oos.writeObject(geometry.getCoordinateSystem()); + WKBWriter.write(geometry, oos); + + } + + public boolean equals(Object o) { + if(!(o instanceof TestPersistableFeature)) { + return false; + } + + TestPersistableFeature that = (TestPersistableFeature)o; + return this.getId().equals(that.getId()) && + this.getGeometry().toString().equals(that.getGeometry().toString()); + } + + public void setGeometry(Geometry geometry) { + this.geometry = geometry; + } + + public Geometry getGeometry(){ + return geometry; + } +} + diff --git a/postgresql/pom.xml b/postgresql/pom.xml index 6c45c4fd..d5a9448a 100644 --- a/postgresql/pom.xml +++ b/postgresql/pom.xml @@ -4,14 +4,14 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 jar nl.ipo.cds postgresql - 2.5 + 2.6 diff --git a/postgresql/postgresql.iml b/postgresql/postgresql.iml new file mode 100644 index 00000000..d21f7bd0 --- /dev/null +++ b/postgresql/postgresql.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/postgresql/src/main/main.iml b/postgresql/src/main/main.iml new file mode 100644 index 00000000..7586f8cc --- /dev/null +++ b/postgresql/src/main/main.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/pom.xml b/resources/pom.xml index 072a9a98..6fcdb575 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -3,11 +3,11 @@ cds-parent nl.ipo.cds - 2.5 + 2.6 nl.ipo.cds resources - 2.5 + 2.6 diff --git a/resources/resources.iml b/resources/resources.iml new file mode 100644 index 00000000..46858609 --- /dev/null +++ b/resources/resources.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/src/main/resources-acc/nl/ipo/cds/admin/admin.properties b/resources/src/main/resources-acc/nl/ipo/cds/admin/admin.properties new file mode 100644 index 00000000..478260f9 --- /dev/null +++ b/resources/src/main/resources-acc/nl/ipo/cds/admin/admin.properties @@ -0,0 +1,2 @@ +admin.requestAuthorization.prompt=Vraag een account aan +admin.requestAuthorization.href=http://www.inspire-provincies.nl \ No newline at end of file diff --git a/resources/src/main/resources-prod/nl/ipo/cds/admin/admin.properties b/resources/src/main/resources-prod/nl/ipo/cds/admin/admin.properties new file mode 100644 index 00000000..478260f9 --- /dev/null +++ b/resources/src/main/resources-prod/nl/ipo/cds/admin/admin.properties @@ -0,0 +1,2 @@ +admin.requestAuthorization.prompt=Vraag een account aan +admin.requestAuthorization.href=http://www.inspire-provincies.nl \ No newline at end of file diff --git a/resources/src/main/resources-tst/nl/ipo/cds/admin/admin.properties b/resources/src/main/resources-tst/nl/ipo/cds/admin/admin.properties new file mode 100644 index 00000000..478260f9 --- /dev/null +++ b/resources/src/main/resources-tst/nl/ipo/cds/admin/admin.properties @@ -0,0 +1,2 @@ +admin.requestAuthorization.prompt=Vraag een account aan +admin.requestAuthorization.href=http://www.inspire-provincies.nl \ No newline at end of file diff --git a/resources/src/main/resources/nl/ipo/cds/admin/admin.properties b/resources/src/main/resources/nl/ipo/cds/admin/admin.properties new file mode 100644 index 00000000..478260f9 --- /dev/null +++ b/resources/src/main/resources/nl/ipo/cds/admin/admin.properties @@ -0,0 +1,2 @@ +admin.requestAuthorization.prompt=Vraag een account aan +admin.requestAuthorization.href=http://www.inspire-provincies.nl \ No newline at end of file diff --git a/resources/src/main/resources/nl/ipo/cds/dl/dl.properties b/resources/src/main/resources/nl/ipo/cds/dl/dl.properties new file mode 100644 index 00000000..4cd54514 --- /dev/null +++ b/resources/src/main/resources/nl/ipo/cds/dl/dl.properties @@ -0,0 +1,2 @@ +dllink.text=Downloadservice admin (acc),Downloadservice admin (test) +dllink.ref=http://acc.inspire-provincies.nl/downloadservice-admin/,http://test.inspire-provincies.nl/downloadservice-admin/ \ No newline at end of file diff --git a/theme-areamanagement/pom.xml b/theme-areamanagement/pom.xml index 089b75bf..33ea41fb 100644 --- a/theme-areamanagement/pom.xml +++ b/theme-areamanagement/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-areamanagement CDS - Theme AreaManagement diff --git a/theme-areamanagement/src/main/main26.iml b/theme-areamanagement/src/main/main26.iml new file mode 100644 index 00000000..6eb694e5 --- /dev/null +++ b/theme-areamanagement/src/main/main26.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-areamanagement/src/main/sql/create-inspire-schema-views-areamanagement.sql b/theme-areamanagement/src/main/sql/create-inspire-schema-views-areamanagement.sql new file mode 100644 index 00000000..595402aa --- /dev/null +++ b/theme-areamanagement/src/main/sql/create-inspire-schema-views-areamanagement.sql @@ -0,0 +1,12 @@ +-- View: inspire.vw_area_management + +-- DROP VIEW inspire.vw_area_management; + +CREATE OR REPLACE VIEW inspire.vw_area_management AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, area_management.id, area_management.job_id, area_management.gfid, area_management.inspire_id_namespace, area_management.inspire_id_local_id, area_management.zonetype_code, area_management.environmental_domain_code, area_management.thematic_id_identifier, area_management.thematic_id_identifier_scheme, area_management.name_spelling, area_management.competent_authority_organisation_name, area_management.legislation_citation_gml_id, area_management.legal_basis_name, area_management.legal_basis_link, area_management.legal_basis_date, area_management.specialised_zone_type_code, area_management.designation_period_begin_designation, area_management.designation_period_end_designation, area_management.designation_period_end_indeterminate, area_management.vergunde_kuubs, area_management.vergunde_diepte, area_management.noise_low_value, area_management.noise_high_value, area_management.geometry, area_management.geom_simple, area_management.specialised_zone_type_codespace + FROM inspire.area_management, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_AM'::text AND spatial_datasetinfo.name::text = 'am:ManagementRestrictionOrRegulationZone'::text; + +ALTER TABLE inspire.vw_area_management + OWNER TO inspire; diff --git a/theme-areamanagement/src/test/test13.iml b/theme-areamanagement/src/test/test13.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-areamanagement/src/test/test13.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-areamanagement/theme-areamanagement.iml b/theme-areamanagement/theme-areamanagement.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-areamanagement/theme-areamanagement.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-exposedelements/pom.xml b/theme-exposedelements/pom.xml index 362e7278..a19afb80 100644 --- a/theme-exposedelements/pom.xml +++ b/theme-exposedelements/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-exposedelements CDS - Theme Exposed Elements diff --git a/theme-exposedelements/src/main/main8.iml b/theme-exposedelements/src/main/main8.iml new file mode 100644 index 00000000..98d3bc45 --- /dev/null +++ b/theme-exposedelements/src/main/main8.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-exposedelements/src/test/test8.iml b/theme-exposedelements/src/test/test8.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-exposedelements/src/test/test8.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-exposedelements/theme-exposedelements.iml b/theme-exposedelements/theme-exposedelements.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-exposedelements/theme-exposedelements.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-habitat/pom.xml b/theme-habitat/pom.xml index 0dd246dd..398321c2 100644 --- a/theme-habitat/pom.xml +++ b/theme-habitat/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-habitat CDS - Theme Habitat diff --git a/theme-habitat/src/main/main28.iml b/theme-habitat/src/main/main28.iml new file mode 100644 index 00000000..6eb694e5 --- /dev/null +++ b/theme-habitat/src/main/main28.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-habitat/src/main/sql/create-inspire-schema-views-habitat.sql b/theme-habitat/src/main/sql/create-inspire-schema-views-habitat.sql new file mode 100644 index 00000000..80363330 --- /dev/null +++ b/theme-habitat/src/main/sql/create-inspire-schema-views-habitat.sql @@ -0,0 +1,12 @@ +-- View: inspire.vw_habitat + +-- DROP VIEW inspire.vw_habitat; + +CREATE OR REPLACE VIEW inspire.vw_habitat AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, habitat.id, habitat.job_id, habitat.gfid, habitat.inspire_id_local_id, habitat.habitat_reference_habitat_type_id_code, habitat.habitat_reference_habitat_type_scheme_code, habitat.habitat_reference_habitat_type_name, habitat.local_habitat_name_local_scheme, habitat.local_habitat_name_local_name_code, habitat.local_habitat_name_local_name, habitat.local_habitat_name_qualifier_local_name, habitat.habitat_area_covered, habitat.geometry, habitat.geom_simple, habitat.inspire_id_namespace, habitat.habitat_reference_habitat_type_id_codespace, habitat.local_habitat_name_local_name_codespace + FROM inspire.habitat, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_HB'::text AND spatial_datasetinfo.name::text = 'hb:Habitat'::text; + +ALTER TABLE inspire.vw_habitat + OWNER TO inspire; diff --git a/theme-habitat/src/test/test14.iml b/theme-habitat/src/test/test14.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-habitat/src/test/test14.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-habitat/theme-habitat.iml b/theme-habitat/theme-habitat.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-habitat/theme-habitat.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-hazardarea/pom.xml b/theme-hazardarea/pom.xml index ad2f60fe..26a7dcab 100644 --- a/theme-hazardarea/pom.xml +++ b/theme-hazardarea/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-hazardarea CDS - Theme HazardArea diff --git a/theme-hazardarea/src/main/main21.iml b/theme-hazardarea/src/main/main21.iml new file mode 100644 index 00000000..98d3bc45 --- /dev/null +++ b/theme-hazardarea/src/main/main21.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-hazardarea/src/main/sql/create-bron-schema-views-hazardarea.sql b/theme-hazardarea/src/main/sql/create-bron-schema-views-hazardarea.sql new file mode 100644 index 00000000..2a7c5bb6 --- /dev/null +++ b/theme-hazardarea/src/main/sql/create-bron-schema-views-hazardarea.sql @@ -0,0 +1,12 @@ +-- View: bron.vw_hazard_area + +-- DROP VIEW bron.vw_hazard_area; + +CREATE OR REPLACE VIEW bron.vw_hazard_area AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, hazard_area.id, hazard_area.job_id, hazard_area.gfid, hazard_area.inspire_id_dataset_code, hazard_area.inspire_id_local_id, hazard_area.hazard_area_id, hazard_area.determination_method, hazard_area.type_of_hazard_hazard_category, hazard_area.likelihood_of_occurrence_assement_method_name, hazard_area.likelihood_of_occurrence_assement_method_link, hazard_area.likelihood_of_occurrence_qualitative_likelihood, hazard_area.likelihood_of_occurrence_quantitative_likelihood_probability, hazard_area.likelihood_of_occurrence_quantitative_likelihood_return_period, hazard_area.geometry + FROM bron.hazard_area, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_NZ'::text AND spatial_datasetinfo.name::text = 'app:HazardArea_NL'::text; + +ALTER TABLE bron.vw_hazard_area + OWNER TO inspire; diff --git a/theme-hazardarea/src/test/test.iml b/theme-hazardarea/src/test/test.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-hazardarea/src/test/test.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-hazardarea/theme-hazardarea.iml b/theme-hazardarea/theme-hazardarea.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-hazardarea/theme-hazardarea.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productionfacility/pom.xml b/theme-productionfacility/pom.xml index fdf27776..5ede7f2a 100644 --- a/theme-productionfacility/pom.xml +++ b/theme-productionfacility/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-productionfacility CDS - Theme ProductionFacility diff --git a/theme-productionfacility/src/main/main23.iml b/theme-productionfacility/src/main/main23.iml new file mode 100644 index 00000000..6eb694e5 --- /dev/null +++ b/theme-productionfacility/src/main/main23.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productionfacility/src/main/sql/create-inspire-schema-views-productionfacility.sql b/theme-productionfacility/src/main/sql/create-inspire-schema-views-productionfacility.sql new file mode 100644 index 00000000..3ba83a6a --- /dev/null +++ b/theme-productionfacility/src/main/sql/create-inspire-schema-views-productionfacility.sql @@ -0,0 +1,12 @@ +-- View: inspire.vw_production_facility + +-- DROP VIEW inspire.vw_production_facility; + +CREATE OR REPLACE VIEW inspire.vw_production_facility AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, production_facility.id, production_facility.job_id, production_facility.gfid, production_facility.inspire_id_namespace, production_facility.inspire_id_local_id, production_facility.production_facility_id, production_facility.thematic_identifier, production_facility.thematic_identifier_scheme, production_facility.function_activity, production_facility.function_input, production_facility.function_output, production_facility.function_description, production_facility.name, production_facility.status_nil_reason, production_facility.status_xsi_nil, production_facility.status_type, production_facility.status_description, production_facility.geometry, production_facility.surface_geometry + FROM inspire.production_facility, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_PF'::text AND spatial_datasetinfo.name::text = 'pf:ProductionFacility'::text; + +ALTER TABLE inspire.vw_production_facility + OWNER TO inspire; diff --git a/theme-productionfacility/src/test/test12.iml b/theme-productionfacility/src/test/test12.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-productionfacility/src/test/test12.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productionfacility/theme-productionfacility.iml b/theme-productionfacility/theme-productionfacility.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-productionfacility/theme-productionfacility.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productioninstallation/pom.xml b/theme-productioninstallation/pom.xml index fb888d31..29f1e87e 100644 --- a/theme-productioninstallation/pom.xml +++ b/theme-productioninstallation/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-productioninstallation CDS - Theme ProductionInstallation diff --git a/theme-productioninstallation/src/main/main15.iml b/theme-productioninstallation/src/main/main15.iml new file mode 100644 index 00000000..6eb694e5 --- /dev/null +++ b/theme-productioninstallation/src/main/main15.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productioninstallation/src/main/sql/create-inspire-schema-views-productioninstallation.sql b/theme-productioninstallation/src/main/sql/create-inspire-schema-views-productioninstallation.sql new file mode 100644 index 00000000..393f5a55 --- /dev/null +++ b/theme-productioninstallation/src/main/sql/create-inspire-schema-views-productioninstallation.sql @@ -0,0 +1,12 @@ +-- View: inspire.vw_production_installation + +-- DROP VIEW inspire.vw_production_installation; + +CREATE OR REPLACE VIEW inspire.vw_production_installation AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, production_installation.id, production_installation.job_id, production_installation.gfid, production_installation.inspire_id_namespace, production_installation.inspire_id_local_id, production_installation.production_facility_id, production_installation.production_installation_id, production_installation.thematic_identifier, production_installation.thematic_identifier_scheme, production_installation.name, production_installation.description, production_installation.status_nil_reason, production_installation.status_xsi_nil, production_installation.status_type, production_installation.status_description, production_installation.type, production_installation.type_codespace, production_installation.point_geometry, production_installation.surface_geometry, production_installation.line_geometry + FROM inspire.production_installation, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_PF'::text AND spatial_datasetinfo.name::text = 'pf:ProductionInstallation'::text; + +ALTER TABLE inspire.vw_production_installation + OWNER TO inspire; diff --git a/theme-productioninstallation/src/test/test16.iml b/theme-productioninstallation/src/test/test16.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-productioninstallation/src/test/test16.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productioninstallation/theme-productioninstallation.iml b/theme-productioninstallation/theme-productioninstallation.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-productioninstallation/theme-productioninstallation.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productioninstallationpart/pom.xml b/theme-productioninstallationpart/pom.xml index 2c1fad1f..05ab90f4 100644 --- a/theme-productioninstallationpart/pom.xml +++ b/theme-productioninstallationpart/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-productioninstallationpart CDS - Theme ProductionInstallationPart diff --git a/theme-productioninstallationpart/src/main/main16.iml b/theme-productioninstallationpart/src/main/main16.iml new file mode 100644 index 00000000..98d3bc45 --- /dev/null +++ b/theme-productioninstallationpart/src/main/main16.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productioninstallationpart/src/main/sql/create-inspire-schema-views-productioninstallationpart.sql b/theme-productioninstallationpart/src/main/sql/create-inspire-schema-views-productioninstallationpart.sql new file mode 100644 index 00000000..d90ca78a --- /dev/null +++ b/theme-productioninstallationpart/src/main/sql/create-inspire-schema-views-productioninstallationpart.sql @@ -0,0 +1,12 @@ +-- View: inspire.vw_production_installation_part + +-- DROP VIEW inspire.vw_production_installation_part; + +CREATE OR REPLACE VIEW inspire.vw_production_installation_part AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, production_installation_part.id, production_installation_part.job_id, production_installation_part.gfid, production_installation_part.inspire_id_namespace, production_installation_part.inspire_id_local_id, production_installation_part.production_installation_id, production_installation_part.name, production_installation_part.status_nil_reason, production_installation_part.status_xsi_nil, production_installation_part.status_type, production_installation_part.status_description, production_installation_part.type, production_installation_part.type_codespace, production_installation_part.technique, production_installation_part.point_geometry + FROM inspire.production_installation_part, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_PF'::text AND spatial_datasetinfo.name::text = 'pf:ProductionInstallationPart'::text; + +ALTER TABLE inspire.vw_production_installation_part + OWNER TO inspire; diff --git a/theme-productioninstallationpart/src/test/test5.iml b/theme-productioninstallationpart/src/test/test5.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-productioninstallationpart/src/test/test5.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-productioninstallationpart/theme-productioninstallationpart.iml b/theme-productioninstallationpart/theme-productioninstallationpart.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-productioninstallationpart/theme-productioninstallationpart.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-protectedsites/pom.xml b/theme-protectedsites/pom.xml index 49656718..822898ee 100644 --- a/theme-protectedsites/pom.xml +++ b/theme-protectedsites/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-protectedsites CDS - Theme ProtectedSites diff --git a/theme-protectedsites/src/main/sql/create-inspire-schema-views-protectedsites.sql b/theme-protectedsites/src/main/sql/create-inspire-schema-views-protectedsites.sql new file mode 100644 index 00000000..0cbd6ed4 --- /dev/null +++ b/theme-protectedsites/src/main/sql/create-inspire-schema-views-protectedsites.sql @@ -0,0 +1,26 @@ +-- View: inspire.vw_named_place + +-- DROP VIEW inspire.vw_named_place; + +CREATE OR REPLACE VIEW inspire.vw_named_place AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, named_place.id, named_place.geometry, named_place.inspire_id_local_id, named_place.inspire_id_namespace + FROM inspire.named_place, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_PS'::text AND spatial_datasetinfo.name::text = 'gn:NamedPlace'::text; + +ALTER TABLE inspire.vw_named_place + OWNER TO inspire; + + +-- View: inspire.vw_protected_site + +-- DROP VIEW inspire.vw_protected_site; + +CREATE OR REPLACE VIEW inspire.vw_protected_site AS + SELECT spatial_datasetinfo.code AS ds_code, spatial_datasetinfo.namespace AS ds_namespace, protected_site.id, protected_site.geometry, protected_site.legal_foundation_date, protected_site.legal_foundation_document, protected_site.inspire_id_local_id, protected_site.inspire_id_namespace + FROM inspire.protected_site, metadata.spatial_datasetinfo + JOIN metadata.service ON spatial_datasetinfo.service_id = service.id + WHERE spatial_datasetinfo.type::text = 'WFS'::text AND service.name = 'download_PS'::text AND spatial_datasetinfo.name::text = 'ps:ProtectedSite'::text; + +ALTER TABLE inspire.vw_protected_site + OWNER TO inspire; diff --git a/theme-protectedsites/theme-protectedsites.iml b/theme-protectedsites/theme-protectedsites.iml new file mode 100644 index 00000000..47b1f4f9 --- /dev/null +++ b/theme-protectedsites/theme-protectedsites.iml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-riskzone/pom.xml b/theme-riskzone/pom.xml index de4d0128..f2e819ad 100644 --- a/theme-riskzone/pom.xml +++ b/theme-riskzone/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 theme-riskzone CDS - Theme Riskzone diff --git a/theme-riskzone/src/main/main18.iml b/theme-riskzone/src/main/main18.iml new file mode 100644 index 00000000..98d3bc45 --- /dev/null +++ b/theme-riskzone/src/main/main18.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-riskzone/src/test/test17.iml b/theme-riskzone/src/test/test17.iml new file mode 100644 index 00000000..9ab484d8 --- /dev/null +++ b/theme-riskzone/src/test/test17.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/theme-riskzone/theme-riskzone.iml b/theme-riskzone/theme-riskzone.iml new file mode 100644 index 00000000..1fdf2da9 --- /dev/null +++ b/theme-riskzone/theme-riskzone.iml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/pom.xml b/themes/pom.xml index 523b4ac8..947b5d39 100644 --- a/themes/pom.xml +++ b/themes/pom.xml @@ -5,7 +5,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 pom @@ -13,42 +13,42 @@ nl.ipo.cds theme-areamanagement - 2.5 + 2.6 nl.ipo.cds theme-exposedelements - 2.5 + 2.6 nl.ipo.cds theme-habitat - 2.5 + 2.6 nl.ipo.cds theme-hazardarea - 2.5 + 2.6 nl.ipo.cds theme-productionfacility - 2.5 + 2.6 nl.ipo.cds theme-productioninstallation - 2.5 + 2.6 nl.ipo.cds theme-productioninstallationpart - 2.5 + 2.6 nl.ipo.cds theme-riskzone - 2.5 + 2.6 \ No newline at end of file diff --git a/themes/themes.iml b/themes/themes.iml new file mode 100644 index 00000000..f67406d5 --- /dev/null +++ b/themes/themes.iml @@ -0,0 +1,136 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/validation/pom.xml b/validation/pom.xml index 29b3b0eb..812b84a6 100644 --- a/validation/pom.xml +++ b/validation/pom.xml @@ -3,7 +3,7 @@ nl.ipo.cds cds-parent - 2.5 + 2.6 validation validation diff --git a/validation/src/main/java/nl/ipo/cds/validation/domain/OverlapValidationPair.java b/validation/src/main/java/nl/ipo/cds/validation/domain/OverlapValidationPair.java new file mode 100644 index 00000000..87392f66 --- /dev/null +++ b/validation/src/main/java/nl/ipo/cds/validation/domain/OverlapValidationPair.java @@ -0,0 +1,18 @@ +/** + * + */ +package nl.ipo.cds.validation.domain; + +/** + * @author marnix + * + */ +public class OverlapValidationPair { + public final T f1; + public final T f2; + + public OverlapValidationPair(T f1, T f2) { + this.f1 = f1; + this.f2 = f2; + } +} diff --git a/validation/src/main/main6.iml b/validation/src/main/main6.iml new file mode 100644 index 00000000..908ad4f5 --- /dev/null +++ b/validation/src/main/main6.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/validation/src/test/test4.iml b/validation/src/test/test4.iml new file mode 100644 index 00000000..ac098846 --- /dev/null +++ b/validation/src/test/test4.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/validation/validation.iml b/validation/validation.iml new file mode 100644 index 00000000..483d009a --- /dev/null +++ b/validation/validation.iml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file