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
0671335628
Merged V2.0 to HEAD
...
5144: Original HEAD revision 5141 that was reverted
WCM-317
WCM-302
WCM-333
WCM-270
WCM-312
WCM-305
WCM-298
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-03-07 11:46:17 +00:00
Derek Hulley
6aec329c9b
Reverted HEAD revision 5141
...
svn merge svn://svn.alfresco.com:3691/alfresco/HEAD@5141 svn://svn.alfresco.com:3691/alfresco/HEAD@5140 .
- 5141 was carried to V2.0 prior to this
- No other actions are required
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5145 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-15 11:10:59 +00:00
Ariel Backenroth
b534839220
- fix for constraints for repeats. looks like a side effect of chiba upgrade. rather than constrain based on count(.) need to use count(../<nodeset>) since it seems like they are evaluating the constraints on individual items rather than the bind nodeset.
...
- fix for handling of fractionDigits for range controls
- automatically add namespace declarations for freemarker output path pattern expressions
- better error handling/reporting for output path patterns
- pass around formInstanceDataName for use in the label of the viewroot
- regenerate renditions on update
- updated unit tests
- use xf:minOccurs and xf:maxOccurs for repeat bindings rather than alfresco:minimum and alfresco:maximum (hadn't seen that it was part of the spec - not supported by chiba - but doesn't interfere)
- fix for attributes with fixed values
bugs fixed:
http://issues.alfresco.com/browse/WCM-317
http://issues.alfresco.com/browse/WCM-302
http://issues.alfresco.com/browse/WCM-333
http://issues.alfresco.com/browse/WCM-270
http://issues.alfresco.com/browse/WCM-312
http://issues.alfresco.com/browse/WCM-305
http://issues.alfresco.com/browse/WCM-298
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5141 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-14 19:14:36 +00:00
Ariel Backenroth
f6bf4acd5d
localizing xforms codebase. adding javascript hash for string used from js.
...
multibyte fixes
appearance hints for textareas (full = rich text editor, minimal = plain text)
using xs:string for xforms:textarea
using xs:normalizedString for xforms:input
IMPORTANT: you will need to recreate all forms in the web project after i check this in. and for any of your own forms, you need to use xs:normalizedString as the type for textfields.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5028 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-02-03 00:01:08 +00:00
Ariel Backenroth
95a3f272c9
renaming this set of tests.
...
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4931 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2007-01-25 23:26:41 +00:00
