Commit Graph

658 Commits

Author SHA1 Message Date
Derek Hulley
a266aab21c Phase one of merge of EC multilingual work
These files are their changes plus adjustments for formatting and immediate clashes
I anticipate that this will break the build, but there are too many changes coming to risk it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-22 04:47:14 +00:00
Kevin Roast
ed5b547943 Portlet webscript updates:
MySpaces portlet changed to use ajax update to main list div.
Upload file now refreshes list after upload complete.
Manual refresh icon added to MySpaces and MyDocs portlets.
Removed video preview from pop-up panel in portlets (unstable in Firefox).
Manic scrollbar flicking fixed in MyDocs and MySpaces portlets.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5736 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-21 17:46:52 +00:00
Gavin Cornwell
6419aef81e First cut of pending submission UI
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5735 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-21 15:15:48 +00:00
Kevin Roast
4eb57cdf86 Upload action implemented in My Spaces webscript portlet. Update of webscript javascripts to use helpful constants.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-18 17:52:00 +00:00
Kevin Roast
b56f065c94 Refactoring webscript authentication to deal with redirecting etc. when no valid authentication for the script is available
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5718 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-18 09:25:38 +00:00
Gavin Cornwell
23d297ac26 Added ability for the dialog and wizard framework to use a 'lightweight' container i.e. with none of the usual web client stuff. Useful for showing dialogs and wizards in popup windows from the new webscripts portlets.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5711 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-17 15:13:47 +00:00
Kevin Roast
e0dccd5a01 TemplateImageResolver refactoring to support 64x64 icons as a new filetype image size. More icons from Linton.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5707 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-17 09:35:56 +00:00
Gavin Cornwell
2c506afb17 - Added delete item action to change request task dialog (means expired items can now be deleted)
- Added virtual server callback to inform it of workflow sandboxes created for change request workflow

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-16 14:57:31 +00:00
Kevin Roast
97f4272546 Fix to some IE6 related issues with portlet template refactoring, improved exception handing in WebScriptServlet
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5686 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-15 16:36:58 +00:00
Gavin Cornwell
1d1cd9ecfd Minor updates to content expiration
- I18N title for change request workflow
 - change request workflow title now includes the web project name the content came from
 - Added admin user name and workflow name as configurable properties for quartz job

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5683 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-15 15:31:17 +00:00
Ariel Backenroth
fd2176bc1c fix for identification of particle for complexContent derived from a complexType. need to recurse model groups to locate the actual particle. resolves issue WCM-474.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5676 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-15 00:00:47 +00:00
Ariel Backenroth
df32d0ddf1 adding support for wcm tinymce extensions to create html from web content wizard
- extracted file picker backing code into its own bean
- refactoring for to extract file picker bean
- refactoring to manage uploads from file picker outside of xforms context
- added some language utility methods to common.js
- refactored extension dialogs to deal with quirkyness of tinymce dialog codebase on IE - mostly works now and addressed bug WCM-471
- resourcifying a couple strings i missed in filepickerbean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5675 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-14 22:03:10 +00:00
Gavin Cornwell
bd54cd2401 First cut of content expiration support
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5674 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-14 19:40:10 +00:00
Kevin Roast
5564310bf2 Upgrade to 1.1 release of mootools web2.0 js library, reduction in reliance on Yahoo js scripts.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5673 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-14 16:51:25 +00:00
David Caruana
116858df78 Merge Content Launch Date (as developed by Gav) from BRANCHES/DEV/WCM_TIMERS
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5666 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-11 15:23:38 +00:00
Kevin Roast
4ca29b11dc Implemented the various classes needed to create a new JSF based runtime for webscripts. Added a new JSF component that implements the webscript runtime and is capable of rendering the output from a webscript url. This means that webscripts can be used in JSF pages, such as new dashlets in the Dashboard. Added some example dashlets that expose the Document List, My Tasks and My Web Forms webscripts as dashlets.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5664 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-11 10:34:29 +00:00
Roy Wetherall
4d0f604256 - PHP library uses upload conten servlet to stream content into the repository. This allows us to handle the upload of large files.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-10 15:44:42 +00:00
Paul Holmes-Higgin
47e4a31aca Updated contributors and copyright year
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-09 17:01:12 +00:00
Kevin Roast
c9ceb5fc4f Added the following community contribution from Ray Gauss II "Add configuration to allow basic search to be changed to search X, Y, Z attributes by default."
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5649 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-09 16:40:28 +00:00
Kevin Roast
0234890142 Integrated code contribution from Michael Kiske - List of Values constraint support added to Advanced Search custom search properties
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5645 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-09 11:18:41 +00:00
Jon Cox
8abfd5ebc8 Point checkin.
Reorg to allow sandbox-related constants to be accessed more easily from 
other compilation units.   AVMConstants had become a dumping ground for
things that had nothing to do with const values.   Therefore, this
is now AVMUtil, and sandbox-related constants have been moved to
org.alfresco.sandbox.SandboxConstants, which builds in repository.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-08 02:33:18 +00:00
Ariel Backenroth
6e0afbf34c various minor bug fixes to create/edit form, parseXMLDocuments
- WCM-351 fixes to select workflow screen on IE (weird onchange behavior)
- WCM-468 fixes to remove rendering engine
- doing the jsp 2.0 thing
- WCM-427 fix to encoding issue with parseXMLDocuements
- fix for remove rendering engine templates in create form (wasn't clearing the list in init)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 21:02:05 +00:00
David Caruana
96b61f3ac7 Web Scripts as JSR-168 portlets
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5628 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 15:11:38 +00:00
David Caruana
fa8309b777 Web Scripts as JSR-168 portlets
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 15:11:19 +00:00
Kevin Roast
741fb75305 My Forms template now opens website virtualisation URL when icon clicked.
New Template AVM API methods added to generate staging, user sandbox and path asset URLs for virtualisation server.
Some refactoring of constants used in AVMConstants into JNDIConstants to allow repository classes to also use them.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 11:27:46 +00:00
Kevin Roast
dd5a638c20 Auto-closing of dialog/wizard pop-up windows on Finish/Cancel when calling a wizard/dialog via a REST style url command
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 09:54:59 +00:00
Ariel Backenroth
41519858df fix misalignment between property wca:xmlschema of aspect wca:form in java constants and in xml model config. the property value was xmlschema in xml but simply schema in java. still unsure as to why this would be causing problems now - and not causing problems on my machine, but this is most likely the cause of the stacktraces we are seeing. thanks much to derek for helping track this down.
i've created issue WCM-477 to track any patch consequences of this realignment.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5618 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-04 01:09:26 +00:00
Ariel Backenroth
ca496b0c86 adding a null check for the schema file to help diagnose a stacktrace in create web content.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5616 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-03 23:27:42 +00:00
Ariel Backenroth
9c3197d467 most of the way through making the wcm tinymce extensions available from create html. still need to address:
- IE issues
- how to handle uploaded files from the create html context
- break out the filepicker backing code into its own bean (it's mingled into the XFormsBean at the moment)

also reorganizing and pruning the xforms unit test tree.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-03 21:26:41 +00:00
Ariel Backenroth
52950cfcfb xforms ui updates and fixes
- WCM-261:  only one active tinymce instance per page.  also extracted tinymce to what will soon be externally configurable parameters which enables different button configurations based on appearance.  having on instance per page does seem to provide a marginal performance boost
- WCM-453: better error message when creating content with a filename that already exists.
- WCM-431: providing tooltips on label based on a hint annotation
- test case for recursive schemas (haven't addressed the bug)
- fix for create web content for non form based content

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-02 21:56:36 +00:00
Roy Wetherall
c79882b3ce - Fixes to web client so PHP templates can rendered as custom views.
- Expended PHP JAva API to provide basic read-only implementations.  This allows naviagtion of a node structure, retrieval of properties and content details.
- Added relevant unit tests
- Implemented and tested doc_info.php example template

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5599 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-02 14:26:10 +00:00
Kevin Roast
a141b2d609 Added new command processor to execute UI Action based commands
For new commands such as 'createwebcontent' - launches the Create Web Content wizard via URL.
Some clean up of JSF Bean name constants.
Minor fixes to webscript templates for demo.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5595 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-02 11:06:36 +00:00
Kevin Roast
f307ecab0a ExternalAccessServlet now supports launching Alfresco dialogs/wizards via URL, My Web Forms template improvements.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-01 14:52:34 +00:00
Mike Hatfield
f6b89ebb0e NodeInfoBean update - optional template parameter on sendNodeInfo()
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5582 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-05-01 07:28:10 +00:00
Kevin Roast
72b5e97ad2 My Tasks improvements, fixes to webscript empty filter argument handling.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-30 20:59:55 +00:00
David Caruana
dac5281218 - jBPM 3.1.2 to 3.2 upgrade
- Implementation of Workflow Timers (primarily for WCM content launch, but also useful in other scenarios)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5578 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-30 17:21:52 +00:00
Ariel Backenroth
172b86dab4 updates to date time pickers
- make them behave better as inline elements for hgroup support
- respect minInclusive, maxInclusive, minExclusive and maxExclusive restrictions for date types.  no support in dojo to support the same with the TimePicker.  addresses feature request WCM-379.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5574 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-28 21:34:15 +00:00
Ariel Backenroth
1b898fb23e checkpoint of xforms improvements
- mostly functional hgroup implementation
- refactoring to support hgroups, make widgets behave better as inline elements
- figured out a way to get rid of dojo's inflight error watcher
- partial support for totalDigits (blocked by a dojo bug)
- improved support for length schema constraint
- refactoring of create widget code on the way to supporting config based on schema type, xform type, and appearance
- fix for silly bug in select workflow portion of create form wizard

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-27 22:33:37 +00:00
Derek Hulley
9770c96fb7 Added d:version mapping to org.alfresco.util.VersionNumber.
Fixed NPE in NodeBrowser where the the dictionary doesn't recognise the persisted type.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5556 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-26 08:19:54 +00:00
Kevin Roast
eecfcd3485 Ajax pop-up summary panel code refactored into generic library.
First cut of the My Tasks webscript..
Added "url.context" help object to template model for TemplateContentServlet.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5549 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-25 14:33:29 +00:00
Derek Hulley
4a22fc137a Merged V2.0 to HEAD
5523: Merged V1.4 to V2.0
      5494: db.schema.update=false disables ALL metadata queries
      5500: AR-1399 NTProtocolHander search handle leakage
      5522: AR-1412 IndexRemoteTransactionTracker startup
   5541: Merged V1.4 to V2.0
      5525: Pass-through authentication and domain mapping
         Resolved minor conflict on AlfrescoAuthenticator.java
      5526: Domain mapping support


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-25 02:44:53 +00:00
Derek Hulley
58bb2adc27 Merged V2.0 to HEAD
5497: cwd variable and forminstancedata
   5512: AR-1303 MLPropertyInterceptor
   5527: CIFS invalid characters


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5543 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-25 02:13:55 +00:00
Derek Hulley
77656d03e1 Merged V2.0 to HEAD
5491: AWC-1154 WCM Workflows
   5507, 5511: AVMGuidPatch


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-25 02:02:30 +00:00
Kevin Roast
5121e99d54 More fall out from Template/Script refactoring:
- fix to missing annotated service method (caused script command servlet to fail)
 - spelling mistakes in annotated service method parameters
 - cleanup in AbstractWebScript

Added ValueConverter concept to Template API - similar to JavaScript API ValueConverter, for a consistent mechanism to recursively convert Alfresco node properties to template accessable objects.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5535 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-24 13:11:25 +00:00
Roy Wetherall
89875c8037 Fallout fix from template/script refactor.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-23 13:19:26 +00:00
Roy Wetherall
c8cf88179a Refactor of template and script services to allow easy addition of further template and script processors.
Hightlights of check-in include:
- Introduction of script processor 
- Neutralisation of script and template models
- The notion of a processor extension introduced
- Extensions applied to processor implementation rather than the services
- Auto selection of processor based on file extension of template or script

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5519 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-20 17:13:34 +00:00
Derek Hulley
24a483f73d Merged V2.0 to HEAD
5457: Merge error on copy web project action
   5459: AR-1278
   5461:
   5462: A few deployment fixes
   5469: Dictionary messages
   5470: L2 cache checks
   5478: WCM-374


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 02:02:42 +00:00
Derek Hulley
69694b7ac0 Merged V2.0 to HEAD
5456: (From WCM_DEPLOY)

There were many pure conflicts on license headers, one conflict due to CR-LF and
some other smaller issues to resolve:
-----------------------------------------
Resolved (line endings not cr-lf):
   root\projects\repository\config\alfresco\public-services-context.xml

Reverted:
   root\projects\web-client\source\web\images\icons\ajax_anim.gif

Reverted or Resolved (License text conflicts):
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\JndiTest.java
   svn resolved root\projects\jndi-client\source\java\org\alfresco\jndi\AVMFileDirContext.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\jndi\AVMBulkLoader.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilter.java
   svn revert root\projects\jndi-client\source\java\org\alfresco\filter\CacheControlFilterInfoBean.java
   svn revert -R root\projects\catalina-virtual\source\java\org\alfresco\mbeans
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\context\AVMStandardContext.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappClassLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\loader\AVMWebappLoader.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMResourceBinding.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostConfig.java
      - why the change in method naming convention?
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHost.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\DefaultAVMResourceBinding.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValveTest.java
   svn resolved root\projects\catalina-virtual\source\java\org\alfresco\catalina\valve\AVMUrlValve.java
   svn revert root\projects\catalina-virtual\source\java\org\alfresco\catalina\host\AVMHostMatch.java

Modified:
   root\projects\web-client\source\java\org\alfresco\web\ui\wcm\component\UIDeployWebsite.java (Kevin to check line 330)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5484 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-12 01:41:14 +00:00
Derek Hulley
1e854c1087 Merged V2.0 to HEAD
5448: (From V1.4)
      5281 (V1.4): Patches not executed in read-only mode
      5284 (V1.4): Integrity messages
      5308 (V1.4): Category selector performance
      5331 (V1.4): Category performance
      5402 (V1.4): AR-1315
      5410 (V1.4): 
      5417 (V1.4): Upgrade script performance
      5435 (V1.4): Lucene test text encoding


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5482 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 23:24:00 +00:00
Derek Hulley
0a79a3db57 Merged V2.0 to HEAD
5297: PostgreSQL upgrade support
   5347: (From 1.4) EHCache configuration fixes and sample
   5380, 5381: AWC-1143
   5398: AWC-966


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 19:05:40 +00:00