Derek Hulley
|
840b3e45be
|
Merged V2.2 to HEAD
7251: First cut at permissions checking in AVM
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8232 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2008-02-08 16:30:11 +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 |
|
Britt Park
|
87b5690fc2
|
Some cleaning up of the AVMService and derived interfaces.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-16 18:17:18 +00:00 |
|
Britt Park
|
a67f2d0cc9
|
User name and password are now picked up from ALFUSER, ALFPASSWORD environment
variables.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4528 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-06 15:58:45 +00:00 |
|
Britt Park
|
e596462ec9
|
The other half of cp for Repo.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4513 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-05 02:07:36 +00:00 |
|
Britt Park
|
a95b3bbed0
|
Working facsimiles of ls and half of cp for Repo.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-04 19:17:34 +00:00 |
|
Britt Park
|
07b18358ae
|
Slightly less broken RepoLs. Checkpoint. Also gave Pair a reasonable toString method.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4508 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-04 13:43:44 +00:00 |
|
Britt Park
|
2845364a18
|
Exported some Repo functionality via RMI. First (still broken) Repo
based CLT. Some cleanup and modification to other CLTs. WIP.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4500 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-04 00:41:06 +00:00 |
|
Britt Park
|
b8595831c8
|
Moved a bunch of things to more logical locations.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4497 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
|
2006-12-03 15:43:16 +00:00 |
|