Derek Hulley
0570c77f46
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
138d1780cb
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
ad80d96da3
Merged V2.0 to HEAD
...
5450: (from V1.4)
5423 (V1.4): CIFS authentication
5451: (from V1.4)
5432 (V1.4): 'No root node' fix
5437 (V1.4): EHCache upgrade
5440 (V1.4): AR-1355 - Ticket cache config fix
5442 (V1.4): Bootstrap reorganization
5446 (V1.4): AR-1353
5452: (from V1.4)
5391: AR-1310 (script rename fix)
5453: Win32NetBIOS LANA
5454: CIFS unused code
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5483 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 23:41:00 +00:00
Derek Hulley
4ea83f7f2b
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
d3e08db677
Merged V2.0 to HEAD
...
5447: (From V1.4 5278, 5279, 5280, 5285, 5298, 5299, 5304): Hibernate session size management for large transactions
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5481 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 23:03:02 +00:00
Derek Hulley
f43d8864cb
Merged V2.0 to HEAD
...
5425: AR-1309
5426: AR-1342
5427: AWC-1157
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5480 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-11 21:46:19 +00:00
Derek Hulley
529c4840e9
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
Andrew Hind
296c55c548
Index deletions by string ID (not NodeRef)
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-10 12:04:21 +00:00
Britt Park
32d1493301
Added DAOs. Attribute query objects seem to be able to generate hibernate predicates.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-09 16:06:01 +00:00
Andrew Hind
838b2bfcd3
Java doc updates
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-05 11:17:21 +00:00
Kevin Roast
98f2e85cc0
New API for templates.
...
Provides access to AVM stores and nodes within those stores. The majority of the standard template Node API is available (such as properties, children, content, icons etc.) and some additional AVM specific methods.
Root level helper object 'avm' provides lookup for AVM store object and AVM nodes objects by path in the OO style expected by template writers. Once retrieved, the store object provides store meta-data and access to the root Template AVM node for the store (or lookup of individual nodes by path) which exposes the standard template Node API.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-04 16:26:16 +00:00
Britt Park
8760a86ff5
This is a checkpoint of metadata work. Nothing works, but it compiles.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5458 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-04-03 23:22:13 +00:00
Kevin Roast
3eb95fac69
Build fix - including global script objects
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5430 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-28 13:47:02 +00:00
Kevin Roast
dc1ba62822
Added getPermissions() missing API for JavaScript Node. Returns all permissions set on a node - helps to solve requirements such as http://forums.alfresco.com/viewtopic.php?p=18928#18928
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5429 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-28 12:35:25 +00:00
Kevin Roast
fab3f867f8
JavaDoc updates for recent Template/script class changes and additions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5428 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-28 09:14:19 +00:00
Kevin Roast
f48caf423e
Rollback of FileFolderServiceImpl accidently checked in on friday
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-27 10:59:46 +00:00
Kevin Roast
1e05a3b0ac
Split of the template node functionality into new interface hierarchy and appropriate base classes impl.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5418 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-23 16:26:09 +00:00
Kevin Roast
20b62e50ca
Child and target associations available via templatenode API. Absurl method available in the Template Content Servlet.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-22 11:14:57 +00:00
Kevin Roast
42eabcf15d
JavaScript files now convert to text/plain using default string extracting content transformer - allow javascript files to be previewed using the node-info ajax popup panel
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-21 12:45:05 +00:00
Kevin Roast
6795d5dc9c
JavaScript node and Template node xpath search now uses QueryParameters for folder path searches
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-21 12:43:51 +00:00
Kevin Roast
7f3c842c79
Script engine now supports an 'import' directive allowing scripts to include other scripts.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5405 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-20 14:47:10 +00:00
David Caruana
d1283ac26a
Fix AR-1323: NPE whilst returning ownership to pool
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5400 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-19 14:40:22 +00:00
Kevin Roast
c1811ebfa6
JavaScript API for Groups modification
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-16 15:58:32 +00:00
David Caruana
7e2116099e
Fix AR-1313: TestModel utility fails to validate bpmModel
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5397 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-16 10:06:24 +00:00
Kevin Roast
a7f73d265d
Missing image resolving support in AbstractWebScript, improvement to video plugin support in FireFox ajax pop-up node panel
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-15 15:46:50 +00:00
Kevin Roast
6f60e2190d
Fixes for AWC-1160 and AWC-1161
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-15 11:34:20 +00:00
Gavin Cornwell
d087a2b31c
Initial version of a "copy to web project" action
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5387 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-15 10:49:26 +00:00
David Caruana
9269054759
1) Consolidate creation of template image resolver in Web Scripts
...
2) Add Help to stand-alone Web Scripts test server
3) Add server-side JavaScript Debugger
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-13 18:54:51 +00:00
Britt Park
3e0c445ff4
Nestable metadata checkpoint. Preliminary mapping. Preliminary interface for value items.
...
Preliminary service interface.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5379 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-12 15:56:59 +00:00
Kevin Roast
bcd81b582e
hasPermission() method added (as configured template API extension) to Template API
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-12 15:42:33 +00:00
Kevin Roast
5e1b1c1189
hasPermission() method added (as configured template API extension) to Template API
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5377 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-12 15:12:56 +00:00
Kevin Roast
200d170489
Added spring configured template extensions support to WebScript and image resolving support.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5374 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-09 18:26:02 +00:00
Kevin Roast
9323a8cd7a
Template extension spring configuration support
...
- similar pattern to existing script bean extension support
- new root model helper objects and custom methods can be added via spring configuration
Cleanup of script extension spring support
Fix to thread safety of configured script extension beans that use the Scopable interface
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5369 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-09 12:30:34 +00:00
Kevin Roast
b63af5d8fd
Source files missing new license header
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5366 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-09 09:38:24 +00:00
Derek Hulley
da793026fb
Brought EHCache configuration loading in line with Hibernate
...
JBPM test was not configuring an L2 cache, which is now mandatory
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5357 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-08 18:43:35 +00:00
David Caruana
a3ae1fc827
Merge Web Scripts from BRANCHES/DEV/DAVE
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5352 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-08 14:47:01 +00:00
Derek Hulley
f17fd30824
Merge V2.0 to HEAD
...
5234: LicenseService shutdown
5256: AR-1273 workaround
5289: AWC-1142
5294: WCM-360
5296: Potential NPE in patches dao
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:14:46 +00:00
Derek Hulley
78d5d43e86
Merged V2.0 to HEAD
...
5178: WCM-336, checkin performance
5182: Missing OpenSearch strings
5183: AR-1126
5185: OpenSearch externalized strings
5190: Schema and xforms
5191: WCM-343
5205: NTML using incorrect auth component
5210: No virtual server start
5211: WCM-352, WCM-353
5212: Manage Task Dialog issues
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 15:04:21 +00:00
Derek Hulley
920e29438f
Merged V2.0 to HEAD
...
5146: AR-1122
5148: AR-1116
5149: RM-5
5152: AR-1167
5153: WCM-324
5154: WCM-325, WCM-301, WCM-258, WCM-25, WCM-320
5156: WCM-338
5158: AR-1164
5169: AR-1216
5177: WCM-328
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5327 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 12:01:58 +00:00
Derek Hulley
6d5739e20f
Merged V2.0 to HEAD
...
5136: AR-918
5137, 5138: AWC-1083
5139: WCM-309, WCM-311
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5325 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 10:07:36 +00:00
Derek Hulley
4a44e4d3a2
Merged V2.0 to HEAD
...
5135: AR-1240 (AuthenticationComponent bean naming)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5324 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 09:59:47 +00:00
Derek Hulley
80ce950335
Merged V2.0 to HEAD
...
5116: AWC-1067, AWC-1126
5121: AR-1233 (from 1.4 via 2.0)
5129: AR-966
5131: Overlay copy and duplicate name
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5323 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 09:50:10 +00:00
Derek Hulley
bf9a4976e7
Merged V2.0 to HEAD
...
5110: AR-1166
5111: AR-729
5112: AR-1217
5113: RM email propery extraction
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5313 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-06 15:00:54 +00:00
Derek Hulley
563ca10bea
Merged V2.0 to HEAD
...
5091: AWC-1118
5092: pooledactor assignment
5100: AWC-1133
5103: CML copy and cm:name
5106: Bubble view discussion topics
5107: AWC-1030, AWC-1137, Console buttons
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-06 13:20:00 +00:00
Derek Hulley
20068f981b
Upgraded to Hibernate 3.2.1
...
The code changes were pulled from the fix branch and V1.4 (HIBERNATE_UPGRADE 5207 5293)
The jars were manually dropped in again due to the new directory structure
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-06 07:26:41 +00:00
Derek Hulley
4866ed4fc7
Merged V2.0 to HEAD
...
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5086 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5087 .
IPC$ name pipe
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5092 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V2.0@5093 .
MSWord support. AR-1228.
Added FLOSS to new file
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5301 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-06 03:05:44 +00:00
Andrew Hind
48fe361cf2
Java doc tidy up in auditing and scheduled actions
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5295 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-05 15:51:09 +00:00
Andrew Hind
6759c60b41
Fix parsing of stop words to a null query to generate an approriate non matching query
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5261 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-02 08:39:19 +00:00
Kevin Roast
a6cd614afa
Merged from BRANCHES/DEV/KEVINR:
...
. NodeInfo panel and Ajax client library
- Rewrite of Node Info panel
- Alfresco common DOM methods refactored into namespaced object (YUI/Dojo style) Alfresco.Dom
- Addition of useful DOM and 'smart' alignment method to common.js
- OpenSearch now uses additional namespace for it's global method handlers: Alfresco.OpenSearchEngine
- Temporary icons added for pop-up node info panel
. Additional FreeMarker model API method "cropContent(contentprop, length)" to return the first N bytes of a content stream - auto converted to plain/text from all supported transformation mimetypes
. DownloadContentServlet now handles ContentIOException more gracefully
. AbstractContentReader fixed to handle empty file data when requesting N characters from a content stream
. Yahoo scripts move to PageTag rendering as appropriate
. Refactoring of existing ajax components that output Yahoo scripts
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-01 17:24:08 +00:00
Kevin Roast
a3d3014467
Merged from BRANCHES/DEV/KEVINR:
...
. Fix from Andy for jboss portal issue with audit component
. Fix to AlfrescoFacesPortlet to work with JBossPortal2.4.1
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-01 15:56:52 +00:00