inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged BRANCHES/DEV/DAVEW/SPRING3 to HEAD

Browse Source 
15422: Fix deploy-virtual-tomcat macro for Spring 3
   15391: Fix ContentStoreReplicatorTest for Spring 3
   15390: Upgrade CXF to version 2.2.2 for Spring 3 compatibility
   15385: Correction to previous checkin
   15384: Fix ClassPathStore.createRelative() to work with Spring 3
      - Relative resource path resolution with directory resources has changed
   15346: Merged V3.3_SPRING3 to SPRING3
      15310: Spring 3: Change to the way that FileContentStore broadcasts its existence to interested parties (for enterprise-only monitoring)
         - Introduced new SafeEventPublisher singleton that queues up events until after the application context has finished refreshing
      15309: Use AUTODETECT_NONE auto detect mode for JMX exporters to be compatible with Spring 3
      15308: Fix IBATIS integration to be compatible with Spring 3
      15307: Added missing runtime dependencies
         - org.springframework.expression-3.0.0.RC2.jar
         - org.springframework.asm-3.0.0.RC2.jar
      15289: Move Alfresco stack to Spring 3
         - Stage 1: get it compiling in eclipse and update ant scripts
         - Still requires Web Framework contributions from Uzi


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17624 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2009-11-23 20:20:06 +00:00
parent 512e7c8cb5
commit 1a481a63c2
41 changed files with 258 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/repo/content/ContentServiceImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
* Copyright (C) 2005-2009 Alfresco Software Limited.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -18,7 +18,7 @@
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* FLOSS exception. You should have received a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing"
*/
@@ -69,10 +69,7 @@ import org.alfresco.util.Pair;
import org.alfresco.util.TempFileProvider;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.ApplicationEventPublisher;
/**
@@ -86,7 +83,7 @@ import org.springframework.context.ConfigurableApplicationContext;
* @author Derek Hulley
* @since 3.2
*/
public class ContentServiceImpl implements ContentService, ApplicationContextAware
public class ContentServiceImpl implements ContentService
{
private static Log logger = LogFactory.getLog(ContentServiceImpl.class);
@@ -94,7 +91,7 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
private NodeService nodeService;
private AVMService avmService;
private RetryingTransactionHelper transactionHelper;
private ApplicationContext applicationContext;
private ApplicationEventPublisher applicationEventPublisher;
/** a registry of all available content transformers */
private ContentTransformerRegistry transformerRegistry;
@@ -163,14 +160,16 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
{
this.imageMagickContentTransformer = imageMagickContentTransformer;
}
/* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
/**
* Sets the application event publisher.
*
* @param applicationEventPublisher
* the new application event publisher
*/
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException
public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher)
{
this.applicationContext = applicationContext;
this.applicationEventPublisher = applicationEventPublisher;
}
/**
@@ -179,8 +178,8 @@ public class ContentServiceImpl implements ContentService, ApplicationContextAwa
public void init()
{
// Set up a temporary store
this.tempStore = new FileContentStore((ConfigurableApplicationContext) this.applicationContext,
TempFileProvider.getTempDir().getAbsolutePath());
this.tempStore = new FileContentStore(this.applicationEventPublisher, TempFileProvider.getTempDir()
.getAbsolutePath());
// Bind on update properties behaviour
this.policyComponent.bindClassBehaviour(