From ab07c2e0ced544f286158486d24deb3275ab89ef Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Fri, 25 Oct 2013 16:08:16 +0200 Subject: [PATCH] Added content_negotiation to official EWF release. --- library/library.index | 105 ++++++++++++++++++++++------------------ tools/install_ewf.bat | 2 + tools/install_ewf.sh | 5 +- tools/uninstall_ewf.bat | 2 + 4 files changed, 66 insertions(+), 48 deletions(-) diff --git a/library/library.index b/library/library.index index fbc1ac0e..379ba989 100644 --- a/library/library.index +++ b/library/library.index @@ -1,51 +1,62 @@ # Available libraries. -http_client-safe : c:\_dev\EWF\EWF-dev\library\network\http_client\http_client-safe.ecf -http_client : c:\_dev\EWF\EWF-dev\library\network\http_client\http_client.ecf -conneg-safe : c:\_dev\EWF\EWF-dev\library\network\protocol\CONNEG\conneg-safe.ecf -conneg : c:\_dev\EWF\EWF-dev\library\network\protocol\CONNEG\conneg.ecf -http-safe : c:\_dev\EWF\EWF-dev\library\network\protocol\http\http-safe.ecf -http : c:\_dev\EWF\EWF-dev\library\network\protocol\http\http.ecf -http_authorization-safe : c:\_dev\EWF\EWF-dev\library\server\authentication\http_authorization\http_authorization-safe.ecf -http_authorization : c:\_dev\EWF\EWF-dev\library\server\authentication\http_authorization\http_authorization.ecf -ewsgi-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi-safe.ecf -ewsgi : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi.ecf -ewsgi_spec-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi_spec-safe.ecf -ewsgi_spec : c:\_dev\EWF\EWF-dev\library\server\ewsgi\ewsgi_spec.ecf -cgi-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\cgi\cgi-safe.ecf -cgi : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\cgi\cgi.ecf -libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf -libfcgi : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\libfcgi\libfcgi.ecf -nino-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\nino\nino-safe.ecf -nino : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\nino\nino.ecf -null-safe : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\null\null-safe.ecf -null : c:\_dev\EWF\EWF-dev\library\server\ewsgi\connectors\null\null.ecf -fcgi-safe : c:\_dev\EWF\EWF-dev\library\server\libfcgi\fcgi-safe.ecf -fcgi : c:\_dev\EWF\EWF-dev\library\server\libfcgi\fcgi.ecf -libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\libfcgi\libfcgi-safe.ecf -libfcgi : c:\_dev\EWF\EWF-dev\library\server\libfcgi\libfcgi.ecf -router-safe : c:\_dev\EWF\EWF-dev\library\server\request\router\router-safe.ecf -router : c:\_dev\EWF\EWF-dev\library\server\request\router\router.ecf -wsf-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\wsf-safe.ecf -wsf : c:\_dev\EWF\EWF-dev\library\server\wsf\wsf.ecf -all-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\all-safe.ecf -cgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\cgi-safe.ecf -cgi : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\cgi.ecf -libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\libfcgi-safe.ecf -libfcgi : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\libfcgi.ecf -nino-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\nino-safe.ecf -nino : c:\_dev\EWF\EWF-dev\library\server\wsf\connector\nino.ecf -cgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\default\cgi-safe.ecf -cgi : c:\_dev\EWF\EWF-dev\library\server\wsf\default\cgi.ecf -libfcgi-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\default\libfcgi-safe.ecf -libfcgi : c:\_dev\EWF\EWF-dev\library\server\wsf\default\libfcgi.ecf -nino-safe : c:\_dev\EWF\EWF-dev\library\server\wsf\default\nino-safe.ecf -nino : c:\_dev\EWF\EWF-dev\library\server\wsf\default\nino.ecf -wsf_extension-safe : c:\_dev\EWF\EWF-dev\library\server\wsf_extension\wsf_extension-safe.ecf -wsf_extension : c:\_dev\EWF\EWF-dev\library\server\wsf_extension\wsf_extension.ecf -encoder-safe : c:\_dev\EWF\EWF-dev\library\text\encoder\encoder-safe.ecf -encoder : c:\_dev\EWF\EWF-dev\library\text\encoder\encoder.ecf -error-safe : c:\_dev\EWF\EWF-dev\library\utility\general\error\error-safe.ecf -error : c:\_dev\EWF\EWF-dev\library\utility\general\error\error.ecf +http_client-safe : C:\_dev\projects\ewf\ewf\library\network\http_client\http_client-safe.ecf +http_client : C:\_dev\projects\ewf\ewf\library\network\http_client\http_client.ecf +conneg-safe : C:\_dev\projects\ewf\ewf\library\network\protocol\content_negotiation\conneg-safe.ecf +conneg : C:\_dev\projects\ewf\ewf\library\network\protocol\content_negotiation\conneg.ecf +http-safe : C:\_dev\projects\ewf\ewf\library\network\protocol\http\http-safe.ecf +http : C:\_dev\projects\ewf\ewf\library\network\protocol\http\http.ecf +notification_email-safe : C:\_dev\projects\ewf\ewf\library\runtime\process\notification_email\notification_email-safe.ecf +notification_email : C:\_dev\projects\ewf\ewf\library\runtime\process\notification_email\notification_email.ecf +openid-safe : C:\_dev\projects\ewf\ewf\library\security\openid\consumer\openid-safe.ecf +openid : C:\_dev\projects\ewf\ewf\library\security\openid\consumer\openid.ecf +demo-safe : C:\_dev\projects\ewf\ewf\library\security\openid\consumer\demo\demo-safe.ecf +http_authorization-safe : C:\_dev\projects\ewf\ewf\library\server\authentication\http_authorization\http_authorization-safe.ecf +http_authorization : C:\_dev\projects\ewf\ewf\library\server\authentication\http_authorization\http_authorization.ecf +ewsgi-safe : C:\_dev\projects\ewf\ewf\library\server\ewsgi\ewsgi-safe.ecf +ewsgi : C:\_dev\projects\ewf\ewf\library\server\ewsgi\ewsgi.ecf +ewsgi_spec-safe : C:\_dev\projects\ewf\ewf\library\server\ewsgi\ewsgi_spec-safe.ecf +ewsgi_spec : C:\_dev\projects\ewf\ewf\library\server\ewsgi\ewsgi_spec.ecf +cgi-safe : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\cgi\cgi-safe.ecf +cgi : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\cgi\cgi.ecf +libfcgi-safe : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf +libfcgi : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\libfcgi\libfcgi.ecf +nino-safe : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\nino\nino-safe.ecf +nino : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\nino\nino.ecf +null-safe : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\null\null-safe.ecf +null : C:\_dev\projects\ewf\ewf\library\server\ewsgi\connectors\null\null.ecf +libfcgi-safe : C:\_dev\projects\ewf\ewf\library\server\libfcgi\libfcgi-safe.ecf +libfcgi : C:\_dev\projects\ewf\ewf\library\server\libfcgi\libfcgi.ecf +wsf-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf-safe.ecf +wsf : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf.ecf +wsf_extension-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_extension-safe.ecf +wsf_extension : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_extension.ecf +wsf_policy_driven-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_policy_driven-safe.ecf +wsf_policy_driven : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_policy_driven.ecf +wsf_router_context-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_router_context-safe.ecf +wsf_router_context : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_router_context.ecf +wsf_session-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_session-safe.ecf +wsf_session : C:\_dev\projects\ewf\ewf\library\server\wsf\wsf_session.ecf +all-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\all-safe.ecf +cgi-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\cgi-safe.ecf +cgi : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\cgi.ecf +libfcgi-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\libfcgi-safe.ecf +libfcgi : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\libfcgi.ecf +nino-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\nino-safe.ecf +nino : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\nino.ecf +openshift-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\connector\openshift-safe.ecf +cgi-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\default\cgi-safe.ecf +cgi : C:\_dev\projects\ewf\ewf\library\server\wsf\default\cgi.ecf +libfcgi-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\default\libfcgi-safe.ecf +libfcgi : C:\_dev\projects\ewf\ewf\library\server\wsf\default\libfcgi.ecf +nino-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\default\nino-safe.ecf +nino : C:\_dev\projects\ewf\ewf\library\server\wsf\default\nino.ecf +openshift-safe : C:\_dev\projects\ewf\ewf\library\server\wsf\default\openshift-safe.ecf +wsf_html-safe : C:\_dev\projects\ewf\ewf\library\server\wsf_html\wsf_html-safe.ecf +wsf_html : C:\_dev\projects\ewf\ewf\library\server\wsf_html\wsf_html.ecf +encoder-safe : C:\_dev\projects\ewf\ewf\library\text\encoder\encoder-safe.ecf +encoder : C:\_dev\projects\ewf\ewf\library\text\encoder\encoder.ecf +error-safe : C:\_dev\projects\ewf\ewf\library\utility\general\error\error-safe.ecf +error : C:\_dev\projects\ewf\ewf\library\utility\general\error\error.ecf diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat index 0e0882fd..154dfd33 100644 --- a/tools/install_ewf.bat +++ b/tools/install_ewf.bat @@ -76,6 +76,8 @@ echo Install library: http_client %COPYCMD% %TMP_DIR%\library\network\http_client %TMP_CONTRIB_DIR%\library\network\http_client echo Install library: http %COPYCMD% %TMP_DIR%\library\network\protocol\http %TMP_CONTRIB_DIR%\library\network\protocol\http +echo Install library: content_negotiation +%COPYCMD% %TMP_DIR%\library\network\protocol\content_negotiation %TMP_CONTRIB_DIR%\library\network\protocol\content_negotiation echo Install library: http_authorization %SAFE_MD% %TMP_CONTRIB_DIR%\library\network\authentication %COPYCMD% %TMP_DIR%\library\server\authentication\http_authorization %TMP_CONTRIB_DIR%\library\network\authentication\http_authorization diff --git a/tools/install_ewf.sh b/tools/install_ewf.sh index 8d278a4f..e0612a3d 100644 --- a/tools/install_ewf.sh +++ b/tools/install_ewf.sh @@ -67,9 +67,12 @@ COPYCMD $TMP_DIR/library/utility/general/error $TMP_CONTRIB_DIR/library/utility/ echo Install library: http_client mkdir -p $TMP_CONTRIB_DIR/library/network COPYCMD $TMP_DIR/library/network/http_client $TMP_CONTRIB_DIR/library/network/http_client -echo Install library: http + mkdir -p $TMP_CONTRIB_DIR/library/network/protocol +echo Install library: http COPYCMD $TMP_DIR/library/network/protocol/http $TMP_CONTRIB_DIR/library/network/protocol/http +echo Install library: content_negotiation +COPYCMD $TMP_DIR/library/network/protocol/content_negotiation $TMP_CONTRIB_DIR/library/network/protocol/content_negotiation echo Install library: http_authorization mkdir -p $TMP_CONTRIB_DIR/library/network/authentication COPYCMD $TMP_DIR/library/server/authentication/http_authorization $TMP_CONTRIB_DIR/library/network/authentication/http_authorization diff --git a/tools/uninstall_ewf.bat b/tools/uninstall_ewf.bat index 78703184..c0b09777 100644 --- a/tools/uninstall_ewf.bat +++ b/tools/uninstall_ewf.bat @@ -54,6 +54,8 @@ echo Uninstall library: http_client %RDCMD% %TMP_CONTRIB_DIR%\library\network\http_client echo Uninstall library: http %RDCMD% %TMP_CONTRIB_DIR%\library\network\protocol\http +echo Uninstall library: content_negotiation +%RDCMD% %TMP_CONTRIB_DIR%\library\network\protocol\content_negotiation echo Uninstall library: http_authorization %RDCMD% %TMP_CONTRIB_DIR%\library\network\authentication\http_authorization echo Uninstall library: security\openid