/[Apache-SVN]/webservices/axis2/trunk/c/include/axis2_svc.h
ViewVC logotype

Log of /webservices/axis2/trunk/c/include/axis2_svc.h

Parent Directory Parent Directory | Revision Log Revision Log


Links to HEAD: (view) (annotate)
Sticky Revision:

Revision 714264 - (view) (annotate) - [select for diffs]
Modified Sat Nov 15 14:05:56 2008 UTC (12 months, 1 week ago) by dimuthu
File length: 41474 byte(s)
Diff to previous 696571 (colored)
fix for https://issues.apache.org/jira/browse/AXIS2C-1290

Revision 696571 - (view) (annotate) - [select for diffs]
Modified Thu Sep 18 06:22:55 2008 UTC (14 months, 1 week ago) by supun
File length: 41056 byte(s)
Diff to previous 671784 (colored)
Fixing issue 1266

Revision 671784 - (view) (annotate) - [select for diffs]
Modified Thu Jun 26 05:45:04 2008 UTC (17 months ago) by damitha
File length: 40740 byte(s)
Diff to previous 634705 (colored)
Giving solution to AXIS2C-1202

Revision 634705 - (view) (annotate) - [select for diffs]
Modified Fri Mar 7 15:07:20 2008 UTC (20 months, 2 weeks ago) by senaka
File length: 40400 byte(s)
Diff to previous 630453 (colored)
Adding support for a default static WSDL path,
as a result of a discussion on the dev list, [1].

[1] http://marc.info/?l=axis-c-dev&m=120489679120417&w=2

Regards,
Senaka

Revision 630453 - (view) (annotate) - [select for diffs]
Modified Sat Feb 23 15:40:56 2008 UTC (21 months ago) by senaka
File length: 39593 byte(s)
Diff to previous 616693 (colored)
Fixing build break due to C++ comments in code and removing other occurences of such.

Revision 616693 - (view) (annotate) - [select for diffs]
Modified Wed Jan 30 09:02:17 2008 UTC (21 months, 3 weeks ago) by senaka
File length: 39620 byte(s)
Diff to previous 580274 (colored)
Adding REST support

Revision 580274 - (view) (annotate) - [select for diffs]
Modified Fri Sep 28 09:47:09 2007 UTC (2 years, 1 month ago) by samisa
File length: 38056 byte(s)
Diff to previous 542115 (colored)
Fixed formatting

Revision 542115 - (view) (annotate) - [select for diffs]
Modified Mon May 28 05:25:27 2007 UTC (2 years, 5 months ago) by manjula
File length: 37964 byte(s)
Diff to previous 524483 (colored)
Merging Neethi Development to the trunk.

Revision 524483 - (view) (annotate) - [select for diffs]
Modified Sat Mar 31 21:28:39 2007 UTC (2 years, 7 months ago) by dinesh
File length: 37659 byte(s)
Diff to previous 524432 (colored)
fixed:axis2c-283, providing static wsdl serving capability

Revision 524432 - (view) (annotate) - [select for diffs]
Modified Sat Mar 31 14:09:20 2007 UTC (2 years, 7 months ago) by dinesh
File length: 36867 byte(s)
Diff to previous 524243 (colored)
fixed:axis2c-146 (disengaging a module), fixed savan build

Revision 524243 - (view) (annotate) - [select for diffs]
Modified Fri Mar 30 19:24:00 2007 UTC (2 years, 7 months ago) by pini
File length: 36213 byte(s)
Diff to previous 524225 (colored)
Fixing jira issue 292

Revision 524225 - (view) (annotate) - [select for diffs]
Modified Fri Mar 30 18:28:18 2007 UTC (2 years, 7 months ago) by pini
File length: 36196 byte(s)
Diff to previous 524208 (colored)
Fixing jira issue 292

Revision 524208 - (view) (annotate) - [select for diffs]
Modified Fri Mar 30 17:56:06 2007 UTC (2 years, 7 months ago) by pini
File length: 36189 byte(s)
Diff to previous 524188 (colored)
Fixing jira issue 292

Revision 524188 - (view) (annotate) - [select for diffs]
Modified Fri Mar 30 17:26:22 2007 UTC (2 years, 7 months ago) by pini
File length: 36188 byte(s)
Diff to previous 524073 (colored)
Fixing jira issue 292

Revision 524073 - (view) (annotate) - [select for diffs]
Modified Fri Mar 30 13:19:43 2007 UTC (2 years, 7 months ago) by pini
File length: 36112 byte(s)
Diff to previous 522810 (colored)
Fixing jira issue 292

Revision 522810 - (view) (annotate) - [select for diffs]
Modified Tue Mar 27 08:39:39 2007 UTC (2 years, 8 months ago) by samisa
File length: 36106 byte(s)
Diff to previous 522481 (colored)
Changed return value of free method to be void

Revision 522481 - (view) (annotate) - [select for diffs]
Modified Mon Mar 26 11:08:43 2007 UTC (2 years, 8 months ago) by pini
File length: 36157 byte(s)
Diff to previous 514587 (colored)
Dropped macros.

Revision 514587 - (view) (annotate) - [select for diffs]
Modified Mon Mar 5 07:33:15 2007 UTC (2 years, 8 months ago) by nandika
File length: 46553 byte(s)
Diff to previous 514547 (colored)
AXIS2_SVC_IS_MODULE_ENGAGED function exported

Revision 514547 - (view) (annotate) - [select for diffs]
Modified Mon Mar 5 04:43:51 2007 UTC (2 years, 8 months ago) by samisa
File length: 46540 byte(s)
Diff to previous 514544 (colored)
Fixed typo

Revision 514544 - (view) (annotate) - [select for diffs]
Modified Mon Mar 5 04:35:45 2007 UTC (2 years, 8 months ago) by samisa
File length: 46527 byte(s)
Diff to previous 514539 (colored)
Fixed typo

Revision 514539 - (view) (annotate) - [select for diffs]
Modified Mon Mar 5 04:11:56 2007 UTC (2 years, 8 months ago) by samisa
File length: 46569 byte(s)
Diff to previous 513288 (colored)
Removed ops from description hierarchy

Revision 513288 - (view) (annotate) - [select for diffs]
Modified Thu Mar 1 11:56:33 2007 UTC (2 years, 8 months ago) by damitha
File length: 53350 byte(s)
Diff to previous 513282 (colored)
Added documentation to the new function added

Revision 513282 - (view) (annotate) - [select for diffs]
Modified Thu Mar 1 11:29:32 2007 UTC (2 years, 8 months ago) by damitha
File length: 53041 byte(s)
Diff to previous 502518 (colored)
Fixed AXIS2C-535

Revision 502518 - (view) (annotate) - [select for diffs]
Modified Fri Feb 2 06:33:54 2007 UTC (2 years, 9 months ago) by samisa
File length: 52600 byte(s)
Diff to previous 502451 (colored)
Fixed the linking to woden and xml-schema


Revision 502451 - (view) (annotate) - [select for diffs]
Modified Fri Feb 2 02:35:32 2007 UTC (2 years, 9 months ago) by samisa
File length: 52458 byte(s)
Diff to previous 495091 (colored)
Removing WSDL WOM layer form operation and service


Revision 495091 - (view) (annotate) - [select for diffs]
Modified Thu Jan 11 02:16:09 2007 UTC (2 years, 10 months ago) by samisa
File length: 56301 byte(s)
Diff to previous 483049 (colored)
Removed loading the service on each request. Also fixed string termination bug

Revision 483049 - (view) (annotate) - [select for diffs]
Modified Wed Dec 6 12:25:47 2006 UTC (2 years, 11 months ago) by pini
File length: 56013 byte(s)
Diff to previous 464953 (colored)
Fixing jira issue 436.

Revision 464953 - (view) (annotate) - [select for diffs]
Modified Tue Oct 17 16:21:36 2006 UTC (3 years, 1 month ago) by dinesh
File length: 55831 byte(s)
Diff to previous 454079 (colored)
fixed:displaying service discriptions

Revision 454079 - (view) (annotate) - [select for diffs]
Modified Sun Oct 8 05:13:15 2006 UTC (3 years, 1 month ago) by samisa
File length: 54790 byte(s)
Diff to previous 453105 (colored)
Reverting chnges to the core API and the related changes to make the build stable back again

Revision 453105 - (view) (annotate) - [select for diffs]
Modified Thu Oct 5 04:26:01 2006 UTC (3 years, 1 month ago) by damitha
File length: 56691 byte(s)
Diff to previous 437378 (colored)
Adding some error codes and added set_listener_address methods and set/get_target_epr methods to
svc_client

Revision 437378 - (view) (annotate) - [select for diffs]
Modified Sun Aug 27 14:26:12 2006 UTC (3 years, 2 months ago) by samisa
File length: 54790 byte(s)
Diff to previous 433938 (colored)
Improved API of service struct of description hierarcy and also fixed doc comments

Revision 433938 - (view) (annotate) - [select for diffs]
Modified Wed Aug 23 06:37:30 2006 UTC (3 years, 3 months ago) by samisa
File length: 40303 byte(s)
Diff to previous 433572 (colored)
Improved API of message struct and related structs. Also fixed the doc comments

Revision 433572 - (view) (annotate) - [select for diffs]
Modified Tue Aug 22 09:43:23 2006 UTC (3 years, 3 months ago) by samisa
File length: 40297 byte(s)
Diff to previous 432496 (colored)
Fixed many API typos 

Revision 432496 - (view) (annotate) - [select for diffs]
Modified Fri Aug 18 06:30:43 2006 UTC (3 years, 3 months ago) by pini
File length: 40289 byte(s)
Diff to previous 424175 (colored)
More formatting fixes

Revision 424175 - (view) (annotate) - [select for diffs]
Modified Fri Jul 21 04:42:49 2006 UTC (3 years, 4 months ago) by damitha
File length: 26928 byte(s)
Diff to previous 417503 (colored)
Removed some gargabe

Revision 417503 - (view) (annotate) - [select for diffs]
Modified Tue Jun 27 16:32:43 2006 UTC (3 years, 4 months ago) by samisa
File length: 26953 byte(s)
Diff to previous 417135 (colored)
Fixing the doc comments stuff to get the doxygen doc structure right

Revision 417135 - (view) (annotate) - [select for diffs]
Modified Mon Jun 26 07:05:20 2006 UTC (3 years, 5 months ago) by sahan
File length: 26977 byte(s)
Diff to previous 414423 (colored)
1. Adding xml schema support to the axis2_svc and axis2_msg
2. Enabling REST GET case in both client side and server side

Revision 414423 - (view) (annotate) - [select for diffs]
Modified Thu Jun 15 01:23:03 2006 UTC (3 years, 5 months ago) by samisa
File length: 19180 byte(s)
Diff to previous 412318 (colored)
Changed get_axis2_svc_name to get_name
AXIS2C-150


Revision 412318 - (view) (annotate) - [select for diffs]
Modified Wed Jun 7 07:51:41 2006 UTC (3 years, 5 months ago) by samisa
File length: 19240 byte(s)
Diff to previous 411506 (colored)
Improved service client API with const paramters and more detailed doc comments

Revision 411506 - (view) (annotate) - [select for diffs]
Modified Sun Jun 4 03:09:08 2006 UTC (3 years, 5 months ago) by samisa
File length: 19234 byte(s)
Diff to previous 410712 (colored)
Replacing all tab characters with 4 spaces

Revision 410712 - (view) (annotate) - [select for diffs]
Modified Thu Jun 1 01:36:55 2006 UTC (3 years, 5 months ago) by samisa
File length: 19174 byte(s)
Diff to previous 410566 (colored)
Replaced AXIS2_DECLARE with AXIS2_EXTERN to seperate the concerns of import/export and calling convention

Revision 410566 - (view) (annotate) - [select for diffs]
Modified Wed May 31 15:54:07 2006 UTC (3 years, 5 months ago) by samisa
File length: 19147 byte(s)
Diff to previous 398884 (colored)
Replaced the double pointer parameter for environment with single const pointer
This would make the code more efficinet and also removed the unwanted use of double pointer parameter

Revision 398884 - (view) (annotate) - [select for diffs]
Modified Tue May 2 09:42:21 2006 UTC (3 years, 6 months ago) by samisa
File length: 18892 byte(s)
Diff to previous 377646 (colored)
Moved axis2.h to axis2_const.h

Revision 377646 - (view) (annotate) - [select for diffs]
Modified Tue Feb 14 06:33:14 2006 UTC (3 years, 9 months ago) by damitha
File length: 18886 byte(s)
Copied from: webservices/axis2/trunk/c/modules/core/description/axis2_svc.h revision 377632
Diff to previous 377613 (colored)
In process of moving header files

Revision 377613 - (view) (annotate) - [select for diffs]
Modified Tue Feb 14 04:31:12 2006 UTC (3 years, 9 months ago) by damitha
Original Path: webservices/axis2/trunk/c/modules/core/description/axis2_svc.h
File length: 18886 byte(s)
Diff to previous 377608 (colored)
Removed axis2_core.h which is not used in the project

Revision 377608 - (view) (annotate) - [select for diffs]
Modified Tue Feb 14 04:14:01 2006 UTC (3 years, 9 months ago) by damitha
Original Path: webservices/axis2/trunk/c/modules/core/description/axis2_svc.h
File length: 18910 byte(s)
Copied from: webservices/axis2/trunk/c/include/axis2_svc.h revision 377568
Diff to previous 375163 (colored)
On fixing Jira Axis2c-17


Revision 375163 - (view) (annotate) - [select for diffs]
Modified Mon Feb 6 02:41:57 2006 UTC (3 years, 9 months ago) by nandika
File length: 18910 byte(s)
Diff to previous 369740 (colored)
modified for compiling on vc7

Revision 369740 - (view) (annotate) - [select for diffs]
Modified Tue Jan 17 10:20:54 2006 UTC (3 years, 10 months ago) by damitha
File length: 18906 byte(s)
Diff to previous 367933 (colored)
Now work upto loading the service. 
Now it returns fail in axis2_svc_builder_populate_svc

Revision 367933 - (view) (annotate) - [select for diffs]
Modified Wed Jan 11 05:23:24 2006 UTC (3 years, 10 months ago) by damitha
File length: 18748 byte(s)
Diff to previous 367522 (colored)
Fixed AXIS2C-6 jira issue

Revision 367522 - (view) (annotate) - [select for diffs]
Modified Tue Jan 10 08:35:31 2006 UTC (3 years, 10 months ago) by damitha
File length: 18652 byte(s)
Diff to previous 356762 (colored)
Removed no argument create method from axis2_svc.h
Added some error codes


Revision 356762 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 09:56:03 2005 UTC (3 years, 11 months ago) by damitha
File length: 18799 byte(s)
Diff to previous 356757 (colored)
axis2_svc_get_name replaced with axis2_cvs_get_qname

Revision 356757 - (view) (annotate) - [select for diffs]
Modified Wed Dec 14 09:34:40 2005 UTC (3 years, 11 months ago) by damitha
File length: 18798 byte(s)
Diff to previous 356513 (colored)
name change to qname 

Revision 356513 - (view) (annotate) - [select for diffs]
Modified Tue Dec 13 08:24:29 2005 UTC (3 years, 11 months ago) by damitha
File length: 18792 byte(s)
Diff to previous 356490 (colored)
OPERATION to OP ENGINE_CONFIG to CONF INPHASE to IN_PHASE OUTPHASE to OUT_PHASE

Revision 356490 - (view) (annotate) - [select for diffs]
Modified Tue Dec 13 06:36:46 2005 UTC (3 years, 11 months ago) by damitha
File length: 18848 byte(s)
Diff to previous 356488 (colored)
engine_config renamed to conf

Revision 356488 - (view) (annotate) - [select for diffs]
Modified Tue Dec 13 06:23:36 2005 UTC (3 years, 11 months ago) by damitha
File length: 18884 byte(s)
Diff to previous 356126 (colored)
renamed axis2_operation to axis2_op

Revision 356126 - (view) (annotate) - [select for diffs]
Modified Mon Dec 12 03:16:03 2005 UTC (3 years, 11 months ago) by damitha
File length: 19206 byte(s)
Diff to previous 351594 (colored)
refactoring completed

Revision 351594 - (view) (annotate) - [select for diffs]
Modified Fri Dec 2 05:13:39 2005 UTC (3 years, 11 months ago) by damitha
File length: 18626 byte(s)
Diff to previous 348907 (colored)
Description module and wsdl module is not compiling. All the files
and code now are in place. Need some refactoring

Revision 348907 - (view) (annotate) - [select for diffs]
Modified Fri Nov 25 07:35:05 2005 UTC (4 years ago) by damitha
File length: 6702 byte(s)
Diff to previous 345818 (colored)
Fixed bug in AXIS2_SVC_GET_OPERATION_WITH_QNAME and AXIS2_SVC_GET_OPERATION_WITH_NAME
macros. It should take three parameters instead of two

Revision 345818 - (view) (annotate) - [select for diffs]
Modified Mon Nov 21 03:19:08 2005 UTC (4 years ago) by damitha
File length: 6635 byte(s)
Diff to previous 344975 (colored)
wsdl dependancy work related to description is done, except addAllOperations
and some other few related stuff

Revision 344975 - (view) (annotate) - [select for diffs]
Modified Wed Nov 16 10:40:37 2005 UTC (4 years ago) by damitha
File length: 7531 byte(s)
Diff to previous 344951 (colored)


Revision 344951 - (view) (annotate) - [select for diffs]
Modified Wed Nov 16 08:21:43 2005 UTC (4 years ago) by samisa
File length: 7539 byte(s)
Diff to previous 344866 (colored)
Added dispatcher base

Revision 344866 - (view) (annotate) - [select for diffs]
Modified Wed Nov 16 03:44:41 2005 UTC (4 years ago) by damitha
File length: 7559 byte(s)
Diff to previous 332195 (colored)
work on wsdl

Revision 332195 - (view) (annotate) - [select for diffs]
Modified Thu Nov 10 01:52:32 2005 UTC (4 years ago) by damitha
File length: 7279 byte(s)
Diff to previous 332009 (colored)
more work on svc and operation

Revision 332009 - (view) (annotate) - [select for diffs]
Modified Wed Nov 9 09:12:27 2005 UTC (4 years ago) by damitha
File length: 5663 byte(s)
Diff to previous 331754 (colored)
put and end of line to om_node.h. wsdl_svc.c is ok

Revision 331754 - (view) (annotate) - [select for diffs]
Modified Tue Nov 8 09:35:39 2005 UTC (4 years ago) by damitha
File length: 5349 byte(s)
Diff to previous 331679 (colored)
Create default error in env create with one para

Revision 331679 - (view) (annotate) - [select for diffs]
Modified Tue Nov 8 04:34:51 2005 UTC (4 years ago) by damitha
File length: 5324 byte(s)
Diff to previous 331225 (colored)
description context and engine modules are now compiling

Revision 331225 - (view) (annotate) - [select for diffs]
Modified Mon Nov 7 06:42:50 2005 UTC (4 years ago) by damitha
File length: 5241 byte(s)
Diff to previous 331192 (colored)
svc grp header file is completed. But not tested

Revision 331192 - (view) (annotate) - [select for diffs]
Modified Mon Nov 7 03:58:36 2005 UTC (4 years ago) by damitha
File length: 5158 byte(s)
Diff to previous 331178 (colored)
param container free function is modified

Revision 331178 - (view) (annotate) - [select for diffs]
Modified Mon Nov 7 02:23:20 2005 UTC (4 years ago) by damitha
File length: 5688 byte(s)
Diff to previous 330777 (colored)
Changes due to name changes. Still not complete

Revision 330777 - (view) (annotate) - [select for diffs]
Modified Fri Nov 4 10:13:03 2005 UTC (4 years ago) by damitha
File length: 7134 byte(s)
Diff to previous 330772 (colored)
More file name changes

Revision 330772 - (view) (annotate) - [select for diffs]
Modified Fri Nov 4 09:58:23 2005 UTC (4 years ago) by damitha
File length: 7142 byte(s)
Copied from: webservices/axis2/trunk/c/include/axis2_service.h revision 330721
Diff to previous 330721 (colored)
More file name changes

Revision 330721 - (view) (annotate) - [select for diffs]
Modified Fri Nov 4 06:05:02 2005 UTC (4 years ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_service.h
File length: 7142 byte(s)
Diff to previous 330516 (colored)
More name changes. changes to axis2_parameter_container and axis2_parameter

Revision 330516 - (view) (annotate) - [select for diffs]
Modified Thu Nov 3 09:32:44 2005 UTC (4 years ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_service.h
File length: 7196 byte(s)
Copied from: webservices/axis2/trunk/c/include/axis2_description_service.h revision 330510
Diff to previous 330510 (colored)
more name changes

Revision 330510 - (view) (annotate) - [select for diffs]
Modified Thu Nov 3 08:37:38 2005 UTC (4 years ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 7196 byte(s)
Diff to previous 330178 (colored)
More name changes

Revision 330178 - (view) (annotate) - [select for diffs]
Modified Wed Nov 2 03:44:08 2005 UTC (4 years ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 6973 byte(s)
Diff to previous 330024 (colored)
Changes to the code

Revision 330024 - (view) (annotate) - [select for diffs]
Modified Tue Nov 1 11:08:52 2005 UTC (4 years ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 6997 byte(s)
Diff to previous 329981 (colored)
More changes on core and project updated

Revision 329981 - (view) (annotate) - [select for diffs]
Modified Tue Nov 1 05:27:27 2005 UTC (4 years ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 7205 byte(s)
Diff to previous 328524 (colored)
changed axis2_environment_t to axis2_env_t.

Revision 328524 - (view) (annotate) - [select for diffs]
Modified Wed Oct 26 02:16:31 2005 UTC (4 years, 1 month ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 7317 byte(s)
Diff to previous 327912 (colored)
Code added

Revision 327912 - (view) (annotate) - [select for diffs]
Modified Mon Oct 24 02:16:07 2005 UTC (4 years, 1 month ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 6852 byte(s)
Diff to previous 327117 (colored)
Fixed some bugs in string.h. Added file handling code to 
stream. added two files to handle file diffs

Revision 327117 - (view) (annotate) - [select for diffs]
Modified Fri Oct 21 08:28:57 2005 UTC (4 years, 1 month ago) by samisa
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 6983 byte(s)
Diff to previous 326836 (colored)
Added doxygen comments to the util structs and also fixed indentation in all headers and the util c files

Revision 326836 - (view) (annotate) - [select for diffs]
Modified Thu Oct 20 06:19:00 2005 UTC (4 years, 1 month ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 6442 byte(s)
Diff to previous 326780 (colored)
Prefixed all library names with axis2_
ex.
before
    libutil.so
now
    libaxis2_util.so


Revision 326780 - (view) (annotate) - [select for diffs]
Modified Thu Oct 20 02:47:09 2005 UTC (4 years, 1 month ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 4682 byte(s)
Diff to previous 326329 (colored)
Added more code to information model. Updated anjuta project by 
adding 4 files related to information model

Revision 326329 - (view) (annotate) - [select for diffs]
Modified Wed Oct 19 02:19:51 2005 UTC (4 years, 1 month ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 3291 byte(s)
Diff to previous 326015 (colored)
updated axis2c.prj. Removed axis2_module_description.*.
Some work on information model

Revision 326015 - (view) (annotate) - [select for diffs]
Added Tue Oct 18 02:18:27 2005 UTC (4 years, 1 month ago) by damitha
Original Path: webservices/axis2/trunk/c/include/axis2_description_service.h
File length: 1869 byte(s)
added conditional compilation for guththila and tests. 
renamed files in core/description

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

  Diffs between and
  Type of Diff should be a

apache@apache.org
ViewVC Help
Powered by ViewVC 1.1.2