Commit Graph

3039 Commits

Author SHA1 Message Date
Mark Rogers
a667b2468c Fix for ALFCOM-1666 - Null pointer when calling ScriptNode in Java (for workflow)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13499 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-09 10:37:00 +00:00
Jan Vonka
9efa446c68 Temporary build/test fix (will be removed when V3.1 is merged to HEAD upto and including r13170)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13488 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-06 10:52:49 +00:00
Andrew Hind
b3c5d867f6 Merged V3.1 to HEAD
13474: Merged V3.0 to V3.1
        13473: Merged V2.2 to V3.0 
            13472: Fix for ETWOTWO-1148: FreeMarkerWithLuceneExtensionsModelFactory.java not closing ResultSet objects 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13479 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-05 10:53:18 +00:00
Jan Vonka
18b1342c57 Build/test fix (MultiTDemoTest)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13463 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-04 10:11:52 +00:00
Jan Vonka
b5dbd53461 MT Share - initial checkpoint
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13459 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-03 22:25:50 +00:00
Derek Hulley
8f1fe3f3df ImporterBootstrap uses Spring's DefaultResourceLoader to load views
- Handles file: and classpath: references
 - Falls back to classloader-based resource search


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13454 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-03-03 15:25:22 +00:00
Jan Vonka
4acb627a08 Fix build/test failure (MessageServiceImplTest) - also switched from BaseSpringTest to straight TestCase
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13398 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-27 13:45:10 +00:00
Mark Rogers
33bf0818ba MERGE 3.2_INVITATION To HEAD
Missed check in of moderated invitation action handler.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13389 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-27 11:00:04 +00:00
Mark Rogers
ef5d9c1eb1 Reverting accedental change from previous check in.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13385 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-26 17:06:15 +00:00
Mark Rogers
0f9c09ba09 MERGE DEV/3.2_INVITATION to HEAD
MOB-124 First cut of invitation service
  First cut group site membership

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13378 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-26 15:53:23 +00:00
Neil McErlean
52a639c2c8 Forms. Url-encoded submit.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13367 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-25 19:55:21 +00:00
Derek Hulley
1250f52a54 Moved PropertyCheck from Repository project to Core project
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13361 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-25 17:35:18 +00:00
Neil McErlean
0d984c724e Added handling for colons,underscores in field names during post
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13312 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-23 09:25:49 +00:00
Derek Hulley
ac8a0b1a51 Merged V3.1 to HEAD
13288: Added @deprecated tag to 'onCopyNode'
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.1:r13288


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13289 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-19 13:23:54 +00:00
Neil McErlean
c062d8020f Changes to formservice transaction spring config
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13286 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-19 12:02:20 +00:00
Mark Rogers
711e4b298e Merge LOGNEON-HEAD-3D-BENCHMARK to HEAD
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13241 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-16 12:21:41 +00:00
Mark Rogers
109b51fb98 ALFCOM-2358 Rework to stop transaction deadlock and adding first ASR unit tests.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13234 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-13 18:35:21 +00:00
Andrew Hind
4e9a4cc1c6 Merged V3.1 to HEAD
12867: Part 1: JAWS-220: Fix existing tests and tests for sort
    12879: JAWS-219: Part 1: First cut of support for CMIS objectid  = objectid joins
    12891: Complete minimalist support for Policies
    12912: CMIS Query: JAWS-219: Tests, fixes and better checking
    13062: Fix for ETHREEOH-1162:Issue with skipCount parameter for CMIS query service


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13224 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-13 12:52:35 +00:00
Michael Uzqu
fc69f52b45 Update to Web Framework to support Production Runtime
- cleaned up the sample files to align with the Wiki (http://wiki.alfresco.com/wiki/Surf_Platform_-_Deployment_Configurations)
- added definitions for resource resolvers so that web assets can be loaded from virtual paths in production tier
- updated javadoc on code in resource package
- updated alf.tld so that <alf:pagelink/> tag now works (to align with Freemarker @pagelink directive)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13215 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-12 21:17:06 +00:00
Neil McErlean
c819d08ddc Merged DEV/FORMS to HEAD (Merging r13070 through r13210)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13211 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-12 16:17:32 +00:00
Gavin Cornwell
d4aafeaf54 Added support for warn logging level messages to ScriptLogger utility classes and updated forms JS script to use it
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-10 16:55:00 +00:00
Neil McErlean
c6a014b1a8 Merged DEV/FORMS to HEAD (r13057-13069)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13070 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-04 19:01:50 +00:00
Gavin Cornwell
5eb5855902 Merged DEV/FORMS to HEAD (all activity from branch creation r12855 through r13056)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13058 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-02-04 15:03:18 +00:00
Dave Ward
64ee008d7e Increment schema number on HEAD to 2000 to give us a range of schema numbers for 3.1 license.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12957 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-29 11:01:30 +00:00
Derek Hulley
36a62cab43 Merged V3.0 to HEAD
12827: Merged V2.2 to V3.0
      12822: Fixed ALFCOM-2372: Upgrade from 2.1C fails

   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r12827
      Merged /alfresco/BRANCHES/V2.2:r12822


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-16 14:27:41 +00:00
Kevin Roast
e4dae16f8c Merged V3.0 to HEAD
12795: ALFCOM-2419: ResourceBundleWrapper is no longer (de)serializable after changes merged from 2.1-A rev 8323
   12826: Fix for ETHREEOH-37 and ETHREEOH-176.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12828 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-16 14:20:15 +00:00
Jan Vonka
97a73fcc00 Fix ALFCOM-2388 + add unit test
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12819 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-16 12:14:11 +00:00
Paul Holmes-Higgin
5a12928781 Changed version label to Labs 3 Stable (official name)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12769 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-15 12:56:49 +00:00
Kevin Roast
aa08480190 Merged V3.0 to HEAD
12762: Another attempt at SiteServiceImplTest with fixes from Roy

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-15 11:14:15 +00:00
Kevin Roast
b1cfa409b0 Merged V3.0 to HEAD
12757: Build fix for SiteServiceImplTest

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12758 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-15 09:09:07 +00:00
Dave Ward
dfc35ffd6c Added isAvailable() and getVersionString() to RuntimeExecutableContentTransformer so that the attributes of the new-style pdf2swf content transformer can be reported via JMX.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12749 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-14 17:47:25 +00:00
Derek Hulley
fd15f44b54 Merged v3.0 to HEAD
12725: *RECORD ONLY* remove errant comma
   12740: Merged V2.2 to V3.0
      12577: Fix ETWOTWO-973 - Enable Logging of Leaked Transactions By Default.
      12582: *RECORD-ONLY* Fix ETWOTWO-872 - openoffice bootstrap config in WAR bundle.
      12628: *RECORD-ONLY* Fix for ETWOTWO-937: Regression Multi-Valued properties - nullpointerexception if only one value is set initially
   12741: Merged V2.2 to V3.0
      12643: Fixed ETWOTWO-354: null properties created on copy-pasted nodes
      12694: Added NodeService.addProperties() method
      12695: Follow-up fix for  ETWOTWO-354: null properties created on copy-pasted nodes
      12715: Fix ETWOTWO-988: Gather Oracle schema stats before, during and after upgrade
      12730: IndexInfo.main processes multiple directory arguments
      12737: Fixed ETWOTWO-246, ETHREEOH-996 (by merge) and ALFCOM-2299: Cancel discussion orphans nodes
   12745: Merged V2.2 to V3.0
      12744: Fixed ETWOTWO-1011 and (by merge) ALFCOM-2372: Upgrade from 2.1C fails

   svn diff -N .
      Merged /alfresco/BRANCHES/V3.0:r12725,12740-12741,12745
      Merged /alfresco/BRANCHES/V2.2:r12577,12582,12628,12643,12694-12695,12715,12730,12737,12744


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12748 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-14 17:32:34 +00:00
Kevin Roast
b7ef06d97c Merged V3.0 to HEAD
12734: Fix for ETHREEOH-1007
   12735: Fix for ALFCOM-2326 (applied to 3.0E original code location)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12739 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-14 14:05:43 +00:00
Dave Ward
fb27a3ec1a Enterprise build fixes
- Set registrationBehaviorName="REGISTRATION_REPLACE_EXISTING" on MBean exporter so that unit test suites initialising multiple application contexts don't fail
- Add support for new clean-webclient-projects target in enterprise build by making it a dependency of clean-projects and overriding it in the enterprise wrapper

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12733 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-14 13:15:25 +00:00
Kevin Roast
a40e8381b6 Merged V3.0 to HEAD
12719: Merged V2.2 to V3.0
      12709: Merged V2.1 to V2.2
         12708: Fix for ALFCOM-2305 (against 2.1E original - to be merged forward)
      12711: Fix for ETHREEOH-1110 (applied to 2.2 where original code is present)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-13 21:03:25 +00:00
Roy Wetherall
0be11fe808 ALFCOM-2310: Creating a space under Sites (web client) breaks the sites search in share
- list site method on site service now filters out non-site nodes found



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-13 16:30:06 +00:00
Paul Holmes-Higgin
e150188167 Changed default location of imagemagick to give consistency across platforms. Upgrades will require manual creation of appropriate folders.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12700 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-12 23:17:56 +00:00
Mike Hatfield
5c5a0a375c DocList support for online edit (activated if Sharepoint amp installed) plus limited file- and folder-links support
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12672 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-09 20:19:50 +00:00
Paul Holmes-Higgin
ef432bccc7 MacOS installer with changes to config for calling out to OOo, pdf2swf & ImageMagick. Win installers may not work until updated as well.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-09 13:17:35 +00:00
Jan Vonka
c246edcef3 Merged DEV/JASONH to HEAD
12169: JCR - guess/set mime type and encoding ... means that doc added via JCR will display properly if clicked on in the web client
  12634: JCR - add test for JAWS-191 (r12169) improvement and wrap debug


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12654 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-09 13:07:34 +00:00
Jan Vonka
0f51b06274 Merged DEV/JASONH to HEAD
12170: (Partial) Performance improvement (ALFCOM-1507) in getBaseVersion()
  12622: JCR - add test for ALFCOM-1507 performance improvement


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12653 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-09 12:58:09 +00:00
Jan Vonka
4c800c25c5 Merged DEV/JASONH to HEAD
12565: JCR - fix ALFCOM-1655 (supercedes part of r12170)
  12644: JCR - fix extra testcase for ALFCOM-1655


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-09 12:43:46 +00:00
Jan Vonka
2c3c766028 WCM SandboxService - minor/consistency updates
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12641 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-08 18:12:36 +00:00
Jan Vonka
f2d23ec0c1 WCM SandboxService - add SandboxVersion (wraps AVM VersionDescriptor)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12640 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-08 17:38:45 +00:00
Mark Rogers
799761d5e9 Reinstated Virtualisation Server Registry.
WCM virtualisation needs it.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-08 13:00:38 +00:00
Derek Hulley
c16bdad03f Fixed ALFCOM-2285: swf2pdf command is hard-coded
- Added toMap() method to TransformationOptions
 - toMap() of SWFTransformationOptions adds 'flashVersion' property
 - RuntimeExecutableContentTransformer uses toMap() to override default properties
 - Changed 'transformer.Pdf2swf' bean to use RuntimeExecutableContentTransformer
 - Removed PDFToSWFContentTransformer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12623 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-08 12:55:20 +00:00
Neil McErlean
857aff414c Script layer impl of form.get (missing file)
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12586 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-07 11:23:26 +00:00
Neil McErlean
1df71e1b03 Script layer impl of form.get
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12584 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-07 09:42:07 +00:00
Dave Ward
38d1d18085 Merged DEV/3.1_ENTERPRISE_ONLY to HEAD
12575: Fix broken SimpleAuthorityServiceTest. Extra admin group has increased the number of initial groups to 2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12576 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-06 14:12:14 +00:00
Derek Hulley
44889712c7 Merged V3.0 to HEAD
12331: Fixed ETHREEOH-1033: alf_child_assoc.qname_localname column too short


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12573 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2009-01-06 13:41:53 +00:00