1.1 --- a/.hgignore	Fri May 02 17:27:46 2014 +0200
     1.2 +++ b/.hgignore	Fri May 02 17:39:27 2014 +0200
     1.3 @@ -1,4 +1,5 @@
     1.4  /target$
     1.5 +target$
     1.6  \.project$
     1.7  \.settings$
     1.8  \.classpath$
     1.9 @@ -11,3 +12,5 @@
    1.10  stdout\.txt
    1.11  stderr\.log
    1.12  stdout\.log
    1.13 +endpoint-client/dependency-reduced-pom\.xml
    1.14 +WEB-INF/faces-config.xml

     2.1 --- a/.hgtags	Fri May 02 17:27:46 2014 +0200
     2.2 +++ b/.hgtags	Fri May 02 17:39:27 2014 +0200
     2.3 @@ -9,3 +9,13 @@
     2.4  30b26e89d0850f73d51aafb6e7450962e0bd64b8 v3.1.9
     2.5  f98df7d45ce21e527813cfe46d60308ca68a228b v3.2.1
     2.6  cba4fb36f4a6dade24b4e50509856e4df79be0fb v3.2.2-MonetDB
     2.7 +8378166a566968b5ba00683384605f6232ef0aaa v3.2.2
     2.8 +331163be068281f22f61b79b31484eb0f4cfc564 v3.2.3
     2.9 +66fbe30eb2e9dcd5c36bf29336efcb1bd3ce45fb v3.2.4
    2.10 +73521cf81d1383a7fd885de46ffd7ed6e844851b Teleios_System_v1-1-1
    2.11 +331163be068281f22f61b79b31484eb0f4cfc564 Teleios_System_v1-1-1
    2.12 +7089b2d52c7f36b40301063efc73476a093f2134 v3.2.5
    2.13 +97afadc6d589b318924ca774659418c055fdf3a0 v3.2.6
    2.14 +b3e0d7415823df2e814aa6fa45aa13374a81e706 v3.2.7
    2.15 +389213ce7843a9c490be447400c1a5c46d44cc96 v3.2.8
    2.16 +92b90ac06d39f8fcf76de046f22bb64526d5ff28 v3.2.9

     3.1 --- a/AUTHORS	Fri May 02 17:27:46 2014 +0200
     3.2 +++ b/AUTHORS	Fri May 02 17:39:27 2014 +0200
     3.3 @@ -3,3 +3,7 @@
     3.4  Manolis Koubarakis	<koubarak@di.uoa.gr>
     3.5  Giorgos Garbis		<ggarbis@di.uoa.gr>
     3.6  Konstantina Bereta	<konstantina.bereta@di.uoa.gr>
     3.7 +Charalampos Nikolaou	<charnik@di.uoa.gr>
     3.8 +Stella Gianakopoulou	<sgian@di.uoa.gr>
     3.9 +Panagiotis Smeros	<psmeros@di.uoa.gr>
    3.10 +Kallirroi Dogani	<kallirroi@di.uoa.gr>

     4.1 --- a/COPYING	Fri May 02 17:27:46 2014 +0200
     4.2 +++ b/COPYING	Fri May 02 17:39:27 2014 +0200
     4.3 @@ -0,0 +1,373 @@
     4.4 +Mozilla Public License Version 2.0
     4.5 +==================================
     4.6 +
     4.7 +1. Definitions
     4.8 +--------------
     4.9 +
    4.10 +1.1. "Contributor"
    4.11 +    means each individual or legal entity that creates, contributes to
    4.12 +    the creation of, or owns Covered Software.
    4.13 +
    4.14 +1.2. "Contributor Version"
    4.15 +    means the combination of the Contributions of others (if any) used
    4.16 +    by a Contributor and that particular Contributor's Contribution.
    4.17 +
    4.18 +1.3. "Contribution"
    4.19 +    means Covered Software of a particular Contributor.
    4.20 +
    4.21 +1.4. "Covered Software"
    4.22 +    means Source Code Form to which the initial Contributor has attached
    4.23 +    the notice in Exhibit A, the Executable Form of such Source Code
    4.24 +    Form, and Modifications of such Source Code Form, in each case
    4.25 +    including portions thereof.
    4.26 +
    4.27 +1.5. "Incompatible With Secondary Licenses"
    4.28 +    means
    4.29 +
    4.30 +    (a) that the initial Contributor has attached the notice described
    4.31 +        in Exhibit B to the Covered Software; or
    4.32 +
    4.33 +    (b) that the Covered Software was made available under the terms of
    4.34 +        version 1.1 or earlier of the License, but not also under the
    4.35 +        terms of a Secondary License.
    4.36 +
    4.37 +1.6. "Executable Form"
    4.38 +    means any form of the work other than Source Code Form.
    4.39 +
    4.40 +1.7. "Larger Work"
    4.41 +    means a work that combines Covered Software with other material, in 
    4.42 +    a separate file or files, that is not Covered Software.
    4.43 +
    4.44 +1.8. "License"
    4.45 +    means this document.
    4.46 +
    4.47 +1.9. "Licensable"
    4.48 +    means having the right to grant, to the maximum extent possible,
    4.49 +    whether at the time of the initial grant or subsequently, any and
    4.50 +    all of the rights conveyed by this License.
    4.51 +
    4.52 +1.10. "Modifications"
    4.53 +    means any of the following:
    4.54 +
    4.55 +    (a) any file in Source Code Form that results from an addition to,
    4.56 +        deletion from, or modification of the contents of Covered
    4.57 +        Software; or
    4.58 +
    4.59 +    (b) any new file in Source Code Form that contains any Covered
    4.60 +        Software.
    4.61 +
    4.62 +1.11. "Patent Claims" of a Contributor
    4.63 +    means any patent claim(s), including without limitation, method,
    4.64 +    process, and apparatus claims, in any patent Licensable by such
    4.65 +    Contributor that would be infringed, but for the grant of the
    4.66 +    License, by the making, using, selling, offering for sale, having
    4.67 +    made, import, or transfer of either its Contributions or its
    4.68 +    Contributor Version.
    4.69 +
    4.70 +1.12. "Secondary License"
    4.71 +    means either the GNU General Public License, Version 2.0, the GNU
    4.72 +    Lesser General Public License, Version 2.1, the GNU Affero General
    4.73 +    Public License, Version 3.0, or any later versions of those
    4.74 +    licenses.
    4.75 +
    4.76 +1.13. "Source Code Form"
    4.77 +    means the form of the work preferred for making modifications.
    4.78 +
    4.79 +1.14. "You" (or "Your")
    4.80 +    means an individual or a legal entity exercising rights under this
    4.81 +    License. For legal entities, "You" includes any entity that
    4.82 +    controls, is controlled by, or is under common control with You. For
    4.83 +    purposes of this definition, "control" means (a) the power, direct
    4.84 +    or indirect, to cause the direction or management of such entity,
    4.85 +    whether by contract or otherwise, or (b) ownership of more than
    4.86 +    fifty percent (50%) of the outstanding shares or beneficial
    4.87 +    ownership of such entity.
    4.88 +
    4.89 +2. License Grants and Conditions
    4.90 +--------------------------------
    4.91 +
    4.92 +2.1. Grants
    4.93 +
    4.94 +Each Contributor hereby grants You a world-wide, royalty-free,
    4.95 +non-exclusive license:
    4.96 +
    4.97 +(a) under intellectual property rights (other than patent or trademark)
    4.98 +    Licensable by such Contributor to use, reproduce, make available,
    4.99 +    modify, display, perform, distribute, and otherwise exploit its
   4.100 +    Contributions, either on an unmodified basis, with Modifications, or
   4.101 +    as part of a Larger Work; and
   4.102 +
   4.103 +(b) under Patent Claims of such Contributor to make, use, sell, offer
   4.104 +    for sale, have made, import, and otherwise transfer either its
   4.105 +    Contributions or its Contributor Version.
   4.106 +
   4.107 +2.2. Effective Date
   4.108 +
   4.109 +The licenses granted in Section 2.1 with respect to any Contribution
   4.110 +become effective for each Contribution on the date the Contributor first
   4.111 +distributes such Contribution.
   4.112 +
   4.113 +2.3. Limitations on Grant Scope
   4.114 +
   4.115 +The licenses granted in this Section 2 are the only rights granted under
   4.116 +this License. No additional rights or licenses will be implied from the
   4.117 +distribution or licensing of Covered Software under this License.
   4.118 +Notwithstanding Section 2.1(b) above, no patent license is granted by a
   4.119 +Contributor:
   4.120 +
   4.121 +(a) for any code that a Contributor has removed from Covered Software;
   4.122 +    or
   4.123 +
   4.124 +(b) for infringements caused by: (i) Your and any other third party's
   4.125 +    modifications of Covered Software, or (ii) the combination of its
   4.126 +    Contributions with other software (except as part of its Contributor
   4.127 +    Version); or
   4.128 +
   4.129 +(c) under Patent Claims infringed by Covered Software in the absence of
   4.130 +    its Contributions.
   4.131 +
   4.132 +This License does not grant any rights in the trademarks, service marks,
   4.133 +or logos of any Contributor (except as may be necessary to comply with
   4.134 +the notice requirements in Section 3.4).
   4.135 +
   4.136 +2.4. Subsequent Licenses
   4.137 +
   4.138 +No Contributor makes additional grants as a result of Your choice to
   4.139 +distribute the Covered Software under a subsequent version of this
   4.140 +License (see Section 10.2) or under the terms of a Secondary License (if
   4.141 +permitted under the terms of Section 3.3).
   4.142 +
   4.143 +2.5. Representation
   4.144 +
   4.145 +Each Contributor represents that the Contributor believes its
   4.146 +Contributions are its original creation(s) or it has sufficient rights
   4.147 +to grant the rights to its Contributions conveyed by this License.
   4.148 +
   4.149 +2.6. Fair Use
   4.150 +
   4.151 +This License is not intended to limit any rights You have under
   4.152 +applicable copyright doctrines of fair use, fair dealing, or other
   4.153 +equivalents.
   4.154 +
   4.155 +2.7. Conditions
   4.156 +
   4.157 +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
   4.158 +in Section 2.1.
   4.159 +
   4.160 +3. Responsibilities
   4.161 +-------------------
   4.162 +
   4.163 +3.1. Distribution of Source Form
   4.164 +
   4.165 +All distribution of Covered Software in Source Code Form, including any
   4.166 +Modifications that You create or to which You contribute, must be under
   4.167 +the terms of this License. You must inform recipients that the Source
   4.168 +Code Form of the Covered Software is governed by the terms of this
   4.169 +License, and how they can obtain a copy of this License. You may not
   4.170 +attempt to alter or restrict the recipients' rights in the Source Code
   4.171 +Form.
   4.172 +
   4.173 +3.2. Distribution of Executable Form
   4.174 +
   4.175 +If You distribute Covered Software in Executable Form then:
   4.176 +
   4.177 +(a) such Covered Software must also be made available in Source Code
   4.178 +    Form, as described in Section 3.1, and You must inform recipients of
   4.179 +    the Executable Form how they can obtain a copy of such Source Code
   4.180 +    Form by reasonable means in a timely manner, at a charge no more
   4.181 +    than the cost of distribution to the recipient; and
   4.182 +
   4.183 +(b) You may distribute such Executable Form under the terms of this
   4.184 +    License, or sublicense it under different terms, provided that the
   4.185 +    license for the Executable Form does not attempt to limit or alter
   4.186 +    the recipients' rights in the Source Code Form under this License.
   4.187 +
   4.188 +3.3. Distribution of a Larger Work
   4.189 +
   4.190 +You may create and distribute a Larger Work under terms of Your choice,
   4.191 +provided that You also comply with the requirements of this License for
   4.192 +the Covered Software. If the Larger Work is a combination of Covered
   4.193 +Software with a work governed by one or more Secondary Licenses, and the
   4.194 +Covered Software is not Incompatible With Secondary Licenses, this
   4.195 +License permits You to additionally distribute such Covered Software
   4.196 +under the terms of such Secondary License(s), so that the recipient of
   4.197 +the Larger Work may, at their option, further distribute the Covered
   4.198 +Software under the terms of either this License or such Secondary
   4.199 +License(s).
   4.200 +
   4.201 +3.4. Notices
   4.202 +
   4.203 +You may not remove or alter the substance of any license notices
   4.204 +(including copyright notices, patent notices, disclaimers of warranty,
   4.205 +or limitations of liability) contained within the Source Code Form of
   4.206 +the Covered Software, except that You may alter any license notices to
   4.207 +the extent required to remedy known factual inaccuracies.
   4.208 +
   4.209 +3.5. Application of Additional Terms
   4.210 +
   4.211 +You may choose to offer, and to charge a fee for, warranty, support,
   4.212 +indemnity or liability obligations to one or more recipients of Covered
   4.213 +Software. However, You may do so only on Your own behalf, and not on
   4.214 +behalf of any Contributor. You must make it absolutely clear that any
   4.215 +such warranty, support, indemnity, or liability obligation is offered by
   4.216 +You alone, and You hereby agree to indemnify every Contributor for any
   4.217 +liability incurred by such Contributor as a result of warranty, support,
   4.218 +indemnity or liability terms You offer. You may include additional
   4.219 +disclaimers of warranty and limitations of liability specific to any
   4.220 +jurisdiction.
   4.221 +
   4.222 +4. Inability to Comply Due to Statute or Regulation
   4.223 +---------------------------------------------------
   4.224 +
   4.225 +If it is impossible for You to comply with any of the terms of this
   4.226 +License with respect to some or all of the Covered Software due to
   4.227 +statute, judicial order, or regulation then You must: (a) comply with
   4.228 +the terms of this License to the maximum extent possible; and (b)
   4.229 +describe the limitations and the code they affect. Such description must
   4.230 +be placed in a text file included with all distributions of the Covered
   4.231 +Software under this License. Except to the extent prohibited by statute
   4.232 +or regulation, such description must be sufficiently detailed for a
   4.233 +recipient of ordinary skill to be able to understand it.
   4.234 +
   4.235 +5. Termination
   4.236 +--------------
   4.237 +
   4.238 +5.1. The rights granted under this License will terminate automatically
   4.239 +if You fail to comply with any of its terms. However, if You become
   4.240 +compliant, then the rights granted under this License from a particular
   4.241 +Contributor are reinstated (a) provisionally, unless and until such
   4.242 +Contributor explicitly and finally terminates Your grants, and (b) on an
   4.243 +ongoing basis, if such Contributor fails to notify You of the
   4.244 +non-compliance by some reasonable means prior to 60 days after You have
   4.245 +come back into compliance. Moreover, Your grants from a particular
   4.246 +Contributor are reinstated on an ongoing basis if such Contributor
   4.247 +notifies You of the non-compliance by some reasonable means, this is the
   4.248 +first time You have received notice of non-compliance with this License
   4.249 +from such Contributor, and You become compliant prior to 30 days after
   4.250 +Your receipt of the notice.
   4.251 +
   4.252 +5.2. If You initiate litigation against any entity by asserting a patent
   4.253 +infringement claim (excluding declaratory judgment actions,
   4.254 +counter-claims, and cross-claims) alleging that a Contributor Version
   4.255 +directly or indirectly infringes any patent, then the rights granted to
   4.256 +You by any and all Contributors for the Covered Software under Section
   4.257 +2.1 of this License shall terminate.
   4.258 +
   4.259 +5.3. In the event of termination under Sections 5.1 or 5.2 above, all
   4.260 +end user license agreements (excluding distributors and resellers) which
   4.261 +have been validly granted by You or Your distributors under this License
   4.262 +prior to termination shall survive termination.
   4.263 +
   4.264 +************************************************************************
   4.265 +*                                                                      *
   4.266 +*  6. Disclaimer of Warranty                                           *
   4.267 +*  -------------------------                                           *
   4.268 +*                                                                      *
   4.269 +*  Covered Software is provided under this License on an "as is"       *
   4.270 +*  basis, without warranty of any kind, either expressed, implied, or  *
   4.271 +*  statutory, including, without limitation, warranties that the       *
   4.272 +*  Covered Software is free of defects, merchantable, fit for a        *
   4.273 +*  particular purpose or non-infringing. The entire risk as to the     *
   4.274 +*  quality and performance of the Covered Software is with You.        *
   4.275 +*  Should any Covered Software prove defective in any respect, You     *
   4.276 +*  (not any Contributor) assume the cost of any necessary servicing,   *
   4.277 +*  repair, or correction. This disclaimer of warranty constitutes an   *
   4.278 +*  essential part of this License. No use of any Covered Software is   *
   4.279 +*  authorized under this License except under this disclaimer.         *
   4.280 +*                                                                      *
   4.281 +************************************************************************
   4.282 +
   4.283 +************************************************************************
   4.284 +*                                                                      *
   4.285 +*  7. Limitation of Liability                                          *
   4.286 +*  --------------------------                                          *
   4.287 +*                                                                      *
   4.288 +*  Under no circumstances and under no legal theory, whether tort      *
   4.289 +*  (including negligence), contract, or otherwise, shall any           *
   4.290 +*  Contributor, or anyone who distributes Covered Software as          *
   4.291 +*  permitted above, be liable to You for any direct, indirect,         *
   4.292 +*  special, incidental, or consequential damages of any character      *
   4.293 +*  including, without limitation, damages for lost profits, loss of    *
   4.294 +*  goodwill, work stoppage, computer failure or malfunction, or any    *
   4.295 +*  and all other commercial damages or losses, even if such party      *
   4.296 +*  shall have been informed of the possibility of such damages. This   *
   4.297 +*  limitation of liability shall not apply to liability for death or   *
   4.298 +*  personal injury resulting from such party's negligence to the       *
   4.299 +*  extent applicable law prohibits such limitation. Some               *
   4.300 +*  jurisdictions do not allow the exclusion or limitation of           *
   4.301 +*  incidental or consequential damages, so this exclusion and          *
   4.302 +*  limitation may not apply to You.                                    *
   4.303 +*                                                                      *
   4.304 +************************************************************************
   4.305 +
   4.306 +8. Litigation
   4.307 +-------------
   4.308 +
   4.309 +Any litigation relating to this License may be brought only in the
   4.310 +courts of a jurisdiction where the defendant maintains its principal
   4.311 +place of business and such litigation shall be governed by laws of that
   4.312 +jurisdiction, without reference to its conflict-of-law provisions.
   4.313 +Nothing in this Section shall prevent a party's ability to bring
   4.314 +cross-claims or counter-claims.
   4.315 +
   4.316 +9. Miscellaneous
   4.317 +----------------
   4.318 +
   4.319 +This License represents the complete agreement concerning the subject
   4.320 +matter hereof. If any provision of this License is held to be
   4.321 +unenforceable, such provision shall be reformed only to the extent
   4.322 +necessary to make it enforceable. Any law or regulation which provides
   4.323 +that the language of a contract shall be construed against the drafter
   4.324 +shall not be used to construe this License against a Contributor.
   4.325 +
   4.326 +10. Versions of the License
   4.327 +---------------------------
   4.328 +
   4.329 +10.1. New Versions
   4.330 +
   4.331 +Mozilla Foundation is the license steward. Except as provided in Section
   4.332 +10.3, no one other than the license steward has the right to modify or
   4.333 +publish new versions of this License. Each version will be given a
   4.334 +distinguishing version number.
   4.335 +
   4.336 +10.2. Effect of New Versions
   4.337 +
   4.338 +You may distribute the Covered Software under the terms of the version
   4.339 +of the License under which You originally received the Covered Software,
   4.340 +or under the terms of any subsequent version published by the license
   4.341 +steward.
   4.342 +
   4.343 +10.3. Modified Versions
   4.344 +
   4.345 +If you create software not governed by this License, and you want to
   4.346 +create a new license for such software, you may create and use a
   4.347 +modified version of this License if you rename the license and remove
   4.348 +any references to the name of the license steward (except to note that
   4.349 +such modified license differs from this License).
   4.350 +
   4.351 +10.4. Distributing Source Code Form that is Incompatible With Secondary
   4.352 +Licenses
   4.353 +
   4.354 +If You choose to distribute Source Code Form that is Incompatible With
   4.355 +Secondary Licenses under the terms of this version of the License, the
   4.356 +notice described in Exhibit B of this License must be attached.
   4.357 +
   4.358 +Exhibit A - Source Code Form License Notice
   4.359 +-------------------------------------------
   4.360 +
   4.361 +  This Source Code Form is subject to the terms of the Mozilla Public
   4.362 +  License, v. 2.0. If a copy of the MPL was not distributed with this
   4.363 +  file, You can obtain one at http://mozilla.org/MPL/2.0/.
   4.364 +
   4.365 +If it is not possible or desirable to put the notice in a particular
   4.366 +file, then You may include the notice in a location (such as a LICENSE
   4.367 +file in a relevant directory) where a recipient would be likely to look
   4.368 +for such a notice.
   4.369 +
   4.370 +You may add additional accurate notices of copyright ownership.
   4.371 +
   4.372 +Exhibit B - "Incompatible With Secondary Licenses" Notice
   4.373 +---------------------------------------------------------
   4.374 +
   4.375 +  This Source Code Form is "Incompatible With Secondary Licenses", as
   4.376 +  defined by the Mozilla Public License, v. 2.0.

     5.1 --- a/ChangeLog	Fri May 02 17:27:46 2014 +0200
     5.2 +++ b/ChangeLog	Fri May 02 17:39:27 2014 +0200
     5.3 @@ -0,0 +1,224 @@
     5.4 +Sat Oct 19 23:37:23 2013   Pyravlos Team
     5.5 +
     5.6 +	* Version 3.2.9 released.
     5.7 +
     5.8 +	* Added support for the following google chart types: PieChart, 
     5.9 +	AreaChart and ColumnChart to strabon endpoint. 
    5.10 +	
    5.11 +	* Added Timemap as new results format in Strabon endpoint. This 
    5.12 +	option displays results in a map and a timeline on the same time, 
    5.13 +	using the Timemap js library (http://code.google.com/p/timemap/).
    5.14 +	The KMLWriter has been extended for that purpose, by transforming
    5.15 +	dateTime values that are included in the result set into the respective
    5.16 +	TimeStamp KML primitive (https://developers.google.com/kml/documentation/time). 
    5.17 +	In the "temporals" branch, the values of the strdf:period datatype 
    5.18 +	are converted into the respective KML TimeSpan primitive. 
    5.19 +	
    5.20 +	* Added extension function <http://postgis.net/ST_Centroid> which is
    5.21 +	mapped to the ST_Centroid(geometry) extension function of PostGIS.
    5.22 +	See also: <http://postgis.org/docs/ST_Centroid.html>.
    5.23 +
    5.24 +	* Added extension function <http://postgis.net/ST_MakeLine> which is
    5.25 +	mapped to the ST_MakeLine(geometry, geometry) extension function of
    5.26 +	PostGIS. See also: <http://postgis.org/docs/ST_MakeLine.html>.
    5.27 +
    5.28 +	* Added PostGIS vocabulary class.
    5.29 +
    5.30 +	* Added support of all SPARQL result types provided by Sesame (json,
    5.31 +	xml, csv, tsv, binary). To get the respective writer, just prepend the
    5.32 +	string "SPARQL/", e.g., "SPARQL/JSON". This is to ensure that we
    5.33 +	support all SPARQL result formats of the SPARQL Protocol.
    5.34 +
    5.35 +	* Fixed a bug where a non-implemented extension function would make
    5.36 +	Strabon throw a NULL pointer exception. Now we get away with it
    5.37 +	through a warning.
    5.38 +
    5.39 +	* Strabon endpoint now publishes the URIs of the supported units of
    5.40 +	measure for use in strdf:distance and geof:distance functions of
    5.41 +	stSPARQL and GeoSPARQL, respectively. The URIs are those defined by
    5.42 +	OGC Units of Measure 1.0 specification which may be found at
    5.43 +	http://www.opengis.net/def/uom/OGC/1.0/. Strabon endpoint publishes
    5.44 +	the URIs at http://localhost:8080/endpoint/Capabilities.
    5.45 +
    5.46 +	* Created new module with name 'vocab` and artifactId
    5.47 +	'strabon-vocabulary` and moved GeoConstants.java there. Other
    5.48 +	vocabularies have been added as well, such as Simple Features, and
    5.49 +	GeoSPARQL.
    5.50 +
    5.51 +	* Strabon endpoint now publishes the URIs of the supported extension
    5.52 +	functions for stSPARQL and GeoSPARQL. One should access them by
    5.53 +	hitting the link http://localhost:8080/endpoint/Capabilities.
    5.54 +
    5.55 +	* Support for parsing EPSG URIs in geometry literals with datatype
    5.56 +	geo:wktLiteral.
    5.57 +	(bug #33: http://bug.strabon.di.uoa.gr/ticket/33)
    5.58 +
    5.59 +	* Endpoint Client now supports querying of Virtuoso and Parliament endpoints.
    5.60 +
    5.61 +	* Endpoint Client now supports store and update operations, but only
    5.62 +	for Strabon Endpoints.
    5.63 +
    5.64 +	* GeoSPARQL functions sfCrosses, sfOverlaps, ehOverlaps do not use the 
    5.65 +	ST_Relate PostGIS function (bug #24: http://bug.strabon.di.uoa.gr/ticket/24)
    5.66 +
    5.67 +	* All Simple Features functions of GeoSPARQL do not use the ST_Relate 
    5.68 +	PostGIS function
    5.69 +
    5.70 +	* Added diffTime function. This function performs the difference 
    5.71 +	between two literals of xsd:time datatype and returns a literal of
    5.72 +	the xsd:time datatype as well.
    5.73 +	
    5.74 +	* Added a testsuite package in default branch. Full tester guide can be found
    5.75 +	in README. Among other, most of GeoSPARQL compliance tests  
    5.76 +	(https://portal.opengeospatial.org/files/?artifact_id=47664, pg. 53) have been 
    5.77 +	implemented.
    5.78 +
    5.79 +	* Changed the definition and implementation of strdf:distance function, by
    5.80 +	adopting the definition of GeoSPARQL.
    5.81 +	(bug #23: http://bug.strabon.di.uoa.gr/ticket/23) 
    5.82 +
    5.83 +	* Changed the definition and implementation of strdf:buffer function, by
    5.84 +        adopting the definition of GeoSPARQL.
    5.85 +        (bug #35: http://bug.strabon.di.uoa.gr/ticket/35)
    5.86 +
    5.87 +	* Added geof:distance and geof:buffer functions, which have the same definition
    5.88 +	with strdf:distance and strdf:buffer respectively.
    5.89 +	(bug #32: http://bug.strabon.di.uoa.gr/ticket/32)
    5.90 +
    5.91 +	* Added a download button when performing describe and construct queries at the
    5.92 +        endpoint.
    5.93 +        (bug #38: http://bug.strabon.di.uoa.gr/ticket/38)
    5.94 +
    5.95 +	* Fixed a bug, where XMLWriter and TSVWriter did not return geometries with the
    5.96 +	SRID.
    5.97 +	(bug #47: http://bug.strabon.di.uoa.gr/ticket/47)
    5.98 +
    5.99 +	* Fixed a bug where the GeoSPARQL construct functions did not return the datatype 
   5.100 +	geo:wktLiteral datatype but strdf:WKT.
   5.101 +
   5.102 +Tue Mar 26 13:28:26 2013   Pyravlos Team
   5.103 +
   5.104 +	* Version 3.2.8 released.
   5.105 +
   5.106 +	* Added support for handling (storing/querying) GeoSPARQL datatypes.
   5.107 +	(bug #31: http://bug.strabon.di.uoa.gr/ticket/31)
   5.108 +
   5.109 +	* Fixed a bug in StoreOp that wouldn't close the connection, neither
   5.110 +	rollback the transaction upon an exception. This had as a side effect
   5.111 +	the abnormal termination of StoreOp (through for example the use of
   5.112 +	Ctrl-C signal) which was leaving the database locked.
   5.113 +
   5.114 +	* Fixed bug where spatial aggregates (e.g., union) didn't work as
   5.115 +	expected when the query didn't contain a `GROUP BY' clause.
   5.116 +	(bug #22: http://bug.strabon.di.uoa.gr/ticket/22)
   5.117 +
   5.118 +	* Updated GeoSPARQL namespaces and fixed function names to comply with
   5.119 +	the GeoSPARQL specification.
   5.120 +	(bug #25: http://bug.strabon.di.uoa.gr/ticket/25)
   5.121 +
   5.122 +Wed Jan 09 18:06:41 2013   Pyravlos Team
   5.123 +
   5.124 +	* Version 3.2.7 released.
   5.125 +
   5.126 +	* Add an extension function 
   5.127 +	<http://strdf.di.uoa.gr/extensions/ontology#diffDateTime> for computing the
   5.128 +	span (in milliseconds) between two timestamps.
   5.129 +
   5.130 +	* Added an <endpoint-exec> module. This module builds an executable jar file 
   5.131 +	with an embedded Apache Tomcat 7. To create and run the executable jar just 
   5.132 +	type:
   5.133 +		$ mvn clean package
   5.134 +		$ java -jar endpoint-exec/target/strabon-endpoint-executable-*.jar
   5.135 +
   5.136 +	* Modified strabon script and postgis/monetdb.StoreOP class to get an
   5.137 +	option for storing a RDF file in a named graph. Moreover, the RDF
   5.138 +	format of the input RDF file now is given as an option (still, if it
   5.139 +	is missing, it is assumed that the input is in N-TRIPLES format). The
   5.140 +	option for the format is -f and the option for the named graph is -g
   5.141 +	(takes a URI as an argument).
   5.142 +
   5.143 +	* Modified the names of the stSPARQL extension functions that
   5.144 +	utilize the minimum bounding boxes of the involved geometries.
   5.145 +
   5.146 +Tue Dec 11 19:33:45 2012   Pyravlos Team
   5.147 +
   5.148 +	* Version 3.2.6 released.
   5.149 +
   5.150 +	* Modified the names of the stSPARQL extension functions to comply  
   5.151 +	with the OGC Simple Features Access standard.
   5.152 +
   5.153 +Tue Dec 11 00:11:43 2012   Pyravlos Team
   5.154 +
   5.155 +	* Version 3.2.5 released.
   5.156 +
   5.157 +	* Added support for querying temporal information. This functionality
   5.158 +	may be found in the `temporals' branch. 
   5.159 +	
   5.160 +		The datatypes <http://strdf.di.uoa.gr/ontology#period> and
   5.161 +		<http://www.w3.org/2001/XMLSchema#dateTime> are used to
   5.162 +		represent periods and instants respectively.
   5.163 +	
   5.164 +		The valid time time of triples is represented using quadtruples,
   5.165 +		with the valid time annotation(instant or period) being the
   5.166 +		fourth element of the quad. In the same way, temporal triple
   5.167 +		patterns are used in queries to retrieve the valid time of
   5.168 +		triples.
   5.169 +		
   5.170 +		Some functions have been renamed (their URIs have changed) to
   5.171 +		follow the names of the respective relations of Allen's
   5.172 +		interval algebra and other functions have been added. 
   5.173 +		
   5.174 +		The following temporal functions are supported:
   5.175 +		during, periodOverlaps, equalsPeriod, nequalsPeriod, adjacent,
   5.176 +		before, after, overleft, overright, meets, starts, finishes, 
   5.177 +		period_intersect, period_union, preceding_period, and
   5.178 +		succeeding_period.
   5.179 +	
   5.180 +	* Changed behaviour of Strabon and Strabon Endpoint for connecting to
   5.181 +	a spatially-enabled database. Only one instance of Strabon is allowed
   5.182 +	at a time.
   5.183 +
   5.184 +	* Implemented a Java client for Strabon Endpoint. The client should be
   5.185 +	used only with endpoint versions >=3.2.5. The implementation may be
   5.186 +	found int the `endpoint-client' submodule of maven. Currently, only
   5.187 +	querying of Strabon Endpoints is supported.
   5.188 +
   5.189 +	* Added support for requesting the capabilities of Strabon Endpoint
   5.190 +	(fixes Bug #20 <http://bug.strabon.di.uoa.gr/ticket/20>). See
   5.191 +	changesets f840796400bf and ?<TBC>? for specific details and how you
   5.192 +	can determine the capabilities of older endpoints (versions <= 3.2.4).
   5.193 +
   5.194 +	* Updated KML writer to include the projected variables of an stSPARQL
   5.195 +	query in "ExtendedData" and "Data" tags. This is the proper way to
   5.196 +	do it if we need to convert a KML to a ESRI shapefile and also include
   5.197 +	such information as attributes for a feature. See related pages from
   5.198 +	KML specification:
   5.199 +		<https://developers.google.com/kml/documentation/kmlreference#extendeddata>
   5.200 +		<https://developers.google.com/kml/documentation/extendeddata>
   5.201 +
   5.202 +	* Added user authentication for storing RDF data through Strabon
   5.203 +	Endpoint. The credentials are specified in
   5.204 +	WEB-INF/credentials.properties file.
   5.205 +
   5.206 +	* Strabon Endpoints now limits the number of the results to a maximum
   5.207 +	one. The maximum number is specified in the beans.xml file. This
   5.208 +	corresponds to parameter "maxLimit". The endpoint script has also been
   5.209 +	updated correspondingly; the limit can be given using the option "-l".
   5.210 +	One can disable limiting of query results, by setting the "maxLimit"
   5.211 +	parameter to 0. Addresses Bug #6
   5.212 +	(<http://bug.strabon.di.uoa.gr/ticket/6>).
   5.213 +
   5.214 +	* Added "Known Issues" section to README.
   5.215 +
   5.216 +	* Added -m (more memory) and -M (much more memory) options in strabon
   5.217 +	script for out-of-memory exceptions.
   5.218 +
   5.219 +	* Fixed Bug #10 (<http://bug.strabon.di.uoa.gr/ticket/10>). Now
   5.220 +	KMLWriter handles more geometric types (other than polygons). See
   5.221 +	changeset 9a3bfee64a39.
   5.222 +
   5.223 +	* Menu and navigation in Strabon Endpoint has changed to use jquery.
   5.224 +	The menu is now populated using the queries placed inside the beans.xml.
   5.225 +
   5.226 +	* Added BrowseBean and browse.jsp for browsing the RDF data using the
   5.227 +	Strabon Endpoint.

     6.1 --- a/README	Fri May 02 17:27:46 2014 +0200
     6.2 +++ b/README	Fri May 02 17:39:27 2014 +0200
     6.3 @@ -27,6 +27,22 @@
     6.4  Currently, only the geospatial features of stSPARQL have been implemented fully.
     6.5  The temporal features are the subject of current work.
     6.6  
     6.7 +Given the very close relationship between stSPARQL and GeoSPARQL which is a 
     6.8 +recent OGC standard for an extension of SPARQL for querying geospatial metadata,
     6.9 +we recently provided support for the Core, Geometry and Geometry Topology 
    6.10 +extension of GeoSPARQL. 
    6.11 +
    6.12 +
    6.13 +Conformance to GeoSPARQL
    6.14 +========================
    6.15 +Strabon implements the `Core', the `Topology Vocabulary Extension', the
    6.16 +`Geometry Extension', the `Geometry Topology Extension', and the `RDFS Entailment
    6.17 +Extension' except for Req. 25
    6.18 +(http://www.opengis.net/spec/geosparql/1.0/req/rdfs-entailment-extension/bgp-rdfs-ent).
    6.19 +
    6.20 +With respect to GML, Strabon supports the GML Profile corresponding to Simple
    6.21 +Features, that is, GML Simple Features Profile 2.0. 
    6.22 +
    6.23  
    6.24  Strabon Homepage
    6.25  ================
    6.26 @@ -38,6 +54,84 @@
    6.27  You can find a demo of the system Strabon at http://test.strabon.di.uoa.gr/NOA/.
    6.28  
    6.29  
    6.30 +How to build and run Strabon from command line
    6.31 +==============================================
    6.32 +Assuming you have already downloaded Strabon and you are in the top-level
    6.33 +directory of Strabon, issue the following command to build it from command line:
    6.34 +
    6.35 +	$ mvn clean package
    6.36 +
    6.37 +In order to run automatically the JUnit tests, pass the option `-DskipTests=false' 
    6.38 +to the above command. The complete command is the following:
    6.39 +
    6.40 +	$ mvn -DskipTests=false clean package
    6.41 +
    6.42 +In case of an error during building of Strabon and assuming that the error does
    6.43 +not come from the JUnit tests, please have a look at the `Known Issues' section
    6.44 +below. If none of the known issues of that section applies, please contact the
    6.45 +developers through the Strabon mailing-list or submit a corresponding bug
    6.46 +(see `Bugs' section below).
    6.47 +
    6.48 +After you have successfully built Strabon, you have access to the following
    6.49 +components:
    6.50 +
    6.51 +  * Strabon Endpoint
    6.52 +
    6.53 +    This is a SPARQL endpoint for Strabon. It is distributed as a war file so
    6.54 +    you may deploy it in a Tomcat container. You may find the war file under
    6.55 +    directory `endpoint/target'.
    6.56 +
    6.57 +  * Strabon Endpoint (standalone)
    6.58 +
    6.59 +    This is a SPARQL endpoint for Strabon like the above one, but it differs
    6.60 +    only in that it does not require the user to have already set up a Tomcat
    6.61 +    container. The standalone Strabon Endpoint may be run by issuing the
    6.62 +    following command:
    6.63 +
    6.64 +    	$ java -jar endpoint-exec/target/strabon-endpoint-executable-${version}.jar
    6.65 +
    6.66 +    After issuing the above command, you may access the Strabon Endpoint at
    6.67 +    the following URL: <http://localhost:8080/>.
    6.68 +
    6.69 +    Please see the page at <http://hg.strabon.di.uoa.gr/Strabon/rev/674f8f91162b>
    6.70 +    to find out other options that you may pass to the Tomcat container that
    6.71 +    will run by the above command.
    6.72 +
    6.73 +    SPECIAL NOTE: if you need to configure the connection details to the
    6.74 +    underlying database, you may do so in two ways:
    6.75 +      1. By modifying file `endpoint/WebContent/WEB-INF/connection.properties'
    6.76 +         before building Strabon and executing the above command.
    6.77 +      2. After executing the above command, by visiting the following page by a
    6.78 +         browser: <http://localhost:8080/ChangeConnection>
    6.79 +
    6.80 +  * Strabon Endpoint Client
    6.81 +
    6.82 +    This is a Java client for interacting with Strabon Endpoint or any other
    6.83 +    SPARQL endpoint. It is packaged as a jar file and may be found under
    6.84 +    directory `endpoint-client/target/' with name
    6.85 +    `strabon-endpoint-client-${version}.jar'. This jar contains any dependencies
    6.86 +    to other code, so may copy and paste it to your project and start playing
    6.87 +    with the code immediately.
    6.88 +
    6.89 +  * Strabon script
    6.90 +
    6.91 +    The `strabon' script is located under the `scripts/' directory and it is the
    6.92 +    main command-line tool for interacting with Strabon. You may use it to store
    6.93 +    RDF data with geospatial information or query/update it using one of
    6.94 +    stSPARQL or GeoSPARQL query languages.
    6.95 +
    6.96 +  * Endpoint script
    6.97 +
    6.98 +    The `endpoint' script is located under the `scripts' directory and it is the
    6.99 +    main command-line tool for interacting with a `Strabon Endpoint'. You may
   6.100 +    use it to do any operation you would like to do with the `strabon' script
   6.101 +    above, but in contrast to the `strabon' script you need to have access to a
   6.102 +    Strabon endpoint. Of course, the `Strabon Endpoint Client' component above
   6.103 +    can be used as well as a command-line tool. At the time of writing, the
   6.104 +    `Strabon Endpoint Client' component supports only querying of RDF data with
   6.105 +    geospatial information.
   6.106 +
   6.107 +
   6.108  Getting Started
   6.109  ===============
   6.110  To get started  with Strabon please have a look at the tutorial for the stRDF
   6.111 @@ -46,6 +140,14 @@
   6.112  stRDF and stSPARQL tutorial
   6.113  	http://www.strabon.di.uoa.gr/files/stSPARQL_tutorial.pdf
   6.114  
   6.115 +
   6.116 +stSPARQL Reference
   6.117 +~~~~~~~~~~~~~~~~~~
   6.118 +The reference for the spatial and temporal extension functions defined in 
   6.119 +stSPARQL can be found at http://www.strabon.di.uoa.gr/stSPARQL#spatial and
   6.120 +http://www.strabon.di.uoa.gr/stSPARQL#temporals respectively.
   6.121 +
   6.122 +
   6.123  User Guide
   6.124  ~~~~~~~~~~
   6.125  Assuming that you are familiar with Maven, the following steps need to be
   6.126 @@ -76,6 +178,114 @@
   6.127  You can see some examples in the classes gr.uoa.di.strabon.example.PostgisExample
   6.128  and gr.uoa.di.strabon.example.PostgisExample2.
   6.129  
   6.130 +	Tuning PostgreSQL
   6.131 +	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   6.132 +The default settings of Postgres are rather conservative. As a result, parameter 
   6.133 +tuning is neccessary for speeding up Postgres, therefore Strabon. If you are 
   6.134 +using Strabon to compare its performance against your implementation of 
   6.135 +stSPARQL/GeoSPARQL, you are *strongly* encouraged to contact us using the Strabon
   6.136 +Users mailing list for assistance on tuning Postgres.
   6.137 +
   6.138 +You can follow the instructions below for tuning a Postgres server running on an 
   6.139 +Ubuntu machine that is dedicated to PostgreSQL and Strabon.
   6.140 +
   6.141 +1. Append the following text at the end of postgresql.conf. 
   6.142 +*Uncomment* the appropriate lines.
   6.143 +
   6.144 +### RAM
   6.145 +## 4 GB of RAM
   6.146 +#shared_buffers       =  3GB
   6.147 +#effective_cache_size =  3GB
   6.148 +#maintenance_work_mem =  1GB
   6.149 +#work_mem             =  2GB
   6.150 +## 8 GB of RAM
   6.151 +#shared_buffers       =  5GB
   6.152 +#effective_cache_size =  6GB
   6.153 +#maintenance_work_mem =  2GB
   6.154 +#work_mem             =  5GB
   6.155 +## 16 GB of RAM
   6.156 +#shared_buffers       = 10GB
   6.157 +#effective_cache_size = 14GB
   6.158 +#maintenance_work_mem =  4GB
   6.159 +#work_mem             = 10GB
   6.160 +## 24 GB of RAM
   6.161 +#shared_buffers       = 16GB 
   6.162 +#effective_cache_size = 22GB 
   6.163 +#maintenance_work_mem =  6GB 
   6.164 +#work_mem             = 15GB
   6.165 +## 48 GB of RAM
   6.166 +#shared_buffers       = 32GB
   6.167 +#effective_cache_size = 46GB
   6.168 +#maintenance_work_mem =  8GB
   6.169 +#work_mem             = 30GB
   6.170 +## 64 GB of RAM
   6.171 +# contact us to find out!
   6.172 +### HD
   6.173 +## RAID with ordinary 7.200 disks
   6.174 +#random_page_cost = 3.5 #3.0-3.5
   6.175 +## High-End NAS/SAN
   6.176 +#random_page_cost = 2 #1.5-2.5
   6.177 +## Amazon EBS/Heroku
   6.178 +#random_page_cost = 1.3 #1.1-2.0
   6.179 +## SSD array
   6.180 +#random_page_cost = 2.0 #1.5-2.5
   6.181 +### Planner options
   6.182 +# Increase the following values in order to avoid using the GEQO planner. 
   6.183 +# Small values (<8) reduce planning time but may produce inferior query plans
   6.184 +# 
   6.185 +geqo_threshold = 15 # keep this value larger that the following two parameters
   6.186 +from_collapse_limit = 14
   6.187 +join_collapse_limit = 14
   6.188 +### Misc
   6.189 +default_statistics_target    = 10000 
   6.190 +constraint_exclusion         = on 
   6.191 +checkpoint_completion_target = 0.9 
   6.192 +wal_buffers                  = 32MB 
   6.193 +checkpoint_segments          = 64 
   6.194 +### Connections
   6.195 +max_connections              = 10
   6.196 +
   6.197 +2. Append the following lines at the end of /etc/sysctl.conf
   6.198 +*Uncomment* the appropriate lines.
   6.199 +
   6.200 +## 4 GB of RAM
   6.201 +#kernel.shmmax = 3758096384
   6.202 +#kernel.shmall = 3758096384
   6.203 +#kernel.shmmni = 4096
   6.204 +## 8 GB of RAM
   6.205 +#kernel.shmmax = 5905580032
   6.206 +#kernel.shmall = 5905580032
   6.207 +#kernel.shmmni = 4096
   6.208 +## 16 GB of RAM
   6.209 +#kernel.shmmax = 11274289152
   6.210 +#kernel.shmall = 11274289152
   6.211 +#kernel.shmmni = 4096
   6.212 +## 24 GB of RAM
   6.213 +#kernel.shmmax = 17716740096
   6.214 +#kernel.shmall = 17716740096
   6.215 +#kernel.shmmni = 4096
   6.216 +## 48 GB of RAM
   6.217 +#kernel.shmmax = 35433480192
   6.218 +#kernel.shmall = 35433480192
   6.219 +#kernel.shmmni = 4224
   6.220 +## 64 GB of RAM
   6.221 +# contact us to find out!
   6.222 +
   6.223 +3. Apply all changes by executing
   6.224 +
   6.225 +$ sudo sysctl -p
   6.226 +$ sudo /etc/init.d/postgresql restart
   6.227 +
   6.228 +4. Prepare for the next run by issuing the command 
   6.229 +
   6.230 +$ sudo -u postgres psql -c 'VACUUM ANALYZE;' db
   6.231 +
   6.232 +or 
   6.233 +
   6.234 +$ psql -c 'VACUUM ANALYZE;' db
   6.235 +
   6.236 +where db is the name of the Postgres database that Strabon will use.
   6.237 +
   6.238  
   6.239  Developer Guide
   6.240  ~~~~~~~~~~~~~~~
   6.241 @@ -102,8 +312,46 @@
   6.242     project, download any dependencies and build the project. 
   6.243  
   6.244  
   6.245 -	Storing stRDF graphs and evaluating stSPARQL queries
   6.246 -	~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   6.247 +Tester Guide
   6.248 +~~~~~~~~~~~~
   6.249 +Assuming again that you are familiar with Maven and Junit these are the steps
   6.250 +you need to follow to test the functionality of Strabon:
   6.251 +
   6.252 +
   6.253 +* Using Eclipse
   6.254 +
   6.255 +	If you want to create a new test:
   6.256 +
   6.257 +	1. Import Strabon into Eclipse as explained in the Developer Guide.
   6.258 +	2. Go to strabon-testsuite project.
   6.259 +	3. Create a new folder (Recommended folder name: <test's name>) and place inside the following files:
   6.260 +		3.1. An ntriples or nquads file with the test dataset (with .nt or .nq extension).
   6.261 +		3.2. Pairs of files with sparql test queries and expected test results in xml format.
   6.262 +			 Notice that each pair must have the same name and .rq extension for the queryFile and .srx extension for the resultsFile.
   6.263 +	4. Create a test class that extends TemplateTest class.
   6.264 +	5. If you have followed the recommendations the test is ready. If you have different names or location for your
   6.265 +	files, insert them explicitly in the constructor of the class. WARNING: All prefixes must be placed in file "prefixes" so that
   6.266 +	every time a namespace changes, we have to change it just once.
   6.267 +	
   6.268 +	If you want to run a test:
   6.269 +	
   6.270 +	1. Right-click on the test class.
   6.271 +	2. Select "Run as JUnit Test".
   6.272 +	3. Database properties are retrieved from database.properties file. If you want, you can change a property
   6.273 +	"on the fly" with an environment variable.
   6.274 +
   6.275 +	
   6.276 +* Command Line
   6.277 +	
   6.278 +	If you want to run all the tests:
   6.279 +	
   6.280 +	1. Go to Strabon directory (root directory of all the subprojects).
   6.281 +	2. Run "mvn test -DskipTests=false".
   6.282 +	3. Optionally you can pass an environment variable with "-DvariableName=variableValue".
   6.283 +
   6.284 +
   6.285 +Storing stRDF graphs and evaluating stSPARQL queries
   6.286 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   6.287  You can see some examples in the classes
   6.288  eu.earthobservatory.runtime.postgis.StoreOp and
   6.289  eu.earthobservatory.runtime.postgis.QueryOp.
   6.290 @@ -125,6 +373,11 @@
   6.291  
   6.292  The current versions of stRDF and stSPARQL which are based on OGC standards are
   6.293  presented in the following document:
   6.294 +  * K. Kyzirakos, M. Karpathiotakis, and M. Koubarakis. Strabon: A Semantic 
   6.295 +    Geospatial DBMS. In Internatioanl Semantic Web Conference (ISWC'12). Boston,
   6.296 +    USA, November 11-15, 2012.
   6.297 +    [pdf: http://strabon.di.uoa.gr/files/strabon-iswc.pdf]
   6.298 +
   6.299    * Manolis Koubarakis, Kostis Kyzirakos, Babis Nikolaou, Michael Sioutis, and
   6.300      Stavros Vassos. A data model and query language for an extension of RDF with
   6.301      time and space. Deliverable D2.1, European ICT project TELEIOS, 2011.
   6.302 @@ -173,24 +426,42 @@
   6.303      Barcelona, Spain.
   6.304      [pdf: http://www.earthobservatory.eu/publications/SciQL_ADASS2011.pdf]
   6.305  
   6.306 +  * C. Nikolaou and M. Koubarakis: "Querying Linked Geospatial Data with
   6.307 +    Incomplete Information". In 5th International Terra Cognita Workshop - 
   6.308 +    Foundations, Technologies and Applications of the Geospatial Web. In
   6.309 +    conjunction with the 11th International Semantic Web Conference, Boston,
   6.310 +    USA, November, 2012.
   6.311 +    [http://www.earthobservatory.eu/publications/iswc-workshop.pdf]
   6.312 +
   6.313  
   6.314  Contributors
   6.315  ============
   6.316  The system Strabon has been developed by the following members of our team:
   6.317  
   6.318  * Manos Karpathiotakis	<mk@di.uoa.gr>
   6.319 -* Kostis Kyzirakos	<kkyzir@di.uoa.gr>
   6.320 +* Kostis Kyzirakos	<Kostis.Kyzirakos@cwi.nl>
   6.321  * Manolis Koubarakis	<koubarak@di.uoa.gr>
   6.322  * Giorgos Garbis	<ggarbis@di.uoa.gr>
   6.323  * Konstantina Bereta	<konstantina.bereta@di.uoa.gr>
   6.324 +* Charalampos Nikolaou	<charnik@di.uoa.gr>
   6.325 +* Stella Gianakopoulou	<sgian@di.uoa.gr>
   6.326 +* Panayiotis Smeros	<psmeros@di.uoa.gr>
   6.327 +* Kallirroi Dogani	<kallirroi@di.uoa.gr>
   6.328  
   6.329  
   6.330  Mailing-list
   6.331  ============
   6.332 -Currently, there is only a developers mailing-list, Strabon-devel, for support
   6.333 -and other questions concerning Strabon. To subscribe to the mailing-list, please
   6.334 -visit page http://cgi.di.uoa.gr/~mailman/listinfo/strabon-devel. To post e-mails
   6.335 -to Strabon-devel mailing-list, write to Strabon-devel@di.uoa.gr.
   6.336 +Currently, we maintain the following mailing lists:
   6.337 +
   6.338 +* Strabon-users, is used as a communication channel for Strabon users.
   6.339 +To subscribe to the mailing-list, please visit page 
   6.340 +http://cgi.di.uoa.gr/~mailman/listinfo/strabon-users. To post e-mails
   6.341 +to Strabon-users mailing-list, write to strabon-users@di.uoa.gr.
   6.342 +
   6.343 +* Strabon-devel, is used as a communication channel with the developers
   6.344 +of Strabon. To subscribe to the mailing-list, please visit page 
   6.345 +http://cgi.di.uoa.gr/~mailman/listinfo/strabon-devel. To post e-mails
   6.346 +to Strabon-devel mailing-list, write to strabon-devel@di.uoa.gr.
   6.347  
   6.348  
   6.349  Bugs
   6.350 @@ -199,6 +470,100 @@
   6.351  the Strabon-devel mailing-list Strabon-devel@di.uoa.gr.
   6.352  
   6.353  
   6.354 +Known Issues
   6.355 +============
   6.356 +* Strabon depends on a version of Sesame OpenRDF that is not hosted at the central
   6.357 +  repository of Maven. These artifacts resided on the Maven repository of Aduna 
   6.358 +  which is not maintained any more. For this reason, you can use a mirror repository 
   6.359 +  hosted by Ontotext. To configure maven to use the Ontotext mirror for the Aduna 
   6.360 +  repository, you append to your settings file ${user.home}/.m2/settings.xml) the 
   6.361 +  following:
   6.362 +
   6.363 +<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
   6.364 +  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   6.365 +  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
   6.366 +                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
   6.367 +...
   6.368 +...
   6.369 +  <mirrors>
   6.370 +    <mirror>
   6.371 +      <id>aduna-mirror</id>
   6.372 +      <name>Aduna Maven Repository - Mirror</name>
   6.373 +      <url>http://maven.ontotext.com/content/repositories/aduna/</url>
   6.374 +      <mirrorOf>aduna-opensource.releases</mirrorOf>
   6.375 +    </mirror>
   6.376 +  </mirrors>
   6.377 +...
   6.378 +...
   6.379 +</settings>
   6.380 +
   6.381 + * By default, Tomcat uses ISO-8859-1 character encoding when decoding URLs received 
   6.382 +   from a browser. This can cause problems when encoding is UTF-8, and you are using 
   6.383 +   international characters. In order to fix this, edit conf/server.xml and find the 
   6.384 +   line where the Connector is defined. Add the parameter URIEncoding and set it to 
   6.385 +   UTF-8. For example:
   6.386 +
   6.387 +   <Connector port="8080" protocol="HTTP/1.1" 
   6.388 +                  connectionTimeout="20000" 
   6.389 +                  URIEncoding="UTF-8"
   6.390 +                  redirectPort="8443" />
   6.391 +
   6.392 + * Building and executing any maven goals fails for maven versions <3.0 due to a
   6.393 +   dependency to the `shade' plugin that is available only for maven version 3.0
   6.394 +   (http://maven.apache.org/plugins/maven-shade-plugin/). In such systems, you may
   6.395 +   disable execution of this plugin by setting the environmental variable
   6.396 +   `shade.skip'. For example, to build Strabon using maven version 2.0 you may
   6.397 +   execute the following command:
   6.398 +
   6.399 +   	$ mvn clean package -Dshade.skip
   6.400 +
   6.401 + * When using MonetDB as a backend, the following source code of MonetDB must be 
   6.402 +   used:
   6.403 +	https://hg.strabon.di.uoa.gr/MonetDB/   
   6.404 +
   6.405 +
   6.406  License
   6.407  =======
   6.408 -Copyright (C) 2010-2012 Strabon Team
   6.409 +This Source Code Form is subject to the terms of the Mozilla Public
   6.410 +License, v. 2.0. If a copy of the MPL was not distributed with this
   6.411 +file, You can obtain one at http://mozilla.org/MPL/2.0/.
   6.412 +
   6.413 +Copyright (C) 2010, 2011, 2012, Pyravlos Team
   6.414 +
   6.415 +http://www.strabon.di.uoa.gr/
   6.416 +
   6.417 +
   6.418 +How to apply the license
   6.419 +========================
   6.420 + * In the beginning of script files (after the shell directive) paste the
   6.421 +   following statement:
   6.422 +#
   6.423 +# This Source Code Form is subject to the terms of the Mozilla Public
   6.424 +# License, v. 2.0. If a copy of the MPL was not distributed with this
   6.425 +# file, You can obtain one at http://mozilla.org/MPL/2.0/.
   6.426 +#
   6.427 +# Copyright (C) 2010, 2011, 2012, Pyravlos Team
   6.428 +#
   6.429 +# http://www.strabon.di.uoa.gr/
   6.430 +#
   6.431 +
   6.432 + * In the beginning of Java source code files paste the following statement:
   6.433 +/**
   6.434 + * This Source Code Form is subject to the terms of the Mozilla Public
   6.435 + * License, v. 2.0. If a copy of the MPL was not distributed with this
   6.436 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
   6.437 + * 
   6.438 + * Copyright (C) 2010, 2011, 2012, Pyravlos Team
   6.439 + * 
   6.440 + * http://www.strabon.di.uoa.gr/
   6.441 + */
   6.442 +
   6.443 + * In the beginning of HTML/XML files paste the following statement:
   6.444 +<!-- This Source Code Form is subject to the terms of the Mozilla Public
   6.445 +   - License, v. 2.0. If a copy of the MPL was not distributed with this
   6.446 +   - file, You can obtain one at http://mozilla.org/MPL/2.0/. 
   6.447 +   -
   6.448 +   - Copyright (C) 2010, 2011, 2012, Pyravlos Team
   6.449 +   -
   6.450 +   - http://www.strabon.di.uoa.gr/
   6.451 +-->

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/endpoint-client/pom.xml	Fri May 02 17:39:27 2014 +0200
     7.3 @@ -0,0 +1,176 @@
     7.4 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     7.5 +
     7.6 +	<modelVersion>4.0.0</modelVersion>
     7.7 +
     7.8 +	<parent>
     7.9 +		<groupId>eu.earthobservatory</groupId>
    7.10 +		<artifactId>strabon</artifactId>
    7.11 +		<version>3.2.10-SNAPSHOT</version>
    7.12 +	</parent>
    7.13 +
    7.14 +	<artifactId>strabon-endpoint-client</artifactId>
    7.15 +
    7.16 +	<name>Strabon: Endpoint client</name>
    7.17 +	<description>A java client for Strabon endpoint</description>
    7.18 +	<packaging>jar</packaging>
    7.19 +
    7.20 +	<dependencies>
    7.21 +		<dependency>
    7.22 +			<groupId>org.openrdf.sesame</groupId>
    7.23 +			<artifactId>sesame-rio-api</artifactId>
    7.24 +		</dependency>
    7.25 +		<dependency>
    7.26 +			<groupId>org.openrdf.sesame</groupId>
    7.27 +			<artifactId>sesame-queryresultio-spatial-api</artifactId>
    7.28 +		</dependency>
    7.29 +		
    7.30 +		<dependency>
    7.31 +			<groupId>org.apache.httpcomponents</groupId>
    7.32 +			<artifactId>httpclient</artifactId>
    7.33 +			<!-- version was put in purpose! do not remove it; -->
    7.34 +			<version>4.2</version>
    7.35 +		</dependency>
    7.36 +
    7.37 +		<!-- Testing: JUnit -->
    7.38 +		<dependency>
    7.39 +			<groupId>junit</groupId>
    7.40 +			<artifactId>junit</artifactId>
    7.41 +			<scope>test</scope>
    7.42 +		</dependency>
    7.43 +		<dependency>
    7.44 +			<groupId>org.openrdf.sesame</groupId>
    7.45 +			<artifactId>
    7.46 +				sesame-queryresultio-spatial-sparqlkml
    7.47 +			</artifactId>
    7.48 +		</dependency>
    7.49 +	</dependencies>
    7.50 +
    7.51 +	<build>
    7.52 +		<pluginManagement>
    7.53 +			<plugins>
    7.54 +				<plugin>
    7.55 +					<groupId>org.eclipse.m2e</groupId>
    7.56 +					<artifactId>lifecycle-mapping</artifactId>
    7.57 +					<version>1.0.0</version>
    7.58 +					<configuration>
    7.59 +						<lifecycleMappingMetadata>
    7.60 +							<pluginExecutions>
    7.61 +								<pluginExecution>
    7.62 +									<pluginExecutionFilter>
    7.63 +										<groupId>org.apache.maven.plugins</groupId>
    7.64 +										<artifactId>maven-dependency-plugin</artifactId>
    7.65 +										<versionRange>[2.4,)</versionRange>
    7.66 +										<goals>
    7.67 +											<goal>copy-dependencies</goal>
    7.68 +										</goals>
    7.69 +									</pluginExecutionFilter>
    7.70 +									<action>
    7.71 +										<ignore />
    7.72 +									</action>
    7.73 +								</pluginExecution>
    7.74 +							</pluginExecutions>
    7.75 +						</lifecycleMappingMetadata>
    7.76 +					</configuration>
    7.77 +				</plugin>
    7.78 +			</plugins>
    7.79 +		</pluginManagement>
    7.80 +
    7.81 +		<plugins>
    7.82 +			<plugin>
    7.83 +				<groupId>org.apache.maven.plugins</groupId>
    7.84 +				<artifactId>maven-compiler-plugin</artifactId>
    7.85 +				<version>2.3.2</version>
    7.86 +				<configuration>
    7.87 +					<source>1.6</source>
    7.88 +					<target>1.6</target>
    7.89 +					<encoding>utf8</encoding>
    7.90 +				</configuration>
    7.91 +			</plugin>
    7.92 +			<plugin>
    7.93 +				<groupId>org.apache.maven.plugins</groupId>
    7.94 +				<artifactId>maven-dependency-plugin</artifactId>
    7.95 +				<version>2.4</version>
    7.96 +				<executions>
    7.97 +					<execution>
    7.98 +						<id>copy-dependencies</id>
    7.99 +						<phase>package</phase>
   7.100 +						<goals>
   7.101 +							<goal>copy-dependencies</goal>
   7.102 +						</goals>
   7.103 +						<configuration>
   7.104 +							<outputDirectory>${project.build.directory}</outputDirectory>
   7.105 +							<overWriteReleases>false</overWriteReleases>
   7.106 +							<overWriteSnapshots>false</overWriteSnapshots>
   7.107 +							<overWriteIfNewer>true</overWriteIfNewer>
   7.108 +						</configuration>
   7.109 +					</execution>
   7.110 +				</executions>
   7.111 +			</plugin>
   7.112 +
   7.113 +			<plugin>
   7.114 +				<groupId>org.apache.maven.plugins</groupId>
   7.115 +				<artifactId>maven-jar-plugin</artifactId>
   7.116 +				<version>2.4</version>
   7.117 +				<configuration>
   7.118 +					<skipIfEmpty>true</skipIfEmpty>
   7.119 +				</configuration>
   7.120 +				<executions>
   7.121 +					<execution>
   7.122 +						<goals>
   7.123 +							<goal>test-jar</goal>
   7.124 +						</goals>
   7.125 +					</execution>
   7.126 +				</executions>
   7.127 +			</plugin>
   7.128 +		</plugins>
   7.129 +	</build>
   7.130 +
   7.131 +<profiles>
   7.132 +	<profile>
   7.133 +		<id>conditional-shade-plugin</id>
   7.134 +
   7.135 +		<activation>
   7.136 +			<property><name>!shade.skip</name></property>
   7.137 +		</activation>
   7.138 +		<build>
   7.139 +			<plugins>
   7.140 +			<plugin>
   7.141 +                                <groupId>org.apache.maven.plugins</groupId>
   7.142 +                                <artifactId>maven-shade-plugin</artifactId>
   7.143 +                                <version>2.2</version>
   7.144 +                        <!--
   7.145 +                                <configuration>
   7.146 +                                </configuration>
   7.147 +                        -->
   7.148 +                                <executions>
   7.149 +                                        <execution>
   7.150 +                                                <phase>package</phase>
   7.151 +                                                <goals>
   7.152 +                                                        <goal>shade</goal>
   7.153 +                                                </goals>
   7.154 +                                                <configuration>
   7.155 +                                                        <transformers>
   7.156 +                                                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
   7.157 +                                                                        <mainClass>eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint</mainClass>
   7.158 +                                                                </transformer>
   7.159 +                                                        </transformers>
   7.160 +                                                        <filters>
   7.161 +															<filter>
   7.162 +																<artifact>*:*</artifact>
   7.163 +																<excludes>
   7.164 +																	<exclude>META-INF/*.SF</exclude>
   7.165 +																	<exclude>META-INF/*.DSA</exclude>
   7.166 +																	<exclude>META-INF/*.RSA</exclude>
   7.167 +																</excludes>
   7.168 +															</filter>
   7.169 +														</filters>
   7.170 +                                                </configuration>
   7.171 +                                        </execution>
   7.172 +                                </executions>
   7.173 +                        </plugin>
   7.174 +			</plugins>
   7.175 +		</build>
   7.176 +	</profile>
   7.177 +</profiles>
   7.178 +</project>
   7.179 +

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/EndpointResult.java	Fri May 02 17:39:27 2014 +0200
     8.3 @@ -0,0 +1,39 @@
     8.4 +/**
     8.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     8.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     8.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     8.8 + * 
     8.9 + * Copyright (C) 2012, Pyravlos Team
    8.10 + * 
    8.11 + * http://www.strabon.di.uoa.gr/
    8.12 + */
    8.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
    8.14 +
    8.15 +/**
    8.16 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    8.17 + *
    8.18 + */
    8.19 +public class EndpointResult {
    8.20 +
    8.21 +	private int statusCode;
    8.22 +	private String statusText;
    8.23 +	private String response;
    8.24 +	
    8.25 +	public EndpointResult(int statusCode, String statusLine, String response) {
    8.26 +		this.statusCode = statusCode;
    8.27 +		this.statusText = statusLine;
    8.28 +		this.response = response;
    8.29 +	}
    8.30 +	
    8.31 +	public int getStatusCode() {
    8.32 +		return statusCode;
    8.33 +	}
    8.34 +
    8.35 +	public String getStatusText() {
    8.36 +		return statusText;
    8.37 +	}
    8.38 +
    8.39 +	public String getResponse() {
    8.40 +		return response;
    8.41 +	}
    8.42 +}

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/HTTPClient.java	Fri May 02 17:39:27 2014 +0200
     9.3 @@ -0,0 +1,112 @@
     9.4 +/**
     9.5 + * This Source Code Form is subject to the terms of the Mozilla Public
     9.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
     9.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
     9.8 + *
     9.9 + * Copyright (C) 2012, Pyravlos Team
    9.10 + *
    9.11 + * http://www.strabon.di.uoa.gr/
    9.12 + */
    9.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
    9.14 +
    9.15 +import org.apache.http.client.HttpClient;
    9.16 +import org.apache.http.conn.ClientConnectionManager;
    9.17 +import org.apache.http.impl.client.DefaultHttpClient;
    9.18 +import org.apache.http.impl.conn.PoolingClientConnectionManager;
    9.19 +
    9.20 +/**
    9.21 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
    9.22 + *
    9.23 + */
    9.24 +public abstract class HTTPClient {
    9.25 +
    9.26 +	/**
    9.27 +	 * The host on which the endpoint is located.
    9.28 +	 */
    9.29 +	protected String host;
    9.30 +	
    9.31 +	/**
    9.32 +	 * The port of the host.
    9.33 +	 */
    9.34 +	protected int port;
    9.35 +	
    9.36 +	/**
    9.37 +	 * The name of the endpoint.
    9.38 +	 * 
    9.39 +	 * This is useful for {@link SPARQLEndpoint} instances that are usually
    9.40 +	 * deployed in a tomcat container as web applications.
    9.41 +	 */
    9.42 +	protected String endpointName;
    9.43 +	
    9.44 +	/**
    9.45 +	 * The username to be used in case the endpoint requires authentication.
    9.46 +	 */
    9.47 +	protected String user;
    9.48 +	
    9.49 +	/**
    9.50 +	 * The password to be used in case the endpoint requires authentication.
    9.51 +	 */
    9.52 +	protected String password;
    9.53 +	
    9.54 +	/**
    9.55 +	 * The connection manager that manages sharing of connections to endpoints
    9.56 +	 * among several threads.
    9.57 +	 */
    9.58 +	private ClientConnectionManager connectionManager;
    9.59 +	
    9.60 +	/**
    9.61 +	 * The HttpClient to be used for connecting to an endpoint.
    9.62 +	 */
    9.63 +	protected HttpClient hc;
    9.64 +	
    9.65 +	public HTTPClient(String host, int port) {
    9.66 +		this(host, port, "/");
    9.67 +	}
    9.68 +	
    9.69 +	public HTTPClient(String host, int port, String endpointName) {
    9.70 +		this.host = host;
    9.71 +		this.port = port;
    9.72 +		
    9.73 +		this.endpointName = (endpointName == null ? "":endpointName);
    9.74 +		
    9.75 +		// create a connection manager for allowing the users of this class use threads
    9.76 +		connectionManager = new PoolingClientConnectionManager();
    9.77 +		
    9.78 +		// create an HttpClient instance that establishes connections based on the connection manager
    9.79 +		hc = new DefaultHttpClient(connectionManager);
    9.80 +	}
    9.81 +		
    9.82 +	public String getHost() {
    9.83 +		return host;
    9.84 +	}
    9.85 +	
    9.86 +	public int getPort() {
    9.87 +		return port;
    9.88 +	}
    9.89 +	
    9.90 +	public void setUser(String user) {
    9.91 +		this.user = user;
    9.92 +	}
    9.93 +	
    9.94 +	public void setPassword(String pass) {
    9.95 +		this.password = pass;
    9.96 +	}
    9.97 +	
    9.98 +	public String getUser() {
    9.99 +		return user;
   9.100 +	}
   9.101 +	
   9.102 +	public String getPassword() {
   9.103 +		return password;
   9.104 +	}
   9.105 +	
   9.106 +	/**
   9.107 +	 * Returns a URL (actually a {@link String}) for establishing connections
   9.108 +	 * to an endpoint based on the information given to the constructor. 
   9.109 +	 * 
   9.110 +	 * @return
   9.111 +	 */
   9.112 +	public String getConnectionURL() {
   9.113 +		return "http://" + host + ((port == 80) ? "":":" + port) + "/" + endpointName; 
   9.114 +	}
   9.115 +}

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SPARQLEndpoint.java	Fri May 02 17:39:27 2014 +0200
    10.3 @@ -0,0 +1,404 @@
    10.4 +/**
    10.5 + * This Source Code Form is subject to the terms of the Mozilla Public
    10.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    10.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    10.8 + *
    10.9 + * Copyright (C) 2012, 2013 Pyravlos Team
   10.10 + *
   10.11 + * http://www.strabon.di.uoa.gr/
   10.12 + */
   10.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   10.14 +
   10.15 +import java.io.BufferedReader;
   10.16 +import java.io.IOException;
   10.17 +import java.io.InputStream;
   10.18 +import java.io.InputStreamReader;
   10.19 +import java.net.URL;
   10.20 +import java.nio.charset.Charset;
   10.21 +import java.util.ArrayList;
   10.22 +import java.util.List;
   10.23 +
   10.24 +import org.apache.commons.httpclient.params.HostParams;
   10.25 +import org.apache.commons.httpclient.params.HttpMethodParams;
   10.26 +import org.apache.commons.httpclient.params.HttpParams;
   10.27 +import org.apache.http.HttpEntity;
   10.28 +import org.apache.http.HttpResponse;
   10.29 +import org.apache.http.NameValuePair;
   10.30 +import org.apache.http.client.entity.UrlEncodedFormEntity;
   10.31 +import org.apache.http.client.methods.HttpPost;
   10.32 +import org.apache.http.entity.StringEntity;
   10.33 +import org.apache.http.message.BasicNameValuePair;
   10.34 +import org.apache.xerces.impl.dv.util.Base64;
   10.35 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   10.36 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   10.37 +import org.openrdf.rio.RDFFormat;
   10.38 +
   10.39 +/**
   10.40 + * This class is the implementation of a java client for accessing
   10.41 + * SPARQLEndpoint instances.
   10.42 + * 
   10.43 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   10.44 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr.
   10.45 + */
   10.46 +public class SPARQLEndpoint extends HTTPClient{
   10.47 +
   10.48 +	public SPARQLEndpoint(String host, int port) {
   10.49 +		super(host, port);
   10.50 +	}
   10.51 +	
   10.52 +	public SPARQLEndpoint(String host, int port, String endpointName) {
   10.53 +		super(host, port, endpointName);
   10.54 +	}
   10.55 +
   10.56 +	
   10.57 +	/**
   10.58 +	 * Executes a SPARQL query on the Endpoint and get the results
   10.59 +	 * in the format specified by stSPARQLQueryResultFormat, which is
   10.60 +	 * an instance of class (or a subclass) {@link TupleQueryResultFormat}.   
   10.61 +	 * 
   10.62 +	 * @param sparqlQuery
   10.63 +	 * @param format
   10.64 +	 * @return
   10.65 +	 * @throws IOException
   10.66 +	 */
   10.67 +	public EndpointResult query(String sparqlQuery, stSPARQLQueryResultFormat format) throws IOException {
   10.68 +		assert(format != null);
   10.69 +		
   10.70 +		// create a post method to execute
   10.71 +		HttpPost method = new HttpPost(getConnectionURL());
   10.72 +		
   10.73 +		// set the query parameter
   10.74 +		List<NameValuePair> params = new ArrayList<NameValuePair>();
   10.75 +		params.add(new BasicNameValuePair("query", sparqlQuery));
   10.76 +		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
   10.77 +		method.setEntity(encodedEntity);
   10.78 +		
   10.79 +		// set the content type
   10.80 +		method.setHeader("Content-Type", "application/x-www-form-urlencoded");
   10.81 +		
   10.82 +		// set the accept format
   10.83 +		method.addHeader("Accept", format.getDefaultMIMEType());
   10.84 +		
   10.85 +		try {
   10.86 +			// response that will be filled next
   10.87 +			String responseBody = "";
   10.88 +			
   10.89 +			// execute the method
   10.90 +			HttpResponse response = hc.execute(method);
   10.91 +			int statusCode = response.getStatusLine().getStatusCode();
   10.92 +			
   10.93 +			// If the response does not enclose an entity, there is no need
   10.94 +			// to worry about connection release
   10.95 +			HttpEntity entity = response.getEntity();
   10.96 +			if (entity != null) {
   10.97 +				InputStream instream = entity.getContent();
   10.98 +				try {
   10.99 +
  10.100 +					BufferedReader reader = new BufferedReader(new InputStreamReader(instream));
  10.101 +					StringBuffer strBuf = new StringBuffer();
  10.102 +					
  10.103 +					// do something useful with the response
  10.104 +					String nextLine;
  10.105 +					while ((nextLine = reader.readLine()) != null) {
  10.106 +						strBuf.append(nextLine + "\n");
  10.107 +					}
  10.108 +					
  10.109 +					// remove last newline character
  10.110 +					if (strBuf.length() > 0) {
  10.111 +						strBuf.setLength(strBuf.length() - 1);
  10.112 +					}
  10.113 +					
  10.114 +					responseBody = strBuf.toString();
  10.115 +
  10.116 +				} catch (IOException ex) {
  10.117 +					// In case of an IOException the connection will be released
  10.118 +					// back to the connection manager automatically
  10.119 +					throw ex;
  10.120 +
  10.121 +				} catch (RuntimeException ex) {
  10.122 +					// In case of an unexpected exception you may want to abort
  10.123 +					// the HTTP request in order to shut down the underlying
  10.124 +					// connection and release it back to the connection manager.
  10.125 +					method.abort();
  10.126 +					throw ex;
  10.127 +
  10.128 +				} finally {
  10.129 +					// Closing the input stream will trigger connection release
  10.130 +					instream.close();
  10.131 +				}
  10.132 +			}
  10.133 +			 
  10.134 +			return new EndpointResult(statusCode, response.getStatusLine().getReasonPhrase(), responseBody);
  10.135 +
  10.136 +		} catch (IOException e) {
  10.137 +			throw e;
  10.138 +			
  10.139 +		} finally {
  10.140 +			// release the connection.
  10.141 +			method.releaseConnection();
  10.142 +		}
  10.143 +	}
  10.144 +
  10.145 +	
  10.146 +	/* Functions 'store' and 'update' do not follow the SPARQL Protocol.
  10.147 +	 * This means that only Strabon Endpoint supports these operations.
  10.148 +	 * In future they must be modified in order to be compatible with
  10.149 +	 * Virtuso and Parliament endpoints.
  10.150 +	 */
  10.151 +	
  10.152 +	
  10.153 +	/**
  10.154 +	 * Stores the RDF <code>data</code> which are in the RDF format
  10.155 +	 * <code>format</code> in the named graph specified by the URL
  10.156 +	 * <code>namedGraph</code>.
  10.157 +	 * 
  10.158 +	 * @param data 
  10.159 +	 * @param format
  10.160 +	 * @param namedGraph
  10.161 +	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
  10.162 +	 * @throws IOException 
  10.163 +	 */
  10.164 +	
  10.165 +	public boolean store(String data, RDFFormat format, URL namedGraph) throws IOException {
  10.166 +assert(format != null);
  10.167 +		
  10.168 +		// create a post method to execute
  10.169 +		HttpPost method = new HttpPost(getConnectionURL());
  10.170 +		
  10.171 +		// set the url and fromurl parameters
  10.172 +		List<NameValuePair> params = new ArrayList<NameValuePair>();
  10.173 +		params.add(new BasicNameValuePair("data", data));
  10.174 +		if (namedGraph!=null)
  10.175 +			params.add(new BasicNameValuePair("graph", namedGraph.toString()));
  10.176 +		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
  10.177 +		method.setEntity(encodedEntity);
  10.178 +		
  10.179 +		// set the content type
  10.180 +		method.setHeader("Content-Type", "application/x-www-form-urlencoded");
  10.181 +		
  10.182 +		// set the accept format
  10.183 +		method.addHeader("Accept", format.getDefaultMIMEType());
  10.184 +		
  10.185 +		//set username and password
  10.186 +		if (getUser()!=null && getPassword()!=null){
  10.187 +			
  10.188 +			String userPass = getUser()+":"+ getPassword();
  10.189 +			String encoding = Base64.encode(userPass.getBytes());
  10.190 +			method.setHeader("Authorization", "Basic "+ encoding);
  10.191 +		}
  10.192 +		
  10.193 +		try {
  10.194 +			// response that will be filled next
  10.195 +		//	String responseBody = "";
  10.196 +			
  10.197 +			// execute the method
  10.198 +			HttpResponse response = hc.execute(method);
  10.199 +			int statusCode = response.getStatusLine().getStatusCode();
  10.200 +			
  10.201 +			if (statusCode==200)
  10.202 +				return true;
  10.203 +			else{
  10.204 +				System.err.println("Status code " + statusCode);
  10.205 +				return false;
  10.206 +			}
  10.207 +				
  10.208 +			
  10.209 +
  10.210 +		} catch (IOException e) {
  10.211 +			throw e;
  10.212 +			
  10.213 +		} finally {
  10.214 +			// release the connection.
  10.215 +			method.releaseConnection();
  10.216 +		}
  10.217 +	}
  10.218 +
  10.219 +	/**
  10.220 +	 * Stores the RDF data located at <code>data</code> which are in the
  10.221 +	 * RDF format <code>format</code> in the named graph specified by the
  10.222 +	 * URL <code>namedGraph</code>.
  10.223 +	 * 
  10.224 +	 * @param data
  10.225 +	 * @param format
  10.226 +	 * @param namedGraph
  10.227 +	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
  10.228 +	 */
  10.229 +
  10.230 +
  10.231 +	/*
  10.232 +	 * Comment: in order to make queries to strabon endpoint we must create a SPARQLEndpoint
  10.233 +	 * with endpointName ".../Query". To store data to strabon endpoint the endpointName of
  10.234 +	 * SPARQLEndpoint must be something like ".../Store". This means that the same object of
  10.235 +	 * SPARQLEndpoint cannot execute store and query operations for strabon endpoints.
  10.236 +	 * This is wrong and must be fixed. Also, the main idea is that the SPARQLEndpoint client 
  10.237 +	 * should be a general endpoint client that supports strabon, virtuoso and parliament endpoints.
  10.238 +	 */
  10.239 +	public boolean store(URL data, RDFFormat format, URL namedGraph) throws IOException{
  10.240 +		
  10.241 +		assert(format != null);
  10.242 +		
  10.243 +		// create a post method to execute
  10.244 +		HttpPost method = new HttpPost(getConnectionURL());
  10.245 +		
  10.246 +		// set the url and fromurl parameters
  10.247 +		List<NameValuePair> params = new ArrayList<NameValuePair>();
  10.248 +		params.add(new BasicNameValuePair("url", data.toString()));
  10.249 +		params.add(new BasicNameValuePair("fromurl", ""));
  10.250 +		if (namedGraph!=null)
  10.251 +			params.add(new BasicNameValuePair("graph", namedGraph.toString()));
  10.252 +		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
  10.253 +		method.setEntity(encodedEntity);
  10.254 +		
  10.255 +		// set the content type
  10.256 +		method.setHeader("Content-Type", "application/x-www-form-urlencoded");
  10.257 +		
  10.258 +		// set the accept format
  10.259 +		method.addHeader("Accept", format.getDefaultMIMEType());
  10.260 +		
  10.261 +		//set username and password
  10.262 +		if (getUser()!=null && getPassword()!=null){
  10.263 +			
  10.264 +			String userPass = getUser()+":"+ getPassword();
  10.265 +			String encoding = Base64.encode(userPass.getBytes());
  10.266 +			method.setHeader("Authorization", "Basic "+ encoding);
  10.267 +		}
  10.268 +		
  10.269 +		try {
  10.270 +			// response that will be filled next
  10.271 +		//	String responseBody = "";
  10.272 +			
  10.273 +			// execute the method
  10.274 +			HttpResponse response = hc.execute(method);
  10.275 +			int statusCode = response.getStatusLine().getStatusCode();
  10.276 +			
  10.277 +			if (statusCode==200)
  10.278 +				return true;
  10.279 +			else{
  10.280 +				System.err.println("Status code " + statusCode);
  10.281 +				return false;
  10.282 +			}
  10.283 +				
  10.284 +			
  10.285 +
  10.286 +		} catch (IOException e) {
  10.287 +			throw e;
  10.288 +			
  10.289 +		} finally {
  10.290 +			// release the connection.
  10.291 +			method.releaseConnection();
  10.292 +		}
  10.293 +	}
  10.294 +		
  10.295 +
  10.296 +	/**
  10.297 +	 * Executes the SPARQL Update query specified in <code>sparqlUpdate</code>.
  10.298 +	 * 
  10.299 +	 * @param sparqlUpdate
  10.300 +	 * @return <code>true</code> if store was successful, <code>false</code> otherwise
  10.301 +	 * @throws IOException 
  10.302 +	 */
  10.303 +
  10.304 +	public boolean update(String sparqlUpdate) throws IOException {
  10.305 +		
  10.306 +		// create a post method to execute
  10.307 +		HttpPost method = new HttpPost(getConnectionURL());
  10.308 +		
  10.309 +		// set the query parameter
  10.310 +		List<NameValuePair> params = new ArrayList<NameValuePair>();
  10.311 +		params.add(new BasicNameValuePair("query", sparqlUpdate));
  10.312 +		UrlEncodedFormEntity encodedEntity = new UrlEncodedFormEntity(params, Charset.defaultCharset());
  10.313 +		method.setEntity(encodedEntity);
  10.314 +		
  10.315 +		// set the content type
  10.316 +		method.setHeader("Content-Type", "application/x-www-form-urlencoded");
  10.317 +		
  10.318 +		// set the accept format
  10.319 +		method.addHeader("Accept", "text/xml");
  10.320 +		
  10.321 +		//set username and password
  10.322 +		if (getUser()!=null && getPassword()!=null){
  10.323 +			
  10.324 +			String userPass = getUser()+":"+ getPassword();
  10.325 +			String encoding = Base64.encode(userPass.getBytes());
  10.326 +			method.setHeader("Authorization", "Basic "+ encoding);
  10.327 +		}
  10.328 +		
  10.329 +		try {
  10.330 +			// response that will be filled next
  10.331 +			
  10.332 +			// execute the method
  10.333 +			HttpResponse response = hc.execute(method);
  10.334 +			int statusCode = response.getStatusLine().getStatusCode();
  10.335 +			
  10.336 +			if (statusCode==200)
  10.337 +				return true;
  10.338 +			else{
  10.339 +				System.err.println("Status code " + statusCode);
  10.340 +				return false;
  10.341 +			}
  10.342 +				
  10.343 +			
  10.344 +
  10.345 +		} catch (IOException e) {
  10.346 +			throw e;
  10.347 +			
  10.348 +		} finally {
  10.349 +			// release the connection.
  10.350 +			method.releaseConnection();
  10.351 +		}
  10.352 +		
  10.353 +	}
  10.354 +
  10.355 +	public EndpointResult describe(String sparqlDescribe) {
  10.356 +		throw new UnsupportedOperationException();
  10.357 +	}
  10.358 +
  10.359 +	public EndpointResult construct(String sparqlConstruct) {
  10.360 +		throw new UnsupportedOperationException();
  10.361 +	}
  10.362 +	
  10.363 +	public EndpointResult ask(String sparqlAsk) {
  10.364 +		throw new UnsupportedOperationException();
  10.365 +	}
  10.366 +	
  10.367 +	
  10.368 +	public static void main(String args[]) {
  10.369 +		if (args.length < 4) {
  10.370 +			System.err.println("Usage: eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint <HOST> <PORT> <APPNAME> [<FORMAT>]");
  10.371 +			System.err.println("       where <HOST>       is the hostname of the Strabon Endpoint");
  10.372 +			System.err.println("             <PORT>       is the port to connect to on the host");
  10.373 +			System.err.println("             <APPNAME>    is the application name of Strabon Endpoint as deployed in the Tomcat container");
  10.374 +			System.err.println("             <QUERY>      is the query to execute on the endpoint");
  10.375 +			System.err.println("             [<FORMAT>]   is the format of your results. Should be one of XML (default), KML, KMZ, GeoJSON, TSV, or HTML.");
  10.376 +			System.exit(1);
  10.377 +		}
  10.378 +		
  10.379 +		String host = args[0];
  10.380 +		Integer port = new Integer(args[1]);
  10.381 +		String appName = args[2];
  10.382 +		String query = args[3];
  10.383 +		String format = "";
  10.384 +		
  10.385 +		if (args.length == 5) {
  10.386 +			format = args[4];
  10.387 +			
  10.388 +		} else {
  10.389 +			format = "XML";
  10.390 +		}
  10.391 +		
  10.392 +		SPARQLEndpoint endpoint = new SPARQLEndpoint(host, port, appName);
  10.393 +		
  10.394 +		try {
  10.395 +			EndpointResult result = endpoint.query(query, (stSPARQLQueryResultFormat) stSPARQLQueryResultFormat.valueOf(format));
  10.396 +			
  10.397 +			System.out.println("Status code: " + result.getStatusCode());
  10.398 +			System.out.println("Status text: " + result.getStatusText());
  10.399 +			System.out.println("<----- Result ----->");
  10.400 +			System.out.println(result.getResponse().replaceAll("\n", "\n\t"));
  10.401 +			System.out.println("<----- Result ----->");
  10.402 +			
  10.403 +		} catch (IOException e) {
  10.404 +			e.printStackTrace();
  10.405 +		}
  10.406 +	}
  10.407 +}

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/endpoint-client/src/main/java/eu/earthobservatory/org/StrabonEndpoint/client/SpatialEndpoint.java	Fri May 02 17:39:27 2014 +0200
    11.3 @@ -0,0 +1,75 @@
    11.4 +/**
    11.5 + * This Source Code Form is subject to the terms of the Mozilla Public
    11.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    11.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    11.8 + *
    11.9 + * Copyright (C) 2012, 2013, Pyravlos Team
   11.10 + *
   11.11 + * http://www.strabon.di.uoa.gr/
   11.12 + */
   11.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   11.14 +
   11.15 +import java.io.ByteArrayInputStream;
   11.16 +import java.io.ByteArrayOutputStream;
   11.17 +import java.io.IOException;
   11.18 +import java.io.InputStream;
   11.19 +import java.util.Vector;
   11.20 +
   11.21 +import org.openrdf.query.QueryEvaluationException;
   11.22 +import org.openrdf.query.TupleQueryResult;
   11.23 +import org.openrdf.query.TupleQueryResultHandlerException;
   11.24 +import org.openrdf.query.resultio.QueryResultIO;
   11.25 +import org.openrdf.query.resultio.QueryResultParseException;
   11.26 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   11.27 +import org.openrdf.query.resultio.UnsupportedQueryResultFormatException;
   11.28 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   11.29 +import org.openrdf.query.resultio.sparqlkml.stSPARQLResultsKMLWriter;
   11.30 +
   11.31 +/**
   11.32 + * SpatialEndpoint is a SPARQLEndpoint which can store and 
   11.33 + * query for spatial data. It also supports KML format for 
   11.34 + * this kind of data.
   11.35 + * 
   11.36 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   11.37 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   11.38 + */
   11.39 +public class SpatialEndpoint extends SPARQLEndpoint {
   11.40 +	
   11.41 +	public SpatialEndpoint(String host, int port) {
   11.42 +		super(host, port);
   11.43 +	}
   11.44 +	
   11.45 +	public SpatialEndpoint(String host, int port, String endpointName) {
   11.46 +		super(host, port, endpointName);
   11.47 +	}
   11.48 +	
   11.49 +	public EndpointResult queryForKML(String sparqlQuery) throws IOException, QueryResultParseException, TupleQueryResultHandlerException, UnsupportedQueryResultFormatException, QueryEvaluationException{
   11.50 +		
   11.51 +		EndpointResult xmlResult = query(sparqlQuery, stSPARQLQueryResultFormat.XML);
   11.52 +		
   11.53 +		if (xmlResult.getStatusCode() != 200) {
   11.54 +			throw new RuntimeException("Failed : HTTP error code : " + xmlResult.getStatusCode() + " " + xmlResult.getStatusText());
   11.55 +		}
   11.56 +		
   11.57 +		String xml = xmlResult.getResponse();
   11.58 +		
   11.59 +		InputStream inputStream = new ByteArrayInputStream(xml.getBytes("UTF-8"));  
   11.60 +		TupleQueryResult results = QueryResultIO.parse(inputStream, TupleQueryResultFormat.SPARQL);
   11.61 +		
   11.62 +		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
   11.63 +		stSPARQLResultsKMLWriter kmlWriter = new stSPARQLResultsKMLWriter(outputStream);
   11.64 +			
   11.65 +		kmlWriter.startQueryResult(new Vector<String>());
   11.66 +					
   11.67 +		while(results.hasNext()){
   11.68 +		
   11.69 +				kmlWriter.handleSolution(results.next());
   11.70 +		}	
   11.71 +					
   11.72 +		kmlWriter.endQueryResult();
   11.73 +			
   11.74 +		EndpointResult kmlResult = new EndpointResult(xmlResult.getStatusCode(), xmlResult.getStatusText(), outputStream.toString());
   11.75 +		return kmlResult;
   11.76 +	}
   11.77 +
   11.78 +}

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestLimit.java	Fri May 02 17:39:27 2014 +0200
    12.3 @@ -0,0 +1,109 @@
    12.4 +///**
    12.5 +// * This Source Code Form is subject to the terms of the Mozilla Public
    12.6 +// * License, v. 2.0. If a copy of the MPL was not distributed with this
    12.7 +// * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    12.8 +// * 
    12.9 +// * Copyright (C) 2012, Pyravlos Team
   12.10 +// * 
   12.11 +// * http://www.strabon.di.uoa.gr/
   12.12 +// */
   12.13 +//package eu.earthobservatory.org.StrabonEndpoint.client;
   12.14 +//
   12.15 +//
   12.16 +//import static org.junit.Assert.assertTrue;
   12.17 +//
   12.18 +//import java.io.IOException;
   12.19 +//import org.junit.Before;
   12.20 +//import org.junit.Test;
   12.21 +//import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   12.22 +//
   12.23 +///**
   12.24 +// * @author Stella Giannakopoulou <sgian@di.uoa.gr>
   12.25 +// *
   12.26 +// */
   12.27 +//public class TestLimit {
   12.28 +//
   12.29 +//	private SPARQLEndpoint endpoint; 
   12.30 +//	private String [] testQueries;
   12.31 +//	private stSPARQLQueryResultFormat format;			
   12.32 +//	
   12.33 +//	@Before
   12.34 +//	public void init() {
   12.35 +//		
   12.36 +//		// initialize endpoint		
   12.37 +//		endpoint = new SPARQLEndpoint("localhost", 8080, "strabon-endpoint/Query");		
   12.38 +//		testQueries = new String[6];
   12.39 +//		
   12.40 +//		 // set queries
   12.41 +//		 testQueries[0] = "SELECT *\n" +
   12.42 +//				"WHERE\n"+							
   12.43 +//				"{\n"+
   12.44 +//				"	?x ?y ?z\n" +
   12.45 +//				"}\n" +
   12.46 +//				"limit 3";	
   12.47 +//		 
   12.48 +//		 testQueries[1] = "SELECT *\n" +
   12.49 +//					"WHERE\n"+							
   12.50 +//					"{\n"+
   12.51 +//					"	?x ?limit 5\n" +
   12.52 +//					"}\n" +
   12.53 +//					"limit 3";
   12.54 +//		 
   12.55 +//		 testQueries[2] = "SELECT *\n" +
   12.56 +//					"WHERE\n"+							
   12.57 +//					"{\n"+
   12.58 +//					"	?x ?limit 5\n" +
   12.59 +//					"}\n" +
   12.60 +//					"limit 3\n" +
   12.61 +//					"offset 4";
   12.62 +//		 
   12.63 +//		 testQueries[3] = "SELECT *\n" +
   12.64 +//					"WHERE\n"+							
   12.65 +//					"{\n"+
   12.66 +//					"	?x ?y ?z\n" +
   12.67 +//					"}\n" +
   12.68 +//					"limit 3000";
   12.69 +//		 
   12.70 +//		 testQueries[4] = "SELECT *\n" +
   12.71 +//					"WHERE\n"+							
   12.72 +//					"{\n"+
   12.73 +//					"	?x ?y ?z\n" +
   12.74 +//					"}\n" +
   12.75 +//					"offset 5" +
   12.76 +//					"limit 3000";
   12.77 +//		 
   12.78 +//		 testQueries[5] = "SELECT *\n" +
   12.79 +//					"WHERE\n"+							
   12.80 +//					"{\n"+
   12.81 +//					"	?x ?z 5\n" +
   12.82 +//					"}\n" +
   12.83 +//					"limit3000\n" +
   12.84 +//					"offset 2";
   12.85 +//		
   12.86 +//		// format does not matter for the test
   12.87 +//		format = stSPARQLQueryResultFormat.HTML;								
   12.88 +//	}
   12.89 +//	
   12.90 +//	/**
   12.91 +//	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.StrabonEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   12.92 +//	 */
   12.93 +//	@Test
   12.94 +//	public void testQuery() {				
   12.95 +//				 
   12.96 +//		for (String query : testQueries) {			
   12.97 +//			try {
   12.98 +//				EndpointResult response = endpoint.query(query, format);
   12.99 +//				
  12.100 +//				if (response.getStatusCode() != 200) {
  12.101 +//					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
  12.102 +//					
  12.103 +//				}
  12.104 +//				
  12.105 +//				assertTrue(response.getStatusCode() == 200);
  12.106 +//
  12.107 +//			} catch (IOException e) {
  12.108 +//				e.printStackTrace();
  12.109 +//			}					
  12.110 +//		}
  12.111 +//	}	
  12.112 +//}

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointStoreWithStrabon.java	Fri May 02 17:39:27 2014 +0200
    13.3 @@ -0,0 +1,90 @@
    13.4 +/**
    13.5 + * This Source Code Form is subject to the terms of the Mozilla Public
    13.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    13.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    13.8 + * 
    13.9 + * Copyright (C) 2013, Pyravlos Team
   13.10 + * 
   13.11 + * http://www.strabon.di.uoa.gr/
   13.12 + */
   13.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   13.14 +
   13.15 +import static org.junit.Assert.assertTrue;
   13.16 +
   13.17 +import java.io.IOException;
   13.18 +import java.net.MalformedURLException;
   13.19 +import java.net.URL;
   13.20 +import java.util.Vector;
   13.21 +
   13.22 +import org.junit.Before;
   13.23 +import org.junit.Test;
   13.24 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   13.25 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   13.26 +import org.openrdf.rio.RDFFormat;
   13.27 +
   13.28 +/**
   13.29 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   13.30 + *
   13.31 + */
   13.32 +public class TestSPARQLEndpointStoreWithStrabon {
   13.33 +
   13.34 +	private SPARQLEndpoint endpoint; 
   13.35 +	private URL data;
   13.36 +	
   13.37 +	@Before
   13.38 +	public void init() {
   13.39 +		// initialize endpoint
   13.40 +		endpoint = new SPARQLEndpoint("luna.di.uoa.gr", 8080, "sextant-endpoint/Store");
   13.41 +		
   13.42 +		// set url data
   13.43 +		try {
   13.44 +			data = new URL("http://luna.di.uoa.gr:8080/strabon-endpoint-gwt/mapontology/map.nt");
   13.45 +		} catch (MalformedURLException e) {
   13.46 +			// TODO Auto-generated catch block
   13.47 +			e.printStackTrace();
   13.48 +		}
   13.49 +		
   13.50 +		endpoint.setUser("endpoint");
   13.51 +		endpoint.setPassword("3ndpo1nt");
   13.52 +		
   13.53 +				
   13.54 +	}
   13.55 +	
   13.56 +	/**
   13.57 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#store(java.net.URL, org.openrdf.rio.RDFFormat, java.net.URL)}.
   13.58 +	 * @throws IOException 
   13.59 +	 */
   13.60 +	@Test
   13.61 +	public void testStoreFromUrl() throws IOException {
   13.62 +		
   13.63 +			URL namedGraph = new URL("http://geo.linkedopendata.gr/map/example");
   13.64 +			Boolean response = endpoint.store(data, RDFFormat.NTRIPLES , namedGraph);
   13.65 +			
   13.66 +			if (response != true) 
   13.67 +				System.err.println("Error");
   13.68 +			
   13.69 +			
   13.70 +		//	assertTrue(response == true);
   13.71 +		
   13.72 +	}
   13.73 +	
   13.74 +	
   13.75 +	/**
   13.76 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#store(java.lang.String, org.openrdf.rio.RDFFormat, java.net.URL)}.
   13.77 +	 * @throws IOException 
   13.78 +	 */
   13.79 +	@Test
   13.80 +	public void testStore() throws IOException {
   13.81 +		
   13.82 +			URL namedGraph = new URL("http://geo.linkedopendata.gr/map/example");
   13.83 +			String data = "<http://geo.linkedopendata.gr/map/id/l22> <http://geo.linkedopendata.gr/map/hasName> \"layer22\" . ";
   13.84 +			Boolean response = endpoint.store(data, RDFFormat.NTRIPLES , namedGraph);
   13.85 +			
   13.86 +			if (response != true) 
   13.87 +				System.err.println("Error");
   13.88 +			
   13.89 +			
   13.90 +		//	assertTrue(response == true);
   13.91 +		
   13.92 +	}
   13.93 +}
   13.94 \ No newline at end of file

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointUpdateWithStrabon.java	Fri May 02 17:39:27 2014 +0200
    14.3 @@ -0,0 +1,51 @@
    14.4 +package eu.earthobservatory.org.StrabonEndpoint.client;
    14.5 +
    14.6 +import static org.junit.Assert.assertTrue;
    14.7 +
    14.8 +import java.io.IOException;
    14.9 +import java.net.MalformedURLException;
   14.10 +import java.net.URL;
   14.11 +
   14.12 +import org.junit.Before;
   14.13 +import org.junit.Test;
   14.14 +import org.openrdf.rio.RDFFormat;
   14.15 +
   14.16 +public class TestSPARQLEndpointUpdateWithStrabon {
   14.17 +	
   14.18 +	private SPARQLEndpoint endpoint; 
   14.19 +	private String query;
   14.20 +	
   14.21 +	@Before
   14.22 +	public void init() {
   14.23 +		// initialize endpoint
   14.24 +		endpoint = new SPARQLEndpoint("luna.di.uoa.gr", 8080, "sextant-endpoint/Update");
   14.25 +		
   14.26 +		// set url data
   14.27 +		query = "insert data" +
   14.28 +				"{graph <http://example.com/update> " +
   14.29 +				"{<http://example.com/map/map> <http://example.com/map/hasLayer>  <http://example.com/map/layer>}  }";
   14.30 +		
   14.31 +		endpoint.setUser("endpoint");
   14.32 +		endpoint.setPassword("3ndpo1nt");
   14.33 +		
   14.34 +				
   14.35 +	}
   14.36 +	
   14.37 +	/**
   14.38 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#update(java.net.URL, org.openrdf.rio.RDFFormat, java.net.URL)}.
   14.39 +	 * @throws IOException 
   14.40 +	 */
   14.41 +	@Test
   14.42 +	public void testUpdate() throws IOException {
   14.43 +		
   14.44 +			Boolean response = endpoint.update(query);
   14.45 +			
   14.46 +			if (response != true) 
   14.47 +				System.err.println("Error");
   14.48 +			
   14.49 +			
   14.50 +		//	assertTrue(response == true);
   14.51 +		
   14.52 +	}
   14.53 +
   14.54 +}

    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithParliament.java	Fri May 02 17:39:27 2014 +0200
    15.3 @@ -0,0 +1,75 @@
    15.4 +///* This Source Code Form is subject to the terms of the Mozilla Public
    15.5 +// * License, v. 2.0. If a copy of the MPL was not distributed with this
    15.6 +// * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    15.7 +// * 
    15.8 +// * Copyright (C) 2013, Pyravlos Team
    15.9 +// * 
   15.10 +// * http://www.strabon.di.uoa.gr/
   15.11 +// */
   15.12 +//package eu.earthobservatory.org.StrabonEndpoint.client;
   15.13 +//
   15.14 +//import static org.junit.Assert.assertTrue;
   15.15 +//
   15.16 +//import java.io.IOException;
   15.17 +//
   15.18 +//import org.junit.Before;
   15.19 +//import org.junit.Test;
   15.20 +//import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   15.21 +//
   15.22 +///**
   15.23 +// * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   15.24 +// *
   15.25 +// */
   15.26 +//
   15.27 +//public class TestSPARQLEndpointWithParliament {
   15.28 +//
   15.29 +//	private SPARQLEndpoint endpoint; 
   15.30 +//	private String query;
   15.31 +//	
   15.32 +//	@Before
   15.33 +//	public void init() {
   15.34 +//		// initialize endpoint
   15.35 +//		endpoint = new SPARQLEndpoint("luna.di.uoa.gr", 8080, "parliament/sparql");
   15.36 +//		
   15.37 +//		// set query
   15.38 +//		query = "PREFIX ex: <http://example.org/> \n" +
   15.39 +//				"SELECT ?k ?g WHERE {\n" +
   15.40 +//				" ex:pol1 ?k ?g\n" +
   15.41 +//				"}" +
   15.42 +//				"\nLIMIT 1";
   15.43 +//				
   15.44 +//	}
   15.45 +//	
   15.46 +//	/**
   15.47 +//	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   15.48 +//	 */
   15.49 +//	@Test
   15.50 +//	public void testQuery() {
   15.51 +//			try {
   15.52 +//				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.XML);
   15.53 +//				
   15.54 +//				System.out.println(response.getResponse());
   15.55 +//				
   15.56 +//				if (response.getStatusCode() != 200) {
   15.57 +//					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   15.58 +//					
   15.59 +//				}
   15.60 +//				
   15.61 +//				assertTrue(response.getStatusCode() == 200);
   15.62 +//				
   15.63 +//			} catch (IOException e) {
   15.64 +//				e.printStackTrace();
   15.65 +//			}
   15.66 +//			
   15.67 +//	}
   15.68 +//	
   15.69 +//	/**
   15.70 +//	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   15.71 +//	 * returns an IOException when it should do so.
   15.72 +//	 */
   15.73 +//	@Test(expected= IOException.class)
   15.74 +//	public void testIOException() throws Exception {
   15.75 +//		SPARQLEndpoint ep = new SPARQLEndpoint("blabla.dgr", 80, "bla");
   15.76 +//		ep.query(query, stSPARQLQueryResultFormat.XML);
   15.77 +//	}
   15.78 +//}

    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithStrabon.java	Fri May 02 17:39:27 2014 +0200
    16.3 @@ -0,0 +1,91 @@
    16.4 +/**
    16.5 + * This Source Code Form is subject to the terms of the Mozilla Public
    16.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    16.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    16.8 + * 
    16.9 + * Copyright (C) 2012, Pyravlos Team
   16.10 + * 
   16.11 + * http://www.strabon.di.uoa.gr/
   16.12 + */
   16.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   16.14 +
   16.15 +import static org.junit.Assert.assertTrue;
   16.16 +
   16.17 +import java.io.IOException;
   16.18 +import java.util.Vector;
   16.19 +
   16.20 +import org.junit.Before;
   16.21 +import org.junit.Test;
   16.22 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   16.23 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   16.24 +
   16.25 +/**
   16.26 + * @author Charalampos Nikolaou <charnik@di.uoa.gr>
   16.27 + *
   16.28 + */
   16.29 +public class TestSPARQLEndpointWithStrabon {
   16.30 +
   16.31 +	private SPARQLEndpoint endpoint; 
   16.32 +	private String query;
   16.33 +	private Vector<stSPARQLQueryResultFormat> formats = new Vector<stSPARQLQueryResultFormat>();
   16.34 +	
   16.35 +	@Before
   16.36 +	public void init() {
   16.37 +		// initialize endpoint
   16.38 +		endpoint = new SPARQLEndpoint("geo.linkedopendata.gr", 9090, "gag-endpoint/Query");
   16.39 +		
   16.40 +		// set query
   16.41 +		query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> " +
   16.42 +				"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> " +
   16.43 +				"PREFIX gag: <http://geo.linkedopendata.gr/gag/ontology/> " +
   16.44 +
   16.45 +				"SELECT ?geometry " +
   16.46 +				"WHERE {" +
   16.47 +
   16.48 +  				"	?m rdf:type gag:Δήμος . " +
   16.49 +  				"	?m rdfs:label \"ΔΗΜΟΣ ΑΘΗΝΑΙΩΝ\" . " +
   16.50 +  				"	?m gag:έχει_γεωμετρία ?geometry. " +
   16.51 +				" } "  ;
   16.52 +		
   16.53 +		// initialized formats
   16.54 +		for (TupleQueryResultFormat format : stSPARQLQueryResultFormat.values()) {
   16.55 +				if (format instanceof stSPARQLQueryResultFormat) {
   16.56 +					formats.add((stSPARQLQueryResultFormat) format);
   16.57 +				}
   16.58 +		}
   16.59 +				
   16.60 +	}
   16.61 +	
   16.62 +	/**
   16.63 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   16.64 +	 */
   16.65 +	@Test
   16.66 +	public void testQuery() {
   16.67 +		//for (stSPARQLQueryResultFormat format : formats) {
   16.68 +			try {
   16.69 +				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.XML);
   16.70 +				
   16.71 +				if (response.getStatusCode() != 200) {
   16.72 +					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   16.73 +					
   16.74 +				}
   16.75 +				
   16.76 +			//	assertTrue(response.getStatusCode() == 200);
   16.77 +
   16.78 +			} catch (IOException e) {
   16.79 +				e.printStackTrace();
   16.80 +			}
   16.81 +			
   16.82 +		//}
   16.83 +	}
   16.84 +	
   16.85 +	/**
   16.86 +	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   16.87 +	 * returns an IOException when it should do so.
   16.88 +	 */
   16.89 +	@Test(expected= IOException.class)
   16.90 +	public void testIOException() throws Exception {
   16.91 +		SPARQLEndpoint ep = new SPARQLEndpoint("blabla.dgr", 80, "bla");
   16.92 +		ep.query(query, formats.get(0));
   16.93 +	}
   16.94 +}

    17.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSPARQLEndpointWithVirtuoso.java	Fri May 02 17:39:27 2014 +0200
    17.3 @@ -0,0 +1,88 @@
    17.4 +/**
    17.5 + * This Source Code Form is subject to the terms of the Mozilla Public
    17.6 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    17.7 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    17.8 + * 
    17.9 + * Copyright (C) 2013, Pyravlos Team
   17.10 + * 
   17.11 + * http://www.strabon.di.uoa.gr/
   17.12 + */
   17.13 +package eu.earthobservatory.org.StrabonEndpoint.client;
   17.14 +
   17.15 +import static org.junit.Assert.assertTrue;
   17.16 +
   17.17 +import java.io.IOException;
   17.18 +import java.util.Vector;
   17.19 +
   17.20 +import org.junit.Before;
   17.21 +import org.junit.Test;
   17.22 +import org.openrdf.query.resultio.TupleQueryResultFormat;
   17.23 +import org.openrdf.query.resultio.stSPARQLQueryResultFormat;
   17.24 +
   17.25 +/**
   17.26 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   17.27 + *
   17.28 + */
   17.29 +
   17.30 +//Virtuso endpoint also needs to be tested for all formats included in stSPARQLQueryResultFormat
   17.31 +//because some of them are not supported
   17.32 +public class TestSPARQLEndpointWithVirtuoso {
   17.33 +
   17.34 +	private SPARQLEndpoint endpoint; 
   17.35 +	private String query;
   17.36 +	private Vector<stSPARQLQueryResultFormat> formats = new Vector<stSPARQLQueryResultFormat>();
   17.37 +	
   17.38 +	@Before
   17.39 +	public void init() {
   17.40 +		// initialize endpoint
   17.41 +		endpoint = new SPARQLEndpoint("dbpedia.org", 8890, "sparql");
   17.42 +		
   17.43 +		// set query
   17.44 +		query = "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n" +
   17.45 +				"SELECT ?x ?y WHERE {\n" +
   17.46 +				" ?x rdf:type ?y\n" +
   17.47 +				"}" +
   17.48 +				"\nLIMIT 10";
   17.49 +		
   17.50 +		// initialized formats
   17.51 +		for (TupleQueryResultFormat format : stSPARQLQueryResultFormat.values()) {
   17.52 +				if (format instanceof stSPARQLQueryResultFormat) {
   17.53 +					formats.add((stSPARQLQueryResultFormat) format);
   17.54 +				}
   17.55 +		}
   17.56 +				
   17.57 +	}
   17.58 +	
   17.59 +	/**
   17.60 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   17.61 +	 */
   17.62 +	@Test
   17.63 +	public void testQuery() {
   17.64 +			try {
   17.65 +				EndpointResult response = endpoint.query(query, stSPARQLQueryResultFormat.TSV);
   17.66 +				
   17.67 +			//	System.out.println(response.getResponse());
   17.68 +				
   17.69 +				if (response.getStatusCode() != 200) {
   17.70 +					System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   17.71 +					
   17.72 +				}
   17.73 +				
   17.74 +			//	assertTrue(response.getStatusCode() == 200);
   17.75 +				
   17.76 +			} catch (IOException e) {
   17.77 +				e.printStackTrace();
   17.78 +			}
   17.79 +			
   17.80 +	}
   17.81 +	
   17.82 +	/**
   17.83 +	 * Test method for testing that method {@link eu.earthobservatory.org.StrabonEndpoint.client.SPARQLEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   17.84 +	 * returns an IOException when it should do so.
   17.85 +	 */
   17.86 +	@Test(expected= IOException.class)
   17.87 +	public void testIOException() throws Exception {
   17.88 +		SPARQLEndpoint ep = new SPARQLEndpoint("blabla.dgr", 80, "bla");
   17.89 +		ep.query(query, formats.get(0));
   17.90 +	}
   17.91 +}

    18.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.2 +++ b/endpoint-client/src/test/java/eu/earthobservatory/org/StrabonEndpoint/client/TestSpatialEndpoint.java	Fri May 02 17:39:27 2014 +0200
    18.3 @@ -0,0 +1,82 @@
    18.4 +/* This Source Code Form is subject to the terms of the Mozilla Public
    18.5 + * License, v. 2.0. If a copy of the MPL was not distributed with this
    18.6 + * file, You can obtain one at http://mozilla.org/MPL/2.0/.
    18.7 + * 
    18.8 + * Copyright (C) 2013, Pyravlos Team
    18.9 + * 
   18.10 + * http://www.strabon.di.uoa.gr/
   18.11 + */
   18.12 +package eu.earthobservatory.org.StrabonEndpoint.client;
   18.13 +
   18.14 +import static org.junit.Assert.assertTrue;
   18.15 +
   18.16 +import java.io.IOException;
   18.17 +
   18.18 +import org.junit.Before;
   18.19 +import org.junit.Test;
   18.20 +import org.openrdf.query.QueryEvaluationException;
   18.21 +import org.openrdf.query.TupleQueryResultHandlerException;
   18.22 +import org.openrdf.query.resultio.QueryResultParseException;
   18.23 +import org.openrdf.query.resultio.UnsupportedQueryResultFormatException;
   18.24 +
   18.25 +/**
   18.26 + * @author Kallirroi Dogani <kallirroi@di.uoa.gr>
   18.27 + *
   18.28 + */
   18.29 +
   18.30 +public class TestSpatialEndpoint {
   18.31 +
   18.32 +	private SpatialEndpoint endpoint;
   18.33 +	private String query;
   18.34 +	
   18.35 +	@Before
   18.36 +	public void init() {
   18.37 +		// initialize endpoint
   18.38 +		endpoint = new SpatialEndpoint("geo.linkedopendata.gr", 9090, "corine-endpoint/Query");
   18.39 +		
   18.40 +		// set query
   18.41 +		query = "PREFIX corine: <http://geo.linkedopendata.gr/corine/ontology#> \n"+
   18.42 +				"SELECT ?geometry \n" +
   18.43 +				 "WHERE {\n " + 
   18.44 +				 "  ?area corine:hasLandUse corine:burntAreas . \n" +
   18.45 +				 "  ?area corine:hasGeometry ?geometry .  } \n" +
   18.46 +				 "LIMIT 2" ;              
   18.47 +	}
   18.48 +	
   18.49 +	/**
   18.50 +	 * Test method for {@link eu.earthobservatory.org.StrabonEndpoint.client.SpatialEndpoint#query(java.lang.String, org.openrdf.query.resultio.stSPARQLQueryResultFormat)}.
   18.51 +	 * @throws TupleQueryResultHandlerException 
   18.52 +	 */
   18.53 +	@Test
   18.54 +	public void testQuery() {
   18.55 +			try {
   18.56 +					EndpointResult response;
   18.57 +				
   18.58 +					response = endpoint.queryForKML(query); 
   18.59 +					
   18.60 +					//System.out.println("KML format:");
   18.61 +					//System.out.println(response.getResponse());
   18.62 +					
   18.63 +					if (response.getStatusCode() != 200) {
   18.64 +						System.err.println("Status code ("+response.getStatusCode()+"):" + response.getStatusText());
   18.65 +						
   18.66 +					}
   18.67 +					
   18.68 +				//	assertTrue(response.getStatusCode() == 200);	
   18.69 +				
   18.70 +				}catch (QueryResultParseException e) {
   18.71 +					e.printStackTrace();
   18.72 +				} catch (UnsupportedQueryResultFormatException e) {
   18.73 +					e.printStackTrace();
   18.74 +				}
   18.75 +				catch (TupleQueryResultHandlerException e) {
   18.76 +					e.printStackTrace();
   18.77 +				}
   18.78 +				catch (IOException e) {
   18.79 +					e.printStackTrace();
   18.80 +				} catch (QueryEvaluationException e) {
   18.81 +					e.printStackTrace();
   18.82 +				}
   18.83 +			
   18.84 +	}
   18.85 +}

    19.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.2 +++ b/endpoint-exec/pom.xml	Fri May 02 17:39:27 2014 +0200
    19.3 @@ -0,0 +1,98 @@
    19.4 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    19.5 +
    19.6 +	<modelVersion>4.0.0</modelVersion>
    19.7 +
    19.8 +	<parent>
    19.9 +		<groupId>eu.earthobservatory</groupId>
   19.10 +		<artifactId>strabon</artifactId>
   19.11 +		<version>3.2.10-SNAPSHOT</version>
   19.12 +	</parent>
   19.13 +
   19.14 +	<artifactId>strabon-endpoint-exec</artifactId>
   19.15 +
   19.16 +	<name>Strabon: Executable endpoint</name>
   19.17 +	<description>A Strabon endpoint packaged with Tomcat 7 as a single executable jar file</description>
   19.18 +	<packaging>pom</packaging>
   19.19 +
   19.20 +	<dependencies>
   19.21 +		<dependency>
   19.22 +			<groupId>eu.earthobservatory</groupId>
   19.23 +			<artifactId>strabon-endpoint</artifactId>
   19.24 +			<version>${eu.earthobservatory.version}</version>
   19.25 +			<type>war</type>
   19.26 +			<scope>compile</scope>
   19.27 +		</dependency>
   19.28 +	</dependencies>
   19.29 +
   19.30 +	<build>
   19.31 +		<plugins>
   19.32 +			<plugin>
   19.33 +				<groupId>org.apache.tomcat.maven</groupId>
   19.34 +				<artifactId>tomcat7-maven-plugin</artifactId>
   19.35 +				<version>2.0</version>
   19.36 +				<executions>
   19.37 +					<execution>
   19.38 +						<id>tomcat-run</id>
   19.39 +						<goals>
   19.40 +							<goal>exec-war-only</goal>
   19.41 +						</goals>
   19.42 +						<phase>package</phase>
   19.43 +						<configuration>
   19.44 +							<path>/</path>
   19.45 +							<uriEncoding>UTF-8</uriEncoding>
   19.46 +							<finalName>strabon-endpoint-executable-${project.version}.jar</finalName>
   19.47 +							<!-- Override the default server.xml if nessecary
   19.48 +							<serverXml>src/main/tomcatconf/server.xml</serverXml>
   19.49 +							-->
   19.50 +							<!--
   19.51 +							<extraResources>
   19.52 +								<extraResource>
   19.53 +									<directory>${basedir}/src/main/resources</directory>
   19.54 +									<includes>
   19.55 +										<include>**/log4j.xml</include>
   19.56 +									</includes>
   19.57 +								</extraResource>
   19.58 +							</extraResources>
   19.59 +							-->
   19.60 +							<warRunDependencies>
   19.61 +								<warRunDependency>
   19.62 +									<dependency>
   19.63 +										<groupId>eu.earthobservatory</groupId>
   19.64 +										<artifactId>strabon-endpoint</artifactId>
   19.65 +										<version>${eu.earthobservatory.version}</version>
   19.66 +										<type>war</type>
   19.67 +									</dependency>
   19.68 +									<contextPath>/</contextPath>
   19.69 +								</warRunDependency>
   19.70 +							</warRunDependencies>
   19.71 +							<!--
   19.72 +							<extraDependencies>
   19.73 +								<extraDependency>
   19.74 +									<groupId>org.slf4j</groupId>
   19.75 +									<artifactId>jul-to-slf4j</artifactId>
   19.76 +									<version>${slf4jVersion}</version>
   19.77 +								</extraDependency>
   19.78 +								<extraDependency>
   19.79 +									<groupId>org.slf4j</groupId>
   19.80 +									<artifactId>slf4j-api</artifactId>
   19.81 +									<version>${slf4jVersion}</version>
   19.82 +								</extraDependency>
   19.83 +								<extraDependency>
   19.84 +									<groupId>org.slf4j</groupId>
   19.85 +									<artifactId>slf4j-log4j12</artifactId>
   19.86 +									<version>${slf4jVersion}</version>
   19.87 +								</extraDependency>
   19.88 +								<extraDependency>
   19.89 +									<groupId>log4j</groupId>
   19.90 +									<artifactId>log4j</artifactId>
   19.91 +									<version>1.2.12</version>
   19.92 +								</extraDependency>	
   19.93 +							</extraDependencies>
   19.94 +							-->
   19.95 +						</configuration>
   19.96 +					</execution>
   19.97 +				</executions>
   19.98 +			</plugin>
   19.99 +		</plugins>
  19.100 +	</build>
  19.101 +</project>

    20.1 --- a/endpoint/WebContent/WEB-INF/beans.xml	Fri May 02 17:27:46 2014 +0200
    20.2 +++ b/endpoint/WebContent/WEB-INF/beans.xml	Fri May 02 17:39:27 2014 +0200
    20.3 @@ -6,6 +6,23 @@
    20.4  		xmlns:jaxws="http://cxf.apache.org/jaxws"
    20.5  		jaxws:schemaLocation="http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
    20.6  
    20.7 +	<bean id="serverProperties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
    20.8 +		<property name="locations">
    20.9 +			<list>
   20.10 +				<value>WEB-INF/connection.properties</value>
   20.11 +			</list>
   20.12 +		</property>
   20.13 +	</bean>
   20.14 +  
   20.15 +	<bean id="capsBean" class="eu.earthobservatory.org.StrabonEndpoint.capabilities.CapabilitiesDelegateBean" destroy-method="destroy">
   20.16 +		<!-- specify which implementation of the Capabilities interface shall be used -->
   20.17 +		<!-- true : AutoDiscoveryCapabilities -->
   20.18 +		<!-- false: EndpointCapabilities -->
   20.19 +		<constructor-arg type="boolean">
   20.20 +            <value>false</value>
   20.21 +        </constructor-arg>
   20.22 +	</bean>
   20.23 +	
   20.24      <bean
   20.25          id="strabonBean"
   20.26          class="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper"
   20.27 @@ -13,27 +30,27 @@
   20.28  
   20.29          <constructor-arg type="java.lang.String" >
   20.30              <!-- Database name -->
   20.31 -            <value>endpoint</value>
   20.32 +            <value>${dbname}</value>
   20.33          </constructor-arg>
   20.34  
   20.35          <constructor-arg type="java.lang.String" >
   20.36              <!-- Username -->
   20.37 -            <value>postgres</value>
   20.38 +            <value>${username}</value>
   20.39          </constructor-arg>
   20.40  
   20.41          <constructor-arg type="java.lang.String" >
   20.42              <!-- Password -->
   20.43 -	    <value>postgres</value>
   20.44 +	    <value>${password}</value>
   20.45          </constructor-arg>
   20.46  
   20.47          <constructor-arg type="int" >
   20.48              <!-- Port -->
   20.49 -            <value>5432</value>
   20.50 +            <value>${port}</value>
   20.51          </constructor-arg>
   20.52  
   20.53          <constructor-arg type="java.lang.String" >
   20.54              <!-- Database server -->
   20.55 -            <value>localhost</value>
   20.56 +            <value>${hostname}</value>
   20.57          </constructor-arg>
   20.58  
   20.59          <constructor-arg type="boolean" >
   20.60 @@ -43,317 +60,212 @@
   20.61  
   20.62          <constructor-arg type="java.lang.String" >
   20.63              <!-- Database Backend (either "postgis" or "monetdb") -->
   20.64 -            <value>postgis</value>
   20.65 +            <value>${dbengine}</value>
   20.66          </constructor-arg>
   20.67          
   20.68 -         <constructor-arg>
   20.69 +        <constructor-arg type="int" >
   20.70 +            <!-- Query limit -->
   20.71 +            <value>0</value>
   20.72 +        </constructor-arg>
   20.73 +        
   20.74 +        <constructor-arg type="boolean" >
   20.75 +            <!-- Load from File -->
   20.76 +            <value>true</value>
   20.77 +        </constructor-arg>
   20.78 +     
   20.79 +     	<!-- Boolean variable linkURL in stSPARQLResultsHTMLWriter.java (line 115) to change the links between web and describe -->
   20.80 +        
   20.81 +        <constructor-arg type="java.lang.String" >
   20.82 +            <!-- Default prefixes -->
   20.83 +            <!-- PREFIX gag: <http://teleios.di.uoa.gr/ontologies/gagKallikratis.rdf#> -->
   20.84 +            <value><![CDATA[PREFIX lgd:<http://linkedgeodata.org/triplify/>
   20.85 +PREFIX lgdgeo:<http://www.w3.org/2003/01/geo/wgs84_pos#>
   20.86 +PREFIX lgdont:<http://linkedgeodata.org/ontology/>
   20.87 +PREFIX geonames:<http://www.geonames.org/ontology#>
   20.88 +PREFIX clc: <http://geo.linkedopendata.gr/corine/ontology#>
   20.89 +PREFIX gag: <http://geo.linkedopendata.gr/greekadministrativeregion/ontology#>
   20.90 +PREFIX geo: <http://www.opengis.net/ont/geosparql#>
   20.91 +PREFIX geof: <http://www.opengis.net/def/function/geosparql/>
   20.92 +PREFIX geor: <http://www.opengis.net/def/rule/geosparql/>
   20.93 +PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
   20.94 +PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
   20.95 +PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
   20.96 +PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
   20.97 +]]>
   20.98 +</value>
   20.99 +        </constructor-arg>
  20.100 +        
  20.101 +        <constructor-arg>
  20.102               <list>
  20.103 -	             <list>
  20.104 +             	<list>
  20.105 +             		<!-- Single valued elements correspond to headers -->
  20.106 +					<value>Discovery Queries</value>
  20.107 +	            </list>
  20.108 +				<list>
  20.109  	                 <!-- Bean -->
  20.110  	                <value>Query</value> 
  20.111  	                <!-- Format -->
  20.112  	                <value>HTML</value>   
  20.113  	                <!-- Label -->
  20.114 -	                <value>Query 1: Discover raw data and products</value> 
  20.115 +	                <value>Find all triples in the dataset.</value> 
  20.116  	                <!-- Statement -->
  20.117 -	                <value><![CDATA[# Discovering raw data and products
  20.118 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.119 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.120 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.121 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.122 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.123 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.124 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.125 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.126 -PREFIX georss: <http://www.georss.org/georss/>
  20.127 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.128 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
  20.129 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.130 -
  20.131 -SELECT ?filename
  20.132 -WHERE {?file rdf:type noa:ShpFile ;
  20.133 -	         noa:hasFilename ?filename ;
  20.134 -	         noa:hasAcquisitionTime ?sensingTime .
  20.135 -	 FILTER( str(?sensingTime) >= "2007-08-26T12:00:00" ) .
  20.136 -	 FILTER( str(?sensingTime) <= "2007-08-26T12:30:00" ) .
  20.137 -	 ?file noa:isDerivedFromSensor ?sensor .
  20.138 -	 FILTER( str(?sensor) = "MSG2" ) .
  20.139 -	 ?file noa:producedFromProcessingChain ?chain .
  20.140 -	 FILTER( str(?chain) = "StaticThresholds" ) . 
  20.141 -}]]></value>
  20.142 -<value>Find all shapefiles derived from sensor MSG2 between [2007-08-26T12:00:00,2007-08-26T12:30:00], using dynamic thresholds.</value>
  20.143 +	                <value><![CDATA[
  20.144 +SELECT *
  20.145 +WHERE { 
  20.146 +	?s ?p ?o	
  20.147 +}
  20.148 +]]></value>
  20.149 +	                <!-- Description -->
  20.150 +					<value></value>
  20.151 +					<!-- Hander (plain, download, map or map_local)-->
  20.152 +					<value>Plain</value>
  20.153  	            </list>
  20.154  	            <list>
  20.155 -	                <!-- Bean -->
  20.156 +	                 <!-- Bean -->
  20.157  	                <value>Query</value> 
  20.158  	                <!-- Format -->
  20.159 -	                <value>KMZMAP</value>
  20.160 +	                <value>HTML</value>   
  20.161  	                <!-- Label -->
  20.162 -	                <value>Query 2: Discover Hotspots</value> 
  20.163 +	                <value>Select all distinct subjects that appear in the dataset.</value> 
  20.164  	                <!-- Statement -->
  20.165 -	                <value><![CDATA[# Get all hotspots 
  20.166 -# - in Pelloponesus 
  20.167 -# - at 2007-08-24
  20.168 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.169 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.170 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.171 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.172 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.173 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.174 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.175 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.176 -PREFIX georss: <http://www.georss.org/georss/>
  20.177 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.178 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
  20.179 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.180 +	                <value><![CDATA[
  20.181 +SELECT DISTINCT (?s AS ?subject)
  20.182 +WHERE { 
  20.183 +	?s ?p ?o
  20.184 +}
  20.185 +]]></value>
  20.186 +	                <!-- Description -->
  20.187 +					<value></value>
  20.188 +					<!-- Hander (plain, download, map or map_local)-->
  20.189 +					<value>Plain</value>
  20.190 +	            </list>
  20.191 +	            <list>
  20.192 +	                 <!-- Bean -->
  20.193 +	                <value>Query</value> 
  20.194 +	                <!-- Format -->
  20.195 +	                <value>HTML</value>   
  20.196 +	                <!-- Label -->
  20.197 +	                <value>Select all distinct predicates that appear in the dataset.</value> 
  20.198 +	                <!-- Statement -->
  20.199 +	                <value><![CDATA[
  20.200 +SELECT DISTINCT (?p AS ?predicate)
  20.201 +WHERE { 
  20.202 +	?s ?p ?o
  20.203 +}
  20.204 +]]></value>
  20.205 +	                <!-- Description -->
  20.206 +					<value></value>
  20.207 +					<!-- Hander (plain, download, map or map_local)-->
  20.208 +					<value>Plain</value>
  20.209 +	            </list>
  20.210 +	            
  20.211 +	            <list>
  20.212 +	                 <!-- Bean -->
  20.213 +	                <value>Query</value> 
  20.214 +	                <!-- Format -->
  20.215 +	                <value>HTML</value>   
  20.216 +	                <!-- Label -->
  20.217 +	                <value>Select all distinct objets that appear in the dataset.</value> 
  20.218 +	                <!-- Statement -->
  20.219 +	                <value><![CDATA[
  20.220 +SELECT DISTINCT (?o AS ?object)
  20.221 +WHERE { 
  20.222 +	?s ?p ?o	
  20.223 +}
  20.224 +]]></value>
  20.225 +	                <!-- Description -->
  20.226 +					<value></value>
  20.227 +					<!-- Hander (plain, download, map or map_local)-->
  20.228 +					<value>Plain</value>
  20.229 +	            </list>
  20.230 +	            <list>
  20.231 +	                 <!-- Bean -->
  20.232 +	                <value>Query</value> 
  20.233 +	                <!-- Format -->
  20.234 +	                <value>HTML</value>   
  20.235 +	                <!-- Label -->
  20.236 +	                <value>Find all distinct classes of the dataset.</value> 
  20.237 +	                <!-- Statement -->
  20.238 +	                <value><![CDATA[PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>	                
  20.239  
  20.240 -SELECT ?h ?hAcqTime ?hConfidence ?hConfirmation ?hProvider ?hSensor ?hSatellite (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 
  20.241 -WHERE { ?h 	rdf:type noa:Hotspot;
  20.242 -			noa:hasGeometry ?hGeo;
  20.243 -			noa:hasAcquisitionTime ?hAcqTime;
  20.244 -			noa:hasConfidence ?hConfidence;
  20.245 -			noa:isProducedBy ?hProvider;
  20.246 -			noa:hasConfirmation ?hConfirmation;
  20.247 -			noa:isDerivedFromSensor ?hSensor;
  20.248 -			noa:isDerivedFromSatellite ?hSatellite ;
  20.249 -			noa:producedFromProcessingChain ?hChain .
  20.250 -	FILTER(str(?hChain) = "StaticThresholds").
  20.251 -	FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) .
  20.252 -	FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 
  20.253 -}]]></value>
  20.254 -<value>Find all hotspots in Pelloponesus derived from the dynamic thresholds processing chain at 2007-08-24T14:45:00.  </value>
  20.255 +SELECT DISTINCT (?o AS ?class)
  20.256 +WHERE { 
  20.257 +	?s rdf:type ?o
  20.258 +}
  20.259 +]]></value>
  20.260 +	                <!-- Description -->
  20.261 +					<value></value>
  20.262 +					<!-- Hander (plain, download, map or map_local)-->
  20.263 +					<value>Plain</value>
  20.264 +	            </list>
  20.265 +	            
  20.266 +	        	<list>
  20.267 +	                 <!-- Bean -->
  20.268 +	                <value>Query</value> 
  20.269 +	                <!-- Format -->
  20.270 +	                <value>HTML</value>   
  20.271 +	                <!-- Label -->
  20.272 +	                <value>Find the number of triples that appear in the dataset.</value> 
  20.273 +	                <!-- Statement -->
  20.274 +	                <value><![CDATA[SELECT (COUNT(?s) AS ?NumOfTriples)
  20.275 +WHERE { 
  20.276 +	?s ?p ?o
  20.277 +}
  20.278 +]]></value>
  20.279 +	                <!-- Description -->
  20.280 +					<value></value>
  20.281 +					<!-- Hander (plain, download, map or map_local)-->
  20.282 +					<value>Plain</value>
  20.283 +	            </list>
  20.284 +	            <list>
  20.285 +	                 <!-- Bean -->
  20.286 +	                <value>Query</value> 
  20.287 +	                <!-- Format -->
  20.288 +	                <value>HTML</value>   
  20.289 +	                <!-- Label -->
  20.290 +	                <value>Present the first ten triples of the dataset.</value> 
  20.291 +	                <!-- Statement -->
  20.292 +	                <value><![CDATA[SELECT *
  20.293 +WHERE { 
  20.294 +	?s ?p ?o
  20.295 +}
  20.296 +LIMIT 10
  20.297 +]]></value>
  20.298 +	                <!-- Description -->
  20.299 +					<value></value>
  20.300 +					<!-- Hander (plain, download, map or map_local)-->
  20.301 +					<value>Plain</value>
  20.302 +	            </list>      
  20.303 +
  20.304 +				<list>
  20.305 +             		<!-- Single valued elements correspond to headers -->
  20.306 +					<value>Explore/Modify operations</value>
  20.307 +	            </list>
  20.308 +	            <list>
  20.309 +             		<!-- Link to bean: two arguemnts -->
  20.310 +					<value>Store</value>
  20.311 +					<value>store.jsp</value>
  20.312 +	            </list>
  20.313 +	            <list>
  20.314 +             		<!-- Link to bean: two arguemnts -->
  20.315 +					<value>Query/Update</value>
  20.316 +					<value>query.jsp</value>
  20.317 +	            </list>
  20.318 +	            <list>
  20.319 +             		<!-- Link to bean: two arguemnts -->
  20.320 +					<value>Describe</value>
  20.321 +					<value>describe.jsp</value>
  20.322 +	            </list>
  20.323 +	            <list>
  20.324 +             		<!-- Link to bean: two arguemnts -->
  20.325 +					<value>Browse</value>
  20.326 +					<value>browse.jsp</value>
  20.327  	            </list>
  20.328  				<list>
  20.329 -	                <!-- Bean -->
  20.330 -	                 <value>Update</value>
  20.331 -	                <!-- Format -->
  20.332 -	                <value>HTML</value>
  20.333 -	                <!-- Label -->
  20.334 -	                <value>Update A: Invalidate hotspots in sea</value> 
  20.335 -	                <!-- Statement -->
  20.336 -	                <value><![CDATA[# Delete hotspots that lie in sea
  20.337 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.338 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.339 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.340 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.341 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.342 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.343 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.344 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.345 -PREFIX georss: <http://www.georss.org/georss/>
  20.346 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.347 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
  20.348 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.349 -DELETE {?h ?property ?object}
  20.350 -WHERE { ?h 	rdf:type noa:Hotspot;
  20.351 -            noa:hasAcquisitionTime ?hAcqTime;
  20.352 -            noa:producedFromProcessingChain ?hChain;
  20.353 -            noa:hasGeometry ?hGeo;
  20.354 -            ?property ?object.
  20.355 -        FILTER(str(?hChain) = "StaticThresholds").
  20.356 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)).
  20.357 -        FILTER("2007-08-24T14:45:00"^^xsd:dateTime = ?hAcqTime).
  20.358 -        OPTIONAL {
  20.359 -            ?c rdf:type noa:Coastline;
  20.360 -               noa:hasGeometry ?cGeo.
  20.361 -            FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?cGeo)).
  20.362 -            FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
  20.363 -        }
  20.364 -        FILTER(!bound(?c)). 
  20.365 -}]]></value>
  20.366 -<value>Mark as invalid all hotspots produced by the static thresholds processing chain and are acquired at 2007-08-24T14:45:00 which are located in the sea</value>
  20.367 -	            </list>
  20.368 -	            <list>
  20.369 -	                <!-- Bean -->
  20.370 -	                <value>Update</value> 
  20.371 -	                <!-- Format -->
  20.372 -	                <value>HTML</value>
  20.373 -	                <!-- Label -->
  20.374 -	                <value>Update B: Refine hotspots in sea</value>
  20.375 -	                <!-- Statement -->
  20.376 -	                <value><![CDATA[# Refine the geometry of hotspots that partially lie in sea
  20.377 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#> 
  20.378 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> 
  20.379 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#> 
  20.380 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#> 
  20.381 -
  20.382 -
  20.383 -INSERT { ?h noa:isDiscarded "1"^^xsd:int . 
  20.384 -	 ?valid rdf:type noa:Hotspot ;
  20.385 -		noa:hasConfidence ?conf ;
  20.386 -	        noa:hasGeometry ?dif ;
  20.387 -		noa:hasAcquisitionTime "TIMESTAMP"^^xsd:dateTime ; 
  20.388 -	        noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
  20.389 -		noa:hasConfirmation noa:unknown ;
  20.390 -	        noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
  20.391 -		noa:isProducedBy noa:noa ;
  20.392 -		noa:isDerivedFromSatellite ?sat .
  20.393 -}
  20.394 -WHERE { 
  20.395 -  SELECT DISTINCT ?h ?hGeo (strdf:intersection(?hGeo, strdf:union(?cGeo)) AS ?dif) (BNODE() AS ?valid) ?conf ?sat
  20.396 -  WHERE { 
  20.397 -    ?h rdf:type noa:Hotspot ; 
  20.398 -       noa:hasAcquisitionTime ?hAcqTime ; 
  20.399 -       noa:producedFromProcessingChain "PROCESSING_CHAIN"^^xsd:string ; 
  20.400 -       noa:isDerivedFromSensor "SENSOR"^^xsd:string ;
  20.401 -       noa:hasGeometry ?hGeo ;
  20.402 -       noa:hasConfidence ?conf ;
  20.403 -       noa:isDerivedFromSatellite ?sat .
  20.404 -    FILTER("TIMESTAMP"^^xsd:dateTime = ?hAcqTime) .
  20.405 -    ?c rdf:type noa:Coastline ;
  20.406 -       noa:hasGeometry ?cGeo .
  20.407 -    FILTER(strdf:anyInteract(?hGeo, ?cGeo)) . 
  20.408 -  }
  20.409 -  GROUP BY ?h ?hGeo ?conf ?sat
  20.410 -  HAVING strdf:overlap(?hGeo, strdf:union(?cGeo))
  20.411 -}
  20.412 -]]></value>
  20.413 -	      <value>Refine hotspots acquired at 2007-08-24T14:45:00 removing the part that lies in the sea. </value>
  20.414 -	            </list>
  20.415 -	            <list>
  20.416 -	                <!-- Bean -->
  20.417 -	                <value>Query</value> 
  20.418 -	                <!-- Format -->
  20.419 -	                <value>KMZMAP</value>
  20.420 -	                <!-- Label -->
  20.421 -	                <value>Query 3: Discover coniferous forests</value> 
  20.422 -	                <!-- Statement -->
  20.423 -	                <value><![CDATA[#Get all coniferous forests in Peloponnese
  20.424 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.425 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.426 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.427 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.428 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.429 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.430 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.431 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.432 -PREFIX georss: <http://www.georss.org/georss/>
  20.433 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.434 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
  20.435 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.436 -
  20.437 -SELECT ?a ?aGeo
  20.438 -WHERE{ ?a rdf:type clc:Area;
  20.439 -          clc:hasLandUse ?aLandUse;
  20.440 -          noa:hasGeometry ?aGeo.
  20.441 -       ?aLandUse rdf:type ?aLandUseType.
  20.442 -       FILTER(?aLandUseType = clc:ConiferousForest).
  20.443 -       FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 
  20.444 -}]]></value>
  20.445 -<value>Discover all coniferous forests using the clc ontology </value>
  20.446 -	            </list>
  20.447 -	            <list>
  20.448 -	                <!-- Bean -->
  20.449 -	                <value>Query</value> 
  20.450 -	                <!-- Format -->
  20.451 -	                <value>KMZMAP</value>
  20.452 -	                <!-- Label -->
  20.453 -	                <value>Query 4: Discover primary roads</value> 
  20.454 -	                <!-- Statement -->
  20.455 -	                <value><![CDATA[# Get all municipalities of Pelloponnese
  20.456 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.457 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.458 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.459 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.460 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.461 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.462 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.463 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.464 -PREFIX georss: <http://www.georss.org/georss/>
  20.465 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.466 -PREFIX lgdo: <http://linkedgeodata.org/lontology/>
  20.467 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.468 -
  20.469 -SELECT  ?d ?dGeo
  20.470 -WHERE { ?d rdf:type gag:Dhmos; 
  20.471 -           strdf:hasGeometry ?dGeo; 
  20.472 -           rdfs:label ?dLabel. 
  20.473 -           FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?dGeo)). 
  20.474 -}]]></value>
  20.475 -<value>Find all municipalities of Pelloponnese using kallikratis ontology </value>
  20.476 -	            </list>
  20.477 -	            <list>
  20.478 -	                <!-- Bean -->
  20.479 -	                <value>Query</value> 
  20.480 -	                <!-- Format -->
  20.481 -	                <value>KMZMAP</value>
  20.482 -	                <!-- Label -->
  20.483 -	                <value>Query 5: Get all primary roads in Pelloponnese</value> 
  20.484 -	                <!-- Statement -->
  20.485 -	                <value><![CDATA[# Get all primary roads in Pelloponnese
  20.486 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.487 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.488 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.489 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.490 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.491 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.492 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.493 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.494 -PREFIX georss: <http://www.georss.org/georss/>
  20.495 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.496 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
  20.497 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.498 -
  20.499 -SELECT  ?r ?rGeo
  20.500 -WHERE { ?r rdf:type ?rType ;
  20.501 -           noa:hasGeometry ?rGeo .
  20.502 -        FILTER(?rType = lgdo:Primary) .
  20.503 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05,21.027 38.36))"^^strdf:WKT, ?rGeo) ). 
  20.504 -}]]></value>
  20.505 -<value>Get all primary roads in Pelloponnese using the linked geodata ontology </value>
  20.506 -	            </list>
  20.507 -	            <list>
  20.508 -	                <!-- Bean -->
  20.509 -	                <value>Query</value> 
  20.510 -	                <!-- Format -->
  20.511 -	                <value>KMZMAP</value>
  20.512 -	                <!-- Label -->
  20.513 -	                <value>Query 6: Discover hotspots</value> 
  20.514 -	                <!-- Statement -->
  20.515 -	                <value><![CDATA[# Get all hotspots 
  20.516 -# - in Pelloponesus 
  20.517 -# - at 2007-08-24
  20.518 -PREFIX noa: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.519 -PREFIX clc: <http://teleios.di.uoa.gr/ontologies/clcOntology.owl#>
  20.520 -PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
  20.521 -PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
  20.522 -PREFIX strdf: <http://strdf.di.uoa.gr/ontology#>
  20.523 -PREFIX teleios: <http://teleios.di.uoa.gr/ontologies/noaOntology.owl#>
  20.524 -PREFIX gag: <http://www.semanticweb.org/ontologies/2011/gagKallikratis.rdf#>
  20.525 -PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>
  20.526 -PREFIX georss: <http://www.georss.org/georss/>
  20.527 -PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
  20.528 -PREFIX lgdo: <http://linkedgeodata.org/ontology/>
  20.529 -PREFIX gn: <http://www.geonames.org/ontology#>
  20.530 -
  20.531 -SELECT  ?h ?hAcqTime (strdf:transform(?hGeo, <http://www.opengis.net/def/crs/EPSG/0/4326>) as ?geo) 
  20.532 -WHERE { ?h 	rdf:type noa:Hotspot;
  20.533 -            noa:hasGeometry ?hGeo;
  20.534 -            noa:hasAcquisitionTime ?hAcqTime;
  20.535 -            noa:producedFromProcessingChain ?hChain .
  20.536 -        FILTER(str(?hChain) = "StaticThresholds").
  20.537 -        FILTER(?hAcqTime = "2007-08-24T14:45:00"^^xsd:dateTime) .
  20.538 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^ strdf:WKT, ?hGeo)) . 
  20.539 -        ?a rdf:type clc:Area;
  20.540 -           clc:hasLandUse ?aLandUse;
  20.541 -           noa:hasGeometry ?aGeo.
  20.542 -        ?aLandUse rdf:type ?aLandUseType.
  20.543 -        FILTER(?aLandUseType = clc:Forest).
  20.544 -        FILTER(strdf:contains("POLYGON((21.027 38.36, 23.77 38.36, 23.77 36.05, 21.027 36.05, 21.027 38.36))"^^strdf:WKT,?aGeo)). 
  20.545 -        FILTER(strdf:overlap(?aGeo, ?hGeo)) . 
  20.546 -}]]></value>
  20.547 -<value>Find all hotspots located in Pelloponnesian forests and acquired at 2007-08-24T14:45:00 using static thresholds processing chain </value>
  20.548 -	            </list>
  20.549 -<!-- 	            <list> -->
  20.550 -<!-- 	                Bean -->
  20.551 -<!-- 	                <value>Query</value>  -->
  20.552 -<!-- 	                Format -->
  20.553 -<!-- 	                <value>KMZMAP</value> -->
  20.554 -<!-- 	                Label -->
  20.555 -<!-- 	                <value></value>  -->
  20.556 -<!-- 	                Statement -->
  20.557 -<!-- 	                <value></value> -->
  20.558 -<!-- 	            </list> -->
  20.559 +					<!-- Link to bean: two arguemnts -->
  20.560 +					<value>Configuration</value>
  20.561 +					<value>connection.jsp</value>
  20.562 +				</list>
  20.563              </list>
  20.564           </constructor-arg>
  20.565      </bean>

    21.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.2 +++ b/endpoint/WebContent/WEB-INF/connection.properties	Fri May 02 17:39:27 2014 +0200
    21.3 @@ -0,0 +1,6 @@
    21.4 +hostname=localhost
    21.5 +port=5432
    21.6 +dbengine=postgis
    21.7 +password=postgres
    21.8 +dbname=endpoint
    21.9 +username=postgres

    22.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.2 +++ b/endpoint/WebContent/WEB-INF/credentials.properties	Fri May 02 17:39:27 2014 +0200
    22.3 @@ -0,0 +1,2 @@
    22.4 +username=endpoint
    22.5 +password=3ndpo1nt
    22.6 \ No newline at end of file

    23.1 --- a/endpoint/WebContent/WEB-INF/web.xml	Fri May 02 17:27:46 2014 +0200
    23.2 +++ b/endpoint/WebContent/WEB-INF/web.xml	Fri May 02 17:39:27 2014 +0200
    23.3 @@ -4,6 +4,22 @@
    23.4  	xmlns:base="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
    23.5  	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    23.6  	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
    23.7 +
    23.8 +	<!-- Uncomment the following lines to enable ip filtering--> 
    23.9 +	<!-- 
   23.10 +	<filter>
   23.11 +		<filter-name>Remote Address Filter</filter-name>
   23.12 +		<filter-class>org.apache.catalina.filters.RemoteAddrFilter</filter-class>
   23.13 +		<init-param> 
   23.14 +			<param-name>allow</param-name>
   23.15 +			<param-value>(195\.134\.(67|71)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(88\.197\.4[4-7]\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(195\.134\.105\.([01]?[0-9][0-9]?))</param-value> 
   23.16 +		</init-param>
   23.17 +	</filter>
   23.18 +	<filter-mapping>
   23.19 +		<filter-name>Remote Address Filter</filter-name>
   23.20 +		<url-pattern>/*</url-pattern>
   23.21 +	</filter-mapping>       
   23.22 +	-->
   23.23  	
   23.24  	<display-name>StrabonEndpoint</display-name>
   23.25  	<context-param>
   23.26 @@ -47,7 +63,7 @@
   23.27  		<url-pattern>/Update</url-pattern>
   23.28  	</servlet-mapping>
   23.29  
   23.30 -        <servlet>
   23.31 +    <servlet>
   23.32  		<display-name>Describe</display-name>
   23.33  		<servlet-name>Describe</servlet-name>
   23.34  		<servlet-class>eu.earthobservatory.org.StrabonEndpoint.DescribeBean</servlet-class>
   23.35 @@ -59,6 +75,50 @@
   23.36  	</servlet-mapping>
   23.37  	
   23.38  	<servlet>
   23.39 +		<display-name>DBConnect</display-name>
   23.40 +		<servlet-name>DBConnect</servlet-name>
   23.41 +		<servlet-class>eu.earthobservatory.org.StrabonEndpoint.ConnectionBean</servlet-class>
   23.42 +		<load-on-startup>1</load-on-startup>
   23.43 +	</servlet>
   23.44 +	<servlet-mapping>
   23.45 +		<servlet-name>DBConnect</servlet-name>
   23.46 +		<url-pattern>/DBConnect</url-pattern>
   23.47 +	</servlet-mapping>
   23.48 +	
   23.49 +	<servlet>
   23.50 +		<display-name>ChangeConnection</display-name>
   23.51 +		<servlet-name>ChangeConnection</servlet-name>
   23.52 +		<servlet-class>eu.earthobservatory.org.StrabonEndpoint.ChangeConnectionBean</servlet-class>
   23.53 +		<load-on-startup>1</load-on-startup>
   23.54 +	</servlet>
   23.55 +	<servlet-mapping>
   23.56 +		<servlet-name>ChangeConnection</servlet-name>
   23.57 +		<url-pattern>/ChangeConnection</url-pattern>
   23.58 +	</servlet-mapping>
   23.59 +	
   23.60 +	<servlet>
   23.61 +		<display-name>Browse</display-name>
   23.62 +		<servlet-name>Browse</servlet-name>
   23.63 +		<servlet-class>eu.earthobservatory.org.StrabonEndpoint.BrowseBean</servlet-class>
   23.64 +		<load-on-startup>1</load-on-startup>
   23.65 +	</servlet>
   23.66 +	<servlet-mapping>
   23.67 +		<servlet-name>Browse</servlet-name>
   23.68 +		<url-pattern>/Browse</url-pattern>
   23.69 +	</servlet-mapping>
   23.70 +	
   23.71 +	<servlet>
   23.72 +		<display-name>Capabilities</display-name>
   23.73 +		<servlet-name>Capabilities</servlet-name>
   23.74 +		<servlet-class>eu.earthobservatory.org.StrabonEndpoint.capabilities.CapabilitiesBean</servlet-class>
   23.75 +		<load-on-startup>1</load-on-startup>
   23.76 +	</servlet>
   23.77 +	<servlet-mapping>
   23.78 +		<servlet-name>Capabilities</servlet-name>
   23.79 +		<url-pattern>/Capabilities</url-pattern>
   23.80 +	</servlet-mapping>
   23.81 +	
   23.82 +	<servlet>
   23.83  		<servlet-name>query.jsp</servlet-name>
   23.84  		<jsp-file>/query.jsp</jsp-file>
   23.85  	</servlet>
   23.86 @@ -73,6 +133,16 @@
   23.87  		<jsp-file>/describe.jsp</jsp-file>
   23.88  	</servlet>
   23.89   
   23.90 + 	<servlet>
   23.91 +		<servlet-name>connection.jsp</servlet-name>
   23.92 +		<jsp-file>/connection.jsp</jsp-file>
   23.93 +	</servlet>
   23.94 +	
   23.95 +	<servlet>
   23.96 +		<servlet-name>browse.jsp</servlet-name>
   23.97 +		<jsp-file>/browse.jsp</jsp-file>
   23.98 +	</servlet>
   23.99 +	
  23.100     	<mime-mapping>
  23.101         	<extension>kml</extension>
  23.102         	<mime-type>application/vnd.google-earth.kml+xml</mime-type>

    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/endpoint/WebContent/browse.jsp	Fri May 02 17:39:27 2014 +0200
    24.3 @@ -0,0 +1,86 @@
    24.4 +<%@page import="java.net.URLDecoder"%>
    24.5 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
    24.6 +<%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
    24.7 +<%@page import="org.springframework.web.context.WebApplicationContext"%>
    24.8 +<%@page import="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper"%>
    24.9 +<%@page import="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapperConfiguration"%>
   24.10 +<%@page import="java.util.List"%>
   24.11 +<%@page import="java.util.Iterator"%>
   24.12 +<jsp:directive.page import="eu.earthobservatory.org.StrabonEndpoint.Common"/>
   24.13 +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
   24.14 +<html>
   24.15 +<head>
   24.16 +	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
   24.17 +	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   24.18 +	<link rel="stylesheet" href="style.css" type="text/css" />
   24.19 +	<script type="text/javascript" src="js/more_link.js"></script>	
   24.20 +	<title>TELEIOS: Strabon Endpoint</title>
   24.21 +	<script>
   24.22 +		$(document).ready(function() {
   24.23 +		var showChar = 100;
   24.24 +		var ellipsestext = "...";
   24.25 +		var moretext = "more";
   24.26 +		var lesstext = "less";
   24.27 +		$('.more').each(function() {
   24.28 +			var content = $(this).html();
   24.29 +	
   24.30 +			if(content.length > showChar) {
   24.31 +	
   24.32 +				var c = content.substr(0, showChar);
   24.33 +				var h = content.substr(showChar-1, content.length - showChar);
   24.34 +	
   24.35 +				var html = c + '<span class="moreelipses">'+ellipsestext+'</span>&nbsp;<span class="morecontent"><span>' + h + '</span>&nbsp;&nbsp;<a href="" class="morelink">'+moretext+'</a></span>';
   24.36 +	
   24.37 +				$(this).html(html);
   24.38 +			}
   24.39 +	
   24.40 +		});
   24.41 +	
   24.42 +		$(".morelink").click(function(){
   24.43 +			if($(this).hasClass("less")) {
   24.44 +				$(this).removeClass("less");
   24.45 +				$(this).html(moretext);
   24.46 +			} else {
   24.47 +				$(this).addClass("less");
   24.48 +				$(this).html(lesstext);
   24.49 +			}
   24.50 +			$(this).parent().prev().toggle();
   24.51 +			$(this).prev().toggle();
   24.52 +			return false;
   24.53 +		});
   24.54 +	});
   24.55 +</script>
   24.56 +</head>
   24.57 +<body topmargin="0" leftmargin="0" link="#FFFFFF" vlink="#FFFFFF" alink="#FFFFFF">
   24.58 +<TABLE width="80%" BORDER=0 CELLPADDING=0 CELLSPACING=0>  
   24.59 +	<TR>
   24.60 +      <TD height="1"></TD>
   24.61 +	</TR>		
   24.62 +	<TR>
   24.63 +      <TD height="60" background="images/nav2_bg.gif"> 
   24.64 +        <table width="100%" border=0>
   24.65 +         <tr>
   24.66 +            <td width="1"><img src="images/nav2_bg.gif" width="1" height="60"></td>
   24.67 +            <td valign="top" width="50px"><a href="query.jsp"><img border="0" src="images/teleios_logo.png" /></a></td>
   24.68 +            <td valign="top" align="left">
   24.69 +            <span class="logo"><a href="query.jsp">&nbsp;stSPARQL Endpoint</a></span><br><span class="style4"></span></td>
   24.70 +          </tr>
   24.71 +        </table>
   24.72 +      </TD>
   24.73 +	</TR>
   24.74 +</TABLE>
   24.75 +	<h1>About: </h1>	
   24.76 +	<a href="#"><%=URLDecoder.decode(request.getAttribute("resource").toString(), "UTF-8")%></a>
   24.77 +	<div id="response">
   24.78 +		<!-- Response -->	
   24.79 +		<% if (request.getAttribute("response") != null) {
   24.80 +			if (Common.getHTMLFormat().equals(request.getParameter("format"))) {%>
   24.81 +				<%=request.getAttribute("response")%>
   24.82 +			<%} else { %>
   24.83 +			<PRE><%=request.getAttribute("response") %></PRE>
   24.84 +			<%}%>
   24.85 +		<%}%>
   24.86 +	</div>
   24.87 +</body>
   24.88 +
   24.89 +</html>
   24.90 \ No newline at end of file

    25.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.2 +++ b/endpoint/WebContent/connection.jsp	Fri May 02 17:39:27 2014 +0200
    25.3 @@ -0,0 +1,107 @@
    25.4 +<jsp:directive.page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"/>
    25.5 +<jsp:directive.page import="eu.earthobservatory.org.StrabonEndpoint.Common"/>
    25.6 +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
    25.7 +<html>
    25.8 +	<head>
    25.9 +		<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
   25.10 +		<link rel="stylesheet" href="style.css" type="text/css" />
   25.11 +		 
   25.12 +		<script type="text/javascript">
   25.13 +			function toggleMe(a) {
   25.14 +				var e = document.getElementById(a);
   25.15 +				if (!e) {
   25.16 +					return true;
   25.17 +				}
   25.18 +				if (e.style.display == "none") {
   25.19 +					e.style.display = "block";
   25.20 +				} else {
   25.21 +					e.style.display = "none";
   25.22 +				}
   25.23 +				return true;
   25.24 +			}
   25.25 +		</script>
   25.26 +		
   25.27 +		<style type="text/css">
   25.28 +		/*demo page css*/
   25.29 +		body{ font: 90% "Trebuchet MS", sans-serif; margin: 50px;}
   25.30 +		.container { height:410px; width:165px;}
   25.31 +		.demoHeaders { margin-top: 1em;}
   25.32 +		#dialog_link {padding: .4em 1em .4em 20px;text-decoration: none;position: relative;}
   25.33 +		#dialog_link span.ui-icon {margin: 0 5px 0 0;position: absolute;left: .2em;top: 50%;margin-top: -8px;}
   25.34 +		ul#icons {margin: 0; padding: 0;}
   25.35 +		ul#icons li {margin: 1px; position: relative; padding: 1px 0; cursor: pointer; float: left;  list-style: none;}
   25.36 +		ul#icons span.ui-icon {float: left; margin: 0 1px;}
   25.37 +		</style>
   25.38 +		<title>Strabon Endpoint</title>
   25.39 +	</head>
   25.40 +<body topmargin="0" leftmargin="0" link="#FFFFFF" vlink="#FFFFFF" alink="#FFFFFF">
   25.41 +
   25.42 +<!-- include TELEIOS header and description -->
   25.43 +<jsp:include page="header.html"/>
   25.44 +<!-- include TELEIOS header and description -->
   25.45 +
   25.46 +<FORM method=POST enctype="UTF-8" accept-charset="UTF-8" action="DBConnect">
   25.47 +<input type="hidden" name="query" value="<%=request.getAttribute("query")%>"/>
   25.48 +<input type="hidden" name="handle" value="<%=request.getAttribute("handle")%>"/>
   25.49 +<input type="hidden" name="format" value="<%=request.getAttribute("format")%>"/>
   25.50 +<TABLE class="style4">	
   25.51 +	<% if (request.getAttribute("error") != null) {%>
   25.52 +		<!-- Error Message -->
   25.53 +	  		<TR><TD colspan=2>
   25.54 +	  		<CENTER><P style="color: red;"><%=request.getAttribute("error") %></P></CENTER>
   25.55 +	  		</TD></TR>
   25.56 +		<!-- Error Message -->
   25.57 +	<%}%>
   25.58 +
   25.59 +	<%if (request.getAttribute("info") != null) { %>
   25.60 +		<!-- Info Message -->
   25.61 +  		<TR><TD colspan=2>
   25.62 +  		<CENTER><P><%=request.getAttribute("info") %></P></CENTER>
   25.63 +  		</TD></TR>
   25.64 +		<!-- Info Message -->
   25.65 +	<%}%>
   25.66 +	<tr>
   25.67 +		<td colspan=2 id="output">
   25.68 +			<div style="font-size:13px"> 
   25.69 +				You must be logged in to change configuration, or run in localhost.
   25.70 +			</div>
   25.71 +		</td>	
   25.72 +	</tr>
   25.73 +	<TR> 
   25.74 +		<TD valign="top" class="style4">Database Name:</TD>
   25.75 +		<TD><input type="text" name="dbname" value="<%=request.getAttribute("dbname")%>"/></TD>
   25.76 +	</TR>
   25.77 +	<TR> 
   25.78 +		<TD valign="top" class="style4">Username:</TD>
   25.79 +		<TD><input type="text" name="username" value="<%=request.getAttribute("username")%>"/></TD>
   25.80 +	</TR>
   25.81 +		<TR> 
   25.82 +		<TD valign="top" class="style4">Password:</TD>
   25.83 +		<TD><input type="password" name="password" value="<%=request.getAttribute("password")%>"/></TD>
   25.84 +	</TR>
   25.85 +	<TR> 
   25.86 +		<TD valign="top" class="style4">Port:</TD>
   25.87 +		<TD><input type="text" name="port" value="<%=request.getAttribute("port")%>"/></TD>
   25.88 +	</TR>
   25.89 +	<TR> 
   25.90 +		<TD valign="top" class="style4">Hostname:</TD>
   25.91 +		<TD><input type="text" name="hostname" value="<%=request.getAttribute("hostname")%>"/></TD>
   25.92 +	</TR>
   25.93 +	<TR> 
   25.94 +		<TD valign="top" class="style4">Database Backend:</TD>
   25.95 +		<TD>
   25.96 +			<SELECT name="dbengine">
   25.97 +				<OPTION value="<%=Common.DBBACKEND_POSTGIS%>" <%=Common.DBBACKEND_POSTGIS.equals(request.getAttribute("dbengine")) ? "selected":""%>><%=Common.DBBACKEND_POSTGIS%></OPTION>
   25.98 +				<OPTION value="<%=Common.DBBACKEND_MONETDB%>" <%=Common.DBBACKEND_MONETDB.equals(request.getAttribute("dbengine")) ? "selected":""%>><%=Common.DBBACKEND_MONETDB%></OPTION>
   25.99 +			</SELECT>
  25.100 +		</TD>
  25.101 +	</TR>
  25.102 +	<TR>
  25.103 +		<TD colspan=2><input type="submit" value="Connect"/></TD>
  25.104 +	</TR>
  25.105 +</TABLE>
  25.106 +
  25.107 +</FORM>
  25.108 +<br/><br/><br/><br/><br/>
  25.109 +</BODY>
  25.110 +</HTML>
  25.111 \ No newline at end of file

    26.1 --- a/endpoint/WebContent/describe.jsp	Fri May 02 17:27:46 2014 +0200
    26.2 +++ b/endpoint/WebContent/describe.jsp	Fri May 02 17:39:27 2014 +0200
    26.3 @@ -1,11 +1,17 @@
    26.4 +<%@page import="java.net.URLEncoder"%>
    26.5  <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
    26.6 +<%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
    26.7 +<%@page import="org.springframework.web.context.WebApplicationContext"%>
    26.8 +<%@page import="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapper"%>
    26.9 +<%@page import="eu.earthobservatory.org.StrabonEndpoint.StrabonBeanWrapperConfiguration"%>
   26.10 +<%@page import="java.util.List"%>
   26.11 +<%@page import="java.util.Iterator"%>
   26.12  <jsp:directive.page import="eu.earthobservatory.org.StrabonEndpoint.Common"/>
   26.13  <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
   26.14  <html>
   26.15  	<head>
   26.16  		<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
   26.17  		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   26.18 -		<title>TELEIOS: Strabon Endpoint</title>
   26.19  		<link rel="stylesheet" href="style.css" type="text/css"/> 
   26.20  		<script type="text/javascript">
   26.21  			function toggleMe(a) {
   26.22 @@ -21,43 +27,176 @@
   26.23  				return true;
   26.24  			}
   26.25  		</script>
   26.26 +		
   26.27 +		<%String handle = "";
   26.28 +		if (request.getParameter("handle") != null) 
   26.29 +		{
   26.30 +			handle = request.getParameter("handle");
   26.31 +			
   26.32 +		} 
   26.33 +		else if (request.getAttribute("handle") != null) 
   26.34 +		{
   26.35 +			handle = (String) request.getAttribute("handle");
   26.36 +			
   26.37 +		}
   26.38 +		
   26.39 +		String selFormat = "RDF/XML";
   26.40 +		if (request.getParameter("format") != null) {
   26.41 +			selFormat = request.getParameter("format");
   26.42 +			
   26.43 +		} else if (request.getAttribute("format") != null) {
   26.44 +			selFormat = (String) request.getAttribute("format");
   26.45 +			
   26.46 +		}%>
   26.47 +		<!-- jQuery start  -->
   26.48 +		<link type="text/css" href="style-menu.css" rel="stylesheet" />
   26.49 +		<script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
   26.50 +		<script type="text/javascript" src="js/jquery-ui-1.8.23.custom.min.js"></script>
   26.51 +		<script type="text/javascript">
   26.52 +		$(function(){
   26.53 +				// Accordion
   26.54 +				$("#accordion").accordion({ 
   26.55 +					header: "h3",
   26.56 +					fillSpace: true,
   26.57 +					navigation: true,
   26.58 +					collapsible: true
   26.59 +				});
   26.60 +				//hover states on the static widgets
   26.61 +				$('#dialog_link, ul#icons li').hover(
   26.62 +					function() { $(this).addClass('ui-state-hover'); },
   26.63 +					function() { $(this).removeClass('ui-state-hover'); }
   26.64 +				);
   26.65 +		});
   26.66 +		</script>
   26.67 +		<style type="text/css">
   26.68 +		/*demo page css*/
   26.69 +		body{ font: 90% "Trebuchet MS", sans-serif; margin: 50px;}
   26.70 +		.container { height:410px; width:165px;}
   26.71 +		.demoHeaders { margin-top: 1em;}
   26.72 +		#dialog_link {padding: .4em 1em .4em 20px;text-decoration: none;position: relative;}
   26.73 +		#dialog_link span.ui-icon {margin: 0 5px 0 0;position: absolute;left: .2em;top: 50%;margin-top: -8px;}
   26.74 +		ul#icons {margin: 0; padding: 0;}
   26.75 +		ul#icons li {margin: 1px; position: relative; padding: 1px 0; cursor: pointer; float: left;  list-style: none;}
   26.76 +		ul#icons span.ui-icon {float: left; margin: 0 1px;}
   26.77 +	</style>
   26.78 +	
   26.79 +		<title>Strabon Endpoint</title>
   26.80 +	
   26.81  	</head>
   26.82  <body topmargin="0" leftmargin="0" link="#FFFFFF" vlink="#FFFFFF" alink="#FFFFFF">
   26.83  
   26.84  <!-- include TELEIOS header and description -->
   26.85 -<jsp:include page="teleios-header.html"/>
   26.86 +<jsp:include page="header.html"/>
   26.87  <!-- include TELEIOS header and description -->
   26.88  
   26.89  <FORM enctype="UTF-8" accept-charset="UTF-8" method="post" action="Describe">
   26.90  <INPUT type=hidden name="view" value="HTML"/>
   26.91  
   26.92 -<table border="0" width="100%"><tr> 
   26.93 -<td width="90" valign="top" class="style4"> 
   26.94 -<table border="0" cellspacing="0" cellpadding="0" width="165" id="navigation"> 
   26.95 -<tr><td width="90" class="style4"><a href="query.jsp" class="navText">Query</a></td></tr> 
   26.96 -<tr><td width="90" class="style4"><a href="store.jsp" class="navText" title="Store triples">Store</a></td></tr> 
   26.97 +<table border="0" width="100%">
   26.98 +<tr> 
   26.99 +	<td width="90" valign="top"> 
  26.100 +		<table border="0" cellspacing="0" cellpadding="0" width="165">  
  26.101 +		<tr><td id="twidth">
  26.102 +		<div class="container">
  26.103 +		<div id="accordion">
  26.104 +		<%
  26.105 +							StrabonBeanWrapper strabonWrapper;
  26.106 +							ServletContext context;
  26.107 +							context = getServletContext();
  26.108 +							WebApplicationContext applicationContext = WebApplicationContextUtils.getWebApplicationContext(context);
  26.109 +							strabonWrapper=(StrabonBeanWrapper) applicationContext.getBean("strabonBean");
  26.110 +							Iterator <StrabonBeanWrapperConfiguration> entryListIterator = strabonWrapper.getEntries().iterator();
  26.111 +							boolean first = true;
  26.112 +							String hash = "";
  26.113 +							while(entryListIterator.hasNext())
  26.114 +							{
  26.115 +								StrabonBeanWrapperConfiguration entry = entryListIterator.next();
  26.116 +								
  26.117 +								if (entry.isHeader()) {
  26.118 +									if (!first) {
  26.119 +										%>
  26.120 +										</div></div>
  26.121 +										<%
  26.122 +									} else {
  26.123 +										first = false;
  26.124 +									}
  26.125 +									
  26.126 +									String label=entry.getLabel();
  26.127 +									String style = "", href = "";
  26.128 +									hash = new Integer(Math.abs(label.hashCode())).toString();
  26.129 +									href="href=\"#"+hash+"\"";									
  26.130 +									%>
  26.131 +									<div><h3><a <%=style%> <%=href%>><%=label%></a></h3><div>
  26.132 +									<%									
  26.133 +								} else if (entry.isBean()) {
  26.134 +									String label=entry.getLabel();
  26.135 +									String bean=entry.getBean();
  26.136 +									if(bean.equals("browse.jsp") || bean.equals("ChangeConnection"))
  26.137 +										continue;
  26.138 +									String style = "", href = "";
  26.139 +									hash = new Integer(Math.abs(label.hashCode()*bean.hashCode())).toString();
  26.140 +									href = "\"" +bean + "#"+ hash+"\"";
  26.141 +									style = "class=\"navText\"";
  26.142 +									%>
  26.143 +									<b>&middot;</b>&nbsp;<a class="linkText" href=<%=href%>><%=label%></a><br/>
  26.144 +									<%
  26.145 +								} else {
  26.146 +									String href="\""+URLEncoder.encode(entry.getBean(),"utf-8")+"?view=HTML&handle="+entry.getHandle()+"&query="+URLEncoder.encode(entry.getStatement(),"utf-8")+"&format="+URLEncoder.encode(entry.getFormat(),"utf-8")+(hash == "" ? "" : "#" + hash)+"\"";
  26.147 +									String title="\""+entry.getTitle()+"\"";
  26.148 +									String label=entry.getLabel();
  26.149 +									%>
  26.150 +									<b>&middot;</b>&nbsp;<a class="linkText" href=<%=href%> title=<%=title%>><%=label%></a><br/>
  26.151 +									<%
  26.152 +			
  26.153 +								}
  26.154 +							}
  26.155 +		%>
  26.156 +		</div>
  26.157 +		</div>
  26.158 +	</td>
  26.159 +</tr>
  26.160 +<!-- 
  26.161 +<tr><td width="90" class="style4"><a href="describe.jsp" class="navText">Describe</a></td></tr>
  26.162 +<tr><td width="90" class="style4"><a href="store.jsp" class="navText" title="Store triples">Store</a></td></tr>
  26.163 + --> 
  26.164  </table>
  26.165 -</td>
  26.166 +	</td>
  26.167  <td width="*" valign="top">
  26.168  <table cellspacing="5">
  26.169  <tr>
  26.170 -<td id="output">stSPARQL Query:</td>
  26.171 +<td id="output" style="width: 150px">stSPARQL Query:</td>
  26.172  <td id="output"><textarea name="query" title="pose your DESCRIBE query here" rows="15" cols="100">
  26.173  <%=request.getParameter("query") != null ? request.getParameter("query"):""%></textarea></td>
  26.174  </tr>
  26.175  <tr>
  26.176 -<td id="output"><center>Output Format:<br/>
  26.177 +<td id="output">Output Format:</td>
  26.178 +<td id="output">
  26.179  <SELECT name="format" title="select one of the following RDF graph format types">
  26.180  	<% for (String format : Common.registeredFormats) {%>
  26.181 -		<OPTION value="<%=format%>"><%=format%></OPTION>
  26.182 +		<OPTION value="<%=format%>"<%=format.equals(selFormat) ? "selected":""%>><%=format%></OPTION>
  26.183  	<%}%>
  26.184 -</SELECT></center></td>
  26.185 -<td colspan=2><br/>
  26.186 +</SELECT>
  26.187 +</td>
  26.188 +</tr>
  26.189 +<tr>
  26.190 +<td id="output">View Result:</td>
  26.191 +<td id="output">
  26.192 +	<SELECT name="handle" title="select how you would like to view the result">
  26.193 +		<OPTION value="plain"<%= ("plain".equals(handle)) ? "selected":""%>>Plain</OPTION>
  26.194 +		<OPTION value="download"<%= ("download".equals(handle)) ? "selected":""%>>Download</OPTION>		
  26.195 +	</SELECT>
  26.196 +</td>
  26.197 +</tr>
  26.198 +<tr>
  26.199 +<td colspan=2 id="output"><br/>
  26.200  <center>
  26.201 -	<input type="submit" title="execute DESCRIBE query" value="Describe" name="submit" style="width: 400px"/><br/>
  26.202 -</center><br/></td>
  26.203 +	<input type="submit" title="execute DESCRIBE query" value="Describe" name="submit" style="width: 350px"/>
  26.204 +</center><br/>
  26.205 +</td>
  26.206  </tr>
  26.207  
  26.208 +
  26.209 +
  26.210  <% if (request.getAttribute("error") != null) {%>
  26.211  	<!-- Error Message -->
  26.212  	<TR>
  26.213 @@ -67,13 +206,15 @@
  26.214  <%}%>
  26.215  
  26.216  
  26.217 -</table></td></tr></table><br/><br/>
  26.218 +</table></td></tr>
  26.219  
  26.220 +
  26.221 +</table>
  26.222 +</form>
  26.223  <% if (request.getAttribute("response") != null) {%>
  26.224  	<!-- Response -->
  26.225 -	<PRE><%=request.getAttribute("response") %></PRE>
  26.226 +	<div><%=request.getAttribute("response") %></div>
  26.227  	<!-- Response -->
  26.228  <%}%>
  26.229 -</form>
  26.230  </body>
  26.231  </html>
  26.232 \ No newline at end of file

    27.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    27.2 +++ b/endpoint/WebContent/header.html	Fri May 02 17:39:27 2014 +0200
    27.3 @@ -0,0 +1,37 @@
    27.4 +<TABLE width="100%" BORDER=0 CELLPADDING=0 CELLSPACING=0>
    27.5 +  
    27.6 +	<TR>
    27.7 +      <TD height="1"></TD>
    27.8 +	</TR>		
    27.9 +	<TR>
   27.10 +      <TD height="60"> 
   27.11 +        <table width="100%" border=0>
   27.12 +         <tr>
   27.13 +            <td width="1">&nbsp;</td>
   27.14 +            <td valign="top" width="50px"><a href="http://en.uoa.gr"><img border="0" src="images/uoa_logo.png" /></a></td>
   27.15 +            <td valign="middle" align="left">
   27.16 +            <span class="logo"><a href="query.jsp">&nbsp;stSPARQL Endpoint</a></span><br><span class="style4"></span></td>
   27.17 +          </tr>
   27.18 +        </table>
   27.19 +      </TD>
   27.20 +	</TR>
   27.21 +	<TR>
   27.22 +      <TD height="50" id="intro">
   27.23 +<p> On this page you can execute stSPARQL queries against the Strabon backend.
   27.24 +<!--  <a onclick="return toggleMe('par')">(More)</a>  -->
   27.25 +<!--
   27.26 +In this context NOA has been developing a real-time fire hotspot detection service for effectively monitoring 
   27.27 +a fire-front. The technique is based on the use of acquisitions originating from the SEVIRI  sensor, on top of MSG-1 and MSG-2 satellite platforms.
   27.28 +-->
   27.29 +<!-- Since 2007, NOA operates an MSG/SEVIRI acquisition station, and has been systematically
   27.30 +archiving raw satellite images on a 5 and 15 minutes basis, the respective temporal resolutions of MSG-1 and MSG-2.  -->
   27.31 +The acquired data are then annotated using the stRDF model and can be queried using the stSPARQL query language.
   27.32 + 
   27.33 +On the left sidebar, some example stSPARQL queries to aquire information on the dataset, are provided. 
   27.34 +<!--The NOA use case is described in more detail in the VLDB
   27.35 +demo paper <a href="http://www.earthobservatory.eu/publications/p2010_manoliskoubarakis_vldb2012-2.pdf">here</a>. 
   27.36 +-->
   27.37 +</p> 
   27.38 +      </TD>
   27.39 +	</TR>
   27.40 +</TABLE>

    28.1 Binary file endpoint/WebContent/images/red-circle.png has changed

    29.1 Binary file endpoint/WebContent/images/ui-bg_flat_75_aaaaaa_40x100.png has changed

    30.1 Binary file endpoint/WebContent/images/ui-bg_glass_100_f5f0e5_1x400.png has changed

    31.1 Binary file endpoint/WebContent/images/ui-bg_glass_25_cb842e_1x400.png has changed

    32.1 Binary file endpoint/WebContent/images/ui-bg_glass_70_ede4d4_1x400.png has changed

    33.1 Binary file endpoint/WebContent/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png has changed

    34.1 Binary file endpoint/WebContent/images/ui-bg_highlight-hard_65_fee4bd_1x100.png has changed

    35.1 Binary file endpoint/WebContent/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png has changed

    36.1 Binary file endpoint/WebContent/images/ui-bg_inset-soft_100_f4f0ec_1x100.png has changed

    37.1 Binary file endpoint/WebContent/images/ui-icons_c47a23_256x240.png has changed

    38.1 Binary file endpoint/WebContent/images/ui-icons_cb672b_256x240.png has changed

    39.1 Binary file endpoint/WebContent/images/ui-icons_f08000_256x240.png has changed

    40.1 Binary file endpoint/WebContent/images/ui-icons_f35f07_256x240.png has changed

    41.1 Binary file endpoint/WebContent/images/ui-icons_ff7519_256x240.png has changed

    42.1 Binary file endpoint/WebContent/images/ui-icons_ffffff_256x240.png has changed

    43.1 Binary file endpoint/WebContent/images/uoa_logo.png has changed

    44.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    44.2 +++ b/endpoint/WebContent/js/ProjectedOverlay.js	Fri May 02 17:39:27 2014 +0200
    44.3 @@ -0,0 +1,138 @@
    44.4 +// Create an overlay on the map from a projected image - Maps v3...
    44.5 +// Author. John D. Coryat 05/2009
    44.6 +// USNaviguide LLC - http://www.usnaviguide.com
    44.7 +// Thanks go to Mile Williams EInsert: http://econym.googlepages.com/einsert.js, Google's GOverlay Example and Bratliff's suggestion...
    44.8 +// Opacity code from TPhoto: http://gmaps.tommangan.us/addtphoto.html
    44.9 +// This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
   44.10 +//
   44.11 +// Parameters:
   44.12 +//    map: This Map
   44.13 +//    imageUrl: URL of the image (Mandatory)
   44.14 +//    bounds: Bounds object of image destination (Mandatory)
   44.15 +//    Options:
   44.16 +//    addZoom: Added Zoom factor as a parameter to the imageUrl (include complete parameter, including separater like '?zoom='
   44.17 +//    percentOpacity: Default 50, percent opacity to use when the image is loaded 0-100.
   44.18 +//    id: Default imageUrl, ID of the div
   44.19 +//
   44.20 +	
   44.21 +function ProjectedOverlay(map, imageUrl, bounds, opts)
   44.22 +{
   44.23 + google.maps.OverlayView.call(this);
   44.24 +
   44.25 + this.map_ = map;
   44.26 + this.url_ = imageUrl ;
   44.27 + this.bounds_ = bounds ;
   44.28 + this.addZ_ = opts.addZoom || '' ;				// Add the zoom to the image as a parameter
   44.29 + this.id_ = opts.id || this.url_ ;				// Added to allow for multiple images
   44.30 + this.percentOpacity_ = opts.percentOpacity || 50 ;
   44.31 +
   44.32 + this.setMap(map);
   44.33 +}
   44.34 +
   44.35 +ProjectedOverlay.prototype = new google.maps.OverlayView();
   44.36 +
   44.37 +ProjectedOverlay.prototype.createElement = function()
   44.38 +{
   44.39 + var panes = this.getPanes() ;
   44.40 + var div = this.div_ ;
   44.41 +
   44.42 + if (!div)
   44.43 + {
   44.44 +  div = this.div_ = document.createElement("div");
   44.45 +  div.style.position = "absolute" ;
   44.46 +  div.setAttribute('id',this.id_) ;
   44.47 +  this.div_ = div ;
   44.48 +  this.lastZoom_ = -1 ;
   44.49 +  if( this.percentOpacity_ )
   44.50 +  {
   44.51 +   this.setOpacity(this.percentOpacity_) ;
   44.52 +  }
   44.53 +  panes.overlayLayer.appendChild(div);
   44.54 + }
   44.55 +}
   44.56 +
   44.57 +// Remove the main DIV from the map pane
   44.58 +
   44.59 +ProjectedOverlay.prototype.remove = function()
   44.60 +{
   44.61 + if (this.div_) 
   44.62 + {
   44.63 +  this.div_.parentNode.removeChild(this.div_);
   44.64 +  this.div_ = null;
   44.65 + }
   44.66 +}
   44.67 +
   44.68 +// Redraw based on the current projection and zoom level...
   44.69 +
   44.70 +ProjectedOverlay.prototype.draw = function(firstTime)
   44.71 +{
   44.72 + // Creates the element if it doesn't exist already.
   44.73 +
   44.74 + this.createElement();
   44.75 +
   44.76 + if (!this.div_)
   44.77 + {
   44.78 +  return ;
   44.79 + }
   44.80 +
   44.81 + var c1 = this.get('projection').fromLatLngToDivPixel(this.bounds_.getSouthWest());
   44.82 + var c2 = this.get('projection').fromLatLngToDivPixel(this.bounds_.getNorthEast());
   44.83 +
   44.84 + if (!c1 || !c2) return;
   44.85 +
   44.86 + // Now position our DIV based on the DIV coordinates of our bounds
   44.87 +
   44.88 + this.div_.style.width = Math.abs(c2.x - c1.x) + "px";
   44.89 + this.div_.style.height = Math.abs(c2.y - c1.y) + "px";
   44.90 + this.div_.style.left = Math.min(c2.x, c1.x) + "px";
   44.91 + this.div_.style.top = Math.min(c2.y, c1.y) + "px";
   44.92 +
   44.93 + // Do the rest only if the zoom has changed...
   44.94 + 
   44.95 + if ( this.lastZoom_ == this.map_.getZoom() )
   44.96 + {
   44.97 +  return ;
   44.98 + }
   44.99 +
  44.100 + this.lastZoom_ = this.map_.getZoom() ;
  44.101 +
  44.102 + var url = this.url_ ;
  44.103 +
  44.104 + if ( this.addZ_ )
  44.105 + {
  44.106 +  url += this.addZ_ + this.map_.getZoom() ;
  44.107 + }
  44.108 +
  44.109 + this.div_.innerHTML = '<img src="' + url + '"  width=' + this.div_.style.width + ' height=' + this.div_.style.height + ' >' ;
  44.110 +}
  44.111 +
  44.112 +ProjectedOverlay.prototype.setOpacity=function(opacity)
  44.113 +{
  44.114 + if (opacity < 0)
  44.115 + {
  44.116 +  opacity = 0 ;
  44.117 + }
  44.118 + if(opacity > 100)
  44.119 + {
  44.120 +  opacity = 100 ;
  44.121 + }
  44.122 + var c = opacity/100 ;
  44.123 +
  44.124 + if (typeof(this.div_.style.filter) =='string')
  44.125 + {
  44.126 +  this.div_.style.filter = 'alpha(opacity:' + opacity + ')' ;
  44.127 + }
  44.128 + if (typeof(this.div_.style.KHTMLOpacity) == 'string' )
  44.129 + {
  44.130 +  this.div_.style.KHTMLOpacity = c ;
  44.131 + }
  44.132 + if (typeof(this.div_.style.MozOpacity) == 'string')
  44.133 + {
  44.134 +  this.div_.style.MozOpacity = c ;
  44.135 + }
  44.136 + if (typeof(this.div_.style.opacity) == 'string')
  44.137 + {
  44.138 +  this.div_.style.opacity = c ;
  44.139 + }
  44.140 +}
  44.141 +

    45.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    45.2 +++ b/endpoint/WebContent/js/ZipFile.complete.js	Fri May 02 17:39:27 2014 +0200
    45.3 @@ -0,0 +1,2172 @@
    45.4 +// ZipFile.complete.js
    45.5 +//
    45.6 +// 2/17/2012
    45.7 +//
    45.8 +// =======================================================
    45.9 +//
   45.10 +
   45.11 +// JSIO.core.js
   45.12 +// ------------------------------------------------------------------
   45.13 +//
   45.14 +// core methods for Javascript IO.
   45.15 +//
   45.16 +// =======================================================
   45.17 +//
   45.18 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
   45.19 +// Copyleft (c) 2012, Brendan Byrd via GPL
   45.20 +//
   45.21 +// This work is licensed under the GPLv3.
   45.22 +
   45.23 +
   45.24 +(function(){
   45.25 +    if (typeof JSIO == "object"){
   45.26 +        var e1 = new Error("JSIO is already defined");
   45.27 +        e1.source = "JSIO.core.js";
   45.28 +        throw e1;
   45.29 +    }
   45.30 +
   45.31 +    JSIO = {};
   45.32 +
   45.33 +    JSIO.version = "2.0 2012Feb";
   45.34 +
   45.35 +    JSIO.throwError = function(msg, source, sub) {
   45.36 +        var error = new Error("Error: " + msg);
   45.37 +        error.source = (source || this._typename || 'JSIO') + (sub ? '.'+sub : '');
   45.38 +        throw error;
   45.39 +    }
   45.40 +
   45.41 +    // Format a number as hex.  Quantities over 7ffffff will be displayed properly.
   45.42 +    JSIO.decimalToHexString = function(number, digits) {
   45.43 +        if (number < 0) {
   45.44 +            number = 0xFFFFFFFF + number + 1;
   45.45 +        }
   45.46 +        var r1 = number.toString(16).toUpperCase();
   45.47 +        if (digits) {
   45.48 +            r1 = "00000000" + r1;
   45.49 +            r1 = r1.substring(r1.length - digits);
   45.50 +        }
   45.51 +        return r1;
   45.52 +    };
   45.53 +
   45.54 +    JSIO.FileType = {
   45.55 +        Text    : 0,
   45.56 +        Binary  : 1,
   45.57 +        XML     : 2,
   45.58 +        Unknown : 3
   45.59 +    };
   45.60 +
   45.61 +
   45.62 +    JSIO.guessFileType = function(name) {
   45.63 +       if (name == "makefile")  { return JSIO.FileType.Text; }
   45.64 +
   45.65 +        var lastDot = name.lastIndexOf(".");
   45.66 +        if (lastDot <= 0) { return JSIO.FileType.Unknown; }
   45.67 +
   45.68 +        var ext= name.substring(lastDot);
   45.69 +        if (ext == ".zip")   { return JSIO.FileType.Binary; }
   45.70 +        if (ext == ".xlsx")  { return JSIO.FileType.Binary; }
   45.71 +        if (ext == ".docx")  { return JSIO.FileType.Binary; }
   45.72 +        if (ext == ".dll")   { return JSIO.FileType.Binary; }
   45.73 +        if (ext == ".obj")   { return JSIO.FileType.Binary; }
   45.74 +        if (ext == ".pdb")   { return JSIO.FileType.Binary; }
   45.75 +        if (ext == ".exe")   { return JSIO.FileType.Binary; }
   45.76 +        if (ext == ".kmz")   { return JSIO.FileType.Binary; }
   45.77 +
   45.78 +        if (ext == ".xml")      { return JSIO.FileType.XML; }
   45.79 +        if (ext == ".xsl")      { return JSIO.FileType.XML; }
   45.80 +        if (ext == ".kml")      { return JSIO.FileType.XML; }
   45.81 +        if (ext == ".csproj")   { return JSIO.FileType.XML; }
   45.82 +        if (ext == ".vbproj")   { return JSIO.FileType.XML; }
   45.83 +        if (ext == ".shfbproj") { return JSIO.FileType.XML; }
   45.84 +        if (ext == ".resx")     { return JSIO.FileType.XML; }
   45.85 +        if (ext == ".xslt")     { return JSIO.FileType.XML; }
   45.86 +
   45.87 +        if (ext == ".sln")  { return JSIO.FileType.Text; }
   45.88 +        if (ext == ".htm")  { return JSIO.FileType.Text; }
   45.89 +        if (ext == ".html") { return JSIO.FileType.Text; }
   45.90 +        if (ext == ".js")   { return JSIO.FileType.Text; }
   45.91 +        if (ext == ".vb")   { return JSIO.FileType.Text; }
   45.92 +        if (ext == ".txt")  { return JSIO.FileType.Text; }
   45.93 +        if (ext == ".rels") { return JSIO.FileType.Text; }
   45.94 +        if (ext == ".css")  { return JSIO.FileType.Text; }
   45.95 +        if (ext == ".cs")   { return JSIO.FileType.Text; }
   45.96 +        if (ext == ".asp")  { return JSIO.FileType.Text; }
   45.97 +
   45.98 +        return JSIO.FileType.Unknown;
   45.99 +    };
  45.100 +
  45.101 +    JSIO.stringOfLength = function (charCode, length) {
  45.102 +        var s3 = "";
  45.103 +        for (var i = 0; i < length; i++) {
  45.104 +            s3 += String.fromCharCode(charCode);
  45.105 +        }
  45.106 +        return s3;
  45.107 +    };
  45.108 +
  45.109 +    JSIO.formatByteArray = function(b) {
  45.110 +        var s1 = "0000  ";
  45.111 +        var s2 = "";
  45.112 +        for (var i = 0; i < b.length; i++) {
  45.113 +            if (i !== 0 && i % 16 === 0) {
  45.114 +                s1 += "    " + s2 +"\n" + JSIO.decimalToHexString(i, 4) + "  ";
  45.115 +                s2 = "";
  45.116 +            }
  45.117 +            s1 += JSIO.decimalToHexString(b[i], 2) + " ";
  45.118 +            if (b[i] >=32 && b[i] <= 126) {
  45.119 +                s2 += String.fromCharCode(b[i]);
  45.120 +            } else {
  45.121 +                s2 += ".";
  45.122 +            }
  45.123 +        }
  45.124 +        if (s2.length > 0) {
  45.125 +            s1 += JSIO.stringOfLength(32, ((i%16>0)? ((16 - i%16) * 3) : 0) + 4) + s2;
  45.126 +        }
  45.127 +        return s1;
  45.128 +    };
  45.129 +
  45.130 +    JSIO.htmlEscape = function(str) {
  45.131 +        return str
  45.132 +            .replace(new RegExp( "&", "g" ), "&amp;")
  45.133 +            .replace(new RegExp( "<", "g" ), "&lt;")
  45.134 +            .replace(new RegExp( ">", "g" ), "&gt;")
  45.135 +            .replace(new RegExp( "\x13", "g" ), "<br/>")
  45.136 +            .replace(new RegExp( "\x10", "g" ), "<br/>");
  45.137 +    };
  45.138 +
  45.139 +    JSIO.massApply = function(func, funcThis, arr, needReturn) {
  45.140 +        var arrayLimit = 99999;  // Chrome has an apply/array limit of 99999; Firefox = 491519
  45.141 +        if (arr.length < arrayLimit) return func.apply(funcThis, arr);
  45.142 +        else {
  45.143 +            var newThis = funcThis;
  45.144 +            var offset = 0;
  45.145 +            var end    = 99999;
  45.146 +
  45.147 +            while (offset < arr.length) {
  45.148 +                var arrSlice;
  45.149 +                if      (arr.subarray) arrSlice = arr.subarray(offset, end);
  45.150 +                else if (arr.slice)    arrSlice = arr.slice(offset, end);
  45.151 +
  45.152 +                if (needReturn) newThis += func.apply(newThis,  arrSlice);
  45.153 +                else                       func.apply(funcThis, arrSlice);
  45.154 +
  45.155 +                offset += arrayLimit;
  45.156 +                end    += arrayLimit;
  45.157 +                end     = Math.min(arr.length, end);
  45.158 +            }
  45.159 +            return newThis;
  45.160 +        }
  45.161 +    }
  45.162 +
  45.163 +})();
  45.164 +
  45.165 +/// JSIO.core.js ends
  45.166 +
  45.167 +
  45.168 +// JSIO.BasicByteReaders.js
  45.169 +// ------------------------------------------------------------------
  45.170 +//
  45.171 +// Part of the JSIO library.  Adds a couple basic ByteReaders to JSIO.
  45.172 +// ByteReaders are forward-only byte-wise readers. They read one byte at
  45.173 +// a time from a source.
  45.174 +//
  45.175 +// =======================================================
  45.176 +//
  45.177 +// A ByteReader exposes an interface with these functions:
  45.178 +//
  45.179 +//    readByte()
  45.180 +//       must return null when EOF is reached.
  45.181 +//
  45.182 +//    readToEnd()
  45.183 +//       returns an array of all bytes read, to EOF
  45.184 +//
  45.185 +//    beginReadToEnd(callback)
  45.186 +//       async version of the above
  45.187 +//
  45.188 +//    readBytes(n)
  45.189 +//       returns an array of the next n bytes from the source
  45.190 +//
  45.191 +//    beginReadBytes(n, callback)
  45.192 +//       async version of the above
  45.193 +//
  45.194 +// =======================================================
  45.195 +//
  45.196 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
  45.197 +// Copyleft (c) 2012, Brendan Byrd via GPL
  45.198 +//
  45.199 +// This work is licensed under the GPLv3.
  45.200 +
  45.201 +
  45.202 +(function(){
  45.203 +    var version = "2.0 2012Feb";
  45.204 +
  45.205 +    if (typeof JSIO !== "object") { JSIO = {}; }
  45.206 +    if ((typeof JSIO.version !== "string")) {
  45.207 +        JSIO.version = version;
  45.208 +    }
  45.209 +    else if ((JSIO.version.length < 3) ||
  45.210 +            (JSIO.version.substring(0,3) !== "2.0")) {
  45.211 +        JSIO.version += " " + version;
  45.212 +    }
  45.213 +
  45.214 +    // =======================================================
  45.215 +    // the base object, used as the prototype of all ByteReader objects.
  45.216 +    var _byteReaderBase = function () {
  45.217 +        this.position = 0;
  45.218 +        // position must be incremented in .readByte() for all derived classes
  45.219 +    };
  45.220 +
  45.221 +    _byteReaderBase.prototype._throwError = JSIO.throwError;
  45.222 +
  45.223 +    _byteReaderBase.prototype._limitCheck = function(len, startPos) {
  45.224 +        var LOE = {
  45.225 +            len: len,
  45.226 +            pos: startPos,
  45.227 +            end: startPos+len
  45.228 +        };
  45.229 +
  45.230 +        if (len === 0)              return {len:0, pos:0, end:0};
  45.231 +        if (len < 0)                this._throwError("Invalid read length");
  45.232 +        if (!this.length)           return {len:len, pos:this.position, end:len+this.position};
  45.233 +        if (!startPos >= 0)         LOE.pos = this.position;
  45.234 +        if (this.length <= LOE.pos) this._throwError("EOF reached");
  45.235 +
  45.236 +        LOE.end = LOE.pos+len;
  45.237 +        if (this.length < LOE.end)  LOE.end = LOE.pos+(LOE.len = this.length-this.position);
  45.238 +        return LOE;
  45.239 +    }
  45.240 +
  45.241 +    JSIO.SeekOrigin = {
  45.242 +        Begin     : 0,
  45.243 +        Current   : 1,
  45.244 +        End       : 2,
  45.245 +        SEEK_SET  : 0,
  45.246 +        SEEK_CUR  : 1,
  45.247 +        SEEK_END  : 2
  45.248 +    };
  45.249 +
  45.250 +    _byteReaderBase.prototype.seek = function(offset, origin) {
  45.251 +        switch (origin) {
  45.252 +            case JSIO.SeekOrigin.Begin:
  45.253 +                if (offset == this.position) return this.position;
  45.254 +                if (!this.length) {
  45.255 +                    if      (offset <  this.position) this._throwError('Uni-directional stream cannot seek backwards', null, 'seek');
  45.256 +                    else if (offset >  this.position) return this.read(offset - this.position);  // read will limit check
  45.257 +                }
  45.258 +                else {
  45.259 +                    if (this.length < offset) this._throwError('Cannot seek past reader length', null, 'seek');
  45.260 +                    this.position = offset;
  45.261 +                }
  45.262 +                break;
  45.263 +            case JSIO.SeekOrigin.Current:
  45.264 +                return this.seek(this.position + offset, JSIO.SeekOrigin.Begin);
  45.265 +                break;
  45.266 +            case JSIO.SeekOrigin.End:
  45.267 +                if (!this.length) this._throwError('Uni-directional stream has no known end length for seek', null, 'seek');
  45.268 +                return this.seek(this.length - 1 + offset, JSIO.SeekOrigin.Begin);
  45.269 +                break;
  45.270 +            default:
  45.271 +                this._throwError('Invalid seek method', null, 'seek');
  45.272 +                break;
  45.273 +        }
  45.274 +
  45.275 +        return this.position;
  45.276 +    };
  45.277 +
  45.278 +    _byteReaderBase.prototype.read = function(len, startPos) {
  45.279 +        var LOE = this._limitCheck(len, startPos);
  45.280 +        if (LOE.len === 0) return [];
  45.281 +        if (LOE.pos != this.position) this.seek(LOE.pos, JSIO.SeekOrigin.Begin);
  45.282 +
  45.283 +        var bytesRead = [];
  45.284 +
  45.285 +        // Faster methods with an array or stream
  45.286 +        if      (this.array && this.array.subarray) bytesRead = this.array.subarray(LOE.pos, LOE.end);
  45.287 +        else if (this.array && this.array.slice)    bytesRead = this.array.slice(LOE.pos, LOE.end);
  45.288 +        else if (this.stream)                       bytesRead = this.stream.read(LOE.len, LOE.pos);
  45.289 +        else if (this.length) {  // Random-access stream
  45.290 +            for(var i=LOE.pos; i<LOE.end; i++) { bytesRead.push(this.readByteAt(i)); }
  45.291 +        }
  45.292 +        else {                   // Uni-directional stream
  45.293 +            for(var i=LOE.pos; i<LOE.end; i++) {
  45.294 +                var b = this.readByte();
  45.295 +                if (b === null || b === undefined) break;
  45.296 +                bytesRead.push(b);
  45.297 +            }
  45.298 +        }
  45.299 +        this.position = LOE.end;
  45.300 +        return bytesRead;
  45.301 +    };
  45.302 +
  45.303 +    _byteReaderBase.prototype.beginRead = function(len, startPos, callback) {
  45.304 +        var LOE = this._limitCheck(len, startPos);
  45.305 +        if (LOE.len === 0) return setTimeout(function() { callback([]); }, 1);
  45.306 +        if (LOE.pos != this.position) this.seek(LOE.pos, JSIO.SeekOrigin.Begin);
  45.307 +
  45.308 +        var bytesRead = [];
  45.309 +        var thisReader = this;
  45.310 +        var leftToRead = LOE.len;
  45.311 +
  45.312 +        var readBatchAsync = function() {
  45.313 +            var c = 0;
  45.314 +            var pos = thisReader.position;
  45.315 +
  45.316 +            // read a 32k batch
  45.317 +            var l = (leftToRead >= 32768) ? 32768 : leftToRead;
  45.318 +            var newBytes = thisReader.read(l);
  45.319 +            JSIO.massApply(bytesRead.push, bytesRead, newBytes);
  45.320 +            c += l;
  45.321 +            leftToRead -= l;
  45.322 +            if (newBytes.length < l) leftToRead = 0;
  45.323 +
  45.324 +            if (leftToRead>0) setTimeout(readBatchAsync, 1);
  45.325 +            else              callback(bytesRead);
  45.326 +        };
  45.327 +
  45.328 +        // kickoff
  45.329 +        setTimeout(readBatchAsync, 1);  // always async, in ALL situations
  45.330 +        return null;
  45.331 +    };
  45.332 +
  45.333 +    _byteReaderBase.prototype.readToEnd = function() {
  45.334 +        if      (this.array && this.array.subarray) return this.array.subarray(this.position);
  45.335 +        else if (this.array && this.array.slice)    return this.array.slice(this.position);
  45.336 +        else if (this.length)                       return this.read(this.length - this.position);
  45.337 +        else                                        return this.read(9000 * 9000);  // over 9000
  45.338 +    };
  45.339 +
  45.340 +    _byteReaderBase.prototype.beginReadToEnd = function(callback) {
  45.341 +        if      (this.array && this.array.subarray) setTimeout(function() { callback( this.array.subarray(this.position) ); }, 1);
  45.342 +        else if (this.array && this.array.slice)    setTimeout(function() { callback(    this.array.slice(this.position) ); }, 1);
  45.343 +        else if (this.length)                       return this.beginRead(this.length - this.position, this.position, callback);
  45.344 +        else                                        return this.beginRead(9000 * 9000, this.position, callback);
  45.345 +    };
  45.346 +
  45.347 +    // Generic routines; one of these two MUST be overloaded (preferrably both)
  45.348 +    _byteReaderBase.prototype.readByte = function(){
  45.349 +        if (this.length && this.position >= this.length) return null;  // EOF
  45.350 +
  45.351 +        var byte;
  45.352 +        if      (this.array)  byte = this.array[this.position++];
  45.353 +        else if (this.length) byte = this.readByteAt(this.position++);
  45.354 +        else if (this.stream) byte = this.stream.read(1)[0];
  45.355 +        else                  byte = this.read(1)[0];
  45.356 +        return (byte === null || byte === undefined) ? null : byte;
  45.357 +    };
  45.358 +    _byteReaderBase.prototype.readByteAt = function(i) {
  45.359 +        var pos  = this.position;  // no position changes on this one
  45.360 +        if (i === null || i === undefined) i = this.position;
  45.361 +
  45.362 +        var byte;
  45.363 +        if      (this.array)  byte = this.array[i];
  45.364 +        else if (i === pos)   byte = this.readByte();
  45.365 +        else if (this.stream) byte = this.stream.read(1, i)[0];
  45.366 +        else                  byte = this.read(1, i)[0];
  45.367 +
  45.368 +        this.position = pos;
  45.369 +        return (byte === null || byte === undefined) ? null : byte;
  45.370 +    }
  45.371 +
  45.372 +    _byteReaderBase.prototype.readBytes = _byteReaderBase.prototype.read;
  45.373 +    _byteReaderBase.prototype.beginReadBytes = function(len, callback) { return this.beginRead(len, this.position, callback); };
  45.374 +
  45.375 +    _byteReaderBase.prototype.readNumber = function(len, startPos){
  45.376 +        var LOE = this._limitCheck(len, startPos);
  45.377 +        if (LOE.len === 0) LOE.len = 1;
  45.378 +        if (LOE.pos != this.position) this.seek(LOE.pos, JSIO.SeekOrigin.Begin);
  45.379 +
  45.380 +        var result = 0;
  45.381 +        var bytes  = this.read(LOE.len, LOE.pos);
  45.382 +        for (var i=bytes.length-1; i>=0; i--) {
  45.383 +            // IE only supports 32-bit integer shifting
  45.384 +            //result = result << 8 | bytes[i];
  45.385 +            result = result*256 + bytes[i];
  45.386 +        }
  45.387 +        return result;
  45.388 +    };
  45.389 +
  45.390 +    _byteReaderBase.prototype.readString = function(len, startPos){
  45.391 +        var LOE = this._limitCheck(len, startPos);
  45.392 +        if (LOE.len === 0) return '';
  45.393 +        if (LOE.pos != this.position) this.seek(LOE.pos, JSIO.SeekOrigin.Begin);
  45.394 +
  45.395 +        var result = '';
  45.396 +        var bytes  = this.read(LOE.len, LOE.pos);
  45.397 +        for(var i=0; i<bytes.length; i++){
  45.398 +            result += String.fromCharCode(bytes[i]);
  45.399 +        }
  45.400 +        return result;
  45.401 +    };
  45.402 +
  45.403 +    _byteReaderBase.prototype.readNullTerminatedString = function(startPos){
  45.404 +        var pos = startPos || this.position;
  45.405 +        if (this.length && this.length < pos) this._throwError('EOF reached', null, 'readNullTerminatedString');
  45.406 +        if (pos != this.position) this.seek(pos, JSIO.SeekOrigin.Begin);
  45.407 +
  45.408 +        var slarge = "";
  45.409 +        var s = "";
  45.410 +        var c = 0;
  45.411 +
  45.412 +        // Faster method with an array
  45.413 +        if (this.array && this.array.indexOf) {
  45.414 +            var len = pos - this.array.indexOf(0, pos);
  45.415 +            if (len > 0) return this.readString(len, pos);
  45.416 +        }
  45.417 +
  45.418 +        var ch;
  45.419 +        while(1) {
  45.420 +            ch = String.fromCharCode(this.readByteAt(pos+c));
  45.421 +            if (ch === null) break;
  45.422 +
  45.423 +            s += ch;
  45.424 +            c++;
  45.425 +            if(c >= 32768) {
  45.426 +                slarge += s;
  45.427 +                s = "";
  45.428 +                pos += c;
  45.429 +                this.position += c;
  45.430 +                c = 0;
  45.431 +            }
  45.432 +        };
  45.433 +        this.position = pos + c;
  45.434 +        return slarge + s;
  45.435 +    };
  45.436 +
  45.437 +    _byteReaderBase.prototype.beginReadNullTerminatedString = function(callback, startPos){
  45.438 +        var pos = startPos || this.position;
  45.439 +        if (this.length && this.length < pos) this._throwError('EOF reached', null, 'beginReadNullTerminatedString');
  45.440 +
  45.441 +        var slarge = "";
  45.442 +        var s = "";
  45.443 +        var thisBinStream = this;
  45.444 +
  45.445 +        var readBatchAsync = function() {
  45.446 +            var c = 0;
  45.447 +
  45.448 +            var ch;
  45.449 +            while(1) {
  45.450 +                ch = String.fromCharCode(this.readByteAt(pos+c));
  45.451 +                if (ch === null) break;
  45.452 +
  45.453 +                s += ch;
  45.454 +                c++;
  45.455 +                if(c >= 32768) {
  45.456 +                    slarge += s;
  45.457 +                    s = "";
  45.458 +                    pos += c;
  45.459 +                    this.position += c;
  45.460 +                    c = 0;
  45.461 +                }
  45.462 +            };
  45.463 +
  45.464 +            thisBinStream.position = pos + c;
  45.465 +            if (ch!==null) setTimeout(readBatchAsync, 1);
  45.466 +            else           callback(slarge+s);
  45.467 +        };
  45.468 +
  45.469 +        // Faster method with an array
  45.470 +        if (this.array && this.array.indexOf) {
  45.471 +            var len = pos - this.array.indexOf(0, pos);
  45.472 +            if (len > 0) readBatchASync = function() { callback(thisBinStream.readString(len, pos)); };
  45.473 +        }
  45.474 +
  45.475 +        // kickoff
  45.476 +        setTimeout(readBatchAsync, 1);  // always async, in ALL situations
  45.477 +        return null;
  45.478 +    };
  45.479 +
  45.480 +
  45.481 +
  45.482 +    JSIO._ByteReaderBase = _byteReaderBase;
  45.483 +    // =======================================================
  45.484 +
  45.485 +
  45.486 +
  45.487 +
  45.488 +    // =======================================================
  45.489 +    // reads from an array of bytes.
  45.490 +    // This basically wraps a readByte() fn onto array access.
  45.491 +    var _arrayReader = function(array) {
  45.492 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.ArrayReader', 'ctor');
  45.493 +        this.position = 0;
  45.494 +        this.array = array;
  45.495 +        this.length = array.length;
  45.496 +        this._typename = "JSIO.ArrayReader";
  45.497 +        this._version = version;
  45.498 +        return this;
  45.499 +    };
  45.500 +
  45.501 +    _arrayReader.prototype = new JSIO._ByteReaderBase();
  45.502 +
  45.503 +    _arrayReader.prototype.readByte = function() {
  45.504 +        if (this.position >= this.array.length) return null;  // EOF
  45.505 +        return this.array[this.position++];
  45.506 +    };
  45.507 +    _arrayReader.prototype.readByteAt = function(i) {
  45.508 +        return this.array[i];
  45.509 +    };
  45.510 +
  45.511 +    // =======================================================
  45.512 +
  45.513 +
  45.514 +    // =======================================================
  45.515 +    // reads bytes at a time from a defined segment of a stream.
  45.516 +    var _streamSegmentReader = function(stream, offset, len) {
  45.517 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.StreamSegmentReader', 'ctor');
  45.518 +        if (!stream)                               this._throwError('You must pass a non-null stream',            'JSIO.StreamSegmentReader', 'ctor');
  45.519 +
  45.520 +        if (!(offset >= 1)) offset = 0;
  45.521 +        if (!(len    >= 1)) len    = 0;
  45.522 +
  45.523 +        this.stream    = stream;
  45.524 +        this.array     = null;
  45.525 +        if (stream.array) {
  45.526 +            var end = len ? offset + len : null;
  45.527 +            if      (stream.array.subarray) this.array = stream.array.subarray(offset, end);
  45.528 +            else if (stream.array.slice)    this.array = stream.array.slice(offset, end);
  45.529 +        }
  45.530 +        this.length    = this.array ? this.array.length : (stream.length ? stream.length - offset : null);
  45.531 +        this.offset    = offset;
  45.532 +        this.limit     = len;
  45.533 +        this.position  = 0;
  45.534 +        this._typeName = 'JSIO.StreamSegmentReader';
  45.535 +        this._version  = version;
  45.536 +
  45.537 +        if (this.array) {
  45.538 +            this.readByte   = _arrayReader.prototype.readByte;
  45.539 +            this.readByteAt = _arrayReader.prototype.readByteAt;
  45.540 +        }
  45.541 +        return this;
  45.542 +    };
  45.543 +
  45.544 +    _streamSegmentReader.prototype = new JSIO._ByteReaderBase();
  45.545 +
  45.546 +    _streamSegmentReader.prototype.readByte = function() {
  45.547 +        if (this.limit && this.position >= this.limit) return null;  // EOF
  45.548 +        this.position++;
  45.549 +        return this.stream.readByteAt(this.offset + this.position - 1);
  45.550 +    };
  45.551 +    _streamSegmentReader.prototype.readByteAt = function(i) {
  45.552 +        if (this.limit && i >= this.limit) return null;  // EOF
  45.553 +        return this.stream.readByteAt(this.offset + i);
  45.554 +    };
  45.555 +
  45.556 +    // =======================================================
  45.557 +
  45.558 +    JSIO.ArrayReader         = _arrayReader;
  45.559 +    JSIO.StreamReader        = _streamSegmentReader;
  45.560 +    JSIO.StreamSegmentReader = _streamSegmentReader;
  45.561 +
  45.562 +})();
  45.563 +
  45.564 +
  45.565 +/// JSIO.BasicByteReaders.js ends
  45.566 +
  45.567 +// JSIO.BinaryUrlStream.js
  45.568 +// ------------------------------------------------------------------
  45.569 +//
  45.570 +// a class that acts as a stream wrapper around binary files obtained from URLs.
  45.571 +//
  45.572 +// =======================================================
  45.573 +//
  45.574 +// Copyleft (c) 2008, Andy G.P. Na <nagoon97@naver.com> via an MIT-style license
  45.575 +// Copyleft (c) 2012, Brendan Byrd via GPL
  45.576 +//
  45.577 +// This work is licensed under the GPLv3.
  45.578 +
  45.579 +(function(){
  45.580 +    var version  = "2.0 2012Feb";
  45.581 +    var typename = "JSIO.BinaryUrlStream";
  45.582 +
  45.583 +    if ((typeof JSIO !== "object") ||
  45.584 +        (typeof JSIO.version !== "string") ||
  45.585 +        (JSIO.version.length < 3) ||
  45.586 +        (JSIO.version.substring(0,3) !== "2.0"))
  45.587 +            JSIO.throwError('This extension requires JSIO.core.js v2.0', typename);
  45.588 +
  45.589 +    if (typeof JSIO._ByteReaderBase !== "function")
  45.590 +        JSIO.throwError('This extension requires JSIO.BasicByteReaders.js', typename);
  45.591 +
  45.592 +    if (/msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent)) {
  45.593 +        var IEBinaryToArray_ByteStr_Script =
  45.594 +            "<!-- IEBinaryToArray_ByteStr -->\r\n"+
  45.595 +            "<script type='text/vbscript'>\r\n"+
  45.596 +            "Function IEBinaryToArray_ByteStr(Binary)\r\n"+
  45.597 +            "   IEBinaryToArray_ByteStr = CStr(Binary)\r\n"+
  45.598 +            "End Function\r\n"+
  45.599 +            "Function IEBinaryToArray_ByteAsc_Last(Binary)\r\n"+
  45.600 +            "   Dim lastIndex\r\n"+
  45.601 +            "   lastIndex = LenB(Binary)\r\n"+
  45.602 +            "   if lastIndex mod 2 Then\r\n"+
  45.603 +            "      IEBinaryToArray_ByteAsc_Last = AscB( MidB( Binary, lastIndex, 1 ) )\r\n"+
  45.604 +            "   Else\r\n"+
  45.605 +            "      IEBinaryToArray_ByteAsc_Last = -1\r\n"+
  45.606 +            "   End If\r\n"+
  45.607 +            "End Function\r\n"+
  45.608 +            "</script>\r\n";
  45.609 +
  45.610 +        // inject VBScript
  45.611 +        document.write(IEBinaryToArray_ByteStr_Script);
  45.612 +    }
  45.613 +
  45.614 +    JSIO.IEByteMapping = null;
  45.615 +
  45.616 +    var bus = function(url, callback) {
  45.617 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.BinaryUrlStream', 'ctor');
  45.618 +
  45.619 +        this.callback   = callback;
  45.620 +        this.position   = 0;
  45.621 +        this.length     = null;
  45.622 +        this.readByte   = JSIO.ArrayReader.prototype.readByte;
  45.623 +        this.readByteAt = JSIO.ArrayReader.prototype.readByteAt;
  45.624 +        this.req        = null;
  45.625 +        this._typename  = typename;
  45.626 +        this._version   = version;
  45.627 +        this.status     = "-none-";
  45.628 +
  45.629 +        var _IeGetBinResource = function(fileURL){
  45.630 +            var binStream = this;
  45.631 +            // http://stackoverflow.com/questions/1919972/how-do-i-access-xhr-responsebody-for-binary-data-from-javascript-in-ie
  45.632 +
  45.633 +            // my helper to convert from responseBody to a byte array
  45.634 +            var convertResponseBodyToArray = function (binary) {
  45.635 +                var byteArray = new Array;
  45.636 +
  45.637 +                try {
  45.638 +                    // very fast; very little work involved
  45.639 +                    byteArray = new VBArray(binary).toArray();
  45.640 +                }
  45.641 +                catch(err) {
  45.642 +                    // use the BinaryToArray VBScript
  45.643 +                    if (!JSIO.IEByteMapping) {
  45.644 +                        JSIO.IEByteMapping = {};
  45.645 +                        for ( var i = 0; i < 256; i++ ) {
  45.646 +                            for ( var j = 0; j < 256; j++ ) {
  45.647 +                                JSIO.IEByteMapping[ String.fromCharCode( i + j * 256 ) ] = [ i, j ];
  45.648 +                            }
  45.649 +                        }
  45.650 +                    }
  45.651 +                    var rawBytes = IEBinaryToArray_ByteStr(binary);
  45.652 +                    var lastAsc  = IEBinaryToArray_ByteAsc_Last(binary);
  45.653 +
  45.654 +                    for ( var i = 0; i < rawBytes.length; i++ ) {
  45.655 +                        byteArray.push.apply(byteArray, JSIO.IEByteMapping[ rawBytes.substr(i,1) ]);
  45.656 +                    }
  45.657 +                    if (lastAsc >= 0) byteArray.push(lastAsc);
  45.658 +                }
  45.659 +
  45.660 +                return byteArray;
  45.661 +            };
  45.662 +
  45.663 +            this.req = (function() {
  45.664 +                if      (window.XMLHttpRequest) return new window.XMLHttpRequest();
  45.665 +                else if (window.ActiveXObject) {
  45.666 +                    // the many versions of IE's XML fetchers
  45.667 +                    var AXOs = [
  45.668 +                        'MSXML2.XMLHTTP.6.0',
  45.669 +                        'MSXML2.XMLHTTP.5.0',
  45.670 +                        'MSXML2.XMLHTTP.4.0',
  45.671 +                        'MSXML2.XMLHTTP.3.0',
  45.672 +                        'MSXML2.XMLHTTP',
  45.673 +                        'Microsoft.XMLHTTP',
  45.674 +                        'MSXML.XMLHTTP'
  45.675 +                    ];
  45.676 +                    for (var i = 0; i < AXOs.length; i++) {
  45.677 +                        try      { return new ActiveXObject(AXOs[i]); }
  45.678 +                        catch(e) { continue; }
  45.679 +                    }
  45.680 +                }
  45.681 +                return null;
  45.682 +            })();
  45.683 +            this.req.open("GET", fileURL, true);
  45.684 +            this.req.setRequestHeader("Accept-Charset", "x-user-defined");
  45.685 +            this.req.onreadystatechange = function(event){
  45.686 +                if (binStream.req.readyState == 4) {
  45.687 +                    binStream.status = "Status: " + binStream.req.status + ' ' + binStream.req.statusText;
  45.688 +                    if (binStream.req.status == 200) {
  45.689 +                        binStream.array  = convertResponseBodyToArray(binStream.req.responseBody);
  45.690 +                        binStream.length = binStream.array.length;
  45.691 +                        if (binStream.length < 0) this._throwError('Failed to load "'+ fileURL + '" after converting');
  45.692 +
  45.693 +                        if (typeof binStream.callback == "function") binStream.callback(binStream);
  45.694 +                    }
  45.695 +                    else {
  45.696 +                        binStream._throwError('Failed to load "'+ fileURL + '": HTTP ' + binStream.status);
  45.697 +                    }
  45.698 +                }
  45.699 +            };
  45.700 +            this.req.send();
  45.701 +        };
  45.702 +
  45.703 +        var _NormalGetBinResource = function(fileURL){
  45.704 +            var binStream= this;
  45.705 +            this.req = new XMLHttpRequest();
  45.706 +            this.req.open('GET', fileURL, true);
  45.707 +            this.req.onreadystatechange = function(aEvt) {
  45.708 +                if (binStream.req.readyState == 4) {
  45.709 +                    binStream.status = "Status: " + binStream.req.status + ' ' + binStream.req.statusText;
  45.710 +                    if(binStream.req.status == 200){
  45.711 +                        var fileContents = binStream.req.responseText;
  45.712 +                        binStream.length = fileContents.byteLength;
  45.713 +                        binStream.array  = fileContents.split('');
  45.714 +                        for ( var i = 0; i < binStream.array.length; i++ ) {
  45.715 +                            binStream.array[i] = binStream.array[i].charCodeAt(0) & 0xff;
  45.716 +                        }
  45.717 +
  45.718 +                        if (typeof binStream.callback == "function") binStream.callback(binStream);
  45.719 +                    }
  45.720 +                    else {
  45.721 +                        binStream._throwError('Failed to load "'+ fileURL + '": HTTP ' + binStream.status);
  45.722 +                    }
  45.723 +                }
  45.724 +            };
  45.725 +            //XHR binary charset opt by Marcus Granado 2006 [http://mgran.blogspot.com]
  45.726 +            this.req.overrideMimeType('text/plain; charset=x-user-defined');
  45.727 +            this.req.send(null);
  45.728 +        };
  45.729 +
  45.730 +        // http://stackoverflow.com/questions/327685/is-there-a-way-to-read-binary-data-into-javascript
  45.731 +        var _ArrayBufferGetBinResource = function(fileURL){
  45.732 +            var binStream= this;
  45.733 +            this.req = new XMLHttpRequest();
  45.734 +            this.req.open('GET', fileURL, true);
  45.735 +            this.req.onreadystatechange = function(aEvt) {
  45.736 +                if (binStream.req.readyState == 4) {
  45.737 +                    binStream.status = "Status: " + binStream.req.status + ' ' + binStream.req.statusText;
  45.738 +                    if(binStream.req.status == 200){
  45.739 +                        var fileContents = binStream.req.response;
  45.740 +                        binStream.length = fileContents.byteLength;
  45.741 +                        binStream.array = new Uint8Array(fileContents);
  45.742 +                        if (typeof binStream.callback == "function") binStream.callback(binStream);
  45.743 +                    }
  45.744 +                    else {
  45.745 +                        binStream._throwError('Failed to load "'+ fileURL + '": HTTP ' + binStream.status);
  45.746 +                    }
  45.747 +                }
  45.748 +            };
  45.749 +            this.req.responseType = 'arraybuffer';
  45.750 +            // http://stackoverflow.com/questions/11284728/how-do-i-access-8-bit-binary-data-from-javascript-in-opera
  45.751 +            this.req.overrideMimeType('application/octet-stream; charset=x-user-defined');
  45.752 +            this.req.send(null);
  45.753 +        };
  45.754 +
  45.755 +
  45.756 +        if      (typeof ArrayBuffer !== 'undefined')                                       _ArrayBufferGetBinResource.apply(this, [url]);
  45.757 +        else if (/msie/i.test(navigator.userAgent) && !/opera/i.test(navigator.userAgent)) _IeGetBinResource.apply(this, [url]);
  45.758 +        else                                                                               _NormalGetBinResource.apply(this, [url]);
  45.759 +    };
  45.760 +
  45.761 +    bus.prototype = new JSIO._ByteReaderBase();
  45.762 +
  45.763 +    bus.prototype.readByte = function(){
  45.764 +        var byte = this.readByteAt(this.position++);
  45.765 +        return (byte === null || byte === undefined) ? null : byte;
  45.766 +    };
  45.767 +
  45.768 +    JSIO.BinaryUrlStream = bus;
  45.769 +
  45.770 +})();
  45.771 +
  45.772 +/// JSIO.BinaryUrlStream.js ends
  45.773 +
  45.774 +// JSIO.TextDecoder.js
  45.775 +// ------------------------------------------------------------------
  45.776 +//
  45.777 +// Part of the JSIO library.  Adds text decoders, for UTF-8 and UTF-16,
  45.778 +// and plain text.
  45.779 +//
  45.780 +// =======================================================
  45.781 +//
  45.782 +// Derived in part from work by notmasteryet.
  45.783 +//   http://www.codeproject.com/KB/scripting/Javascript_binaryenc.aspx
  45.784 +
  45.785 +// Copyleft (c) 2008, notmasteryet via an MIT-style license
  45.786 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
  45.787 +// Copyleft (c) 2012, Brendan Byrd via GPL
  45.788 +//
  45.789 +// This work is licensed under the GPLv3.
  45.790 +
  45.791 +(function(){
  45.792 +    var version = "2.0 2012Feb";
  45.793 +    var typename = "JSIO.TextDecoder";
  45.794 +
  45.795 +    if ((typeof JSIO !== "object") ||
  45.796 +        (typeof JSIO.version !== "string") ||
  45.797 +        (JSIO.version.length < 3) ||
  45.798 +        (JSIO.version.substring(0,3) !== "2.0"))
  45.799 +            JSIO.throwError('This extension requires JSIO.core.js v2.0', typename);
  45.800 +
  45.801 +    if (typeof JSIO._ByteReaderBase !== "function")
  45.802 +        JSIO.throwError('This extension requires JSIO.BasicByteReaders.js', typename);
  45.803 +
  45.804 +    var _ansi = function(reader) {
  45.805 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.TextDecoder.ANSI', 'ctor');
  45.806 +        this.byteReader = reader;
  45.807 +        this.charWidth = 1;
  45.808 +        this._version = version;
  45.809 +        this._typename = typename + ".ANSI";
  45.810 +        return this;
  45.811 +    };
  45.812 +
  45.813 +    _ansi.prototype.readChar = function() {
  45.814 +        var code = this.byteReader.readByte();
  45.815 +        return (code < 0) ? null : String.fromCharCode(code);
  45.816 +    };
  45.817 +
  45.818 +    _ansi.prototype.parseChar = function(code) {
  45.819 +        return (code < 0) ? null : String.fromCharCode(code);
  45.820 +    };
  45.821 +
  45.822 +    var _utf16 = function(reader) {
  45.823 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.TextDecoder.UTF16', 'ctor');
  45.824 +        this.byteReader = reader;
  45.825 +        this.charWidth = 2;
  45.826 +        this.bomState = 0;
  45.827 +        this._version = version;
  45.828 +        this._typename = typename + ".UTF16";
  45.829 +        return this;
  45.830 +    };
  45.831 +
  45.832 +    _utf16.prototype.readChar = function() {
  45.833 +        var b1 = this.byteReader.readByte();
  45.834 +        if (b1 < 0) return null;
  45.835 +        var b2 = this.byteReader.readByte();
  45.836 +        if (b2 < 0) this._throwError('Incomplete UTF16 character', null, 'readChar');
  45.837 +
  45.838 +        if ((this.bomState === 0) && ((b1 + b2) == 509)) {
  45.839 +            this.bomState = (b2 == 254) ? 1 : 2;
  45.840 +
  45.841 +            b1 = this.byteReader.readByte();
  45.842 +            if (b1 < 0) return null;
  45.843 +            b2 = this.byteReader.readByte();
  45.844 +            if (b2 < 0) this._throwError('Incomplete UTF16 character', null, 'readChar');
  45.845 +        }
  45.846 +        else {
  45.847 +            this.bomState = 1;
  45.848 +        }
  45.849 +        return this.parseChar(b1, b2);
  45.850 +    };
  45.851 +
  45.852 +    _utf16.prototype.parseChar = function(b1, b2) {
  45.853 +        return String.fromCharCode( this.bomState == 1 ? (b2 << 8 | b1) : (b1 << 8 | b2) );
  45.854 +    }
  45.855 +
  45.856 +    /* RFC 3629 */
  45.857 +    var _utf8 = function(reader) {
  45.858 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.TextDecoder.UTF8', 'ctor');
  45.859 +        this.byteReader = reader;
  45.860 +        this.charWidth = null;
  45.861 +        this.waitBom = true;
  45.862 +        this.strict = false;
  45.863 +        this.pendingChar = null;
  45.864 +        this._version = version;
  45.865 +        this._typename = typename + ".UTF8";
  45.866 +        return this;
  45.867 +    };
  45.868 +
  45.869 +    _utf8.prototype.readChar = function() {
  45.870 +        var ch = null;
  45.871 +        do {
  45.872 +            if (this.pendingChar !== null) {
  45.873 +                ch = this.pendingChar;
  45.874 +                this.pendingChar = null;
  45.875 +            }
  45.876 +            else {
  45.877 +                var b1 = this.byteReader.readByte();
  45.878 +                if (b1 === null) return null;
  45.879 +
  45.880 +                if ((b1 & 0x80) === 0) ch = String.fromCharCode(b1);
  45.881 +                else {
  45.882 +                    var currentPrefix = 0xC0;
  45.883 +                    var ttlBytes = 0;
  45.884 +                    do {
  45.885 +                        var mask = currentPrefix >> 1 | 0x80;
  45.886 +                        if((b1 & mask) == currentPrefix) break;
  45.887 +                        currentPrefix = currentPrefix >> 1 | 0x80;
  45.888 +                    } while(++ttlBytes < 5);
  45.889 +
  45.890 +                    if (ttlBytes > 0) {
  45.891 +                        var code;
  45.892 +                        if (ttlBytes === 1) code = (b1 & 0x1F) << 6 | (this.byteReader.readByte() & 0x3F);
  45.893 +                        else {
  45.894 +                            code = code << 6*ttlBytes
  45.895 +                            var bytes = this.byteReader.read(ttlBytes);
  45.896 +                            for (var i = 0; i > ttlBytes; i++) {
  45.897 +                                var bi = bytes[i];
  45.898 +                                if ((bi & 0xC0) != 0x80) this._throwError('Invalid sequence character', null, 'readChar');
  45.899 +                                code = (code << 6) | (bi & 0x3F);
  45.900 +                            }
  45.901 +                        }
  45.902 +
  45.903 +                        if (code <= 0xFFFF) {
  45.904 +                            ch = (code == 0xFEFF && this.waitBom) ? null : String.fromCharCode(code);
  45.905 +                        }
  45.906 +                        else {
  45.907 +                            var v = code - 0x10000;
  45.908 +                            var w1 = 0xD800 | ((v >> 10) & 0x3FF);
  45.909 +                            var w2 = 0xDC00 | (v & 0x3FF);
  45.910 +                            this.pendingChar = String.fromCharCode(w2);
  45.911 +                            ch = String.fromCharCode(w1);
  45.912 +                        }
  45.913 +                    }
  45.914 +                    else {
  45.915 +                        // a byte higher than 0x80.
  45.916 +                        if (this.strict) this._throwError('Invalid character', null, 'readChar');
  45.917 +                        // fall back to "super ascii" (eg IBM-437)
  45.918 +                        else ch = String.fromCharCode(b1);
  45.919 +                    }
  45.920 +                }
  45.921 +            }
  45.922 +            this.waitBom = false;
  45.923 +        } while(ch === null);
  45.924 +        return ch;
  45.925 +    };
  45.926 +
  45.927 +    JSIO.TextDecoder = {
  45.928 +        Default : _ansi,
  45.929 +        ANSI    : _ansi,
  45.930 +        UTF16   : _utf16,
  45.931 +        UTF8    : _utf8
  45.932 +    };
  45.933 +
  45.934 +})();
  45.935 +
  45.936 +
  45.937 +/// JSIO.TextDecoder.js ends
  45.938 +
  45.939 +// JSIO.TextReader.js
  45.940 +// ------------------------------------------------------------------
  45.941 +//
  45.942 +// A reader class that decodes text as it reads.
  45.943 +//
  45.944 +// =======================================================
  45.945 +//
  45.946 +// Methods:
  45.947 +//    readChar()         = read 1 char
  45.948 +//    read(n)            = read n chars
  45.949 +//    readLine()         = read one line of data (to \n)
  45.950 +//    unreadChar(ch)     = unread one char
  45.951 +//    readToEnd()        = read all data in the reader;
  45.952 +//                         return a string.
  45.953 +//    beginReadToEnd(cb) = asynchronously read all data.
  45.954 +//
  45.955 +// =======================================================
  45.956 +//
  45.957 +// Derived in part from work by notmasteryet.
  45.958 +//   http://www.codeproject.com/KB/scripting/Javascript_binaryenc.aspx
  45.959 +//
  45.960 +// Copyleft (c) 2008, notmasteryet via an MIT-style license
  45.961 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
  45.962 +// Copyleft (c) 2012, Brendan Byrd via GPL
  45.963 +//
  45.964 +// This work is licensed under the GPLv3.
  45.965 +
  45.966 +
  45.967 +(function(){
  45.968 +    var version = "2.0 2012Feb";
  45.969 +    var typename = "JSIO.TextReader";
  45.970 +
  45.971 +    if (typeof JSIO._ByteReaderBase !== "function")
  45.972 +        JSIO.throwError('This extension requires JSIO.BasicByteReaders.js', typename);
  45.973 +
  45.974 +    var tr =  function(textDecoder) {
  45.975 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', typename, 'ctor');
  45.976 +        this.decoder   = textDecoder;
  45.977 +        this._version  = version;
  45.978 +        this._typename = typename;
  45.979 +        this.unreads   = [];
  45.980 +    };
  45.981 +
  45.982 +    // read one char
  45.983 +    tr.prototype.readChar = function() {
  45.984 +        return (this.unreads.length > 0) ? this.unreads.pop() : this.decoder.readChar();
  45.985 +    };
  45.986 +
  45.987 +    // read a length of data
  45.988 +    tr.prototype.read = function(n) {
  45.989 +        // ANSI makes this easy
  45.990 +        if (this.decoder.charWidth === 1) return JSIO.massApply(String.fromCharCode, new String, this.decoder.byteReader.read(n), true);
  45.991 +
  45.992 +        var s = "";
  45.993 +        for (vari=0; i<n; i++) {
  45.994 +            var ch = this.readChar();
  45.995 +            if (ch !== null) s+= ch;
  45.996 +            else             break;
  45.997 +        }
  45.998 +        return s;
  45.999 +    };
 45.1000 +
 45.1001 +    tr.prototype.unreadChar = function(ch) {
 45.1002 +        this.unreads.push(ch);
 45.1003 +    };
 45.1004 +
 45.1005 +    tr.prototype.readToEnd = function() {
 45.1006 +        // ANSI makes this easy
 45.1007 +        if (this.decoder.charWidth === 1) return JSIO.massApply(String.fromCharCode, new String, this.decoder.byteReader.readToEnd(n), true);
 45.1008 +
 45.1009 +        var slarge = "";
 45.1010 +        var s = "";
 45.1011 +        var c = 0;
 45.1012 +        var ch = this.readChar();
 45.1013 +        while(ch !== null) {
 45.1014 +            s += ch;
 45.1015 +            c++;
 45.1016 +            if(c >= 32768) {
 45.1017 +                slarge += s;
 45.1018 +                s = "";
 45.1019 +                c = 0;
 45.1020 +            }
 45.1021 +            ch = this.readChar();
 45.1022 +        }
 45.1023 +        return slarge + s;
 45.1024 +    };
 45.1025 +
 45.1026 +    tr.prototype.beginReadToEnd = function(callback) {
 45.1027 +        // ANSI makes this easy
 45.1028 +        if (this.decoder.charWidth === 1) {
 45.1029 +            this.decoder.byteReader.beginReadToEnd(function (bytes) {
 45.1030 +                callback( JSIO.massApply(String.fromCharCode, new String, bytes, true) );
 45.1031 +            });
 45.1032 +            return null;
 45.1033 +        }
 45.1034 +
 45.1035 +        var slarge = "";
 45.1036 +        var s = "";
 45.1037 +        var txtrdr = this;
 45.1038 +
 45.1039 +        var readBatchAsync = function() {
 45.1040 +            var c = 0;
 45.1041 +            var ch = txtrdr.readChar();
 45.1042 +            while(ch !== null) {
 45.1043 +                s += ch;c++;
 45.1044 +                if(c >= 32768) {
 45.1045 +                    slarge += s;
 45.1046 +                    s = "";
 45.1047 +                    break;
 45.1048 +                }
 45.1049 +                ch = txtrdr.readChar();
 45.1050 +            }
 45.1051 +            if (ch!==null){
 45.1052 +                setTimeout(readBatchAsync, 1);
 45.1053 +            }
 45.1054 +            else {
 45.1055 +                callback(slarge+s);
 45.1056 +            }
 45.1057 +        };
 45.1058 +
 45.1059 +        // kickoff
 45.1060 +        setTimeout(readBatchAsync, 1);  // always async, in ALL situations
 45.1061 +        return null;
 45.1062 +    };
 45.1063 +
 45.1064 +    tr.prototype.readLine = function() {
 45.1065 +        var s = "";
 45.1066 +        var ch = this.readChar();
 45.1067 +        if (ch === null) return null;
 45.1068 +
 45.1069 +        while(ch != "\r" && ch != "\n") {
 45.1070 +            s += ch;
 45.1071 +            ch = this.readChar();
 45.1072 +            if (ch === null) return s;
 45.1073 +        }
 45.1074 +        if(ch == "\r") {
 45.1075 +            ch = this.readChar();
 45.1076 +            if(ch !== null && ch != "\n"){
 45.1077 +                this.unreadChar(ch);
 45.1078 +            }
 45.1079 +        }
 45.1080 +        return s;
 45.1081 +    };
 45.1082 +
 45.1083 +    JSIO.TextReader = tr;
 45.1084 +
 45.1085 +})();
 45.1086 +
 45.1087 +
 45.1088 +/// JSIO.TextReader.js ends
 45.1089 +
 45.1090 +// JSIO.Crc32.js
 45.1091 +//
 45.1092 +// Part of the JSIO library.  This adds an CRC32-calculating
 45.1093 +// ByteReader to JSIO.
 45.1094 +//
 45.1095 +// =======================================================
 45.1096 +//
 45.1097 +// A ByteReader exposes an interface with these functions:
 45.1098 +//
 45.1099 +//    readByte()
 45.1100 +//       must return null when EOF is reached.
 45.1101 +//
 45.1102 +//    readToEnd()
 45.1103 +//       returns an array of all bytes read, to EOF
 45.1104 +//
 45.1105 +//    beginReadToEnd(callback)
 45.1106 +//       async version of the above
 45.1107 +//
 45.1108 +//    readBytes(n)
 45.1109 +//       returns an array of all n bytes read from the source
 45.1110 +//
 45.1111 +//    beginReadBytes(n, callback)
 45.1112 +//       async version of the above
 45.1113 +//
 45.1114 +// =======================================================
 45.1115 +//
 45.1116 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
 45.1117 +// Copyleft (c) 2012, Brendan Byrd via GPL
 45.1118 +//
 45.1119 +// This work is licensed under the GPLv3.
 45.1120 +
 45.1121 +(function(){
 45.1122 +    var version = "2.0 2012Feb";
 45.1123 +    var typename = "JSIO.Crc32";
 45.1124 +
 45.1125 +    if (typeof JSIO._ByteReaderBase !== "function")
 45.1126 +        JSIO.throwError('This extension requires JSIO.BasicByteReaders.js', typename);
 45.1127 +
 45.1128 +    JSIO.crc32Table = null;
 45.1129 +    JSIO.crc32Polynomial = 0xEDB88320;
 45.1130 +
 45.1131 +    var crc32TableCalc = function () {
 45.1132 +        // do this once only, for all instances
 45.1133 +        if (JSIO.crc32Table) return;
 45.1134 +        JSIO.crc32Table = new Array(256);
 45.1135 +        for (var i = 0; i < 256; i++) {
 45.1136 +            var c=i;
 45.1137 +            for (var k = 0; k < 8; k++) {
 45.1138 +                if ((c & 1) == 1) c = JSIO.crc32Polynomial ^ (c>>>1);
 45.1139 +                else              c >>>= 1;
 45.1140 +            }
 45.1141 +            JSIO.crc32Table[i] = c;
 45.1142 +        }
 45.1143 +    };
 45.1144 +
 45.1145 +    JSIO.computeCrc32 = function(str) {
 45.1146 +        crc32TableCalc(); // once
 45.1147 +        var c = 0xFFFFFFFF;
 45.1148 +        var sL = str.length;
 45.1149 +        if (typeof str == "object") {
 45.1150 +            for (var n1=0; n1<sL; n1++) {
 45.1151 +                c = JSIO.crc32Table[(c&0xff) ^ str[n1]] ^ (c>>>8);
 45.1152 +            }
 45.1153 +        } else {
 45.1154 +            for (var n2=0; n2<sL; n2++) {
 45.1155 +                c = JSIO.crc32Table[(c&0xff) ^ str.charCodeAt(n2)] ^ (c>>>8);
 45.1156 +            }
 45.1157 +        }
 45.1158 +        c ^= 0xFFFFFFFF;
 45.1159 +        if (c < 0) c += 0xFFFFFFFF+1;
 45.1160 +        return c;
 45.1161 +    };
 45.1162 +
 45.1163 +    // =======================================================
 45.1164 +    var _crc32 = function() {
 45.1165 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', typename, 'ctor');
 45.1166 +        crc32TableCalc(); // once
 45.1167 +        this._typename = typename;
 45.1168 +        this._version  = version;
 45.1169 +        this._runningCrc32 = 0xFFFFFFFF;
 45.1170 +    };
 45.1171 +
 45.1172 +    _crc32.prototype.slurpByte = function(b) {
 45.1173 +        var r = this._runningCrc32;
 45.1174 +        this._runningCrc32 = r>>>8 ^ JSIO.crc32Table[b ^ (r & 0x000000FF)];
 45.1175 +    };
 45.1176 +
 45.1177 +    _crc32.prototype.result = function() {
 45.1178 +        var c = this._runningCrc32 ^ 0xFFFFFFFF;
 45.1179 +        if (c < 0) c += 0xFFFFFFFF+1;
 45.1180 +        return c;
 45.1181 +    };
 45.1182 +    // =======================================================
 45.1183 +
 45.1184 +
 45.1185 +
 45.1186 +    var _crc32CalculatingReader = function(reader) {
 45.1187 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', 'JSIO.Crc32Reader', 'ctor');
 45.1188 +        this._byteReader = reader;
 45.1189 +        this._typename = "JSIO.Crc32Reader";
 45.1190 +        this._version = version;
 45.1191 +        this._crc32 = new JSIO.Crc32();
 45.1192 +    };
 45.1193 +
 45.1194 +    _crc32CalculatingReader.prototype = new JSIO._ByteReaderBase();
 45.1195 +
 45.1196 +    _crc32CalculatingReader.prototype.readByte = function() {
 45.1197 +        var b = this._byteReader.readByte();
 45.1198 +        if (b !== null) this._crc32.slurpByte(b);
 45.1199 +        this.position++;
 45.1200 +        return b;
 45.1201 +    };
 45.1202 +
 45.1203 +    _crc32CalculatingReader.prototype.read = function(len) {
 45.1204 +        if (len === 0) return [];
 45.1205 +        var bytes = this._byteReader.read(len);
 45.1206 +        len = bytes.length;
 45.1207 +
 45.1208 +        var tbl = JSIO.crc32Table;
 45.1209 +        var r = this._crc32._runningCrc32;
 45.1210 +        var t;
 45.1211 +        for (var i = 0; i < len; i++) {
 45.1212 +            t = tbl[ bytes[i] ^ (r & 0x000000FF) ];
 45.1213 +            r = (r >>> 8) ^ t;
 45.1214 +        }
 45.1215 +        this._crc32._runningCrc32 = r;
 45.1216 +
 45.1217 +        this.position += len;
 45.1218 +        return bytes;
 45.1219 +    }
 45.1220 +
 45.1221 +    _crc32CalculatingReader.prototype.crc32 = function() {
 45.1222 +        return this._crc32.result();
 45.1223 +    };
 45.1224 +
 45.1225 +    JSIO.Crc32 = _crc32;
 45.1226 +    JSIO.Crc32Reader = _crc32CalculatingReader;
 45.1227 +
 45.1228 +})();
 45.1229 +
 45.1230 +/// JSIO.CRC32.js ends
 45.1231 +// JSIO.InflatingReader.js
 45.1232 +// ------------------------------------------------------------------
 45.1233 +//
 45.1234 +// Part of the JSIO library.  This adds an Inflating ByteReader to
 45.1235 +// JSIO.
 45.1236 +//
 45.1237 +// =======================================================
 45.1238 +//
 45.1239 +// A ByteReader exposes an interface with these functions:
 45.1240 +//
 45.1241 +//    readByte()
 45.1242 +//       must return null when EOF is reached.
 45.1243 +//
 45.1244 +//    readToEnd()
 45.1245 +//       returns an array of all bytes read, to EOF
 45.1246 +//
 45.1247 +//    beginReadToEnd(callback)
 45.1248 +//       async version of the above
 45.1249 +//
 45.1250 +//    readBytes(n)
 45.1251 +//       returns an array of all n bytes read from the source
 45.1252 +//
 45.1253 +//    beginReadBytes(n, callback)
 45.1254 +//       async version of the above
 45.1255 +//
 45.1256 +// =======================================================
 45.1257 +//
 45.1258 +// Derived in part from work by notmasteryet.
 45.1259 +//   http://www.codeproject.com/KB/scripting/Javascript_binaryenc.aspx
 45.1260 +//
 45.1261 +// Copyleft (c) 2008, notmasteryet via an MIT-style license
 45.1262 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
 45.1263 +// Copyleft (c) 2012, Brendan Byrd via GPL
 45.1264 +//
 45.1265 +// This work is licensed under the GPLv3.
 45.1266 +
 45.1267 +
 45.1268 +(function(){
 45.1269 +    var version = "2.0 2012Feb";
 45.1270 +    var typename = "JSIO.InflatingReader";
 45.1271 +
 45.1272 +    if (typeof JSIO._ByteReaderBase !== "function")
 45.1273 +        JSIO.throwError('This extension requires JSIO.BasicByteReaders.js', typename);
 45.1274 +
 45.1275 +    // =======================================================
 45.1276 +    //  _InternalBitReader is used internally in the InflatingReader class.
 45.1277 +    //
 45.1278 +
 45.1279 +    JSIO.bitShiftTable = null;
 45.1280 +
 45.1281 +    var bitShiftTableCalc = function () {
 45.1282 +        // do this once only, for all instances
 45.1283 +        if (JSIO.bitShiftTable) return;
 45.1284 +
 45.1285 +        var bits = 8;
 45.1286 +        JSIO.bitShiftTable = {
 45.1287 +            LSB: new Array(bits),
 45.1288 +            MSB: new Array(bits)
 45.1289 +        }
 45.1290 +        for (var bp = 0; bp < bits; bp++) {
 45.1291 +            var lim = bits - bp;
 45.1292 +            JSIO.bitShiftTable.LSB[bp] = new Array(lim);
 45.1293 +            JSIO.bitShiftTable.MSB[bp] = new Array(lim);
 45.1294 +
 45.1295 +            var maskLSB = 1 << bp;
 45.1296 +            var maskMSB = 1 << lim-1;
 45.1297 +            for (var len = 1; len <= lim; len++) {
 45.1298 +                JSIO.bitShiftTable.LSB[bp][len-1] = maskLSB;
 45.1299 +                JSIO.bitShiftTable.MSB[bp][len-1] = maskMSB;
 45.1300 +                maskLSB |= 1 << bp+len;
 45.1301 +                maskMSB |= 1 << lim-len-1;
 45.1302 +            }
 45.1303 +        }
 45.1304 +    };
 45.1305 +
 45.1306 +    var _InternalBitReader = function(reader) {
 45.1307 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', typename + '._InternalBitReader.ctor');
 45.1308 +        this.bitsLength = 0;
 45.1309 +        this.bits = 0;
 45.1310 +        this.byteReader = reader;
 45.1311 +        this._typeName = typename + "._InternalBitReader";
 45.1312 +        this._version = version;
 45.1313 +        bitShiftTableCalc();
 45.1314 +    };
 45.1315 +
 45.1316 +    _InternalBitReader.prototype._throwError = JSIO.throwError;
 45.1317 +
 45.1318 +    _InternalBitReader.prototype.readBit = function() {
 45.1319 +        if (this.bitsLength === 0) {
 45.1320 +            var nextByte = this.byteReader.readByte();
 45.1321 +            if (nextByte === null) this._throwError('Unexpected end of stream', null, 'readBit');
 45.1322 +            this.bits = nextByte;
 45.1323 +            this.bitsLength = 8;
 45.1324 +        }
 45.1325 +
 45.1326 +        var bit = (this.bits & 1 << 8-this.bitsLength) !== 0;
 45.1327 +        this.bitsLength--;
 45.1328 +        return bit;
 45.1329 +    };
 45.1330 +
 45.1331 +    _InternalBitReader.prototype.align = function() { this.bitsLength = 0; };
 45.1332 +
 45.1333 +    _InternalBitReader.prototype.readBits = function(len, type) {
 45.1334 +        var data = 0;
 45.1335 +        type = type || 'LSB';
 45.1336 +        var tbl = JSIO.bitShiftTable[type];
 45.1337 +        var dl = 0;
 45.1338 +        while (len > 0) {
 45.1339 +            if (this.bitsLength === 0) {
 45.1340 +                var nextByte = this.byteReader.readByte();
 45.1341 +                if (nextByte === null) this._throwError('Unexpected end of stream', null, 'read'+type);
 45.1342 +                this.bits = nextByte;
 45.1343 +                this.bitsLength = 8;
 45.1344 +            }
 45.1345 +
 45.1346 +            var maskLen = (this.bitsLength >= len) ? len : this.bitsLength;
 45.1347 +            var bitsPos = 8-this.bitsLength;
 45.1348 +            data |= (this.bits & tbl[bitsPos][maskLen-1]) >>> bitsPos << dl;
 45.1349 +
 45.1350 +            dl += maskLen;
 45.1351 +            len -= maskLen;
 45.1352 +            this.bitsLength -= maskLen;
 45.1353 +        };
 45.1354 +        return data;
 45.1355 +    };
 45.1356 +
 45.1357 +    _InternalBitReader.prototype.readLSB = function(len) { return this.readBits(len, 'LSB'); }
 45.1358 +    _InternalBitReader.prototype.readMSB = function(len) { return this.readBits(len, 'MSB'); }
 45.1359 +
 45.1360 +    //
 45.1361 +    // =======================================================
 45.1362 +
 45.1363 +
 45.1364 +    /* inflating ByteReader - RFC 1951 */
 45.1365 +    var _inflatingReader = function(reader) {
 45.1366 +        if (! (this instanceof arguments.callee) ) this._throwError('You must use new to instantiate this class', typename, 'ctor');
 45.1367 +        this._byteReader = reader;
 45.1368 +        this._bitReader = new _InternalBitReader(reader);
 45.1369 +        this._buffer = [];
 45.1370 +        this._bufferPosition = 0;
 45.1371 +        this._state = 0;
 45.1372 +        this._blockFinal = false;
 45.1373 +        this._typeName = typename;
 45.1374 +        this._version = version;
 45.1375 +        return this;
 45.1376 +    };
 45.1377 +
 45.1378 +
 45.1379 +    // shared fns and variables
 45.1380 +
 45.1381 +    var staticCodes = null;
 45.1382 +    var staticDistances = null;
 45.1383 +
 45.1384 +    var clenMap = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15];
 45.1385 +
 45.1386 +    var buildCodes = function(lengths){
 45.1387 +        var i=0;
 45.1388 +        var codes = new Array(lengths.length);
 45.1389 +        var maxBits = lengths[0];
 45.1390 +        for (i=1; i<lengths.length; i++) {
 45.1391 +            if (maxBits < lengths[i]) maxBits = lengths[i];
 45.1392 +        }
 45.1393 +
 45.1394 +        var bitLengthsCount = new Array(maxBits + 1);
 45.1395 +        for (i=0; i<=maxBits; i++) bitLengthsCount[i]=0;
 45.1396 +
 45.1397 +        for (i=0; i<lengths.length; i++) {
 45.1398 +            ++bitLengthsCount[lengths[i]];
 45.1399 +        }
 45.1400 +
 45.1401 +        var nextCode = new Array(maxBits + 1);
 45.1402 +        var code = 0;
 45.1403 +        bitLengthsCount[0] = 0;
 45.1404 +        for (var bits=1; bits<=maxBits; bits++) {
 45.1405 +            code = (code + bitLengthsCount[bits - 1]) << 1;
 45.1406 +            nextCode[bits] = code;
 45.1407 +        }
 45.1408 +
 45.1409 +        for (i=0; i<codes.length; i++) {
 45.1410 +            var len = lengths[i];
 45.1411 +            if (len !== 0) {
 45.1412 +                codes[i] = nextCode[len];
 45.1413 +                nextCode[len]++;
 45.1414 +            }
 45.1415 +        }
 45.1416 +        return codes;
 45.1417 +    };
 45.1418 +
 45.1419 +    var buildTree = function(codes, lengths){
 45.1420 +        var nonEmptyCodes = [];
 45.1421 +        for(var i=0; i<codes.length; ++i) {
 45.1422 +            if(lengths[i] > 0) {
 45.1423 +                var code = {};
 45.1424 +                code.bits = codes[i];
 45.1425 +                code.length = lengths[i];
 45.1426 +                code.index = i;
 45.1427 +                nonEmptyCodes.push(code);
 45.1428 +            }
 45.1429 +        }
 45.1430 +        return buildTreeBranch(nonEmptyCodes, 0, 0);
 45.1431 +    };
 45.1432 +
 45.1433 +
 45.1434 +    var buildTreeBranch = function(codes, prefix, prefixLength){
 45.1435 +        if (codes.length === 0) return null;
 45.1436 +
 45.1437 +        var zeros = [];
 45.1438 +        var ones = [];
 45.1439 +        var branch = {};
 45.1440 +        branch.isLeaf = false;
 45.1441 +        for(var i=0; i<codes.length; ++i) {
 45.1442 +            if (codes[i].length == prefixLength && codes[i].bits == prefix) {
 45.1443 +                branch.isLeaf = true;
 45.1444 +                branch.index = codes[i].index;
 45.1445 +                break;
 45.1446 +            }
 45.1447 +            else {
 45.1448 +                var nextBit = ((codes[i].bits >> (codes[i].length - prefixLength - 1)) & 1) > 0;
 45.1449 +                if (nextBit)  ones.push(codes[i]);
 45.1450 +                else         zeros.push(codes[i]);
 45.1451 +            }
 45.1452 +        }
 45.1453 +        if(!branch.isLeaf) {
 45.1454 +            branch.zero = buildTreeBranch(zeros, (prefix << 1), prefixLength + 1);
 45.1455 +            branch.one = buildTreeBranch(ones, (prefix << 1) | 1, prefixLength + 1);
 45.1456 +        }
 45.1457 +        return branch;
 45.1458 +    };
 45.1459 +
 45.1460 +
 45.1461 +    var encodedLengthStart = [3,4,5,6,7,8,9,10,
 45.1462 +                              11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,
 45.1463 +                              115,131,163,195,227,258];
 45.1464 +
 45.1465 +    var encodedLengthAdditionalBits = [0,0,0,0,0,0,0,0,
 45.1466 +                                       1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0];
 45.1467 +
 45.1468 +    var encodedDistanceStart = [1,2,3,4, 5,7,9, 13,17,25, 33,49,65,
 45.1469 +                                97,129,193,257,385,513,769,1025,1537,2049,
 45.1470 +                                3073,4097,6145,8193,12289,16385,24577];
 45.1471 +
 45.1472 +    var encodedDistanceAdditionalBits = [0,0,0,0,1,1,2,2,3,3,4,4,
 45.1473 +                                         5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13];
 45.1474 +
 45.1475 +
 45.1476 +    var readDynamicTrees = function(bitReader){
 45.1477 +        var hlit  = bitReader.readLSB(5) + 257;
 45.1478 +        var hdist = bitReader.readLSB(5) + 1;
 45.1479 +        var hclen = bitReader.readLSB(4) + 4;
 45.1480 +        var clen  = new Array(19);
 45.1481 +        var i;
 45.1482 +        for (i=0; i<clen.length; i++) { clen[i]          = 0; }
 45.1483 +        for (i=0; i<hclen;       i++) { clen[clenMap[i]] = bitReader.readLSB(3); }
 45.1484 +
 45.1485 +        var clenCodes = buildCodes(clen);
 45.1486 +        var clenTree  = buildTree(clenCodes, clen);
 45.1487 +
 45.1488 +        var lengthsSequence = [];
 45.1489 +        while(lengthsSequence.length < hlit + hdist) {
 45.1490 +            var p = clenTree;
 45.1491 +            while(!p.isLeaf) { p = bitReader.readBit() ? p.one : p.zero; }
 45.1492 +
 45.1493 +            var code = p.index;
 45.1494 +            if      (code <= 15) lengthsSequence.push(code);
 45.1495 +            else if (code == 16) {
 45.1496 +                // TODO: replace with faster repeat algorythm
 45.1497 +                var repeat = bitReader.readLSB(2) + 3;
 45.1498 +                for(var q=0; q<repeat; ++q){
 45.1499 +                    lengthsSequence.push(lengthsSequence[lengthsSequence.length - 1]);
 45.1500 +                }
 45.1501 +            }
 45.1502 +            else if (code == 17) {
 45.1503 +                var repeat1 = bitReader.readLSB(3) + 3;
 45.1504 +                for(var q1=0; q1<repeat1; ++q1) {
 45.1505 +                    lengthsSequence.push(0);
 45.1506 +                }
 45.1507 +            }
 45.1508 +            else if (code == 18) {
 45.1509 +                var repeat2 = bitReader.readLSB(7) + 11;
 45.1510 +                for(var q2=0; q2<repeat2; ++q2){
 45.1511 +                    lengthsSequence.push(0);
 45.1512 +                }
 45.1513 +            }
 45.1514 +        }
 45.1515 +
 45.1516 +        var codesLengths     = lengthsSequence.slice(0, hlit);
 45.1517 +        var codes            = buildCodes(codesLengths);
 45.1518 +        var distancesLengths = lengthsSequence.slice(hlit, hlit + hdist);
 45.1519 +        var distances        = buildCodes(distancesLengths);
 45.1520 +
 45.1521 +        return {
 45.1522 +            codesTree     : buildTree(codes,     codesLengths),
 45.1523 +            distancesTree : buildTree(distances, distancesLengths)
 45.1524 +        };
 45.1525 +    };
 45.1526 +
 45.1527 +
 45.1528 +    _inflatingReader.prototype = new JSIO._ByteReaderBase();
 45.1529 +
 45.1530 +
 45.1531 +    // internal instance fns
 45.1532 +    _inflatingReader.prototype._decodeItem = function() {
 45.1533 +        if (this._state == 2) return null;  // end-of-blocks
 45.1534 +
 45.1535 +        var item;
 45.1536 +        if(this._state === 0) {
 45.1537 +            this._blockFinal = this._bitReader.readBit();
 45.1538 +            var blockType = this._bitReader.readLSB(2);
 45.1539 +            switch(blockType) {
 45.1540 +            case 0:
 45.1541 +                this._bitReader.align();
 45.1542 +                var len  = this._bitReader.readLSB(16);  // low-byte first, as opposed to readNumber's HBF
 45.1543 +                var nlen = this._bitReader.readLSB(16);
 45.1544 +                if ((len & ~nlen) != len) this._throwError('Invalid block type 0 length', null, '_decodeItem');
 45.1545 +
 45.1546 +                item = {};
 45.1547 +                item.itemType = 0;
 45.1548 +                item.array = this._bitReader.byteReader.read(len);
 45.1549 +                if (item.array.length < len) this._throwError('Incomplete block', null, '_decodeItem');
 45.1550 +                if (this._blockFinal) this._state = 2;
 45.1551 +                return item;
 45.1552 +            case 1:
 45.1553 +                this._codesTree = staticCodes;
 45.1554 +                this._distancesTree = staticDistances;
 45.1555 +                this._state = 1;
 45.1556 +                break;
 45.1557 +            case 2:
 45.1558 +                var dTrees = readDynamicTrees(this._bitReader);
 45.1559 +                this._codesTree = dTrees.codesTree;
 45.1560 +                this._distancesTree = dTrees.distancesTree;
 45.1561 +                this._state = 1;
 45.1562 +                break;
 45.1563 +            default:
 45.1564 +                this._throwError('Invalid block type ('+ blockType +')', null, '_decodeItem');
 45.1565 +            }
 45.1566 +        }
 45.1567 +
 45.1568 +        item = {};
 45.1569 +
 45.1570 +        var p = this._codesTree;
 45.1571 +        while (!p.isLeaf) { p = this._bitReader.readBit() ? p.one : p.zero; }
 45.1572 +        if(p.index < 256) {
 45.1573 +            item.itemType = 2;
 45.1574 +            item.symbol = p.index;
 45.1575 +        } else if(p.index > 256) {
 45.1576 +            var lengthCode = p.index;
 45.1577 +            if(lengthCode > 285) this._throwError('Invalid length code', null, '_decodeItem');
 45.1578 +
 45.1579 +            var length = encodedLengthStart[lengthCode - 257];
 45.1580 +            if(encodedLengthAdditionalBits[lengthCode - 257] > 0) {
 45.1581 +                length += this._bitReader.readLSB(encodedLengthAdditionalBits[lengthCode - 257]);
 45.1582 +            }
 45.1583 +
 45.1584 +            p = this._distancesTree;
 45.1585 +            while (!p.isLeaf) { p = this._bitReader.readBit() ? p.one : p.zero; }
 45.1586 +
 45.1587 +            var distanceCode = p.index;
 45.1588 +            var distance = encodedDistanceStart[distanceCode];
 45.1589 +            if (encodedDistanceAdditionalBits[distanceCode] > 0)
 45.1590 +                distance += this._bitReader.readLSB(encodedDistanceAdditionalBits[distanceCode]);
 45.1591 +
 45.1592 +            item.itemType = 3;
 45.1593 +            item.distance = distance;
 45.1594 +            item.length = length;
 45.1595 +        } else {
 45.1596 +            item.itemType = 1;
 45.1597 +            this._state = this._blockFinal ? 2 : 0;  // EOB
 45.1598 +        }
 45.1599 +        return item;
 45.1600 +    };
 45.1601 +
 45.1602 +
 45.1603 +
 45.1604 +    // public instance functions
 45.1605 +
 45.1606 +    _inflatingReader.prototype.readByte = function() {
 45.1607 +        var byte = this.read(1)[0];
 45.1608 +        return (byte === null || byte === undefined) ? null : byte;
 45.1609 +    };
 45.1610 +
 45.1611 +    _inflatingReader.prototype.read = function(len) {
 45.1612 +        var b = this._buffer;  // (since we use this so much...)
 45.1613 +
 45.1614 +        // Keep reading until we get to the right length
 45.1615 +        while (this._bufferPosition+len > b.length) {
 45.1616 +            var item = this._decodeItem();
 45.1617 +            if (item === null) {  // EOF
 45.1618 +                len = b.length - this._bufferPosition;
 45.1619 +                break;
 45.1620 +            }
 45.1621 +            switch(item.itemType) {
 45.1622 +                case 0:
 45.1623 +                    JSIO.massApply(b.push, b, item.array);
 45.1624 +                    break;
 45.1625 +                case 2:
 45.1626 +                    b.push(item.symbol);
 45.1627 +                    break;
 45.1628 +                case 3:
 45.1629 +                    var j = b.length - item.distance;
 45.1630 +                    if (item.distance >= item.length)
 45.1631 +                        JSIO.massApply(b.push, b, b.slice(j, j+item.length));
 45.1632 +                    // sometimes DEFLATE tries some trickery with "look-ahead" compression
 45.1633 +                    else {
 45.1634 +                        // this is basically just a repetition of the same string, plus some possible cutoff
 45.1635 +                        var count = parseInt(item.length / item.distance);
 45.1636 +                        var repArr = b.slice(j);
 45.1637 +                        // http://stackoverflow.com/questions/202605/repeat-string-javascript/5450113#5450113
 45.1638 +                        while (count > 0) {
 45.1639 +                            if (count   & 1) JSIO.massApply(     b.push,      b, repArr);
 45.1640 +                            if (count >>= 1) JSIO.massApply(repArr.push, repArr, repArr);
 45.1641 +                        }
 45.1642 +                        // add any remaining cutoff
 45.1643 +                        var r;
 45.1644 +                        if (r = item.length % item.distance)
 45.1645 +                            JSIO.massApply(b.push, b, b.slice(j, j+r));
 45.1646 +                    }
 45.1647 +                    break;
 45.1648 +            }
 45.1649 +        }
 45.1650 +        var bytes = b.slice(this._bufferPosition, this._bufferPosition+len);
 45.1651 +        this._bufferPosition += len;
 45.1652 +        this.position        += len;
 45.1653 +
 45.1654 +        if (this._bufferPosition > 0xC000) {
 45.1655 +            var shift = b.length - 0x8000;
 45.1656 +            if (shift > this._bufferPosition) shift = this._bufferPosition;
 45.1657 +            b.splice(0, shift);
 45.1658 +            this._bufferPosition -= shift;
 45.1659 +        }
 45.1660 +
 45.1661 +        return bytes;
 45.1662 +    };
 45.1663 +
 45.1664 +    // initialization routine - once per type
 45.1665 +    (function(){
 45.1666 +
 45.1667 +        var codes = new Array(288);
 45.1668 +        var codesLengths = new Array(288);
 45.1669 +        var i=0;
 45.1670 +        for ( i = 0;   i <= 143; i++) {
 45.1671 +            codes[i] = 0x0030 + i;
 45.1672 +            codesLengths[i] = 8;
 45.1673 +        }
 45.1674 +        for ( i = 144; i <= 255; i++) {
 45.1675 +            codes[i] = 0x0190 + i - 144;
 45.1676 +            codesLengths[i] = 9;
 45.1677 +        }
 45.1678 +        for ( i = 256; i <= 279; i++) {
 45.1679 +            codes[i] = 0x0000 + i - 256;
 45.1680 +            codesLengths[i] = 7;
 45.1681 +        }
 45.1682 +        for ( i = 280; i <= 287; i++) {
 45.1683 +            codes[i] = 0x00C0 + i - 280;
 45.1684 +            codesLengths[i] = 8;
 45.1685 +        }
 45.1686 +        staticCodes = buildTree(codes, codesLengths);
 45.1687 +
 45.1688 +        var distances = new Array(32);
 45.1689 +        var distancesLengths = new Array(32);
 45.1690 +        for ( i = 0; i <= 31; i++) {
 45.1691 +            distances[i] = i;
 45.1692 +            distancesLengths[i] = 5;
 45.1693 +        }
 45.1694 +        staticDistances = buildTree(distances, distancesLengths);
 45.1695 +    })();
 45.1696 +
 45.1697 +
 45.1698 +    JSIO.InflatingReader = _inflatingReader;
 45.1699 +
 45.1700 +})();
 45.1701 +
 45.1702 +
 45.1703 +/// JSIO.InflatingReader.js ends
 45.1704 +
 45.1705 +// Zipfile.js
 45.1706 +// ------------------------------------------------------------------
 45.1707 +//
 45.1708 +// A class that reads Zip files.
 45.1709 +// Depends on the JSIO library functions.
 45.1710 +//
 45.1711 +// =======================================================
 45.1712 +//
 45.1713 +// Copyleft (c) 2010, Dino Chiesa via MS-PL
 45.1714 +// Copyleft (c) 2012, Brendan Byrd via GPL
 45.1715 +//
 45.1716 +// This work is licensed under the GPLv3.
 45.1717 +
 45.1718 +(function(){
 45.1719 +    var version = "2.0 2012Feb";
 45.1720 +    var typename = "Zipfile";
 45.1721 +
 45.1722 +    if (typeof JSIO.BinaryUrlStream !== "function") JSIO.throwError('This extension requires JSIO.BinaryUrlStream.js v2.0', typename);
 45.1723 +    if (typeof JSIO.TextDecoder     !== "object")   JSIO.throwError('This extension requires JSIO.TextDecoder.js v2.0',     typename);
 45.1724 +    if (typeof JSIO.TextReader      !== "function") JSIO.throwError('This extension requires JSIO.TextReader.js v2.0',      typename);
 45.1725 +    if (typeof JSIO.Crc32           !== "function") JSIO.throwError('This extension requires JSIO.Crc32.js v2.0',           typename);
 45.1726 +    if (typeof JSIO.InflatingReader !== "function") JSIO.throwError('This extension requires JSIO.InflatingReader.js v2.0', typename);
 45.1727 +
 45.1728 +    // =======================================================
 45.1729 +    function ZipEntry(zip) {
 45.1730 +        this.zipfile = zip;
 45.1731 +        this._typename = "ZipEntry";
 45.1732 +        this._version = version;
 45.1733 +        this._crcCalculator = null;
 45.1734 +    }
 45.1735 +
 45.1736 +    ZipEntry.prototype._throwError = JSIO.throwError;
 45.1737 +
 45.1738 +    // return byte array or string
 45.1739 +    ZipEntry.prototype.extract = function(callback, asString) {
 45.1740 +        this.contentType = JSIO.guessFileType(this.name);
 45.1741 +        asString = asString || ( this.contentType == JSIO.FileType.Text ||
 45.1742 +                                 this.contentType == JSIO.FileType.XML);
 45.1743 +        var thisEntry = this;
 45.1744 +
 45.1745 +        if (this.compressionMethod !== 0 && this.compressionMethod != 8)
 45.1746 +            this._throwError('Unsupported compression method: ' + this.compressionMethod, null, 'extract');
 45.1747 +
 45.1748 +        var reader = (asString) ? this.openTextReader(thisEntry.utf8 ? JSIO.TextDecoder.UTF8 : JSIO.TextDecoder.ANSI) : this.openBinaryReader();
 45.1749 +
 45.1750 +        // diagnostic purpose only; tag the reader with the entry name
 45.1751 +        reader.zipEntryName = thisEntry.name;
 45.1752 +
 45.1753 +        if (typeof callback != "function") {
 45.1754 +            // synchronous
 45.1755 +            var result = reader.readToEnd();
 45.1756 +            this.verifyCrc32();
 45.1757 +            return result;
 45.1758 +        }
 45.1759 +
 45.1760 +        // asynchronous
 45.1761 +        reader.beginReadToEnd(function(result){
 45.1762 +            try {
 45.1763 +                thisEntry.verifyCrc32();
 45.1764 +                callback(thisEntry, result);
 45.1765 +            }
 45.1766 +            catch (exc1) {
 45.1767 +                callback(thisEntry, exc1);
 45.1768 +            }
 45.1769 +        });
 45.1770 +        return null;
 45.1771 +    };
 45.1772 +
 45.1773 +
 45.1774 +    // open a ByteReader on the entry, which will read binary
 45.1775 +    // content from the compressed stream.
 45.1776 +    ZipEntry.prototype.openBinaryReader = function() {
 45.1777 +        var reader =
 45.1778 +                new JSIO.StreamSegmentReader(this.zipfile.binaryStream,
 45.1779 +                                             this.offset + this.lengthOfHeader,
 45.1780 +                                             this.compressedSize);
 45.1781 +        if (this.compressionMethod === 0) {
 45.1782 +            this._crcCalculator = new JSIO.Crc32Reader(reader);
 45.1783 +        }
 45.1784 +        else {
 45.1785 +            var inflator = new JSIO.InflatingReader(reader);
 45.1786 +            this._crcCalculator = new JSIO.Crc32Reader(inflator);
 45.1787 +        }
 45.1788 +        // Whether compressed or not, the source ByteReader in each case
 45.1789 +        // is wrapped in a second ByteReader object that calculates CRC
 45.1790 +        // as it reads.  That way, after all reading is complete, the
 45.1791 +        // caller can check the calcuated CRC against the expected CRC.
 45.1792 +        return this._crcCalculator;
 45.1793 +    };
 45.1794 +
 45.1795 +    // open a TextReader on the entry, to read text from the
 45.1796 +    // compressed stream.
 45.1797 +    ZipEntry.prototype.openTextReader = function(decoderKind) {
 45.1798 +        var reader = this.openBinaryReader();
 45.1799 +        decoderKind = decoderKind || JSIO.TextDecoder.UTF8;
 45.1800 +        var d = new decoderKind(reader);
 45.1801 +        var textReader = new JSIO.TextReader(d);
 45.1802 +        d._parent = textReader;  // store a reference, for diagnostic purposes only
 45.1803 +        return textReader;
 45.1804 +    };
 45.1805 +
 45.1806 +    // verify the CRC on the entry.
 45.1807 +    // call this after all bytes have been read.
 45.1808 +    ZipEntry.prototype.verifyCrc32 = function() {
 45.1809 +        var computedCrc = this._crcCalculator.crc32();
 45.1810 +        var rc = false;  // CRC FAIL
 45.1811 +        if (this.crc32 != computedCrc) {
 45.1812 +            var msg = "WARNING: CRC check failed: " +
 45.1813 +                "entry(" + this.name + ") " +
 45.1814 +                "computed(" + JSIO.decimalToHexString(computedCrc,8) + ") " +
 45.1815 +                "expected(" + JSIO.decimalToHexString(this.crc32,8) + ") ";
 45.1816 +            this.zipfile.status.push(msg);
 45.1817 +        } else {
 45.1818 +            rc = true;  // OK
 45.1819 +            if (this.zipfile.verbose>2) {
 45.1820 +                this.zipfile.status.push("INFO: CRC check ok: 0x" +
 45.1821 +                                         JSIO.decimalToHexString(this.crc32,8));
 45.1822 +            }
 45.1823 +        }
 45.1824 +        return rc;
 45.1825 +    };
 45.1826 +
 45.1827 +
 45.1828 +    // ctor
 45.1829 +    ZipFile = function(fileUrl, callback, verbosity) {
 45.1830 +        if (! (this instanceof arguments.callee) ) JSIO.throwError('You must use new to instantiate this class', typename, 'ctor');
 45.1831 +
 45.1832 +        this.verbose     = verbosity || 0;
 45.1833 +        this.entries     = [];
 45.1834 +        this.entryNames  = [];
 45.1835 +        this.status      = [];
 45.1836 +        this._version    = version;
 45.1837 +        this._typename   = "ZipFile";
 45.1838 +        this._throwError = JSIO.throwError;
 45.1839 +
 45.1840 +        var thisZipFile = this;
 45.1841 +
 45.1842 +        // Could use a back-tracking reader for the central directory, but
 45.1843 +        // there's no point, since all the zip data is held in memory anyway.
 45.1844 +
 45.1845 +        /* function ReadCentralDirectory(){
 45.1846 +            var posn = thisZipFile.binaryStream.length - 64;
 45.1847 +            var maxSeekback = Math.Max(s.Length - 0x4000, 10);
 45.1848 +            var success = false;
 45.1849 +            var nTries = 0;
 45.1850 +            do
 45.1851 +            {
 45.1852 +                thisZipFile.binaryStream.Seek(posn, SeekOrigin.Begin);
 45.1853 +                var bytesRead = thisZipFile.binaryStream.findSignature(thisZipFile.Signatures.EndOfCentralDirectory);
 45.1854 +                if (bytesRead != -1)
 45.1855 +                    success = true;
 45.1856 +                else
 45.1857 +                {
 45.1858 +                    nTries++;
 45.1859 +                    // increasingly larger
 45.1860 +                    posn -= (32 * (nTries + 1) * nTries);
 45.1861 +                    if (posn < 0) posn = 0;  // BOF
 45.1862 +                }
 45.1863 +            }
 45.1864 +            while (!success && posn > maxSeekback);
 45.1865 +            if (!success) {
 45.1866 +                thisZipFile.status.push("cannot find End of Central Directory");
 45.1867 +                return;
 45.1868 +            }
 45.1869 +        } */
 45.1870 +
 45.1871 +
 45.1872 +        function DateFromPackedFormat(packed) {
 45.1873 +            if (packed == 0xFFFF || packed === 0) return new Date(1995, 0, 1, 0,0,0,0);
 45.1874 +
 45.1875 +            var packedTime = packed & 0x0000ffff;
 45.1876 +            var packedDate = ((packed & 0xffff0000) >> 16);
 45.1877 +
 45.1878 +            var year = 1980 + ((packedDate & 0xFE00) >> 9);
 45.1879 +            var month = ((packedDate & 0x01E0) >> 5) -1;
 45.1880 +            var day = packedDate & 0x001F;
 45.1881 +
 45.1882 +            var hour = (packedTime & 0xF800) >> 11;
 45.1883 +            var minute = (packedTime & 0x07E0) >> 5;
 45.1884 +            var second = (packedTime & 0x001F) * 2;
 45.1885 +
 45.1886 +            // Validation and error checking.
 45.1887 +            // This is not foolproof but will catch most errors.
 45.1888 +
 45.1889 +            // I can't believe how many different ways applications
 45.1890 +            // can mess up a simple date format.
 45.1891 +
 45.1892 +            if (second >= 60) { minute++; second = 0; }
 45.1893 +            if (minute >= 60) { hour++;   minute = 0; }
 45.1894 +            if (hour   >= 24) { day++;    hour   = 0; }
 45.1895 +            var success = false;
 45.1896 +            var d;
 45.1897 +            try {
 45.1898 +                d = new Date(year, month, day, hour, minute, second, 0);
 45.1899 +                success= true;
 45.1900 +            }
 45.1901 +            catch (exc1) {
 45.1902 +                if (year == 1980 && (month === 0 || day === 0)) {
 45.1903 +                    try {
 45.1904 +                        d = new Date(1980, 0, 1, hour, minute, second, 0);
 45.1905 +                        success= true;
 45.1906 +                    }
 45.1907 +                    catch (exc2) {
 45.1908 +                        try {
 45.1909 +                            d = new Date(1980, 0, 1, 0, 0, 0, 0);
 45.1910 +                            success= true;
 45.1911 +                        }
 45.1912 +                        catch (exc3) { }  // how could this fail??
 45.1913 +                    }
 45.1914 +                }
 45.1915 +                else {
 45.1916 +                    try {
 45.1917 +                        if (year   < 1980) year   = 1980;
 45.1918 +                        if (year   > 2030) year   = 2030;
 45.1919 +                        if (month  < 1)    month  = 1;
 45.1920 +                        if (month  > 12)   month  = 12;
 45.1921 +                        if (day    < 1)    day    = 1;
 45.1922 +                        if (day    > 31)   day    = 31;
 45.1923 +                        if (minute < 0)    minute = 0;
 45.1924 +                        if (minute > 59)   minute = 59;
 45.1925 +                        if (second < 0)    second = 0;
 45.1926 +                        if (second > 59)   second = 59;
 45.1927 +                        d = new Date(year, month-1, day, hour, minute, second, 0);
 45.1928 +                        success= true;
 45.1929 +                    }
 45.1930 +                    catch (exc4){}
 45.1931 +                }
 45.1932 +            }
 45.1933 +            if (!success) this._throwError('Bad date/time value in this ZIP file', null, 'DateFromPackedFormat');
 45.1934 +            return d;
 45.1935 +        }
 45.1936 +
 45.1937 +
 45.1938 +        function ReadZipEntries () {
 45.1939 +            // read only once
 45.1940 +            if (thisZipFile.entryNames.length === 0){
 45.1941 +                var e;
 45.1942 +                while ((e = ReadZipEntry()) !== null) {
 45.1943 +                    thisZipFile.entries.push(e);
 45.1944 +                    thisZipFile.entryNames.push(e.name);
 45.1945 +                }
 45.1946 +            }
 45.1947 +        }
 45.1948 +
 45.1949 +
 45.1950 +        function ReadZipEntry () {
 45.1951 +            var offset = thisZipFile.binaryStream.position;
 45.1952 +            var sig = thisZipFile.binaryStream.readNumber(4);
 45.1953 +            if (sig == ZipFile.Signatures.DirEntry) {
 45.1954 +                // after all entries, comes the central directory
 45.1955 +                if (thisZipFile.verbose > 0) {
 45.1956 +                    thisZipFile.status.push("INFO: at offset 0x" +
 45.1957 +                                     JSIO.decimalToHexString(offset) +
 45.1958 +                                     ", found start of Zip Directory.");
 45.1959 +                }
 45.1960 +                // all done reading
 45.1961 +                return null;
 45.1962 +            }
 45.1963 +            if (sig != ZipFile.Signatures.Entry) {
 45.1964 +                thisZipFile.status.push("WARNING: at offset 0x" +
 45.1965 +                                 JSIO.decimalToHexString(offset) +
 45.1966 +                                 ", found unexpected signature: 0x" +
 45.1967 +                                 JSIO.decimalToHexString(sig));
 45.1968 +                return null;
 45.1969 +            }
 45.1970 +
 45.1971 +            var entry = new ZipEntry(thisZipFile);
 45.1972 +            entry.offset            = offset;
 45.1973 +            entry.versionNeeded     = thisZipFile.binaryStream.readNumber(2);
 45.1974 +            entry.bitField          = thisZipFile.binaryStream.readNumber(2);
 45.1975 +            entry.compressionMethod = thisZipFile.binaryStream.readNumber(2);
 45.1976 +            var timeBlob            = thisZipFile.binaryStream.readNumber(4);
 45.1977 +            entry.lastModified      = DateFromPackedFormat(timeBlob);
 45.1978 +            entry.crc32             = thisZipFile.binaryStream.readNumber(4);
 45.1979 +            entry.compressedSize    = thisZipFile.binaryStream.readNumber(4);
 45.1980 +            entry.uncompressedSize  = thisZipFile.binaryStream.readNumber(4);
 45.1981 +
 45.1982 +            if ((entry.bitField & 0x01) == 0x01){
 45.1983 +                thisZipFile.status.push("This zipfile uses Encryption, which is not supported by ZipFile.js.");
 45.1984 +                return null;
 45.1985 +            }
 45.1986 +
 45.1987 +            entry.utf8 = ((entry.bitField & 0x0800) == 0x0800);
 45.1988 +
 45.1989 +            if ((entry.bitField & 0x0008) == 0x0008){
 45.1990 +                thisZipFile.status.push("This zipfile uses a bit 3 trailing data descriptor, which is not supported by ZipFile.js.");
 45.1991 +                return null;
 45.1992 +            }
 45.1993 +
 45.1994 +            if (entry.compressedSize == 0xFFFFFFFF ||
 45.1995 +                entry.uncompressedSize == 0xFFFFFFFF) {
 45.1996 +                thisZipFile.status.push("This zipfile uses ZIP64, which is not supported by ZipFile.js");
 45.1997 +                return null;
 45.1998 +            }
 45.1999 +
 45.2000 +            var filenameLength   = thisZipFile.binaryStream.readNumber(2);
 45.2001 +            var extraFieldLength = thisZipFile.binaryStream.readNumber(2);
 45.2002 +
 45.2003 +            thisZipFile.status.push("INFO: filename length= " + filenameLength);
 45.2004 +
 45.2005 +            // we've read 30 bytes of metadata so far
 45.2006 +            var bytesRead = 30 + filenameLength + extraFieldLength;
 45.2007 +
 45.2008 +            if (entry.utf8) {
 45.2009 +                thisZipFile.status.push("INFO: before filename, position= 0x" +
 45.2010 +                                        JSIO.decimalToHexString( thisZipFile.binaryStream.position ));
 45.2011 +                var binReader =
 45.2012 +                    new JSIO.StreamSegmentReader(thisZipFile.binaryStream,
 45.2013 +                                                 thisZipFile.binaryStream.position,
 45.2014 +                                                 filenameLength);
 45.2015 +                var utf8Decoder = new JSIO.TextDecoder.UTF8(binReader);
 45.2016 +                var textReader  = new JSIO.TextReader(utf8Decoder);
 45.2017 +                entry.name = textReader.readToEnd();
 45.2018 +
 45.2019 +                // advance the filepointer:
 45.2020 +                thisZipFile.binaryStream.seek(filenameLength,
 45.2021 +                                              JSIO.SeekOrigin.Current,
 45.2022 +                                              thisZipFile);
 45.2023 +
 45.2024 +                thisZipFile.status.push("INFO: after filename, position= 0x" +
 45.2025 +                                        JSIO.decimalToHexString( thisZipFile.binaryStream.position ));
 45.2026 +            }
 45.2027 +            else {
 45.2028 +                entry.name = thisZipFile.binaryStream.readString(filenameLength);
 45.2029 +            }
 45.2030 +
 45.2031 +            // There are a bunch of things in the "extra" header, thisZipFile we
 45.2032 +            // could parse, like timestamps and other things.  This class
 45.2033 +            // only identifies and separates them.
 45.2034 +
 45.2035 +            // More info here: http://www.pkware.com/documents/casestudies/APPNOTE.TXT
 45.2036 +
 45.2037 +            var extraPos = 0;
 45.2038 +            entry.extra = [];
 45.2039 +            while (extraPos < extraFieldLength) {
 45.2040 +                var extraBlock = {
 45.2041 +                    type: thisZipFile.binaryStream.readNumber(2),
 45.2042 +                    size: thisZipFile.binaryStream.readNumber(2)
 45.2043 +                };
 45.2044 +                extraBlock.typeDescription = ZipFile.ExtraFieldTypes[extraBlock.type];
 45.2045 +                extraBlock.data = thisZipFile.binaryStream.read(extraBlock.size);
 45.2046 +                entry.extra.push(extraBlock);
 45.2047 +                extraPos += 4 + extraBlock.size;
 45.2048 +            }
 45.2049 +
 45.2050 +            if (thisZipFile.verbose > 1) {
 45.2051 +                thisZipFile.status.push("INFO: at offset 0x" +
 45.2052 +                             JSIO.decimalToHexString(entry.offset) +
 45.2053 +                             ", found entry '" + entry.name + "' fnl(" +
 45.2054 +                             filenameLength + ") efl(" +
 45.2055 +                             extraFieldLength +")");
 45.2056 +            }
 45.2057 +
 45.2058 +            if (extraFieldLength > 0) {
 45.2059 +                if (thisZipFile.verbose > 0) {
 45.2060 +                    thisZipFile.status.push("INFO: entry " + entry.name + " has " +
 45.2061 +                                     extraFieldLength + " bytes of " +
 45.2062 +                                     "extra metadata (ID'd but ignored)");
 45.2063 +                }
 45.2064 +            }
 45.2065 +
 45.2066 +            entry.lengthOfHeader = bytesRead;
 45.2067 +            entry.totalEntrySize = entry.lengthOfHeader + entry.compressedSize;
 45.2068 +
 45.2069 +            // seek past the data without reading it. We will read on Extract()
 45.2070 +            if (thisZipFile.verbose > 1) {
 45.2071 +                thisZipFile.status.push("INFO: seek 0x" +
 45.2072 +                                 JSIO.decimalToHexString(entry.compressedSize) +
 45.2073 +                                 " (" + entry.compressedSize + ") bytes");
 45.2074 +            }
 45.2075 +
 45.2076 +            thisZipFile.binaryStream.seek(entry.compressedSize,
 45.2077 +                              JSIO.SeekOrigin.Current,
 45.2078 +                              thisZipFile);
 45.2079 +
 45.2080 +            return entry;
 45.2081 +        }
 45.2082 +
 45.2083 +
 45.2084 +        var parseZipFile = function(bfr){
 45.2085 +            try {
 45.2086 +                if (bfr.req.status == 200) {
 45.2087 +                    var sig = thisZipFile.binaryStream.readNumber(4);
 45.2088 +                    if (sig != ZipFile.Signatures.Entry){
 45.2089 +                        thisZipFile.status.push("WARNING: this file does not appear to be a zip file");
 45.2090 +                    } else {
 45.2091 +                        thisZipFile.binaryStream.seek(0, JSIO.SeekOrigin.Begin);
 45.2092 +                        ReadZipEntries();
 45.2093 +                        if (thisZipFile.verbose > 0) {
 45.2094 +                            thisZipFile.status.push("INFO: read " + thisZipFile.entries.length + " entries");
 45.2095 +                        }
 45.2096 +                    }
 45.2097 +                }
 45.2098 +                else {
 45.2099 +                    thisZipFile.status.push("ERROR: the URL could not be read (" +
 45.2100 +                                     bfr.req.status + " " + bfr.req.statusText + ")");
 45.2101 +                }
 45.2102 +                callback(thisZipFile);
 45.2103 +            }
 45.2104 +            catch (exc1)
 45.2105 +            {
 45.2106 +                thisZipFile.status.push("Exception: " + exc1.message);
 45.2107 +                callback(thisZipFile);
 45.2108 +            }
 45.2109 +        };
 45.2110 +
 45.2111 +        this.binaryStream = new JSIO.BinaryUrlStream(fileUrl, parseZipFile);
 45.2112 +
 45.2113 +        return this;
 45.2114 +    };
 45.2115 +
 45.2116 +
 45.2117 +    ZipFile.Signatures = {
 45.2118 +        Entry                 : 0x04034b50,
 45.2119 +        EndOfCentralDirectory : 0x06054b50,
 45.2120 +        DirEntry              : 0x02014b50
 45.2121 +    };
 45.2122 +
 45.2123 +    ZipFile.Version = version;
 45.2124 +
 45.2125 +    ZipFile.EncryptionAlgorithm = {
 45.2126 +        None      : 0,
 45.2127 +        PkzipWeak : 1,
 45.2128 +        WinZipAes : 2
 45.2129 +    };
 45.2130 +
 45.2131 +    ZipFile.ExtraFieldTypes = {};
 45.2132 +    ZipFile.ExtraFieldTypes[0x0001] = 'Zip64 Extended Info';
 45.2133 +    ZipFile.ExtraFieldTypes[0x0007] = 'AV Info';
 45.2134 +    ZipFile.ExtraFieldTypes[0x0008] = 'Extended Language Encoding Data (PFS)';
 45.2135 +    ZipFile.ExtraFieldTypes[0x0009] = 'OS/2';
 45.2136 +    ZipFile.ExtraFieldTypes[0x000a] = 'NTFS ';
 45.2137 +    ZipFile.ExtraFieldTypes[0x000c] = 'OpenVMS';
 45.2138 +    ZipFile.ExtraFieldTypes[0x000d] = 'UNIX';
 45.2139 +    ZipFile.ExtraFieldTypes[0x000e] = 'File Stream and Fork Descriptors';
 45.2140 +    ZipFile.ExtraFieldTypes[0x000f] = 'Patch Descriptor';
 45.2141 +    ZipFile.ExtraFieldTypes[0x0014] = 'PKCS#7 Store for X.509 Certificates';
 45.2142 +    ZipFile.ExtraFieldTypes[0x0015] = 'X.509 Certificate ID and Signature (Individual File)';
 45.2143 +    ZipFile.ExtraFieldTypes[0x0016] = 'X.509 Certificate ID (Central Directory)';
 45.2144 +    ZipFile.ExtraFieldTypes[0x0017] = 'Strong Encryption Header';
 45.2145 +    ZipFile.ExtraFieldTypes[0x0018] = 'Record Management Controls';
 45.2146 +    ZipFile.ExtraFieldTypes[0x0019] = 'PKCS#7 Encryption Recipient Certificate List';
 45.2147 +    ZipFile.ExtraFieldTypes[0x0065] = 'IBM S/390 (Z390), AS/400 (I400) attributes (uncompressed)';
 45.2148 +    ZipFile.ExtraFieldTypes[0x0066] = 'IBM S/390 (Z390), AS/400 (I400) attributes (compressed)';
 45.2149 +    ZipFile.ExtraFieldTypes[0x4690] = 'POSZIP 4690 (reserved) ';
 45.2150 +    ZipFile.ExtraFieldTypes[0x07c8] = 'Macintosh';
 45.2151 +    ZipFile.ExtraFieldTypes[0x2605] = 'ZipIt Macintosh';
 45.2152 +    ZipFile.ExtraFieldTypes[0x2705] = 'ZipIt Macintosh 1.3.5+';
 45.2153 +    ZipFile.ExtraFieldTypes[0x2805] = 'ZipIt Macintosh 1.3.5+';
 45.2154 +    ZipFile.ExtraFieldTypes[0x334d] = 'Info-ZIP Macintosh';
 45.2155 +    ZipFile.ExtraFieldTypes[0x4341] = 'Acorn/SparkFS ';
 45.2156 +    ZipFile.ExtraFieldTypes[0x4453] = 'Windows NT security descriptor (binary ACL)';
 45.2157 +    ZipFile.ExtraFieldTypes[0x4704] = 'VM/CMS';
 45.2158 +    ZipFile.ExtraFieldTypes[0x470f] = 'MVS';
 45.2159 +    ZipFile.ExtraFieldTypes[0x4b46] = 'FWKCS MD5';
 45.2160 +    ZipFile.ExtraFieldTypes[0x4c41] = 'OS/2 access control list (text ACL)';
 45.2161 +    ZipFile.ExtraFieldTypes[0x4d49] = 'Info-ZIP OpenVMS';
 45.2162 +    ZipFile.ExtraFieldTypes[0x4f4c] = 'Xceed original location extra field';
 45.2163 +    ZipFile.ExtraFieldTypes[0x5356] = 'AOS/VS (ACL)';
 45.2164 +    ZipFile.ExtraFieldTypes[0x5455] = 'extended timestamp';
 45.2165 +    ZipFile.ExtraFieldTypes[0x554e] = 'Xceed unicode extra field';
 45.2166 +    ZipFile.ExtraFieldTypes[0x5855] = 'Info-ZIP UNIX (original, also OS/2, NT, etc)';
 45.2167 +    ZipFile.ExtraFieldTypes[0x6375] = 'Info-ZIP Unicode Comment Extra Field';
 45.2168 +    ZipFile.ExtraFieldTypes[0x6542] = 'BeOS/BeBox';
 45.2169 +    ZipFile.ExtraFieldTypes[0x7075] = 'Info-ZIP Unicode Path Extra Field';
 45.2170 +    ZipFile.ExtraFieldTypes[0x756e] = 'ASi UNIX';
 45.2171 +    ZipFile.ExtraFieldTypes[0x7855] = 'Info-ZIP UNIX (new)';
 45.2172 +    ZipFile.ExtraFieldTypes[0xa220] = 'Microsoft Open Packaging Growth Hint';
 45.2173 +    ZipFile.ExtraFieldTypes[0xfd4a] = 'SMS/QDOS';
 45.2174 +
 45.2175 +})();