diff --git a/.idea/artifacts/orient_sample1_war.xml b/.idea/artifacts/orient_sample1_war.xml new file mode 100644 index 0000000..9220483 --- /dev/null +++ b/.idea/artifacts/orient_sample1_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/orient-samples/orient-sample1/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/orient_sample1_war_exploded.xml b/.idea/artifacts/orient_sample1_war_exploded.xml new file mode 100644 index 0000000..5e206ba --- /dev/null +++ b/.idea/artifacts/orient_sample1_war_exploded.xml @@ -0,0 +1,31 @@ + + + $PROJECT_DIR$/orient-samples/orient-sample1/target/orient-sample1-0.5.0-SNAPSHOT + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/orient_sample2_war.xml b/.idea/artifacts/orient_sample2_war.xml new file mode 100644 index 0000000..cf7788c --- /dev/null +++ b/.idea/artifacts/orient_sample2_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/orient-samples/orient-sample2/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/orient_sample2_war_exploded.xml b/.idea/artifacts/orient_sample2_war_exploded.xml new file mode 100644 index 0000000..e12d38c --- /dev/null +++ b/.idea/artifacts/orient_sample2_war_exploded.xml @@ -0,0 +1,28 @@ + + + $PROJECT_DIR$/orient-samples/orient-sample2/target/orient-sample2-0.5.0-SNAPSHOT + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ 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 0000000..b8d93d8 --- /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 0000000..30ff5cb --- /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__asm_asm_3_2.xml b/.idea/libraries/Maven__asm_asm_3_2.xml new file mode 100644 index 0000000..f4064b2 --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__asm_asm_analysis_3_2.xml b/.idea/libraries/Maven__asm_asm_analysis_3_2.xml new file mode 100644 index 0000000..fa043fc --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_analysis_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__asm_asm_commons_3_2.xml b/.idea/libraries/Maven__asm_asm_commons_3_2.xml new file mode 100644 index 0000000..e4b0193 --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_commons_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__asm_asm_tree_3_2.xml b/.idea/libraries/Maven__asm_asm_tree_3_2.xml new file mode 100644 index 0000000..75c3bdc --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_tree_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__asm_asm_util_3_2.xml b/.idea/libraries/Maven__asm_asm_util_3_2.xml new file mode 100644 index 0000000..1564a26 --- /dev/null +++ b/.idea/libraries/Maven__asm_asm_util_3_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_4.xml b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_4.xml new file mode 100644 index 0000000..8a645e3 --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_classic_1_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_4.xml b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_4.xml new file mode 100644 index 0000000..967dccf --- /dev/null +++ b/.idea/libraries/Maven__ch_qos_logback_logback_core_1_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__colt_colt_1_2_0.xml b/.idea/libraries/Maven__colt_colt_1_2_0.xml new file mode 100644 index 0000000..58562ac --- /dev/null +++ b/.idea/libraries/Maven__colt_colt_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_hppc_0_6_0.xml b/.idea/libraries/Maven__com_carrotsearch_hppc_0_6_0.xml new file mode 100644 index 0000000..9da3fd7 --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_hppc_0_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_2.xml new file mode 100644 index 0000000..62bd97f --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_3.xml new file mode 100644 index 0000000..63ad5ef --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_2.xml new file mode 100644 index 0000000..aad100c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_3.xml new file mode 100644 index 0000000..59af1c2 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_2_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_2_2.xml new file mode 100644 index 0000000..d3b20f8 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_2_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_2_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_2_3.xml new file mode 100644 index 0000000..78c63ec --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_json_org_2_2_3.xml b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_json_org_2_2_3.xml new file mode 100644 index 0000000..3a94d1c --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_datatype_jackson_datatype_json_org_2_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_4.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_4.xml new file mode 100644 index 0000000..1141d99 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_4_1.xml b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_4_1.xml new file mode 100644 index 0000000..ff5a103 --- /dev/null +++ b/.idea/libraries/Maven__com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru_1_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orient_commons_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orient_commons_1_7_10.xml new file mode 100644 index 0000000..fd36d6e --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orient_commons_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_client_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_client_1_7_10.xml new file mode 100644 index 0000000..85da64c --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_client_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_client_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_client_2_0.xml new file mode 100644 index 0000000..832448f --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_client_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_client_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_client_2_0_2.xml new file mode 100644 index 0000000..65c9338 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_client_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_core_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_core_1_7_10.xml new file mode 100644 index 0000000..2713374 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_core_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_core_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_core_2_0.xml new file mode 100644 index 0000000..ec5b201 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_core_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_core_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_core_2_0_2.xml new file mode 100644 index 0000000..e969a31 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_core_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_1_7_10.xml new file mode 100644 index 0000000..f8bbd18 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_2_0.xml new file mode 100644 index 0000000..4bb2755 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_2_0_2.xml new file mode 100644 index 0000000..fe81ad6 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_enterprise_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_1_7_10.xml new file mode 100644 index 0000000..635191f --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_2_0.xml new file mode 100644 index 0000000..db5e584 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_2_0_2.xml new file mode 100644 index 0000000..b434378 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_graphdb_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_nativeos_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_nativeos_1_7_10.xml new file mode 100644 index 0000000..502b3be --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_nativeos_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_object_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_object_1_7_10.xml new file mode 100644 index 0000000..54e0a9d --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_object_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_object_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_object_2_0.xml new file mode 100644 index 0000000..7a09cd4 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_object_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_object_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_object_2_0_2.xml new file mode 100644 index 0000000..6f252e5 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_object_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_server_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_server_1_7_10.xml new file mode 100644 index 0000000..8ada020 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_server_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_server_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_server_2_0.xml new file mode 100644 index 0000000..5c686f6 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_server_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_server_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_server_2_0_2.xml new file mode 100644 index 0000000..c094c2c --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_server_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_1_7_10.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_1_7_10.xml new file mode 100644 index 0000000..4d83147 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_1_7_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_2_0.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_2_0.xml new file mode 100644 index 0000000..3f1cde7 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_2_0_2.xml b/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_2_0_2.xml new file mode 100644 index 0000000..ea5bfd9 --- /dev/null +++ b/.idea/libraries/Maven__com_orientechnologies_orientdb_tools_2_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_blueprints_blueprints_core_2_5_0.xml b/.idea/libraries/Maven__com_tinkerpop_blueprints_blueprints_core_2_5_0.xml new file mode 100644 index 0000000..991e383 --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_blueprints_blueprints_core_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_blueprints_blueprints_core_2_6_0.xml b/.idea/libraries/Maven__com_tinkerpop_blueprints_blueprints_core_2_6_0.xml new file mode 100644 index 0000000..2298cdb --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_blueprints_blueprints_core_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_groovy_2_5_0.xml b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_groovy_2_5_0.xml new file mode 100644 index 0000000..8549e88 --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_groovy_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_groovy_2_6_0.xml b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_groovy_2_6_0.xml new file mode 100644 index 0000000..1096658 --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_groovy_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_java_2_5_0.xml b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_java_2_5_0.xml new file mode 100644 index 0000000..5a29adc --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_java_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_java_2_6_0.xml b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_java_2_6_0.xml new file mode 100644 index 0000000..6517114 --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_gremlin_gremlin_java_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_pipes_2_5_0.xml b/.idea/libraries/Maven__com_tinkerpop_pipes_2_5_0.xml new file mode 100644 index 0000000..9f43b77 --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_pipes_2_5_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_tinkerpop_pipes_2_6_0.xml b/.idea/libraries/Maven__com_tinkerpop_pipes_2_6_0.xml new file mode 100644 index 0000000..7171f7c --- /dev/null +++ b/.idea/libraries/Maven__com_tinkerpop_pipes_2_6_0.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 0000000..1cb64ed --- /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_beanutils_commons_beanutils_core_1_8_0.xml b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.xml new file mode 100644 index 0000000..3fda2c0 --- /dev/null +++ b/.idea/libraries/Maven__commons_beanutils_commons_beanutils_core_1_8_0.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 0000000..3caee7e --- /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_configuration_commons_configuration_1_6.xml b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.xml new file mode 100644 index 0000000..ae96781 --- /dev/null +++ b/.idea/libraries/Maven__commons_configuration_commons_configuration_1_6.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 0000000..49f1def --- /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_lang_commons_lang_2_4.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_4.xml new file mode 100644 index 0000000..5e8b8d3 --- /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_logging_commons_logging_1_1_1.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 0000000..b770f56 --- /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__concurrent_concurrent_1_3_4.xml b/.idea/libraries/Maven__concurrent_concurrent_1_3_4.xml new file mode 100644 index 0000000..4acbd2f --- /dev/null +++ b/.idea/libraries/Maven__concurrent_concurrent_1_3_4.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 0000000..180d587 --- /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_faces_jsf_api_2_1.xml b/.idea/libraries/Maven__javax_faces_jsf_api_2_1.xml new file mode 100644 index 0000000..da20dd8 --- /dev/null +++ b/.idea/libraries/Maven__javax_faces_jsf_api_2_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 0000000..ead2b38 --- /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__jline_jline_0_9_94.xml b/.idea/libraries/Maven__jline_jline_0_9_94.xml new file mode 100644 index 0000000..903c339 --- /dev/null +++ b/.idea/libraries/Maven__jline_jline_0_9_94.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 0000000..f33320d --- /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__net_java_dev_jna_jna_4_0_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_4_0_0.xml new file mode 100644 index 0000000..ad82c3f --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_4_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_0_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_0_0.xml new file mode 100644 index 0000000..8ff5c8c --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_0_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_1_8_3.xml b/.idea/libraries/Maven__org_apache_ant_ant_1_8_3.xml new file mode 100644 index 0000000..f3ce64d --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_1_8_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_3.xml b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_3.xml new file mode 100644 index 0000000..724b273 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_8_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_annotation_1_1_spec_1_0.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_annotation_1_1_spec_1_0.xml new file mode 100644 index 0000000..760c6f0 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_annotation_1_1_spec_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_atinject_1_0_spec_1_0.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_atinject_1_0_spec_1_0.xml new file mode 100644 index 0000000..8e6ffbf --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_atinject_1_0_spec_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_ejb_3_1_spec_1_0_2.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_ejb_3_1_spec_1_0_2.xml new file mode 100644 index 0000000..f6117e7 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_ejb_3_1_spec_1_0_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_j2ee_connector_1_6_spec_1_0.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_j2ee_connector_1_6_spec_1_0.xml new file mode 100644 index 0000000..52c3611 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_j2ee_connector_1_6_spec_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jcdi_1_0_spec_1_0.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jcdi_1_0_spec_1_0.xml new file mode 100644 index 0000000..4965616 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jcdi_1_0_spec_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jpa_2_0_spec_1_1.xml b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jpa_2_0_spec_1_1.xml new file mode 100644 index 0000000..f9c859b --- /dev/null +++ b/.idea/libraries/Maven__org_apache_geronimo_specs_geronimo_jpa_2_0_spec_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_ivy_ivy_2_3_0.xml b/.idea/libraries/Maven__org_apache_ivy_ivy_2_3_0.xml new file mode 100644 index 0000000..1eb6516 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_ivy_ivy_2_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_groovy_groovy_1_8_9.xml b/.idea/libraries/Maven__org_codehaus_groovy_groovy_1_8_9.xml new file mode 100644 index 0000000..47f5a85 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_groovy_groovy_1_8_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_3.xml b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_3.xml new file mode 100644 index 0000000..bccc7b1 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jettison_jettison_1_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_5.xml b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_5.xml new file mode 100644 index 0000000..e5dce92 --- /dev/null +++ b/.idea/libraries/Maven__org_fusesource_jansi_jansi_1_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_main_extras_glassfish_embedded_all_3_1_2_2.xml b/.idea/libraries/Maven__org_glassfish_main_extras_glassfish_embedded_all_3_1_2_2.xml new file mode 100644 index 0000000..332f02d --- /dev/null +++ b/.idea/libraries/Maven__org_glassfish_main_extras_glassfish_embedded_all_3_1_2_2.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 0000000..f58bbc1 --- /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_javassist_javassist_3_16_1_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_16_1_GA.xml new file mode 100644 index 0000000..7b4e548 --- /dev/null +++ b/.idea/libraries/Maven__org_javassist_javassist_3_16_1_GA.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 0000000..e57dc0a --- /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_slf4j_jcl_over_slf4j_1_6_6.xml b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_6.xml new file mode 100644 index 0000000..d88e457 --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_6_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_6_6.xml b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_6_6.xml new file mode 100644 index 0000000..e0c89ea --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_6_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_6.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_6.xml new file mode 100644 index 0000000..65a3e2e --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_6_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_3_2_3_RELEASE.xml new file mode 100644 index 0000000..d82dce0 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_aop_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_3_2_3_RELEASE.xml new file mode 100644 index 0000000..03aa0c4 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_beans_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_3_2_3_RELEASE.xml new file mode 100644 index 0000000..ce1934a --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_context_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_3_2_3_RELEASE.xml new file mode 100644 index 0000000..47802ab --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_core_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_3_2_3_RELEASE.xml new file mode 100644 index 0000000..5da79d8 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_expression_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_test_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_test_3_2_3_RELEASE.xml new file mode 100644 index 0000000..9849827 --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_test_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_tx_3_2_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_tx_3_2_3_RELEASE.xml new file mode 100644 index 0000000..71f68ad --- /dev/null +++ b/.idea/libraries/Maven__org_springframework_spring_tx_3_2_3_RELEASE.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_0_1.xml b/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_0_1.xml new file mode 100644 index 0000000..0aba85b --- /dev/null +++ b/.idea/libraries/Maven__org_xerial_snappy_snappy_java_1_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__stax_stax_api_1_0_1.xml b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml new file mode 100644 index 0000000..0b13335 --- /dev/null +++ b/.idea/libraries/Maven__stax_stax_api_1_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..df03603 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/orient-itest/orient-itest.iml b/orient-itest/orient-itest.iml new file mode 100644 index 0000000..e0dbce8 --- /dev/null +++ b/orient-itest/orient-itest.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-itest/pom.xml b/orient-itest/pom.xml index a9f65d6..933b0c2 100644 --- a/orient-itest/pom.xml +++ b/orient-itest/pom.xml @@ -3,7 +3,7 @@ org.ops4j orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT orient-itest diff --git a/orient-ra-api/orient-ra-api.iml b/orient-ra-api/orient-ra-api.iml new file mode 100644 index 0000000..a973f1a --- /dev/null +++ b/orient-ra-api/orient-ra-api.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-ra-api/pom.xml b/orient-ra-api/pom.xml index 9618ed0..0ae1e39 100644 --- a/orient-ra-api/pom.xml +++ b/orient-ra-api/pom.xml @@ -3,7 +3,7 @@ org.ops4j orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient orient-ra-api diff --git a/orient-ra-api/src/main/java/org/ops4j/orient/adapter/api/OrientDatabaseConnection.java b/orient-ra-api/src/main/java/org/ops4j/orient/adapter/api/OrientDatabaseConnection.java index 296d3ca..11c5ebe 100644 --- a/orient-ra-api/src/main/java/org/ops4j/orient/adapter/api/OrientDatabaseConnection.java +++ b/orient-ra-api/src/main/java/org/ops4j/orient/adapter/api/OrientDatabaseConnection.java @@ -21,17 +21,13 @@ import java.io.Closeable; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; -import com.orientechnologies.orient.core.db.graph.OGraphDatabase; import com.orientechnologies.orient.object.db.OObjectDatabaseTx; - /** * @author Harald Wellmann - * */ public interface OrientDatabaseConnection extends Closeable { - ODatabaseDocumentTx document(); - OObjectDatabaseTx object(); - OGraphDatabase graph(); - void close(); + ODatabaseDocumentTx document(); + OObjectDatabaseTx object(); + void close(); } diff --git a/orient-ra/orient-ra.iml b/orient-ra/orient-ra.iml new file mode 100644 index 0000000..0ec0724 --- /dev/null +++ b/orient-ra/orient-ra.iml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-ra/pom.xml b/orient-ra/pom.xml index 6f31830..2c2be02 100644 --- a/orient-ra/pom.xml +++ b/orient-ra/pom.xml @@ -3,7 +3,7 @@ org.ops4j orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient orient-ra diff --git a/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientDatabaseConnectionImpl.java b/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientDatabaseConnectionImpl.java index 3b738b5..a8d8b7a 100644 --- a/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientDatabaseConnectionImpl.java +++ b/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientDatabaseConnectionImpl.java @@ -21,60 +21,60 @@ import org.ops4j.orient.adapter.api.OrientDatabaseConnection; import org.ops4j.orient.adapter.api.OrientDatabaseConnectionInvalidException; -import com.orientechnologies.orient.core.db.ODatabaseComplex; +import com.orientechnologies.orient.core.db.ODatabase; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; -import com.orientechnologies.orient.core.db.graph.OGraphDatabase; import com.orientechnologies.orient.object.db.OObjectDatabaseTx; +import com.orientechnologies.common.exception.OException; + /** * @author Harald Wellmann - * */ public class OrientDatabaseConnectionImpl implements OrientDatabaseConnection { + private OrientManagedConnectionImpl mc; + private ODatabase db; + private boolean valid = true; - private OrientManagedConnectionImpl mc; - private ODatabaseComplex db; - private boolean valid = true; + public OrientDatabaseConnectionImpl(ODatabase db, OrientManagedConnectionImpl mc) { + this.db = db; + this.mc = mc; + } - public OrientDatabaseConnectionImpl(ODatabaseComplex db, OrientManagedConnectionImpl mc) { - this.db = db; - this.mc = mc; - } + @Override + public ODatabaseDocumentTx document() { + checkValidity(); + return (ODatabaseDocumentTx) db; + } - @Override - public ODatabaseDocumentTx document() { - checkValidity(); - return (ODatabaseDocumentTx) db; - } + @Override + public OObjectDatabaseTx object() { + checkValidity(); + return (OObjectDatabaseTx) db; + } - @Override - public OObjectDatabaseTx object() { - checkValidity(); - return (OObjectDatabaseTx) db; - } + @Override + public void close() { + mc.close(); + } - @Override - public OGraphDatabase graph() { - checkValidity(); - return (OGraphDatabase) db; - } + protected synchronized void setValid(boolean valid) { + this.valid = valid; + } - @Override - public void close() { - mc.close(); - } - - protected synchronized void setValid(boolean valid) { - this.valid = valid; - } + protected synchronized boolean isValid() { + return valid; + } - protected synchronized boolean isValid() { - return valid; + private void checkValidity() { + if (!isValid()) { + throw new OrientDatabaseConnectionInvalidException(); } + } - private void checkValidity() { - if (!isValid()) { - throw new OrientDatabaseConnectionInvalidException(); - } - } + /** + * exception to be thrown upon commit - used for unit testing 2pc + */ + public void setCommitException(OException commitException) { + mc.setCommitException(commitException); + } } diff --git a/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionFactoryImpl.java b/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionFactoryImpl.java index 4951dee..9f4956e 100644 --- a/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionFactoryImpl.java +++ b/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionFactoryImpl.java @@ -87,8 +87,8 @@ private void validate() throws ResourceException { throw new ResourceException("configuration property [connectionUrl] must not be empty"); } - if (!Arrays.asList("document", "graph", "object").contains(type)) { - throw new ResourceException("configuration property [type] must be one of 'document', 'graph', 'object'"); + if (!Arrays.asList("document", "object").contains(type)) { + throw new ResourceException("configuration property [type] must be one of 'document', 'object'"); } } diff --git a/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionImpl.java b/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionImpl.java index 0357bfd..5962719 100644 --- a/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionImpl.java +++ b/orient-ra/src/main/java/org/ops4j/orient/adapter/impl/OrientManagedConnectionImpl.java @@ -42,217 +42,242 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.orientechnologies.orient.core.db.ODatabaseComplex; +import com.orientechnologies.orient.core.db.ODatabase; import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; -import com.orientechnologies.orient.core.db.graph.OGraphDatabase; import com.orientechnologies.orient.object.db.OObjectDatabaseTx; +import com.orientechnologies.common.exception.OException; + /** * @author Harald Wellmann * */ public class OrientManagedConnectionImpl implements ManagedConnection, Closeable { + private static Logger log = LoggerFactory.getLogger(OrientManagedConnectionImpl.class); - private static Logger log = LoggerFactory.getLogger(OrientManagedConnectionImpl.class); - - private OrientManagedConnectionFactoryImpl mcf; - private ODatabaseComplex db; - private PrintWriter logWriter; - private List listeners = new ArrayList(); - private ConnectionRequestInfo cri; - - private OrientDatabaseConnectionImpl connection; + private OrientManagedConnectionFactoryImpl mcf; + private ODatabase db; + private PrintWriter logWriter; + private List listeners = new ArrayList(); + private ConnectionRequestInfo cri; - private String engine; + private OrientDatabaseConnectionImpl connection; - class OrientLocalTransaction implements LocalTransaction { + private String engine; - @Override - public void begin() throws ResourceException { - log.debug("begin()"); - db.begin(); - fireConnectionEvent(LOCAL_TRANSACTION_STARTED); - } - - @Override - public void commit() throws ResourceException { - log.debug("commit()"); - db.commit(); - fireConnectionEvent(LOCAL_TRANSACTION_COMMITTED); - } + private OException commitException; - @Override - public void rollback() throws ResourceException { - log.debug("rollback()"); - db.rollback(); - fireConnectionEvent(LOCAL_TRANSACTION_ROLLEDBACK); - } + class OrientLocalTransaction implements LocalTransaction { + @Override + public void begin() throws ResourceException { + log.debug("begin()"); + db.begin(); + fireConnectionEvent(LOCAL_TRANSACTION_STARTED); } - public OrientManagedConnectionImpl(OrientManagedConnectionFactoryImpl mcf, - ConnectionRequestInfo cri) throws ResourceException { - this.mcf = mcf; - this.cri = cri; - determineEngine(); - createDatabaseHandle(); - createDatabaseIfNeeded(); + @Override + public void commit() throws ResourceException { + log.debug("commit()"); + Exception transactionOperationException = null; + try { + if (commitException != null) { + /* simulate error during commit */ + db.rollback(true); + throw commitException; + } + else { + db.commit(true); + } + } + catch (OException t) { + transactionOperationException = t; + } + fireConnectionEvent(LOCAL_TRANSACTION_COMMITTED, transactionOperationException); } @Override - public Object getConnection(Subject subject, ConnectionRequestInfo cxRequestInfo) - throws ResourceException { - log.debug("getConnection()"); - - connection = new OrientDatabaseConnectionImpl(db, this); - if (db.isClosed()) { - openDatabase(); - } - - return connection; + public void rollback() throws ResourceException { + log.debug("rollback()"); + db.rollback(true); + fireConnectionEvent(LOCAL_TRANSACTION_ROLLEDBACK); } - - private void createDatabaseHandle() { - String type = mcf.getType(); - String url = mcf.getConnectionUrl(); - - log.debug("instantiating Orient Database of type [{}] with URL [{}]", type, url); - if (type.equals("document")) { - this.db = new ODatabaseDocumentTx(url); - } - else if (type.equals("object")) { - this.db = new OObjectDatabaseTx(url); - } - else if (type.equals("graph")) { - this.db = new OGraphDatabase(url); - } + } + + public OrientManagedConnectionImpl(OrientManagedConnectionFactoryImpl mcf, + ConnectionRequestInfo cri) throws ResourceException { + this.mcf = mcf; + this.cri = cri; + determineEngine(); + createDatabaseHandle(); + createDatabaseIfNeeded(); + } + + @Override + public Object getConnection(Subject subject, ConnectionRequestInfo cxRequestInfo) + throws ResourceException { + log.debug("getConnection()"); + + connection = new OrientDatabaseConnectionImpl(db, this); + if (db.isClosed()) { + openDatabase(); } - private synchronized void createDatabaseIfNeeded() { - if (!engine.equals("remote")) { - if (!db.exists()) { - db.create(); - } - } - } + return connection; + } - private void determineEngine() throws ResourceException { - int colon = mcf.getConnectionUrl().indexOf(':'); - if (colon == -1) { - throw new ResourceException(); - } - this.engine = mcf.getConnectionUrl().substring(0, colon); - } - - private void openDatabase() { - log.debug("opening database for user [{}]", mcf.getUsername()); - if (db.isClosed()) { - db.open(mcf.getUsername(), mcf.getPassword()); - } - } + private void createDatabaseHandle() { + String type = mcf.getType(); + String url = mcf.getConnectionUrl(); - private void closeDatabase() { - db.close(); + log.debug("instantiating Orient Database of type [{}] with URL [{}]", type, url); + if (type.equals("document")) { + this.db = new ODatabaseDocumentTx(url); } - - @Override - public void destroy() throws ResourceException { - log.debug("destroy()"); - closeDatabase(); + else if (type.equals("object")) { + this.db = new OObjectDatabaseTx(url); } + } - @Override - public void cleanup() throws ResourceException { - log.debug("cleanup()"); - this.connection.setValid(false); - this.connection = null; + private synchronized void createDatabaseIfNeeded() { + if (!engine.equals("remote")) { + if (!db.exists()) { + db.create(); + } } + } - @Override - public void associateConnection(Object connection) throws ResourceException { - log.debug("associateConnection()"); - this.connection = (OrientDatabaseConnectionImpl) connection; + private void determineEngine() throws ResourceException { + int colon = mcf.getConnectionUrl().indexOf(':'); + if (colon == -1) { + throw new ResourceException(); } + this.engine = mcf.getConnectionUrl().substring(0, colon); + } - @Override - public void addConnectionEventListener(ConnectionEventListener listener) { - log.debug("addConnectionEventListener()"); - synchronized (listeners) { - listeners.add(listener); - } + private void openDatabase() { + log.debug("opening database for user [{}]", mcf.getUsername()); + if (db.isClosed()) { + db.open(mcf.getUsername(), mcf.getPassword()); } + } - @Override - public void removeConnectionEventListener(ConnectionEventListener listener) { - synchronized (listeners) { - listeners.remove(listener); - } - } + private void closeDatabase() { + db.close(); + } - @Override - public XAResource getXAResource() throws ResourceException { - throw new ResourceException("OrientDB resource adapter does not support XA transactions"); - } + @Override + public void destroy() throws ResourceException { + log.debug("destroy()"); + closeDatabase(); + } - @Override - public LocalTransaction getLocalTransaction() throws ResourceException { - log.debug("getLocalTransaction()"); - return new OrientLocalTransaction(); - } + @Override + public void cleanup() throws ResourceException { + log.debug("cleanup()"); - @Override - public ManagedConnectionMetaData getMetaData() throws ResourceException { - return new OrientManagedConnectionMetaData(); + if (connection != null) { + this.connection.setValid(false); + this.connection = null; } - - @Override - public void setLogWriter(PrintWriter out) throws ResourceException { - this.logWriter = out; + } + + @Override + public void associateConnection(Object connection) throws ResourceException { + log.debug("associateConnection()"); + this.connection = (OrientDatabaseConnectionImpl) connection; + } + + @Override + public void addConnectionEventListener(ConnectionEventListener listener) { + log.debug("addConnectionEventListener()"); + synchronized (listeners) { + listeners.add(listener); } + } - @Override - public PrintWriter getLogWriter() throws ResourceException { - return logWriter; + @Override + public void removeConnectionEventListener(ConnectionEventListener listener) { + synchronized (listeners) { + listeners.remove(listener); } - - private void fireConnectionEvent(int event) { - ConnectionEvent connectionEvent = new ConnectionEvent(this, event); - connectionEvent.setConnectionHandle(connection); - synchronized (listeners) { - for (ConnectionEventListener listener : this.listeners) { - switch (event) { - case LOCAL_TRANSACTION_STARTED: - listener.localTransactionStarted(connectionEvent); - break; - case LOCAL_TRANSACTION_COMMITTED: - listener.localTransactionCommitted(connectionEvent); - break; - case LOCAL_TRANSACTION_ROLLEDBACK: - listener.localTransactionRolledback(connectionEvent); - break; - case CONNECTION_CLOSED: - listener.connectionClosed(connectionEvent); - break; - case CONNECTION_ERROR_OCCURRED: - listener.connectionErrorOccurred(connectionEvent); - break; - default: - throw new IllegalArgumentException("Unknown event: " + event); - } - } + } + + @Override + public XAResource getXAResource() throws ResourceException { + throw new ResourceException("OrientDB resource adapter does not support XA transactions"); + } + + @Override + public LocalTransaction getLocalTransaction() throws ResourceException { + log.debug("getLocalTransaction()"); + return new OrientLocalTransaction(); + } + + @Override + public ManagedConnectionMetaData getMetaData() throws ResourceException { + return new OrientManagedConnectionMetaData(); + } + + @Override + public void setLogWriter(PrintWriter out) throws ResourceException { + this.logWriter = out; + } + + @Override + public PrintWriter getLogWriter() throws ResourceException { + return logWriter; + } + + private void fireConnectionEvent(int event) { + fireConnectionEvent(event, null); + } + + private void fireConnectionEvent(int event, Exception ex) { + ConnectionEvent connectionEvent = (ex != null ? new ConnectionEvent(this, event, ex) : new ConnectionEvent(this, event)); + connectionEvent.setConnectionHandle(connection); + synchronized (listeners) { + for (ConnectionEventListener listener : this.listeners) { + switch (event) { + case LOCAL_TRANSACTION_STARTED: + listener.localTransactionStarted(connectionEvent); + break; + case LOCAL_TRANSACTION_COMMITTED: + listener.localTransactionCommitted(connectionEvent); + break; + case LOCAL_TRANSACTION_ROLLEDBACK: + listener.localTransactionRolledback(connectionEvent); + break; + case CONNECTION_CLOSED: + listener.connectionClosed(connectionEvent); + break; + case CONNECTION_ERROR_OCCURRED: + listener.connectionErrorOccurred(connectionEvent); + break; + default: + throw new IllegalArgumentException("Unknown event: " + event); } + } } - - /** - * Do not close the underlying connection now, as it may be used in a container-managed - * transaction. The connection will be closed in {@link #cleanup()}. - */ - @Override - public void close() { - log.debug("close()"); - fireConnectionEvent(CONNECTION_CLOSED); - } - - public ConnectionRequestInfo getConnectionRequestInfo() { - return cri; - } + } + + /** + * Do not close the underlying connection now, as it may be used in a container-managed + * transaction. The connection will be closed in {@link #cleanup()}. + */ + @Override + public void close() { + log.debug("close()"); + fireConnectionEvent(CONNECTION_CLOSED); + } + + public ConnectionRequestInfo getConnectionRequestInfo() { + return cri; + } + + /** + * exception to be thrown upon commit - used for unit testing 2pc + */ + public void setCommitException(OException commitException) { + this.commitException = commitException; + } } diff --git a/orient-rar/orient-rar.iml b/orient-rar/orient-rar.iml new file mode 100644 index 0000000..d8f348a --- /dev/null +++ b/orient-rar/orient-rar.iml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-rar/pom.xml b/orient-rar/pom.xml index abc904d..f63b16f 100644 --- a/orient-rar/pom.xml +++ b/orient-rar/pom.xml @@ -3,7 +3,7 @@ org.ops4j orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient orient-rar @@ -23,6 +23,11 @@ com.orientechnologies orientdb-client + + + com.orientechnologies + orientdb-graphdb + org.javassist diff --git a/orient-samples/orient-sample1/orient-sample1.iml b/orient-samples/orient-sample1/orient-sample1.iml new file mode 100644 index 0000000..becea27 --- /dev/null +++ b/orient-samples/orient-sample1/orient-sample1.iml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-samples/orient-sample1/pom.xml b/orient-samples/orient-sample1/pom.xml index 496db20..948eb90 100644 --- a/orient-samples/orient-sample1/pom.xml +++ b/orient-samples/orient-sample1/pom.xml @@ -3,7 +3,7 @@ org.ops4j.orient orient-samples - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient.samples orient-sample1 diff --git a/orient-samples/orient-sample2/orient-sample2.iml b/orient-samples/orient-sample2/orient-sample2.iml new file mode 100644 index 0000000..2223779 --- /dev/null +++ b/orient-samples/orient-sample2/orient-sample2.iml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-samples/orient-sample2/pom.xml b/orient-samples/orient-sample2/pom.xml index cc426db..8cad646 100644 --- a/orient-samples/orient-sample2/pom.xml +++ b/orient-samples/orient-sample2/pom.xml @@ -3,7 +3,7 @@ org.ops4j.orient orient-samples - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient.samples diff --git a/orient-samples/orient-samples.iml b/orient-samples/orient-samples.iml new file mode 100644 index 0000000..432ca47 --- /dev/null +++ b/orient-samples/orient-samples.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-samples/pom.xml b/orient-samples/pom.xml index d8e9866..d6632a7 100644 --- a/orient-samples/pom.xml +++ b/orient-samples/pom.xml @@ -3,7 +3,7 @@ org.ops4j orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient diff --git a/orient-spring-tx/orient-spring-tx.iml b/orient-spring-tx/orient-spring-tx.iml new file mode 100644 index 0000000..1d9caf9 --- /dev/null +++ b/orient-spring-tx/orient-spring-tx.iml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/orient-spring-tx/pom.xml b/orient-spring-tx/pom.xml index b7a552c..7c77892 100644 --- a/orient-spring-tx/pom.xml +++ b/orient-spring-tx/pom.xml @@ -3,7 +3,7 @@ org.ops4j orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT org.ops4j.orient @@ -81,6 +81,12 @@ test + + com.orientechnologies + orientdb-graphdb + test + + \ No newline at end of file diff --git a/orient.iml b/orient.iml new file mode 100644 index 0000000..82acd7c --- /dev/null +++ b/orient.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 5f1190f..5c06bc2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ orient - 0.3.0-SNAPSHOT + 0.5.0-SNAPSHOT pom OPS4J OrientDB Extensions Reactor @@ -24,7 +24,7 @@ ${project.build.directory}/endorsed 1.0.4 - 1.5.0 + 2.0.2 1.6.6 3.2.3.RELEASE @@ -97,7 +97,6 @@ provided - com.orientechnologies orientdb-core @@ -110,6 +109,12 @@ ${orientdb.version} + + com.orientechnologies + orientdb-graphdb + ${orientdb.version} + + com.orientechnologies orientdb-object @@ -274,4 +279,4 @@ - \ No newline at end of file +