Commit Graph

27 Commits

Author SHA1 Message Date
Derek Hulley
31d1fa1fb1 Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4364 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4658 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 14:58:16 +00:00
Derek Hulley
473c9ff1ff Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4329 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4331 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4332 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4339 .


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-19 12:35:52 +00:00
Derek Hulley
72bb79696d Merged 1.4 to HEAD
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4252 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4294 .
   svn revert root\common\common.xml
   svn resolved root\projects\repository\config\alfresco\script-services-context.xml


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4634 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-12-18 13:45:11 +00:00
Jon Cox
0eda95cc5f Point checkin.
Inserting a password-protected MBean and associated RMI-based 
 MBeanServer into the Alfresco webapp context.

 Right now, it's just in "hello world" condition,
 but you can say: 

        jconsole service:jmx:rmi:///jndi/rmi://your-alfresco-box:50500/alfresco/jmxrmi

 and browse the MBean  (assuming you know the associated jmxrolename/password).
 Just one property right now ("moo"), but fleshes out all the major issues
 for isolating the JMX for our MBean from the JMX for the JVM as a whole.




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4441 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-24 19:08:01 +00:00
Britt Park
b2f9df29d1 Humongous merge. It is incomplete, however; faces-config-navigation.xml and ClientConfigElement
were both beyond me, and are just the raw conflict merge data.  If Kev can't figure out how they should
go together by tomorrow AM (for me) I'll dig back in.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-11-08 05:17:40 +00:00
Britt Park
111296d4dc Heinous merge from HEAD. Seems to basically work. Be on guard however.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-10-18 02:24:36 +00:00
Kevin Roast
df04fa65f9 . Added "Content Forms" folder to the Data Dictionary on bootstrap
. Added the usual helper methods to get assoc name for the new folder

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3974 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-29 13:30:28 +00:00
Kevin Roast
979ca93112 . Checkpoint of WCM ui work (nothing to see here, move along please, move along)
- "Websites" folder created under root of Company Home during bootstrap
 - Bootstrap properties and getter helper added to import-export-context & web-client
 - Beginnings of the Create Website wizard
 - Action definition added for Create Website action
 - Beginings of the model for avm webfolders and associated sub-structures

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3763 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-11 16:57:01 +00:00
Britt Park
820da6ecab Merge from HEAD to WCM-DEV2.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-09-02 18:19:00 +00:00
Britt Park
8031cc6574 Big honkin' merge from head. Sheesh!
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-27 01:01:30 +00:00
Britt Park
0606fa3ab6 AVM Nodes are (theoretically) mostly aspect ready. AVMNodeService is
now derived from AbstractNodeServiceImpl to make policy awareness easier.
Moved addDefaultPropertyValues from DbNodeServiceImpl to 
AbstractNodeServiceImpl so AVMNodeService can use it.  A fix for an
NPE that showed up in stress test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3603 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-24 18:36:59 +00:00
Britt Park
1df576890c AVM remote interface wiring. Also missed file from last checkin.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3498 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-08-14 16:26:34 +00:00
Britt Park
6692c7a979 Merged AVMService into the rest of Alfresco. It all comes up in
the same ApplicationContext. Some adjustments to tests needed,
but everything is passing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-07-26 13:47:40 +00:00
Britt Park
7d940d08e1 Big hunk of merge.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3265 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-28 17:31:18 +00:00
Britt Park
7f79a2a498 Merged up to HEAD.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3129 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-06-16 19:18:30 +00:00
Derek Hulley
fcad8b7a1f Content and folder node archival
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2767 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-04 16:04:55 +00:00
Kevin Roast
c9e5bd6c22 . Rhino JavaScript integration checkpoint:
- Added a new action to the repository for executing JavaScript files
  - Added script action UI to rule framework, means we can execute a JavaScript file as part of a rule
  - Lucene search and Saved Search functionality added to default data-model for scripts
  - Added Scripts folder to Data Dictionary (created during bootstrap)
  - Created patch to add the Scripts folder to existing schemas
  - Added ScriptService to ServiceRegistry bean

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-05-03 12:01:21 +00:00
Kevin Roast
764675cb2a return repository.properties to default values, oops
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2554 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-17 18:23:12 +00:00
Kevin Roast
05c11d5650 . First cut of the Externalised UI Actions
- XML Config for UI actions: web-client-config-actions.xml
   - commented examples are included in the config, I will write up a Wiki page to document it properly :)
 - Named groups of actions can also be reused across screens (where as previously individual ActionLink components had to be coded up for each screen by hand in the JSP)
 - Individual Actions can be reused across action groups or defined against a specific action group
 - UI actions for Browse (Create, More, Document and Space actions), Document and Space details pages now externalised into config
 - Refactoring of other JSPs to use externalised config - big reduction in hand coded JSF tags and code duplication between pages
. Document Details and Space Details pages now have Actions panel on the right hand side instead of an Actions drop-down menu
. Several unreported minor bugs fixed where actions conditions or listeners were inconsistent between browse and details pages

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2553 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-17 18:07:47 +00:00
Kevin Roast
d8b2e56aa3 . Addition of Email Templates folder (in Data Dictionary) to Bootstrap spaces.xml
. New patch to apply Email Templates folder to older schemas

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2515 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-03-03 17:39:32 +00:00
Derek Hulley
d7a8ab1065 Fixed AR-451: Display both current version of repo and installed version of repo
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2485 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-23 16:40:53 +00:00
Derek Hulley
440fa299b4 Content URLs are now generated with an extra HOUR folder to handle high volume input in one day better
Added cleanup job for content stores
 - content is moved into (alf_data)/contentstore.deleted and mirrors the live content store
 - We'll make a call about disabling the trigger for the job, but currently it will fire at 4am


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2422 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-16 20:01:57 +00:00
Andrew Hind
f9ccb9ad25 Lucene config and TX fixes
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2293 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-02-03 13:25:42 +00:00
Andrew Hind
4408850b7a Guest and LDAP progress
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2127 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-17 14:17:39 +00:00
Kevin Roast
c068713ef1 . First pass of the Saved Searches functionality for the web-client
. Saved Searches bootstrap folder
. Document details and Space details page now show a copy-and-paste NodeRef link 
. Minor bug fixes to Breadcrumb and ActionLink components

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2104 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2006-01-12 13:40:20 +00:00
David Caruana
13e1356130 Remove references to activiti2
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2042 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-16 11:58:58 +00:00
Derek Hulley
e1e6508fec Moving to root below branch label
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2005 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2005-12-08 07:13:07 +00:00