Merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba
- bug-1189996
- Merge into trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Chris Hillery | ||||
Approved revision: | 11515 | ||||
Merged at revision: | 11510 | ||||
Proposed branch: | lp:~zorba-coders/zorba/bug-1189996 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
1473 lines (+230/-210) 72 files modified
ChangeLog (+1/-0) doc/cxx/examples/binary.cpp (+4/-4) include/zorba/annotation.h (+1/-1) include/zorba/api_shared_types.h (+1/-1) include/zorba/dynamic_context.h (+3/-3) include/zorba/function.h (+1/-1) include/zorba/internal/unit_tests.h (+14/-14) include/zorba/query_location.h (+1/-1) include/zorba/static_context.h (+3/-3) include/zorba/stemmer.h (+1/-1) include/zorba/thesaurus.h (+1/-1) include/zorba/tokenizer.h (+1/-1) include/zorba/uri_resolvers.h (+4/-4) include/zorba/util/base64_util.h (+23/-19) include/zorba/util/calendar.h (+3/-3) modules/ExternalModules.conf (+26/-13) modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp (+6/-7) modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp (+3/-3) modules/org/expath/ns/file.xq.src/file.cpp (+2/-2) src/api/base64_streambuf.cpp (+1/-1) src/api/base64impl.cpp (+43/-46) src/api/serialization/serializer.cpp (+1/-1) src/api/smart_ptr.cpp (+4/-3) src/api/transcode_streambuf.cpp (+1/-1) src/compiler/expression/ftnode.cpp (+1/-1) src/compiler/expression/ftnode.h (+1/-1) src/context/dynamic_context.h (+2/-2) src/context/uri_resolver.h (+1/-1) src/debugger/debugger_clientimpl.cpp (+5/-2) src/debugger/debugger_server.cpp (+4/-4) src/diagnostics/dict.cpp (+1/-1) src/precompiled/stdafx.h (+6/-4) src/runtime/base64/base64_impl.cpp (+1/-1) src/runtime/durations_dates_times/format_dateTime.cpp (+1/-1) src/runtime/fetch/fetch_impl.cpp (+1/-1) src/runtime/full_text/apply.cpp (+1/-1) src/runtime/full_text/ft_module_impl.cpp (+1/-1) src/runtime/full_text/ft_stop_words_set.cpp (+1/-1) src/runtime/full_text/ft_stop_words_set.h (+1/-1) src/runtime/full_text/ft_thesaurus.h (+1/-1) src/runtime/full_text/ft_token_matcher.h (+1/-1) src/runtime/full_text/ft_util.cpp (+1/-1) src/runtime/full_text/ft_util.h (+1/-1) src/runtime/full_text/full_text_impl.cpp (+1/-1) src/runtime/full_text/icu_tokenizer.cpp (+1/-1) src/runtime/full_text/icu_tokenizer.h (+1/-1) src/runtime/full_text/stemmer.cpp (+1/-1) src/runtime/full_text/stemmer.h (+1/-1) src/runtime/full_text/stemmer/sb_stemmer.cpp (+1/-1) src/runtime/full_text/thesauri/iso2788.h (+1/-1) src/runtime/full_text/thesauri/wn_thesaurus.cpp (+2/-1) src/runtime/full_text/thesauri/xqftts_relationship.cpp (+1/-1) src/runtime/full_text/thesaurus.h (+1/-1) src/runtime/full_text/tokenizer.cpp (+1/-1) src/runtime/sequences/sequences_impl.cpp (+1/-1) src/runtime/uris/uris_impl.cpp (+2/-2) src/store/api/item.h (+1/-1) src/store/naive/node_items.cpp (+7/-11) src/store/naive/node_items.h (+5/-5) src/unit_tests/test_base64_streambuf.cpp (+1/-1) src/unit_tests/test_time_parse.cpp (+1/-1) src/unit_tests/unit_tests.cpp (+8/-5) src/util/CMakeLists.txt (+1/-0) src/util/locale.h (+1/-1) src/util/time_parse.cpp (+1/-1) src/util/time_parse.h (+1/-1) src/util/time_util.h (+1/-1) src/util/transcode_streambuf.h (+1/-1) src/zorbatypes/ft_token.cpp (+1/-1) src/zorbatypes/ft_token.h (+1/-1) src/zorbautils/CMakeLists.txt (+0/-1) test/unit/lib_unit_test.cpp (+3/-3) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug-1189996 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Paul J. Lucas | Approve | ||
Review via email: mp+168850@code.launchpad.net |
Commit message
Relocated some headers to zorba/include/util.
Description of the change
Relocated some headers to zorba/include/util.
Paul J. Lucas (paul-lucas) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
No tests were run - build or configure step must have failed.
Not commiting changes.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
9 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
The attempt to merge lp:~zorba-coders/zorba/bug-1189996 into lp:zorba failed. Below is the output from the failed tests.
CMake Error at /home/ceej/
Validation queue job bug-1189996-2013-06-
final status was:
1 tests did not succeed - changes not commited.
Error in read script: /home/ceej/
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-1189996-2013-06-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve.
Chris Hillery (ceejatec) : | # |
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-1189996-2013-06-
All tests succeeded!
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue starting for merge proposal.
Log at: http://
Zorba Build Bot (zorba-buildbot) wrote : | # |
Validation queue job bug-1189996-2013-06-
All tests succeeded!
Preview Diff
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2013-06-12 15:38:39 +0000 |
3 | +++ ChangeLog 2013-06-13 01:24:25 +0000 |
4 | @@ -33,6 +33,7 @@ |
5 | for user-defined types. |
6 | * jn:members function takes item()* as aparameter (instead of item()) |
7 | * jn:keys function takes item()* as aparameter (instead of item()) |
8 | + * Fixed bug #1189996 (Relocate some public API headers to util) |
9 | * Object/array navigation allows item()* as the type of the input sequence |
10 | (doing implicit iteration over the input sequence and skipping items |
11 | that are not objects/arrays). |
12 | |
13 | === modified file 'doc/cxx/examples/binary.cpp' |
14 | --- doc/cxx/examples/binary.cpp 2013-02-07 17:24:36 +0000 |
15 | +++ doc/cxx/examples/binary.cpp 2013-06-13 01:24:25 +0000 |
16 | @@ -13,18 +13,18 @@ |
17 | * See the License for the specific language governing permissions and |
18 | * limitations under the License. |
19 | */ |
20 | + |
21 | #include <zorba/zorba.h> |
22 | -#include <zorba/base64.h> |
23 | +#include <zorba/util/base64_util.h> |
24 | #include <iostream> |
25 | |
26 | - |
27 | using namespace zorba; |
28 | |
29 | bool |
30 | encode_example() |
31 | { |
32 | String lString("Hello Zorba"); |
33 | - String lEncoded = zorba::encoding::Base64::encode(lString); |
34 | + String lEncoded = zorba::base64::encode(lString); |
35 | return lEncoded == "SGVsbG8gWm9yYmE="; |
36 | } |
37 | |
38 | @@ -32,7 +32,7 @@ |
39 | decode_example() |
40 | { |
41 | String lEncoded("SGVsbG8gWm9yYmE="); |
42 | - String lDecoded = zorba::encoding::Base64::decode(lEncoded); |
43 | + String lDecoded = zorba::base64::decode(lEncoded); |
44 | return lDecoded == "Hello Zorba"; |
45 | } |
46 | |
47 | |
48 | === modified file 'include/zorba/annotation.h' |
49 | --- include/zorba/annotation.h 2013-02-07 17:24:36 +0000 |
50 | +++ include/zorba/annotation.h 2013-06-13 01:24:25 +0000 |
51 | @@ -18,7 +18,7 @@ |
52 | |
53 | #include <zorba/config.h> |
54 | #include <zorba/api_shared_types.h> |
55 | -#include <zorba/smart_ptr.h> |
56 | +#include <zorba/util/smart_ptr.h> |
57 | |
58 | namespace zorba { |
59 | |
60 | |
61 | === modified file 'include/zorba/api_shared_types.h' |
62 | --- include/zorba/api_shared_types.h 2013-05-31 03:38:45 +0000 |
63 | +++ include/zorba/api_shared_types.h 2013-06-13 01:24:25 +0000 |
64 | @@ -17,7 +17,7 @@ |
65 | #define ZORBA_SHARED_TYPES_INCL_H |
66 | |
67 | #include <zorba/config.h> |
68 | -#include <zorba/smart_ptr.h> |
69 | +#include <zorba/util/smart_ptr.h> |
70 | |
71 | namespace zorba { |
72 | |
73 | |
74 | === modified file 'include/zorba/dynamic_context.h' |
75 | --- include/zorba/dynamic_context.h 2013-05-22 02:22:35 +0000 |
76 | +++ include/zorba/dynamic_context.h 2013-06-13 01:24:25 +0000 |
77 | @@ -21,12 +21,12 @@ |
78 | #include <memory> |
79 | |
80 | #include <zorba/config.h> |
81 | -#include <zorba/locale.h> |
82 | -#include <zorba/time.h> |
83 | #include <zorba/api_shared_types.h> |
84 | +#include <zorba/external_function_parameter.h> |
85 | #include <zorba/static_context_consts.h> |
86 | +#include <zorba/util/calendar.h> |
87 | +#include <zorba/util/locale.h> |
88 | #include <zorba/xmldatamanager.h> |
89 | -#include <zorba/external_function_parameter.h> |
90 | |
91 | |
92 | namespace zorba { |
93 | |
94 | === modified file 'include/zorba/function.h' |
95 | --- include/zorba/function.h 2013-04-19 22:25:21 +0000 |
96 | +++ include/zorba/function.h 2013-06-13 01:24:25 +0000 |
97 | @@ -21,7 +21,7 @@ |
98 | |
99 | #include <zorba/config.h> |
100 | #include <zorba/api_shared_types.h> |
101 | -#include <zorba/smart_ptr.h> |
102 | +#include <zorba/util/smart_ptr.h> |
103 | |
104 | namespace zorba { |
105 | |
106 | |
107 | === renamed file 'include/zorba/unit_tests.h' => 'include/zorba/internal/unit_tests.h' |
108 | --- include/zorba/unit_tests.h 2013-02-07 17:24:36 +0000 |
109 | +++ include/zorba/internal/unit_tests.h 2013-06-13 01:24:25 +0000 |
110 | @@ -13,24 +13,24 @@ |
111 | * See the License for the specific language governing permissions and |
112 | * limitations under the License. |
113 | */ |
114 | -#ifndef ZORBA_UNIT_TESTS_H |
115 | -#define ZORBA_UNIT_TESTS_H |
116 | + |
117 | +#ifndef ZORBA_INTERNAL_UNIT_TESTS_H |
118 | +#define ZORBA_INTERNAL_UNIT_TESTS_H |
119 | |
120 | #include <zorba/config.h> |
121 | |
122 | - |
123 | namespace zorba { |
124 | - |
125 | - namespace UnitTests |
126 | - { |
127 | - ZORBA_DLL_PUBLIC int runUnitTest(int argc, char* argv[]); |
128 | - }; |
129 | - |
130 | -} |
131 | - |
132 | - |
133 | -#endif |
134 | - |
135 | +namespace UnitTests { |
136 | + |
137 | +/////////////////////////////////////////////////////////////////////////////// |
138 | + |
139 | +ZORBA_DLL_PUBLIC int runUnitTest(int argc, char* argv[]); |
140 | + |
141 | +/////////////////////////////////////////////////////////////////////////////// |
142 | + |
143 | +} // namespace UnitTests |
144 | +} // namespace Zorba |
145 | +#endif /* ZORBA_INTERNAL_UNIT_TESTS_H */ |
146 | /* |
147 | * Local variables: |
148 | * mode: c++ |
149 | |
150 | === modified file 'include/zorba/query_location.h' |
151 | --- include/zorba/query_location.h 2013-02-07 17:24:36 +0000 |
152 | +++ include/zorba/query_location.h 2013-06-13 01:24:25 +0000 |
153 | @@ -18,8 +18,8 @@ |
154 | #define QUERYLOCATION_H |
155 | |
156 | #include <zorba/config.h> |
157 | -#include <zorba/smart_ptr.h> |
158 | #include <zorba/api_shared_types.h> |
159 | +#include <zorba/util/smart_ptr.h> |
160 | |
161 | namespace zorba{ |
162 | |
163 | |
164 | === modified file 'include/zorba/static_context.h' |
165 | --- include/zorba/static_context.h 2013-03-25 23:02:19 +0000 |
166 | +++ include/zorba/static_context.h 2013-06-13 01:24:25 +0000 |
167 | @@ -16,17 +16,17 @@ |
168 | #ifndef XQP_STATIC_CONTEXT_API_H |
169 | #define XQP_STATIC_CONTEXT_API_H |
170 | |
171 | +#include <vector> |
172 | + |
173 | #include <zorba/config.h> |
174 | #include <zorba/api_shared_types.h> |
175 | #include <zorba/zorba_string.h> |
176 | #include <zorba/typeident.h> |
177 | #include <zorba/static_context_consts.h> |
178 | #include <zorba/options.h> // for compiler hints class |
179 | -#include <vector> |
180 | #include <zorba/function.h> |
181 | #include <zorba/annotation.h> |
182 | -#include <zorba/smart_ptr.h> |
183 | -#include <zorba/smart_ptr.h> |
184 | +#include <zorba/util/smart_ptr.h> |
185 | #ifndef ZORBA_NO_FULL_TEXT |
186 | #include <zorba/thesaurus.h> |
187 | #endif /* ZORBA_NO_FULL_TEXT */ |
188 | |
189 | === modified file 'include/zorba/stemmer.h' |
190 | --- include/zorba/stemmer.h 2013-06-01 00:30:39 +0000 |
191 | +++ include/zorba/stemmer.h 2013-06-13 01:24:25 +0000 |
192 | @@ -24,7 +24,7 @@ |
193 | #include <zorba/internal/cxx_util.h> |
194 | #include <zorba/internal/unique_ptr.h> |
195 | #include <zorba/internal/ztd.h> |
196 | -#include <zorba/locale.h> |
197 | +#include <zorba/util/locale.h> |
198 | #include <zorba/zorba_string.h> |
199 | |
200 | namespace zorba { |
201 | |
202 | === modified file 'include/zorba/thesaurus.h' |
203 | --- include/zorba/thesaurus.h 2013-06-01 00:30:39 +0000 |
204 | +++ include/zorba/thesaurus.h 2013-06-13 01:24:25 +0000 |
205 | @@ -24,8 +24,8 @@ |
206 | #include <zorba/internal/cxx_util.h> |
207 | #include <zorba/internal/unique_ptr.h> |
208 | #include <zorba/internal/ztd.h> |
209 | -#include <zorba/locale.h> |
210 | #include <zorba/uri_resolvers.h> |
211 | +#include <zorba/util/locale.h> |
212 | #include <zorba/zorba_string.h> |
213 | |
214 | namespace zorba { |
215 | |
216 | === modified file 'include/zorba/tokenizer.h' |
217 | --- include/zorba/tokenizer.h 2013-06-01 00:30:39 +0000 |
218 | +++ include/zorba/tokenizer.h 2013-06-13 01:24:25 +0000 |
219 | @@ -24,7 +24,7 @@ |
220 | #include <zorba/internal/cxx_util.h> |
221 | #include <zorba/internal/unique_ptr.h> |
222 | #include <zorba/internal/ztd.h> |
223 | -#include <zorba/locale.h> |
224 | +#include <zorba/util/locale.h> |
225 | |
226 | namespace zorba { |
227 | |
228 | |
229 | === modified file 'include/zorba/uri_resolvers.h' |
230 | --- include/zorba/uri_resolvers.h 2013-02-07 17:24:36 +0000 |
231 | +++ include/zorba/uri_resolvers.h 2013-06-13 01:24:25 +0000 |
232 | @@ -22,12 +22,12 @@ |
233 | |
234 | #include <zorba/config.h> |
235 | #include <zorba/api_shared_types.h> |
236 | +#include <zorba/internal/unique_ptr.h> |
237 | +#include <zorba/internal/ztd.h> |
238 | #include <zorba/item.h> |
239 | +#include <zorba/streams.h> |
240 | +#include <zorba/util/locale.h> |
241 | #include <zorba/zorba_string.h> |
242 | -#include <zorba/streams.h> |
243 | -#include <zorba/locale.h> |
244 | -#include <zorba/internal/unique_ptr.h> |
245 | -#include <zorba/internal/ztd.h> |
246 | |
247 | /** |
248 | * @file uri_resolvers.h |
249 | |
250 | === renamed file 'include/zorba/base64_stream.h' => 'include/zorba/util/base64_stream.h' |
251 | === renamed file 'include/zorba/base64.h' => 'include/zorba/util/base64_util.h' |
252 | --- include/zorba/base64.h 2013-02-07 17:24:36 +0000 |
253 | +++ include/zorba/util/base64_util.h 2013-06-13 01:24:25 +0000 |
254 | @@ -13,33 +13,37 @@ |
255 | * See the License for the specific language governing permissions and |
256 | * limitations under the License. |
257 | */ |
258 | + |
259 | #ifndef ZORBA_BASE64_API_H |
260 | #define ZORBA_BASE64_API_H |
261 | |
262 | -#include <string> |
263 | +// standard |
264 | +#include <iostream> |
265 | |
266 | +// zorba |
267 | #include <zorba/config.h> |
268 | #include <zorba/zorba_string.h> |
269 | |
270 | namespace zorba { |
271 | -namespace encoding { |
272 | - |
273 | - struct ZORBA_DLL_PUBLIC Base64 |
274 | - { |
275 | - static String |
276 | - encode(const String& aString); |
277 | - |
278 | - static String |
279 | - encode(std::istream& aStream); |
280 | - |
281 | - static String |
282 | - decode(const String& aString); |
283 | - |
284 | - static String |
285 | - decode(std::istream& aStream); |
286 | - }; |
287 | - |
288 | -} // namespace encoding |
289 | +namespace base64 { |
290 | + |
291 | +/////////////////////////////////////////////////////////////////////////////// |
292 | + |
293 | +ZORBA_DLL_PUBLIC |
294 | +String encode( String const &aString ); |
295 | + |
296 | +ZORBA_DLL_PUBLIC |
297 | +String encode( std::istream &aStream ); |
298 | + |
299 | +ZORBA_DLL_PUBLIC |
300 | +String decode( String const &aString ); |
301 | + |
302 | +ZORBA_DLL_PUBLIC |
303 | +String decode( std::istream &aStream ); |
304 | + |
305 | +/////////////////////////////////////////////////////////////////////////////// |
306 | + |
307 | +} // namespace base64 |
308 | } // namespace zorba |
309 | |
310 | #endif /* ZORBA_BASE64_API_H */ |
311 | |
312 | === renamed file 'include/zorba/time.h' => 'include/zorba/util/calendar.h' |
313 | --- include/zorba/time.h 2013-05-24 23:08:13 +0000 |
314 | +++ include/zorba/util/calendar.h 2013-06-13 01:24:25 +0000 |
315 | @@ -14,8 +14,8 @@ |
316 | * limitations under the License. |
317 | */ |
318 | |
319 | -#ifndef ZORBA_TIME_API_H |
320 | -#define ZORBA_TIME_API_H |
321 | +#ifndef ZORBA_CALENDAR_API_H |
322 | +#define ZORBA_CALENDAR_API_H |
323 | |
324 | namespace zorba { |
325 | namespace time { |
326 | @@ -63,5 +63,5 @@ |
327 | |
328 | } // namespace time |
329 | } // namespace zorba |
330 | -#endif /* ZORBA_TIME_API_H */ |
331 | +#endif /* ZORBA_CALENDAR_API_H */ |
332 | /* vim:set et sw=2 ts=2: */ |
333 | |
334 | === renamed file 'include/zorba/locale.h' => 'include/zorba/util/locale.h' |
335 | === renamed file 'include/zorba/smart_ptr.h' => 'include/zorba/util/smart_ptr.h' |
336 | === renamed file 'include/zorba/transcode_stream.h' => 'include/zorba/util/transcode_stream.h' |
337 | === modified file 'modules/ExternalModules.conf' |
338 | --- modules/ExternalModules.conf 2013-06-11 23:54:50 +0000 |
339 | +++ modules/ExternalModules.conf 2013-06-13 01:24:25 +0000 |
340 | @@ -26,10 +26,13 @@ |
341 | # "tag" is the VCS tag to check out (optional - defaults to HEAD; |
342 | # currently only works for bzr, since svn tags are just different URLS) |
343 | |
344 | -archive bzr lp:zorba/archive-module zorba-2.9 |
345 | -csv bzr lp:zorba/csv-module |
346 | +#archive bzr lp:zorba/archive-module |
347 | +archive bzr lp:~zorba-coders/zorba/bug-1189996-archive |
348 | +#csv bzr lp:zorba/csv-module |
349 | +csv bzr lp:~zorba-coders/zorba/bug-1189996-csv |
350 | data-cleaning bzr lp:zorba/data-cleaning-module |
351 | -data-formatting bzr lp:zorba/data-formatting-module |
352 | +#data-formatting bzr lp:zorba/data-formatting-module |
353 | +data-formatting bzr lp:~zorba-coders/zorba/bug-1189996-data-formatting |
354 | excel bzr lp:zorba/excel-module zorba-2.9 |
355 | info-extraction bzr lp:zorba/info-extraction-module zorba-2.9 |
356 | geo bzr lp:zorba/geo-module zorba-2.9 |
357 | @@ -37,19 +40,29 @@ |
358 | graphviz bzr lp:zorba/graphviz-module zorba-2.9 |
359 | html bzr lp:zorba/html-module zorba-2.9 |
360 | http-client bzr lp:zorba/http-client-module zorba-2.9 |
361 | -image bzr lp:zorba/image-module zorba-2.9 |
362 | -jdbc bzr lp:zorba/jdbc-module |
363 | +#image bzr lp:zorba/image-module zorba-2.9 |
364 | +image bzr lp:~zorba-coders/zorba/bug-1189996-image |
365 | +#jdbc bzr lp:zorba/jdbc-module |
366 | +jdbc bzr lp:~zorba-coders/zorba/bug-1189996-jdbc |
367 | languages bzr lp:zorba/languages-module zorba-2.9 |
368 | -oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module |
369 | +#oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module |
370 | +oracle-nosql-db bzr lp:~zorba-coders/zorba/bug-1189996-oracle-nosql-db |
371 | oauth bzr lp:zorba/oauth-module zorba-2.9 |
372 | process bzr lp:zorba/process-module |
373 | -read-pdf bzr lp:zorba/read-pdf-module |
374 | -security bzr lp:zorba/security-module zorba-2.9 |
375 | +#read-pdf bzr lp:zorba/read-pdf-module |
376 | +read-pdf bzr lp:~zorba-coders/zorba/bug-1189996-read-pdf |
377 | +#security bzr lp:zorba/security-module zorba-2.9 |
378 | +security bzr lp:~zorba-coders/zorba/bug-1189996-security |
379 | system bzr lp:zorba/system-module zorba-2.9 |
380 | -email bzr lp:zorba/email-module zorba-2.9 |
381 | -util-jvm bzr lp:zorba/util-jvm-module |
382 | -schema-tools bzr lp:zorba/schema-tools-module |
383 | +#email bzr lp:zorba/email-module zorba-2.9 |
384 | +email bzr lp:~zorba-coders/zorba/bug-1189996-email |
385 | +#util-jvm bzr lp:zorba/util-jvm-module |
386 | +util-jvm bzr lp:~zorba-coders/zorba/bug-1189996-util-jvm |
387 | +#schema-tools bzr lp:zorba/schema-tools-module |
388 | +schema-tools bzr lp:~zorba-coders/zorba/bug-1189996-schema-tools |
389 | stack bzr lp:zorba/stack-module zorba-2.9 |
390 | queue bzr lp:zorba/queue-module zorba-2.9 |
391 | -couchbase bzr lp:zorba/couchbase-module zorba-2.9 |
392 | -sqlite bzr lp:zorba/sqlite-module zorba-2.9 |
393 | +#couchbase bzr lp:zorba/couchbase-module zorba-2.9 |
394 | +couchbase bzr lp:~zorba-coders/zorba/bug-1189996-couchbase |
395 | +#sqlite bzr lp:zorba/sqlite-module zorba-2.9 |
396 | +sqlite bzr lp:~zorba-coders/zorba/bug-1189996-sqlite |
397 | |
398 | === modified file 'modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp' |
399 | --- modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp 2013-02-07 17:24:36 +0000 |
400 | +++ modules/com/zorba-xquery/www/modules/http-client.xq.src/http_request_handler.cpp 2013-06-13 01:24:25 +0000 |
401 | @@ -16,14 +16,13 @@ |
402 | |
403 | #include <iostream> |
404 | |
405 | +#include <zorba/api_shared_types.h> |
406 | +#include <zorba/serializer.h> |
407 | +#include <zorba/singleton_item_sequence.h> |
408 | +#include <zorba/util/base64_util.h> |
409 | +#include <zorba/xquery_functions.h> |
410 | #include <zorba/zorba.h> |
411 | -#include <zorba/singleton_item_sequence.h> |
412 | -#include <zorba/serializer.h> |
413 | -#include <zorba/api_shared_types.h> |
414 | -#include <zorba/xquery_functions.h> |
415 | #include <zorba/zorba_functions.h> |
416 | -#include <zorba/base64.h> |
417 | -#include <zorba/xquery_functions.h> |
418 | |
419 | #include "http_request_handler.h" |
420 | |
421 | @@ -117,7 +116,7 @@ |
422 | if (lAuthMethod == "basic") { |
423 | String lAuthString = aUsername + ":" + aPassword; |
424 | String lAuth = "Authorization: Basic "; |
425 | - lAuth += encoding::Base64::encode(lAuthString); |
426 | + lAuth += base64::encode(lAuthString); |
427 | theAuthMethod = lAuth.c_str(); |
428 | theHeaderLists[0] = curl_slist_append(theHeaderLists[0], theAuthMethod.c_str()); |
429 | } else if (lAuthMethod == "digest") { |
430 | |
431 | === modified file 'modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp' |
432 | --- modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp 2013-04-10 05:17:20 +0000 |
433 | +++ modules/com/zorba-xquery/www/modules/http-client.xq.src/http_response_parser.cpp 2013-06-13 01:24:25 +0000 |
434 | @@ -21,13 +21,13 @@ |
435 | #include <stdexcept> |
436 | #include <string> |
437 | |
438 | -#include <zorba/base64.h> |
439 | #include <zorba/config.h> |
440 | #include <zorba/diagnostic_list.h> |
441 | #include <zorba/error.h> |
442 | #include <zorba/item.h> |
443 | #include <zorba/item_factory.h> |
444 | -#include <zorba/transcode_stream.h> |
445 | +#include <zorba/util/base64_util.h> |
446 | +#include <zorba/util/transcode_stream.h> |
447 | #include <zorba/xmldatamanager.h> |
448 | #include <zorba/xquery_exception.h> |
449 | #include <zorba/xquery_exception.h> |
450 | @@ -328,7 +328,7 @@ |
451 | // TODO: once a proper streaming implementation is in place this can be |
452 | // changed. This required a Base64 encoding stream since the item factory |
453 | // work only builds base64binary and assumes the data is already encoded. |
454 | - String lEncoded = encoding::Base64::encode(aStream); |
455 | + String lEncoded = base64::encode(aStream); |
456 | return lFactory->createBase64Binary(lEncoded.data(), lEncoded.size()); |
457 | } |
458 | |
459 | |
460 | === modified file 'modules/org/expath/ns/file.xq.src/file.cpp' |
461 | --- modules/org/expath/ns/file.xq.src/file.cpp 2013-06-12 23:54:27 +0000 |
462 | +++ modules/org/expath/ns/file.xq.src/file.cpp 2013-06-13 01:24:25 +0000 |
463 | @@ -23,15 +23,15 @@ |
464 | #include <stdexcept> |
465 | |
466 | // Zorba |
467 | -#include <zorba/base64.h> |
468 | #include <zorba/diagnostic_list.h> |
469 | #include <zorba/empty_sequence.h> |
470 | #include <zorba/serializer.h> |
471 | #include <zorba/singleton_item_sequence.h> |
472 | -#include <zorba/transcode_stream.h> |
473 | #include <zorba/user_exception.h> |
474 | +#include <zorba/util/base64_util.h> |
475 | #include <zorba/util/fs_util.h> |
476 | #include <zorba/util/stream_util.h> |
477 | +#include <zorba/util/transcode_stream.h> |
478 | |
479 | // local |
480 | #include "file_module.h" |
481 | |
482 | === modified file 'src/api/base64_streambuf.cpp' |
483 | --- src/api/base64_streambuf.cpp 2013-04-16 22:12:03 +0000 |
484 | +++ src/api/base64_streambuf.cpp 2013-06-13 01:24:25 +0000 |
485 | @@ -23,7 +23,7 @@ |
486 | # include <stdio.h> |
487 | #endif |
488 | |
489 | -#include <zorba/base64_stream.h> |
490 | +#include <zorba/util/base64_stream.h> |
491 | |
492 | #include "util/base64_util.h" |
493 | |
494 | |
495 | === modified file 'src/api/base64impl.cpp' |
496 | --- src/api/base64impl.cpp 2013-02-07 17:24:36 +0000 |
497 | +++ src/api/base64impl.cpp 2013-06-13 01:24:25 +0000 |
498 | @@ -16,8 +16,8 @@ |
499 | #include "stdafx.h" |
500 | |
501 | #include <sstream> |
502 | -#include <zorba/base64.h> |
503 | #include <zorba/diagnostic_list.h> |
504 | +#include <zorba/util/base64_util.h> |
505 | |
506 | #include <zorba/config.h> |
507 | #include <zorba/zorba_string.h> |
508 | @@ -27,61 +27,58 @@ |
509 | #include "util/base64_util.h" |
510 | |
511 | #define CATCH_BASE64_EXCEPTION() \ |
512 | - catch (const base64::exception& e) \ |
513 | + catch (base64::exception const &e) \ |
514 | { \ |
515 | throw XQUERY_EXCEPTION(err::FORG0001, \ |
516 | ERROR_PARAMS(ZED(FORG0001_Base64BadChar_2), e.invalid_char())); \ |
517 | } \ |
518 | - catch (const std::invalid_argument&) \ |
519 | + catch (std::invalid_argument const&) \ |
520 | { \ |
521 | throw XQUERY_EXCEPTION(err::FORG0001, \ |
522 | ERROR_PARAMS(ZED(FORG0001_Base64Multiple4))); \ |
523 | } |
524 | |
525 | +using namespace std; |
526 | |
527 | namespace zorba { |
528 | -namespace encoding { |
529 | - |
530 | -String Base64::encode(const String& aString) |
531 | -{ |
532 | - String result; |
533 | - base64::encode( aString.data(), aString.size(), &result ); |
534 | - return result; |
535 | -} |
536 | - |
537 | - |
538 | -String Base64::encode(std::istream& aStream) |
539 | -{ |
540 | - String result; |
541 | - base64::encode( aStream, &result ); |
542 | - return result; |
543 | -} |
544 | - |
545 | - |
546 | -String Base64::decode(const String& aString) |
547 | -{ |
548 | - try { |
549 | - String result; |
550 | - base64::decode( |
551 | - aString.data(), aString.size(), &result, base64::dopt_ignore_ws |
552 | - ); |
553 | - return result; |
554 | - } |
555 | - CATCH_BASE64_EXCEPTION() |
556 | -} |
557 | - |
558 | - |
559 | -String Base64::decode(std::istream& aStream) |
560 | -{ |
561 | - try { |
562 | - String result; |
563 | - base64::decode( aStream, &result, base64::dopt_ignore_ws ); |
564 | - return result; |
565 | - } |
566 | - CATCH_BASE64_EXCEPTION() |
567 | -} |
568 | - |
569 | - |
570 | -} // namespace encoding |
571 | +namespace base64 { |
572 | + |
573 | +/////////////////////////////////////////////////////////////////////////////// |
574 | + |
575 | +String encode(String const &aString ) { |
576 | + String result; |
577 | + encode( aString.data(), aString.size(), &result ); |
578 | + return result; |
579 | +} |
580 | + |
581 | +String encode( istream& aStream ) { |
582 | + String result; |
583 | + encode( aStream, &result ); |
584 | + return result; |
585 | +} |
586 | + |
587 | + |
588 | +String decode( String const &aString ) { |
589 | + try { |
590 | + String result; |
591 | + decode( aString.data(), aString.size(), &result, dopt_ignore_ws ); |
592 | + return result; |
593 | + } |
594 | + CATCH_BASE64_EXCEPTION() |
595 | +} |
596 | + |
597 | + |
598 | +String decode( istream &aStream ) { |
599 | + try { |
600 | + String result; |
601 | + decode( aStream, &result, dopt_ignore_ws ); |
602 | + return result; |
603 | + } |
604 | + CATCH_BASE64_EXCEPTION() |
605 | +} |
606 | + |
607 | +/////////////////////////////////////////////////////////////////////////////// |
608 | + |
609 | +} // namespace base64 |
610 | } // namespace zorba |
611 | /* vim:set et sw=2 ts=2: */ |
612 | |
613 | === modified file 'src/api/serialization/serializer.cpp' |
614 | --- src/api/serialization/serializer.cpp 2013-06-05 00:37:35 +0000 |
615 | +++ src/api/serialization/serializer.cpp 2013-06-13 01:24:25 +0000 |
616 | @@ -19,7 +19,7 @@ |
617 | #include <iomanip> |
618 | |
619 | #include <zorba/zorba_string.h> |
620 | -#include <zorba/transcode_stream.h> |
621 | +#include <zorba/util/transcode_stream.h> |
622 | |
623 | #include "diagnostics/xquery_diagnostics.h" |
624 | #include "diagnostics/assert.h" |
625 | |
626 | === modified file 'src/api/smart_ptr.cpp' |
627 | --- src/api/smart_ptr.cpp 2013-02-07 17:24:36 +0000 |
628 | +++ src/api/smart_ptr.cpp 2013-06-13 01:24:25 +0000 |
629 | @@ -13,9 +13,10 @@ |
630 | * See the License for the specific language governing permissions and |
631 | * limitations under the License. |
632 | */ |
633 | -#include "stdafx.h" |
634 | -#include <zorba/smart_ptr.h> |
635 | -#include "stdafx.h" |
636 | + |
637 | +#include "stdafx.h" |
638 | + |
639 | +#include <zorba/util/smart_ptr.h> |
640 | |
641 | namespace zorba { |
642 | |
643 | |
644 | === modified file 'src/api/transcode_streambuf.cpp' |
645 | --- src/api/transcode_streambuf.cpp 2013-02-07 17:24:36 +0000 |
646 | +++ src/api/transcode_streambuf.cpp 2013-06-13 01:24:25 +0000 |
647 | @@ -15,7 +15,7 @@ |
648 | */ |
649 | |
650 | #include "stdafx.h" |
651 | -#include <zorba/transcode_stream.h> |
652 | +#include <zorba/util/transcode_stream.h> |
653 | |
654 | #include "util/transcode_streambuf.h" |
655 | |
656 | |
657 | === modified file 'src/compiler/expression/ftnode.cpp' |
658 | --- src/compiler/expression/ftnode.cpp 2013-06-01 00:30:39 +0000 |
659 | +++ src/compiler/expression/ftnode.cpp 2013-06-13 01:24:25 +0000 |
660 | @@ -22,8 +22,8 @@ |
661 | #include "types/casting.h" |
662 | #include "util/ascii_util.h" |
663 | #include "util/indent.h" |
664 | +#include "util/locale.h" |
665 | #include "util/stl_util.h" |
666 | -#include "zorbautils/locale.h" |
667 | |
668 | #include "expr_visitor.h" |
669 | #include "ftnode.h" |
670 | |
671 | === modified file 'src/compiler/expression/ftnode.h' |
672 | --- src/compiler/expression/ftnode.h 2013-06-01 00:30:39 +0000 |
673 | +++ src/compiler/expression/ftnode.h 2013-06-13 01:24:25 +0000 |
674 | @@ -17,8 +17,8 @@ |
675 | #ifndef ZORBA_COMPILER_FTNODE_H |
676 | #define ZORBA_COMPILER_FTNODE_H |
677 | |
678 | -#include <zorba/locale.h> |
679 | #include <zorba/internal/cxx_util.h> |
680 | +#include <zorba/util/locale.h> |
681 | |
682 | #include "common/shared_types.h" |
683 | |
684 | |
685 | === modified file 'src/context/dynamic_context.h' |
686 | --- src/context/dynamic_context.h 2013-05-08 08:01:05 +0000 |
687 | +++ src/context/dynamic_context.h 2013-06-13 01:24:25 +0000 |
688 | @@ -18,11 +18,11 @@ |
689 | #define ZORBA_DYNAMIC_CONTEXT_H |
690 | |
691 | #include <zorba/external_function_parameter.h> |
692 | -#include <zorba/time.h> |
693 | +#include <zorba/util/calendar.h> |
694 | |
695 | +#include "util/locale.h" |
696 | #include "zorbautils/hashmap_zstring.h" |
697 | #include "zorbautils/hashmap_itemp.h" |
698 | -#include "zorbautils/locale.h" |
699 | |
700 | #include "common/shared_types.h" |
701 | |
702 | |
703 | === modified file 'src/context/uri_resolver.h' |
704 | --- src/context/uri_resolver.h 2013-02-07 17:24:36 +0000 |
705 | +++ src/context/uri_resolver.h 2013-06-13 01:24:25 +0000 |
706 | @@ -34,7 +34,7 @@ |
707 | #include <util/auto_vector.h> |
708 | #include <store/api/shared_types.h> |
709 | #include <zorba/streams.h> |
710 | -#include <zorba/locale.h> |
711 | +#include <zorba/util/locale.h> |
712 | |
713 | namespace zorba { |
714 | |
715 | |
716 | === modified file 'src/debugger/debugger_clientimpl.cpp' |
717 | --- src/debugger/debugger_clientimpl.cpp 2013-02-07 17:24:36 +0000 |
718 | +++ src/debugger/debugger_clientimpl.cpp 2013-06-13 01:24:25 +0000 |
719 | @@ -14,11 +14,14 @@ |
720 | * limitations under the License. |
721 | */ |
722 | #include "stdafx.h" |
723 | + |
724 | #include <iostream> |
725 | #include <sstream> |
726 | #include <cassert> |
727 | + |
728 | #include <zorba/debugger_event_handler.h> |
729 | -#include <zorba/base64.h> |
730 | +#include <zorba/util/base64_util.h> |
731 | + |
732 | #include "debugger/debugger_clientimpl.h" |
733 | #include "debugger/socket_streambuf.h" |
734 | |
735 | @@ -566,7 +569,7 @@ |
736 | DebuggerClientImpl::eval(std::string const &aExpr) |
737 | { |
738 | std::size_t id = ++theLastId; |
739 | - *theOutStream << "eval -i " << id << " -- " << encoding::Base64::encode(aExpr.c_str()) << '\0'; |
740 | + *theOutStream << "eval -i " << id << " -- " << base64::encode(aExpr.c_str()) << '\0'; |
741 | theOutStream->flush(); |
742 | return id; |
743 | } |
744 | |
745 | === modified file 'src/debugger/debugger_server.cpp' |
746 | --- src/debugger/debugger_server.cpp 2013-02-07 17:24:36 +0000 |
747 | +++ src/debugger/debugger_server.cpp 2013-06-13 01:24:25 +0000 |
748 | @@ -22,7 +22,7 @@ |
749 | # include <signal.h> |
750 | #endif |
751 | |
752 | -#include <zorba/base64.h> |
753 | +#include <zorba/util/base64_util.h> |
754 | #include <zorba/util/uri.h> |
755 | |
756 | #include "api/xqueryimpl.h" |
757 | @@ -401,7 +401,7 @@ |
758 | try { |
759 | |
760 | String lEncodedData(aCommand.getData()); |
761 | - String lDecodedData = encoding::Base64::decode(lEncodedData); |
762 | + String lDecodedData = base64::decode(lEncodedData); |
763 | |
764 | zstring lVar(lDecodedData.c_str()); |
765 | std::list<std::pair<zstring, zstring> > lResults = theRuntime->eval(lVar); |
766 | @@ -734,7 +734,7 @@ |
767 | buildChildProperties(aName, lResults, aStream); |
768 | } else if (lResults.size() == 1) { |
769 | String lValue(lResults.front().first.c_str()); |
770 | - aStream << encoding::Base64::encode(lValue); |
771 | + aStream << base64::encode(lValue); |
772 | } |
773 | |
774 | aStream << "</property>"; |
775 | @@ -761,7 +761,7 @@ |
776 | << "encoding=\"base64\" " |
777 | << "constant=\"1\" " |
778 | << "children=\"0\" " |
779 | - << ">" << encoding::Base64::encode(lValue) |
780 | + << ">" << base64::encode(lValue) |
781 | << "</property>"; |
782 | } |
783 | } |
784 | |
785 | === modified file 'src/diagnostics/dict.cpp' |
786 | --- src/diagnostics/dict.cpp 2013-02-07 17:24:36 +0000 |
787 | +++ src/diagnostics/dict.cpp 2013-06-13 01:24:25 +0000 |
788 | @@ -20,7 +20,7 @@ |
789 | #include <utility> /* for pair */ |
790 | #include <cassert> |
791 | |
792 | -#include "zorbautils/locale.h" |
793 | +#include "util/locale.h" |
794 | |
795 | #include "dict.h" |
796 | #include "dict_impl.h" |
797 | |
798 | === modified file 'src/precompiled/stdafx.h' |
799 | --- src/precompiled/stdafx.h 2013-06-01 00:30:39 +0000 |
800 | +++ src/precompiled/stdafx.h 2013-06-13 01:24:25 +0000 |
801 | @@ -49,16 +49,19 @@ |
802 | #include <zorba/store_manager.h> |
803 | #include <zorba/xquery.h> |
804 | #include <zorba/xquery_exception.h> |
805 | + |
806 | #include "diagnostics/assert.h" |
807 | - #include "zorbatypes/mapm/m_apm_lc.h" |
808 | - #include "zorbatypes/datetime/parse.h" |
809 | + #include "util/cxx_util.h" |
810 | + #include "util/locale.h" |
811 | #include "zorbatypes/chartype.h" |
812 | #include "zorbatypes/collation_manager.h" |
813 | + #include "zorbatypes/datetime/parse.h" |
814 | #include "zorbatypes/ft_token.h" |
815 | #include "zorbatypes/m_apm.h" |
816 | + #include "zorbatypes/mapm/m_apm_lc.h" |
817 | #include "zorbatypes/rclock.h" |
818 | #include "zorbatypes/schema_types.h" |
819 | -// |
820 | + |
821 | #include "zorbatypes/timezone.h" |
822 | #include "zorbatypes/URI.h" |
823 | #include "zorbatypes/xerces_xmlcharray.h" |
824 | @@ -72,7 +75,6 @@ |
825 | #include "zorbautils/hashset.h" |
826 | |
827 | #include "zorbautils/latch.h" |
828 | - #include "zorbautils/locale.h" |
829 | #include "zorbautils/lock.h" |
830 | #include "zorbautils/mutex.h" |
831 | #include "zorbautils/runnable.h" |
832 | |
833 | === modified file 'src/runtime/base64/base64_impl.cpp' |
834 | --- src/runtime/base64/base64_impl.cpp 2013-04-16 21:12:12 +0000 |
835 | +++ src/runtime/base64/base64_impl.cpp 2013-06-13 01:24:25 +0000 |
836 | @@ -16,7 +16,7 @@ |
837 | #include "stdafx.h" |
838 | |
839 | #include <sstream> |
840 | -#include <zorba/transcode_stream.h> |
841 | +#include <zorba/util/transcode_stream.h> |
842 | |
843 | #include "system/globalenv.h" |
844 | |
845 | |
846 | === modified file 'src/runtime/durations_dates_times/format_dateTime.cpp' |
847 | --- src/runtime/durations_dates_times/format_dateTime.cpp 2013-05-22 02:22:35 +0000 |
848 | +++ src/runtime/durations_dates_times/format_dateTime.cpp 2013-06-13 01:24:25 +0000 |
849 | @@ -32,13 +32,13 @@ |
850 | #include "store/api/store.h" |
851 | #include "system/globalenv.h" |
852 | #include "util/ascii_util.h" |
853 | +#include "util/locale.h" |
854 | #include "util/stream_util.h" |
855 | #include "util/string_util.h" |
856 | #include "util/time_util.h" |
857 | #include "util/utf8_util.h" |
858 | #include "zorbatypes/datetime.h" |
859 | #include "zorbatypes/zstring.h" |
860 | -#include "zorbautils/locale.h" |
861 | |
862 | // local |
863 | #include "format_dateTime.h" |
864 | |
865 | === modified file 'src/runtime/fetch/fetch_impl.cpp' |
866 | --- src/runtime/fetch/fetch_impl.cpp 2013-02-26 04:12:43 +0000 |
867 | +++ src/runtime/fetch/fetch_impl.cpp 2013-06-13 01:24:25 +0000 |
868 | @@ -15,7 +15,7 @@ |
869 | */ |
870 | #include "stdafx.h" |
871 | |
872 | -#include <zorba/transcode_stream.h> |
873 | +#include <zorba/util/transcode_stream.h> |
874 | |
875 | #include "diagnostics/assert.h" |
876 | #include "diagnostics/xquery_diagnostics.h" |
877 | |
878 | === modified file 'src/runtime/full_text/apply.cpp' |
879 | --- src/runtime/full_text/apply.cpp 2013-06-07 22:04:25 +0000 |
880 | +++ src/runtime/full_text/apply.cpp 2013-06-13 01:24:25 +0000 |
881 | @@ -31,9 +31,9 @@ |
882 | #include "store/api/store.h" |
883 | #include "system/globalenv.h" |
884 | #include "util/indent.h" |
885 | +#include "util/locale.h" |
886 | #include "util/stl_util.h" |
887 | #include "zorbamisc/ns_consts.h" |
888 | -#include "zorbautils/locale.h" |
889 | |
890 | #ifndef NDEBUG |
891 | # include "system/properties.h" |
892 | |
893 | === modified file 'src/runtime/full_text/ft_module_impl.cpp' |
894 | --- src/runtime/full_text/ft_module_impl.cpp 2013-05-30 21:22:57 +0000 |
895 | +++ src/runtime/full_text/ft_module_impl.cpp 2013-06-13 01:24:25 +0000 |
896 | @@ -44,11 +44,11 @@ |
897 | #include "types/casting.h" |
898 | #include "types/typeimpl.h" |
899 | #include "types/typeops.h" |
900 | +#include "util/locale.h" |
901 | #include "util/stl_util.h" |
902 | #include "util/utf8_util.h" |
903 | #include "zorbatypes/integer.h" |
904 | #include "zorbatypes/URI.h" |
905 | -#include "zorbautils/locale.h" |
906 | |
907 | #include "ft_module_util.h" |
908 | #include "ft_stop_words_set.h" |
909 | |
910 | === modified file 'src/runtime/full_text/ft_stop_words_set.cpp' |
911 | --- src/runtime/full_text/ft_stop_words_set.cpp 2013-06-01 00:30:39 +0000 |
912 | +++ src/runtime/full_text/ft_stop_words_set.cpp 2013-06-13 01:24:25 +0000 |
913 | @@ -21,10 +21,10 @@ |
914 | #include "context/static_context.h" |
915 | #include "context/uri_resolver.h" |
916 | #include "util/ascii_util.h" |
917 | +#include "util/locale.h" |
918 | #include "util/mmap_file.h" |
919 | #include "util/stl_util.h" |
920 | #include "util/uri_util.h" |
921 | -#include "zorbautils/locale.h" |
922 | |
923 | #include "ft_stop_words_set.h" |
924 | |
925 | |
926 | === modified file 'src/runtime/full_text/ft_stop_words_set.h' |
927 | --- src/runtime/full_text/ft_stop_words_set.h 2013-02-07 17:24:36 +0000 |
928 | +++ src/runtime/full_text/ft_stop_words_set.h 2013-06-13 01:24:25 +0000 |
929 | @@ -19,8 +19,8 @@ |
930 | |
931 | #include <set> |
932 | |
933 | -#include <zorba/locale.h> |
934 | #include <zorba/internal/unique_ptr.h> |
935 | +#include <zorba/util/locale.h> |
936 | |
937 | #include "compiler/expression/ftnode.h" |
938 | #include "zorbatypes/zstring.h" |
939 | |
940 | === modified file 'src/runtime/full_text/ft_thesaurus.h' |
941 | --- src/runtime/full_text/ft_thesaurus.h 2013-02-07 17:24:36 +0000 |
942 | +++ src/runtime/full_text/ft_thesaurus.h 2013-06-13 01:24:25 +0000 |
943 | @@ -17,8 +17,8 @@ |
944 | #ifndef ZORBA_FULL_TEXT_FT_THESAURUS_H |
945 | #define ZORBA_FULL_TEXT_FT_THESAURUS_H |
946 | |
947 | -#include <zorba/locale.h> |
948 | #include <zorba/internal/unique_ptr.h> |
949 | +#include <zorba/util/locale.h> |
950 | |
951 | #include "zorbatypes/zstring.h" |
952 | |
953 | |
954 | === modified file 'src/runtime/full_text/ft_token_matcher.h' |
955 | --- src/runtime/full_text/ft_token_matcher.h 2013-02-07 17:24:36 +0000 |
956 | +++ src/runtime/full_text/ft_token_matcher.h 2013-06-13 01:24:25 +0000 |
957 | @@ -17,7 +17,7 @@ |
958 | #ifndef ZORBA_FULL_TEXT_FT_TOKEN_MATCHER_H |
959 | #define ZORBA_FULL_TEXT_FT_TOKEN_MATCHER_H |
960 | |
961 | -#include <zorba/locale.h> |
962 | +#include <zorba/util/locale.h> |
963 | |
964 | #include "compiler/expression/ftnode.h" |
965 | #include "context/static_context.h" |
966 | |
967 | === modified file 'src/runtime/full_text/ft_util.cpp' |
968 | --- src/runtime/full_text/ft_util.cpp 2013-05-08 20:14:47 +0000 |
969 | +++ src/runtime/full_text/ft_util.cpp 2013-06-13 01:24:25 +0000 |
970 | @@ -19,10 +19,10 @@ |
971 | #include <stdexcept> |
972 | |
973 | #include "diagnostics/xquery_diagnostics.h" |
974 | +#include "util/locale.h" |
975 | #include "zorbamisc/ns_consts.h" |
976 | #include "zorbatypes/integer.h" |
977 | #include "zorbatypes/numconversions.h" |
978 | -#include "zorbautils/locale.h" |
979 | |
980 | #include "ft_util.h" |
981 | |
982 | |
983 | === modified file 'src/runtime/full_text/ft_util.h' |
984 | --- src/runtime/full_text/ft_util.h 2013-06-01 00:30:39 +0000 |
985 | +++ src/runtime/full_text/ft_util.h 2013-06-13 01:24:25 +0000 |
986 | @@ -19,7 +19,7 @@ |
987 | |
988 | #include <zorba/internal/cxx_util.h> |
989 | #include <zorba/item.h> |
990 | -#include <zorba/locale.h> |
991 | +#include <zorba/util/locale.h> |
992 | |
993 | #include "compiler/expression/ftnode.h" |
994 | #include "store/api/item.h" |
995 | |
996 | === modified file 'src/runtime/full_text/full_text_impl.cpp' |
997 | --- src/runtime/full_text/full_text_impl.cpp 2013-02-07 17:24:36 +0000 |
998 | +++ src/runtime/full_text/full_text_impl.cpp 2013-06-13 01:24:25 +0000 |
999 | @@ -15,7 +15,7 @@ |
1000 | */ |
1001 | #include "stdafx.h" |
1002 | |
1003 | -#include <zorba/locale.h> |
1004 | +#include <zorba/util/locale.h> |
1005 | |
1006 | #include "common/common.h" |
1007 | #include "store/api/ft_token_iterator.h" |
1008 | |
1009 | === modified file 'src/runtime/full_text/icu_tokenizer.cpp' |
1010 | --- src/runtime/full_text/icu_tokenizer.cpp 2013-06-01 00:30:39 +0000 |
1011 | +++ src/runtime/full_text/icu_tokenizer.cpp 2013-06-13 01:24:25 +0000 |
1012 | @@ -33,10 +33,10 @@ |
1013 | #include "diagnostics/xquery_exception.h" |
1014 | #include "diagnostics/zorba_exception.h" |
1015 | #include "util/ascii_util.h" |
1016 | +#include "util/locale.h" |
1017 | #include "util/stl_util.h" |
1018 | #include "util/unicode_util.h" |
1019 | #include "util/utf8_util.h" |
1020 | -#include "zorbautils/locale.h" |
1021 | #include "zorbautils/mutex.h" |
1022 | |
1023 | #include "icu_tokenizer.h" |
1024 | |
1025 | === modified file 'src/runtime/full_text/icu_tokenizer.h' |
1026 | --- src/runtime/full_text/icu_tokenizer.h 2013-06-01 00:30:39 +0000 |
1027 | +++ src/runtime/full_text/icu_tokenizer.h 2013-06-13 01:24:25 +0000 |
1028 | @@ -21,8 +21,8 @@ |
1029 | |
1030 | #include <zorba/internal/cxx_util.h> |
1031 | #include <zorba/internal/unique_ptr.h> |
1032 | -#include <zorba/locale.h> |
1033 | #include <zorba/tokenizer.h> |
1034 | +#include <zorba/util/locale.h> |
1035 | |
1036 | namespace zorba { |
1037 | |
1038 | |
1039 | === modified file 'src/runtime/full_text/stemmer.cpp' |
1040 | --- src/runtime/full_text/stemmer.cpp 2013-06-01 00:30:39 +0000 |
1041 | +++ src/runtime/full_text/stemmer.cpp 2013-06-13 01:24:25 +0000 |
1042 | @@ -17,7 +17,7 @@ |
1043 | |
1044 | #include <zorba/internal/cxx_util.h> |
1045 | |
1046 | -#include "zorbautils/locale.h" |
1047 | +#include "util/locale.h" |
1048 | #include "zorbautils/mutex.h" |
1049 | |
1050 | #include "stemmer.h" |
1051 | |
1052 | === modified file 'src/runtime/full_text/stemmer.h' |
1053 | --- src/runtime/full_text/stemmer.h 2013-02-07 17:24:36 +0000 |
1054 | +++ src/runtime/full_text/stemmer.h 2013-06-13 01:24:25 +0000 |
1055 | @@ -22,7 +22,7 @@ |
1056 | #ifndef ZORBA_NO_FULL_TEXT |
1057 | |
1058 | #include <zorba/internal/unique_ptr.h> |
1059 | -#include <zorba/locale.h> |
1060 | +#include <zorba/util/locale.h> |
1061 | |
1062 | #include "util/stl_util.h" |
1063 | #include "zorbatypes/zstring.h" |
1064 | |
1065 | === modified file 'src/runtime/full_text/stemmer/sb_stemmer.cpp' |
1066 | --- src/runtime/full_text/stemmer/sb_stemmer.cpp 2013-06-01 00:30:39 +0000 |
1067 | +++ src/runtime/full_text/stemmer/sb_stemmer.cpp 2013-06-13 01:24:25 +0000 |
1068 | @@ -17,8 +17,8 @@ |
1069 | |
1070 | #include <zorba/internal/cxx_util.h> |
1071 | |
1072 | +#include "util/locale.h" |
1073 | #include "zorbautils/fatal.h" |
1074 | -#include "zorbautils/locale.h" |
1075 | |
1076 | #include "sb_stemmer.h" |
1077 | |
1078 | |
1079 | === modified file 'src/runtime/full_text/thesauri/iso2788.h' |
1080 | --- src/runtime/full_text/thesauri/iso2788.h 2013-02-07 17:24:36 +0000 |
1081 | +++ src/runtime/full_text/thesauri/iso2788.h 2013-06-13 01:24:25 +0000 |
1082 | @@ -20,7 +20,7 @@ |
1083 | #include <cstdlib> /* for abs(3) */ |
1084 | #include <iostream> |
1085 | |
1086 | -#include <zorba/locale.h> |
1087 | +#include <zorba/util/locale.h> |
1088 | |
1089 | namespace zorba { |
1090 | |
1091 | |
1092 | === modified file 'src/runtime/full_text/thesauri/wn_thesaurus.cpp' |
1093 | --- src/runtime/full_text/thesauri/wn_thesaurus.cpp 2013-06-01 00:30:39 +0000 |
1094 | +++ src/runtime/full_text/thesauri/wn_thesaurus.cpp 2013-06-13 01:24:25 +0000 |
1095 | @@ -30,11 +30,12 @@ |
1096 | #include "system/globalenv.h" |
1097 | #include "util/fs_util.h" |
1098 | #include "util/less.h" |
1099 | +#include "util/locale.h" |
1100 | #if DEBUG_FT_THESAURUS |
1101 | # include "util/oseparator.h" |
1102 | #endif |
1103 | #include "util/utf8_util.h" |
1104 | -#include "zorbautils/locale.h" |
1105 | +#include "system/globalenv.h" |
1106 | |
1107 | #include "decode_base128.h" |
1108 | #include "wn_db_segment.h" |
1109 | |
1110 | === modified file 'src/runtime/full_text/thesauri/xqftts_relationship.cpp' |
1111 | --- src/runtime/full_text/thesauri/xqftts_relationship.cpp 2013-02-07 17:24:36 +0000 |
1112 | +++ src/runtime/full_text/thesauri/xqftts_relationship.cpp 2013-06-13 01:24:25 +0000 |
1113 | @@ -15,7 +15,7 @@ |
1114 | */ |
1115 | #include "stdafx.h" |
1116 | |
1117 | -#include <zorba/locale.h> |
1118 | +#include <zorba/util/locale.h> |
1119 | |
1120 | #include "util/utf8_util.h" |
1121 | |
1122 | |
1123 | === modified file 'src/runtime/full_text/thesaurus.h' |
1124 | --- src/runtime/full_text/thesaurus.h 2013-02-07 17:24:36 +0000 |
1125 | +++ src/runtime/full_text/thesaurus.h 2013-06-13 01:24:25 +0000 |
1126 | @@ -17,8 +17,8 @@ |
1127 | #ifndef ZORBA_THESAURUS_H |
1128 | #define ZORBA_THESAURUS_H |
1129 | |
1130 | -#include <zorba/locale.h> |
1131 | #include <zorba/internal/unique_ptr.h> |
1132 | +#include <zorba/util/locale.h> |
1133 | |
1134 | #include "context/uri_resolver.h" |
1135 | #include "util/stl_util.h" |
1136 | |
1137 | === modified file 'src/runtime/full_text/tokenizer.cpp' |
1138 | --- src/runtime/full_text/tokenizer.cpp 2013-02-07 17:24:36 +0000 |
1139 | +++ src/runtime/full_text/tokenizer.cpp 2013-06-13 01:24:25 +0000 |
1140 | @@ -25,8 +25,8 @@ |
1141 | #include "diagnostics/assert.h" |
1142 | #include "store/api/store.h" |
1143 | #include "system/globalenv.h" |
1144 | +#include "util/locale.h" |
1145 | #include "zorbamisc/ns_consts.h" |
1146 | -#include "zorbautils/locale.h" |
1147 | |
1148 | #include "ft_util.h" |
1149 | |
1150 | |
1151 | === modified file 'src/runtime/sequences/sequences_impl.cpp' |
1152 | --- src/runtime/sequences/sequences_impl.cpp 2013-06-11 05:40:04 +0000 |
1153 | +++ src/runtime/sequences/sequences_impl.cpp 2013-06-13 01:24:25 +0000 |
1154 | @@ -31,7 +31,7 @@ |
1155 | // For timing |
1156 | #include <zorba/util/time.h> |
1157 | |
1158 | -#include <zorba/transcode_stream.h> |
1159 | +#include <zorba/util/transcode_stream.h> |
1160 | |
1161 | #include <util/fs_util.h> |
1162 | #include <util/uri_util.h> |
1163 | |
1164 | === modified file 'src/runtime/uris/uris_impl.cpp' |
1165 | --- src/runtime/uris/uris_impl.cpp 2013-06-05 00:37:35 +0000 |
1166 | +++ src/runtime/uris/uris_impl.cpp 2013-06-13 01:24:25 +0000 |
1167 | @@ -17,6 +17,8 @@ |
1168 | |
1169 | #include <algorithm> |
1170 | |
1171 | +#include <zorba/util/transcode_stream.h> |
1172 | + |
1173 | #include "common/common.h" |
1174 | |
1175 | #include "diagnostics/assert.h" |
1176 | @@ -28,8 +30,6 @@ |
1177 | #include "system/globalenv.h" |
1178 | #include "store/api/item_factory.h" |
1179 | |
1180 | -#include "zorba/transcode_stream.h" |
1181 | - |
1182 | #include "util/uri_util.h" |
1183 | |
1184 | #include "zorbatypes/URI.h" |
1185 | |
1186 | === modified file 'src/store/api/item.h' |
1187 | --- src/store/api/item.h 2013-06-05 00:37:35 +0000 |
1188 | +++ src/store/api/item.h 2013-06-13 01:24:25 +0000 |
1189 | @@ -32,8 +32,8 @@ |
1190 | #include "diagnostics/xquery_diagnostics.h" |
1191 | |
1192 | #ifndef ZORBA_NO_FULL_TEXT |
1193 | -#include <zorba/locale.h> |
1194 | #include <zorba/tokenizer.h> |
1195 | +#include <zorba/util/locale.h> |
1196 | #include "store/api/ft_token_iterator.h" |
1197 | #endif /* ZORBA_NO_FULL_TEXT */ |
1198 | |
1199 | |
1200 | === modified file 'src/store/naive/node_items.cpp' |
1201 | --- src/store/naive/node_items.cpp 2013-04-23 10:58:29 +0000 |
1202 | +++ src/store/naive/node_items.cpp 2013-06-13 01:24:25 +0000 |
1203 | @@ -22,17 +22,17 @@ |
1204 | #include <zorba/item.h> |
1205 | |
1206 | #include "api/unmarshaller.h" |
1207 | - |
1208 | #include "diagnostics/assert.h" |
1209 | #include "diagnostics/util_macros.h" |
1210 | #include "diagnostics/xquery_diagnostics.h" |
1211 | - |
1212 | +#ifndef ZORBA_NO_FULL_TEXT |
1213 | +#include "util/locale.h" |
1214 | +#endif /* ZORBA_NO_FULL_TEXT */ |
1215 | +#include "util/mem_sizeof.h" |
1216 | +#include "util/stl_util.h" |
1217 | +#include "util/string_util.h" |
1218 | +#include "zorbamisc/ns_consts.h" |
1219 | #include "zorbatypes/URI.h" |
1220 | -#ifndef ZORBA_NO_FULL_TEXT |
1221 | -#include "zorbautils/locale.h" |
1222 | -#endif /* ZORBA_NO_FULL_TEXT */ |
1223 | - |
1224 | -#include "zorbamisc/ns_consts.h" |
1225 | |
1226 | #include "store/api/copymode.h" |
1227 | #include "atomic_items.h" |
1228 | @@ -48,10 +48,6 @@ |
1229 | #include "dataguide.h" |
1230 | #include "node_factory.h" |
1231 | |
1232 | -#include "util/mem_sizeof.h" |
1233 | -#include "util/stl_util.h" |
1234 | -#include "util/string_util.h" |
1235 | - |
1236 | #ifndef ZORBA_NO_FULL_TEXT |
1237 | using namespace zorba::locale; |
1238 | #endif /* ZORBA_NO_FULL_TEXT */ |
1239 | |
1240 | === modified file 'src/store/naive/node_items.h' |
1241 | --- src/store/naive/node_items.h 2013-05-21 21:44:25 +0000 |
1242 | +++ src/store/naive/node_items.h 2013-06-13 01:24:25 +0000 |
1243 | @@ -22,16 +22,16 @@ |
1244 | |
1245 | #include <store/api/item.h> |
1246 | |
1247 | -#include <diagnostics/assert.h> |
1248 | #include <zorba/config.h> |
1249 | #include <zorba/error.h> |
1250 | #ifndef ZORBA_NO_FULL_TEXT |
1251 | -#include <zorba/locale.h> |
1252 | #include <zorba/tokenizer.h> |
1253 | +#include <zorba/util/locale.h> |
1254 | #endif /* ZORBA_NO_FULL_TEXT */ |
1255 | -#include <zorbatypes/zstring.h> |
1256 | -#include <zorbautils/fatal.h> |
1257 | -#include <zorbautils/hashfun.h> |
1258 | +#include "diagnostics/assert.h" |
1259 | +#include "zorbatypes/zstring.h" |
1260 | +#include "zorbautils/fatal.h" |
1261 | +#include "zorbautils/hashfun.h" |
1262 | |
1263 | #ifndef ZORBA_NO_FULL_TEXT |
1264 | #include "ft_token_store.h" |
1265 | |
1266 | === modified file 'src/unit_tests/test_base64_streambuf.cpp' |
1267 | --- src/unit_tests/test_base64_streambuf.cpp 2013-04-16 22:12:03 +0000 |
1268 | +++ src/unit_tests/test_base64_streambuf.cpp 2013-06-13 01:24:25 +0000 |
1269 | @@ -19,7 +19,7 @@ |
1270 | #include <iostream> |
1271 | #include <sstream> |
1272 | |
1273 | -#include <zorba/base64_stream.h> |
1274 | +#include <zorba/util/base64_stream.h> |
1275 | |
1276 | using namespace std; |
1277 | using namespace zorba; |
1278 | |
1279 | === modified file 'src/unit_tests/test_time_parse.cpp' |
1280 | --- src/unit_tests/test_time_parse.cpp 2013-03-12 03:46:25 +0000 |
1281 | +++ src/unit_tests/test_time_parse.cpp 2013-06-13 01:24:25 +0000 |
1282 | @@ -23,10 +23,10 @@ |
1283 | #include <string> |
1284 | |
1285 | #include "util/ascii_util.h" |
1286 | +#include "util/locale.h" |
1287 | #include "util/stl_util.h" |
1288 | #include "util/time_parse.h" |
1289 | #include "zorbatypes/zstring.h" |
1290 | -#include "zorbautils/locale.h" |
1291 | |
1292 | using namespace std; |
1293 | using namespace zorba; |
1294 | |
1295 | === modified file 'src/unit_tests/unit_tests.cpp' |
1296 | --- src/unit_tests/unit_tests.cpp 2013-05-31 03:38:45 +0000 |
1297 | +++ src/unit_tests/unit_tests.cpp 2013-06-13 01:24:25 +0000 |
1298 | @@ -15,21 +15,23 @@ |
1299 | */ |
1300 | #include "stdafx.h" |
1301 | |
1302 | -#include <zorba/unit_tests.h> |
1303 | -#include "unit_test_list.h" |
1304 | - |
1305 | #include <map> |
1306 | #include <string> |
1307 | #include <iostream> |
1308 | |
1309 | - |
1310 | -typedef int (*libunittestfunc)(int , char*[]); |
1311 | +#include <zorba/internal/unit_tests.h> |
1312 | + |
1313 | +#include "unit_test_list.h" |
1314 | + |
1315 | +typedef int (*libunittestfunc)(int,char*[]); |
1316 | |
1317 | using namespace std; |
1318 | |
1319 | namespace zorba { |
1320 | namespace UnitTests { |
1321 | |
1322 | +/////////////////////////////////////////////////////////////////////////////// |
1323 | + |
1324 | map<string,libunittestfunc> libunittests; |
1325 | |
1326 | /** |
1327 | @@ -105,6 +107,7 @@ |
1328 | return (* iter->second)(argc, argv); |
1329 | } |
1330 | |
1331 | +/////////////////////////////////////////////////////////////////////////////// |
1332 | |
1333 | } // namespace UnitTests |
1334 | } // namespace zorba |
1335 | |
1336 | === modified file 'src/util/CMakeLists.txt' |
1337 | --- src/util/CMakeLists.txt 2013-05-31 03:38:45 +0000 |
1338 | +++ src/util/CMakeLists.txt 2013-06-13 01:24:25 +0000 |
1339 | @@ -22,6 +22,7 @@ |
1340 | indent.cpp |
1341 | json_parser.cpp |
1342 | json_util.cpp |
1343 | + locale.cpp |
1344 | mem_streambuf.cpp |
1345 | stream_util.cpp |
1346 | string_util.cpp |
1347 | |
1348 | === renamed file 'src/zorbautils/locale.cpp' => 'src/util/locale.cpp' |
1349 | === renamed file 'src/zorbautils/locale.h' => 'src/util/locale.h' |
1350 | --- src/zorbautils/locale.h 2013-05-08 01:05:04 +0000 |
1351 | +++ src/util/locale.h 2013-06-13 01:24:25 +0000 |
1352 | @@ -19,7 +19,7 @@ |
1353 | |
1354 | #include <iostream> |
1355 | |
1356 | -#include <zorba/locale.h> |
1357 | +#include <zorba/util/locale.h> |
1358 | |
1359 | #include "util/string_util.h" |
1360 | #include "zorbatypes/zstring.h" |
1361 | |
1362 | === modified file 'src/util/time_parse.cpp' |
1363 | --- src/util/time_parse.cpp 2013-06-01 00:30:39 +0000 |
1364 | +++ src/util/time_parse.cpp 2013-06-13 01:24:25 +0000 |
1365 | @@ -24,8 +24,8 @@ |
1366 | #include <zorba/internal/cxx_util.h> |
1367 | #include "ascii_util.h" |
1368 | #include "string_util.h" |
1369 | +#include "util/locale.h" |
1370 | #include "zorbatypes/zstring.h" |
1371 | -#include "zorbautils/locale.h" |
1372 | |
1373 | // local |
1374 | #include "time_parse.h" |
1375 | |
1376 | === modified file 'src/util/time_parse.h' |
1377 | --- src/util/time_parse.h 2013-06-01 00:30:39 +0000 |
1378 | +++ src/util/time_parse.h 2013-06-13 01:24:25 +0000 |
1379 | @@ -25,7 +25,7 @@ |
1380 | #include <zorba/internal/cxx_util.h> |
1381 | #include "string_util.h" |
1382 | #include "time_util.h" |
1383 | -#include "zorbautils/locale.h" |
1384 | +#include "util/locale.h" |
1385 | |
1386 | namespace zorba { |
1387 | namespace time { |
1388 | |
1389 | === modified file 'src/util/time_util.h' |
1390 | --- src/util/time_util.h 2013-06-12 04:51:35 +0000 |
1391 | +++ src/util/time_util.h 2013-06-13 01:24:25 +0000 |
1392 | @@ -26,7 +26,7 @@ |
1393 | // Zorba |
1394 | #include <zorba/config.h> |
1395 | #include <zorba/internal/cxx_util.h> |
1396 | -#include <zorba/time.h> |
1397 | +#include <zorba/util/calendar.h> |
1398 | #include "string_util.h" |
1399 | |
1400 | #ifndef TM_YEAR_BASE |
1401 | |
1402 | === modified file 'src/util/transcode_streambuf.h' |
1403 | --- src/util/transcode_streambuf.h 2013-02-07 17:24:36 +0000 |
1404 | +++ src/util/transcode_streambuf.h 2013-06-13 01:24:25 +0000 |
1405 | @@ -18,7 +18,7 @@ |
1406 | #define ZORBA_TRANSCODE_STREAMBUF_H |
1407 | |
1408 | #include <zorba/config.h> |
1409 | -#include <zorba/transcode_stream.h> |
1410 | +#include <zorba/util/transcode_stream.h> |
1411 | |
1412 | /////////////////////////////////////////////////////////////////////////////// |
1413 | |
1414 | |
1415 | === modified file 'src/zorbatypes/ft_token.cpp' |
1416 | --- src/zorbatypes/ft_token.cpp 2013-06-01 00:30:39 +0000 |
1417 | +++ src/zorbatypes/ft_token.cpp 2013-06-13 01:24:25 +0000 |
1418 | @@ -22,10 +22,10 @@ |
1419 | #include "diagnostics/assert.h" |
1420 | #include "runtime/full_text/ft_wildcard.h" |
1421 | #include "runtime/full_text/stemmer.h" |
1422 | +#include "util/locale.h" |
1423 | #include "util/stl_util.h" |
1424 | #include "util/unicode_util.h" |
1425 | #include "util/utf8_util.h" |
1426 | -#include "zorbautils/locale.h" |
1427 | |
1428 | #include "ft_token.h" |
1429 | |
1430 | |
1431 | === modified file 'src/zorbatypes/ft_token.h' |
1432 | --- src/zorbatypes/ft_token.h 2013-06-01 00:30:39 +0000 |
1433 | +++ src/zorbatypes/ft_token.h 2013-06-13 01:24:25 +0000 |
1434 | @@ -21,7 +21,7 @@ |
1435 | #include <vector> |
1436 | |
1437 | #include <zorba/internal/cxx_util.h> |
1438 | -#include <zorba/locale.h> |
1439 | +#include <zorba/util/locale.h> |
1440 | |
1441 | #include "zorbatypes/zstring.h" |
1442 | |
1443 | |
1444 | === modified file 'src/zorbautils/CMakeLists.txt' |
1445 | --- src/zorbautils/CMakeLists.txt 2013-02-07 17:24:36 +0000 |
1446 | +++ src/zorbautils/CMakeLists.txt 2013-06-13 01:24:25 +0000 |
1447 | @@ -20,7 +20,6 @@ |
1448 | mutex.cpp |
1449 | condition.cpp |
1450 | latch.cpp |
1451 | - locale.cpp |
1452 | lock.cpp |
1453 | runnable.cpp |
1454 | synchronous_logger.cpp |
1455 | |
1456 | === modified file 'test/unit/lib_unit_test.cpp' |
1457 | --- test/unit/lib_unit_test.cpp 2013-02-07 17:24:36 +0000 |
1458 | +++ test/unit/lib_unit_test.cpp 2013-06-13 01:24:25 +0000 |
1459 | @@ -17,11 +17,11 @@ |
1460 | |
1461 | #include <zorba/zorba.h> |
1462 | #include <zorba/store_manager.h> |
1463 | -#include <zorba/unit_tests.h> |
1464 | +#include <zorba/internal/unit_tests.h> |
1465 | |
1466 | /** |
1467 | - * This is the main entry point for unit tests which require a running |
1468 | - * Zorba instance, and which execute inside of libzorba. |
1469 | + * This is the main entry point for unit tests that require a running |
1470 | + * Zorba instance and execute inside of libzorba. |
1471 | */ |
1472 | |
1473 | using namespace zorba; |
Validation queue starting for merge proposal. zorbatest. lambda. nu:8080/ remotequeue/ bug-1189996- 2013-06- 12T05-27- 59.092Z/ log.html
Log at: http://