You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/11/03 08:11:33 UTC
[2/4] git commit: merged
merged
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/38d4a7c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/38d4a7c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/38d4a7c6
Branch: refs/heads/develop
Commit: 38d4a7c697568a3046345abd9c78c791597a959c
Parents: 71d6ce0 872b9b8
Author: Sergio Fernández <wi...@apache.org>
Authored: Sun Nov 3 08:10:47 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Sun Nov 3 08:10:47 2013 +0100
----------------------------------------------------------------------
.gitignore | 1 +
.idea/libraries/Maven__antlr_antlr_2_7_7.xml | 13 +++
.idea/libraries/Maven__asm_asm_3_2.xml | 13 +++
.idea/libraries/Maven__asm_asm_analysis_3_2.xml | 13 +++
.idea/libraries/Maven__asm_asm_commons_3_2.xml | 13 +++
.idea/libraries/Maven__asm_asm_tree_3_2.xml | 13 +++
.idea/libraries/Maven__asm_asm_util_3_2.xml | 13 +++
..._concurrent_backport_util_concurrent_3_1.xml | 13 +++
.../Maven__ch_qos_cal10n_cal10n_api_0_8_1.xml | 13 +++
...n__ch_qos_logback_logback_classic_1_0_13.xml | 13 +++
...aven__ch_qos_logback_logback_core_1_0_13.xml | 13 +++
...asterxml_jackson_core_jackson_core_2_1_4.xml | 13 +++
...oogle_code_tempus_fugit_tempus_fugit_1_1.xml | 13 +++
.../Maven__com_google_guava_guava_14_0_1.xml | 13 +++
.../Maven__com_googlecode_jatl_jatl_0_2_2.xml | 13 +++
.../Maven__com_h2database_h2_1_3_170.xml | 13 +++
...om_jayway_restassured_rest_assured_1_7_1.xml | 13 +++
..._thetransactioncompany_cors_filter_1_5_1.xml | 13 +++
...sactioncompany_java_property_utils_1_7_1.xml | 13 +++
...ommons_beanutils_commons_beanutils_1_8_3.xml | 13 +++
.../Maven__commons_cli_commons_cli_1_2.xml | 13 +++
.../Maven__commons_codec_commons_codec_1_8.xml | 13 +++
...ns_collections_commons_collections_3_2_1.xml | 13 +++
..._configuration_commons_configuration_1_9.xml | 13 +++
...n__commons_digester_commons_digester_1_8.xml | 13 +++
...ommons_httpclient_commons_httpclient_3_1.xml | 13 +++
.../Maven__commons_io_commons_io_2_4.xml | 13 +++
.../Maven__commons_lang_commons_lang_2_5.xml | 13 +++
.../Maven__commons_lang_commons_lang_2_6.xml | 13 +++
.../Maven__commons_net_commons_net_3_2.xml | 13 +++
...ommons_validator_commons_validator_1_4_0.xml | 13 +++
...aven__eu_medsea_mimeutil_mime_util_2_1_3.xml | 13 +++
.../Maven__javassist_javassist_3_12_0_GA.xml | 13 +++
.../Maven__javax_activation_activation_1_1.xml | 13 +++
.../Maven__javax_annotation_jsr250_api_1_0.xml | 13 +++
.../Maven__javax_el_javax_el_api_2_2_4.xml | 13 +++
.../Maven__javax_enterprise_cdi_api_1_1.xml | 13 +++
.../Maven__javax_inject_javax_inject_1.xml | 13 +++
...n__javax_servlet_javax_servlet_api_3_0_1.xml | 13 +++
...javax_validation_validation_api_1_0_0_GA.xml | 13 +++
.idea/libraries/Maven__jaxen_jaxen_1_1_4.xml | 13 +++
.idea/libraries/Maven__junit_junit_4_11.xml | 13 +++
...Maven__mysql_mysql_connector_java_5_1_21.xml | 13 +++
.../Maven__net_jcip_jcip_annotations_1_0.xml | 13 +++
...Maven__net_sf_ehcache_ehcache_core_2_6_6.xml | 13 +++
.../Maven__net_sf_opencsv_opencsv_2_0.xml | 13 +++
...en__org_apache_commons_commons_lang3_3_1.xml | 13 +++
...g_apache_httpcomponents_httpclient_4_2_3.xml | 13 +++
...he_httpcomponents_httpclient_cache_4_2_3.xml | 13 +++
...org_apache_httpcomponents_httpcore_4_2_3.xml | 13 +++
...org_apache_httpcomponents_httpmime_4_2_3.xml | 13 +++
...test_jar_tests_3_1_0_incubating_SNAPSHOT.xml | 13 +++
...test_jar_tests_3_1_0_incubating_SNAPSHOT.xml | 13 +++
.../Maven__org_apache_tika_tika_core_1_2.xml | 13 +++
...en__org_apache_tomcat_tomcat_jdbc_7_0_40.xml | 13 +++
...en__org_apache_tomcat_tomcat_juli_7_0_40.xml | 13 +++
...en__org_ccil_cowan_tagsoup_tagsoup_1_2_1.xml | 13 +++
.../Maven__org_codehaus_groovy_groovy_1_8_4.xml | 13 +++
...codehaus_jackson_jackson_core_asl_1_9_12.xml | 13 +++
...rg_codehaus_jackson_jackson_jaxrs_1_9_12.xml | 13 +++
...dehaus_jackson_jackson_mapper_asl_1_9_12.xml | 13 +++
...__org_codehaus_jackson_jackson_xc_1_9_12.xml | 13 +++
...g_codehaus_janino_commons_compiler_2_6_1.xml | 13 +++
.../Maven__org_codehaus_janino_janino_2_6_1.xml | 13 +++
...eclipse_jetty_jetty_http_9_0_3_v20130506.xml | 13 +++
...g_eclipse_jetty_jetty_io_9_0_3_v20130506.xml | 13 +++
...pse_jetty_jetty_security_9_0_3_v20130506.xml | 13 +++
...lipse_jetty_jetty_server_9_0_3_v20130506.xml | 13 +++
...ipse_jetty_jetty_servlet_9_0_3_v20130506.xml | 13 +++
...eclipse_jetty_jetty_util_9_0_3_v20130506.xml | 13 +++
..._orbit_javax_servlet_3_0_0_v201112011016.xml | 13 +++
.../Maven__org_freemarker_freemarker_2_3_19.xml | 13 +++
.../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 +++
...Maven__org_hamcrest_hamcrest_library_1_3.xml | 13 +++
...Maven__org_javassist_javassist_3_17_1_GA.xml | 13 +++
...eptor_jboss_interceptor_core_2_0_0_Final.xml | 13 +++
...ceptor_jboss_interceptor_spi_2_0_0_Final.xml | 13 +++
...org_jboss_resteasy_jaxrs_api_2_3_6_Final.xml | 13 +++
..._jboss_resteasy_resteasy_cdi_2_3_6_Final.xml | 13 +++
...sy_resteasy_jackson_provider_2_3_6_Final.xml | 13 +++
...boss_resteasy_resteasy_jaxrs_2_3_6_Final.xml | 13 +++
...ss_interceptors_api_1_1_spec_1_0_0_Beta1.xml | 13 +++
..._jboss_weld_se_weld_se_core_1_1_13_Final.xml | 13 +++
...d_servlet_weld_servlet_core_1_1_13_Final.xml | 13 +++
...Maven__org_jboss_weld_weld_api_1_1_Final.xml | 13 +++
...n__org_jboss_weld_weld_core_1_1_13_Final.xml | 13 +++
...Maven__org_jboss_weld_weld_spi_1_1_Final.xml | 13 +++
.idea/libraries/Maven__org_jdom_jdom2_2_0_5.xml | 13 +++
.../libraries/Maven__org_jsoup_jsoup_1_7_2.xml | 13 +++
...symmetric_jdbc_postgresql_9_2_1002_jdbc4.xml | 13 +++
.../Maven__org_mnode_ical4j_ical4j_1_0_3.xml | 13 +++
...ven__org_mnode_ical4j_ical4j_vcard_0_9_5.xml | 13 +++
..._openrdf_sesame_sesame_http_client_2_7_1.xml | 13 +++
...penrdf_sesame_sesame_http_protocol_2_7_1.xml | 13 +++
...n__org_openrdf_sesame_sesame_model_2_7_1.xml | 13 +++
...n__org_openrdf_sesame_sesame_query_2_7_1.xml | 13 +++
...ame_sesame_queryalgebra_evaluation_2_7_1.xml | 13 +++
...f_sesame_sesame_queryalgebra_model_2_7_1.xml | 13 +++
...nrdf_sesame_sesame_queryparser_api_2_7_1.xml | 13 +++
...df_sesame_sesame_queryparser_serql_2_7_1.xml | 13 +++
...f_sesame_sesame_queryparser_sparql_2_7_1.xml | 13 +++
...df_sesame_sesame_queryresultio_api_2_7_1.xml | 13 +++
...me_sesame_queryresultio_sparqljson_2_7_1.xml | 13 +++
...ame_sesame_queryresultio_sparqlxml_2_7_1.xml | 13 +++
...f_sesame_sesame_queryresultio_text_2_7_1.xml | 13 +++
...enrdf_sesame_sesame_repository_api_2_7_1.xml | 13 +++
...rdf_sesame_sesame_repository_event_2_7_1.xml | 13 +++
...nrdf_sesame_sesame_repository_sail_2_7_1.xml | 13 +++
...df_sesame_sesame_repository_sparql_2_7_1.xml | 13 +++
..._org_openrdf_sesame_sesame_rio_api_2_7_1.xml | 13 +++
...penrdf_sesame_sesame_rio_datatypes_2_7_1.xml | 13 +++
...penrdf_sesame_sesame_rio_languages_2_7_1.xml | 13 +++
...__org_openrdf_sesame_sesame_rio_n3_2_7_1.xml | 13 +++
...openrdf_sesame_sesame_rio_ntriples_2_7_1.xml | 13 +++
...g_openrdf_sesame_sesame_rio_rdfxml_2_7_1.xml | 13 +++
...org_openrdf_sesame_sesame_rio_trig_2_7_1.xml | 13 +++
...org_openrdf_sesame_sesame_rio_trix_2_7_1.xml | 13 +++
...g_openrdf_sesame_sesame_rio_turtle_2_7_1.xml | 13 +++
...org_openrdf_sesame_sesame_sail_api_2_7_1.xml | 13 +++
...nrdf_sesame_sesame_sail_inferencer_2_7_1.xml | 13 +++
..._openrdf_sesame_sesame_sail_memory_2_7_1.xml | 13 +++
...enrdf_sesame_sesame_sail_nativerdf_2_7_1.xml | 13 +++
...en__org_openrdf_sesame_sesame_util_2_7_1.xml | 13 +++
...ven__org_scannotation_scannotation_1_0_3.xml | 13 +++
...ven__org_semarglproject_semargl_core_0_4.xml | 13 +++
...aven__org_semarglproject_semargl_rdf_0_4.xml | 13 +++
...ven__org_semarglproject_semargl_rdfa_0_4.xml | 13 +++
...n__org_semarglproject_semargl_sesame_0_4.xml | 13 +++
.../Maven__org_slf4j_jcl_over_slf4j_1_7_5.xml | 13 +++
.../Maven__org_slf4j_jul_to_slf4j_1_7_5.xml | 13 +++
.../Maven__org_slf4j_log4j_over_slf4j_1_7_5.xml | 13 +++
.../Maven__org_slf4j_slf4j_api_1_7_5.xml | 13 +++
.../Maven__org_slf4j_slf4j_ext_1_7_5.xml | 13 +++
.../Maven__org_slf4j_slf4j_simple_1_7_5.xml | 13 +++
.../Maven__org_webjars_jquery_1_8_2.xml | 13 +++
.../Maven__xml_apis_xml_apis_1_4_01.xml | 13 +++
launchers/marmotta-webapp/pom.xml | 1 +
.../src/main/webapp/META-INF/context.xml | 7 ++
.../src/main/webapp/WEB-INF/web.xml | 7 ++
libraries/kiwi/pom.xml | 22 -----
.../functions/AbstractTextFilterFunction.java | 74 +++++++++++++++++
libraries/ldpath/ldpath-functions-html/pom.xml | 4 +
.../model/functions/html/CleanHtmlFunction.java | 61 ++------------
.../model/functions/html/HtmlTextFunction.java | 52 ++++++++++++
...rmotta.ldpath.api.functions.SelectorFunction | 3 +-
.../model/functions/html/HtmlFunctionsTest.java | 36 ++++++--
libraries/ldpath/ldpath-functions-xml/pom.xml | 4 +
.../functions/xml/RemoveXmlTagsFunction.java | 60 ++------------
.../model/functions/xml/XmlTextFunction.java | 58 +++++++++++++
.../functions/xml/XmlUnescapeFunction.java | 57 +++++++++++++
...rmotta.ldpath.api.functions.SelectorFunction | 4 +-
.../xml/RemoveXmlTagsFunctionTest.java | 2 +-
.../model/functions/xml/XPathFunctionTest.java | 2 +-
.../functions/xml/XmlTextFunctionTest.java | 87 ++++++++++++++++++++
parent/pom.xml | 31 +------
.../templating/AdminTemplatingServiceImpl.java | 6 --
.../marmotta/platform/core/util/CDIContext.java | 4 +-
pom.xml | 2 +-
158 files changed, 2161 insertions(+), 179 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/38d4a7c6/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 51449c6,119a70e..39fd385
--- a/.gitignore
+++ b/.gitignore
@@@ -15,3 -15,4 +15,4 @@@
target
target/*
.idea
-.idea/**
++.idea/**