inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,187 Commits 323 Branches 2,164 Tags
0a24b5f41bf20ba0c3a7c37a6e5e583aa322c96f
Commit Graph

23 Commits

Author SHA1 Message Date
Derek Hulley
f047c6baaf Merged DEV\EXTENSIONS to HEAD 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4868 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4869 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4904 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4938 .
   Module management support
   Modularization of Records Management


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4956 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2007-01-29 14:43:37 +00:00
Derek Hulley
05d2cd1b28 Merged DEV\EXTENSIONS to HEAD 
svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4832 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4833 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4862 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4863 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4866 svn://svn.alfresco.com:3691/alfresco/BRANCHES/DEV/EXTENSIONS@4867 .
   svn rm --force root\projects\repository\source\java\org\alfresco\repo\extension
   svn rm --force root\projects\repository\source\java\org\alfresco\service\cmr\extension


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4954 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2007-01-29 14:02:14 +00:00
Jon Cox
cdfe23c2c6 To give developers final control over the tuning 
of their own local build, the dev-context.xml file                                                                                                                    
   is processed last  (note: dev-context.xml isn't                                                                                                                       
   part of the source tree itself).                                                                                                                                      
                                                                                                                                                                                 
   Once this file said:

      <import resource="classpath*:alfresco/extension/*-context.xml"/>                                                                                                           


   Now it ensures dev-context.xml is last via:

      <import resource="classpath*:alfresco/extension/*-context.xml"/>                                                                                                           
      <import resource="classpath*:alfresco/extension/dev-context.xml" />                                                                                                        

   The order matters if you have a dev-context.xml 
   that overrides fileServersConfigSource  
   (which is the "right" way to assert a private version of:  

     root/projects/repository/config/alfresco/extension/file-servers-custom.xml
     
   It seems weird that we have a checked-in extension like this,
   so I supose it's no stranger that the means to override it
   should also be a little curious.

   Anyway, now my dev-context.xml can say:
  
      <bean id="fileServersConfigSource" 
            class="org.alfresco.config.source.UrlConfigSource">
        <constructor-arg>
           <list>
              <value>classpath:alfresco/file-servers.xml</value>
              
              <!-- Get the CIFS port from a custom application context config file -->
              <!-- <value>classpath:alfresco/extension/file-servers-custom.xml</value> -->
              <value>file:/home/jcox/etc/alfresco/file-servers-custom.xml</value>                                                                                
           </list>
        </constructor-arg>
     </bean>


   This allows me to provide *my*  file-servers-custom.xml that
   won't ever get checked in by mistake, because it only uses
   the existing dev-context.xml mechanism. 

   From there, I can set my CIFS ports.
   Whew.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4511 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-12-04 23:32:03 +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
39a18df7f2 Yet another merge from head to WCM-DEV2. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3774 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-09-12 18:55:07 +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
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
David Caruana
19e3138e1c - Incorporate JCR project into Repository project 
- Single configuration entry point for JCR and non-JCR clients (i.e. application-context.xml)
- Addition of build-war, incremental-war build targets (no deploy)
- Remove build of JCR TCK war file by default

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-05-05 16:33:22 +00:00
Derek Hulley
7edcb18bc0 Schema changes and ID-based node storage 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-04-28 12:54:29 +00:00
Kevin Roast
1757cec4f8 Checkpoint for the Rhino Script engine integration 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2720 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-04-27 09:39:25 +00:00
David Caruana
0330f2cdb7 Transaction-level Policies. Modify AuditableAspect and ContentHits example to make use of transaction policies so they only trigger once. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2651 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-04-12 16:15:20 +00:00
David Caruana
701657f2f1 Full Repository Export / Import Support - first checkpoint 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2591 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-03-30 18:38:03 +00:00
David Caruana
6cb16abef4 Fix AR-431, AR-432. 
Modified the Repository bootstrap mechanism so it's performed after all other initialisation and the order of bootstrap is explicit.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2414 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-02-16 15:11:53 +00:00
Derek Hulley
cd8c1dd9fc Enabled wildcard classpath imports of extension application context files. Added an ignore for reserved extension/dev-context.xml. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2213 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-26 04:19:20 +00:00
Derek Hulley
0e7fda10a1 More generic use of Spring <import> using classpath*:...*.xml notation 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2209 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-26 00:32:44 +00:00
Derek Hulley
5f50bb6d0a Workaround for bean import bug in Spring 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2172 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-23 10:02:18 +00:00
Derek Hulley
b4220a973b Moved patch config files 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2160 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-20 14:43:33 +00:00
Derek Hulley
47449b1555 Checkpoint checkin of patch code. 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-16 19:49:34 +00:00
Derek Hulley
6dcf035c11 Comment enhancements 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2095 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-10 14:58:51 +00:00
Derek Hulley
cbc6901611 Making stuff clearer for configuration extensions 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2091 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2006-01-10 11:44:25 +00:00
Roy Wetherall
366873440c - Fixed unreported bug where boolean deafult values where not set correctly 
- Fixed AR-314, category rule was not appending additional categories
- Fixed spelling mistake and moved lock messages into properties file while I was there (AWC-350)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
 2005-12-13 17:21:33 +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