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

Another attempt to stop the uild breaking. This is a quick fix solution, probably need to think about a longer term solution.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15912 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2009-08-25 17:43:43 +00:00
parent 46a20ae097
commit 9fff828051
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/java/org/alfresco/repo/workflow/jbpm/AlfrescoJbpmConfigurationFactoryBean.java
View File

@@ -22,6 +22,7 @@
* the FLOSS exception, and it is also available here: * the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing" * http://www.alfresco.com/legal/licensing"
*/ */
package org.alfresco.repo.workflow.jbpm; package org.alfresco.repo.workflow.jbpm;
import java.io.InputStream; import java.io.InputStream;
@@ -46,13 +47,17 @@ import org.springmodules.workflow.jbpm31.JbpmFactoryLocator;
* @author Costin Leau * @author Costin Leau
* @author davidc * @author davidc
*/ */
public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, FactoryBean, BeanFactoryAware, public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, FactoryBean,
BeanNameAware, DisposableBean BeanFactoryAware, BeanNameAware, DisposableBean
{ {
private JbpmConfiguration jbpmConfiguration; private JbpmConfiguration jbpmConfiguration;
private ObjectFactory objectFactory; private ObjectFactory objectFactory;
private Resource configuration; private Resource configuration;
private SessionFactory sessionFactory; private SessionFactory sessionFactory;
private String contextName = JbpmContext.DEFAULT_JBPM_CONTEXT_NAME; private String contextName = JbpmContext.DEFAULT_JBPM_CONTEXT_NAME;
/** /**
@@ -63,16 +68,23 @@ public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, F
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see * @see
* org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org.springframework.beans.factory.BeanFactory) * org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org
* .springframework.beans.factory.BeanFactory)
*/ */
public void setBeanFactory(final BeanFactory beanFactory) throws BeansException public void setBeanFactory(final BeanFactory beanFactory) throws BeansException
{ {
// TODO Added to get the build working. A better solution is needed
// long-term.
this.factoryLocator.destroy();
this.factoryLocator.setBeanFactory(beanFactory); this.factoryLocator.setBeanFactory(beanFactory);
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) * @see
* org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang
* .String)
*/ */
public void setBeanName(final String name) public void setBeanName(final String name)
{ {
@@ -81,14 +93,13 @@ public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, F
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() * @see
* org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/ */
public void afterPropertiesSet() throws Exception public void afterPropertiesSet() throws Exception
{ {
if (this.configuration == null) if (this.configuration == null) { throw new IllegalArgumentException(
{ "configuration or objectFactory property need to be not null"); }
throw new IllegalArgumentException("configuration or objectFactory property need to be not null");
}
// 1. Construct Jbpm Configuration // 1. Construct Jbpm Configuration
// NOTE: Jbpm 3.2 adds a JbpmConfiguration value to its context // NOTE: Jbpm 3.2 adds a JbpmConfiguration value to its context
@@ -146,8 +157,7 @@ public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, F
} }
/** /**
* @param configuration * @param configuration The configuration to set
* The configuration to set
*/ */
public void setConfiguration(final Resource configuration) public void setConfiguration(final Resource configuration)
{ {
@@ -163,8 +173,7 @@ public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, F
} }
/** /**
* @param objectFactory * @param objectFactory The objectFactory to set
* The objectFactory to set
*/ */
public void setObjectFactory(final ObjectFactory objectFactory) public void setObjectFactory(final ObjectFactory objectFactory)
{ {
@@ -180,8 +189,7 @@ public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, F
} }
/** /**
* @param contextName * @param contextName The contextName to set
* The contextName to set
*/ */
public void setContextName(final String contextName) public void setContextName(final String contextName)
{ {
@@ -197,8 +205,7 @@ public class AlfrescoJbpmConfigurationFactoryBean implements InitializingBean, F
} }
/** /**
* @param sessionFactory * @param sessionFactory The sessionFactory to set
* The sessionFactory to set
*/ */
public void setSessionFactory(final SessionFactory sessionFactory) public void setSessionFactory(final SessionFactory sessionFactory)
{ {