diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java index 1f5f620b1e..71b6bd6e11 100644 --- a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java +++ b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java @@ -37,6 +37,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.model.ContentModel; +import org.alfresco.processor.ProcessorExtension; import org.alfresco.repo.processor.BaseProcessor; import org.alfresco.scripts.ScriptException; import org.alfresco.scripts.ScriptResourceHelper; @@ -46,7 +47,6 @@ import org.alfresco.service.cmr.model.FileNotFoundException; import org.alfresco.service.cmr.repository.ContentIOException; import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.ProcessorExtension; import org.alfresco.service.cmr.repository.ScriptLocation; import org.alfresco.service.cmr.repository.ScriptProcessor; import org.alfresco.service.cmr.repository.StoreRef; diff --git a/source/java/org/alfresco/repo/processor/BaseProcessor.java b/source/java/org/alfresco/repo/processor/BaseProcessor.java index c33db8ef72..e154be35bb 100644 --- a/source/java/org/alfresco/repo/processor/BaseProcessor.java +++ b/source/java/org/alfresco/repo/processor/BaseProcessor.java @@ -28,9 +28,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import org.alfresco.processor.Processor; +import org.alfresco.processor.ProcessorExtension; import org.alfresco.service.ServiceRegistry; -import org.alfresco.service.cmr.repository.Processor; -import org.alfresco.service.cmr.repository.ProcessorExtension; import org.alfresco.service.cmr.repository.ScriptProcessor; import org.alfresco.service.cmr.repository.ScriptService; import org.alfresco.service.cmr.repository.TemplateProcessor; @@ -60,7 +60,7 @@ public abstract class BaseProcessor implements Processor protected ServiceRegistry services; /** A map containing all the processor extenstions */ - protected Map processorExtensions = new HashMap(10); + protected Map processorExtensions = new HashMap(16); /** * Registers this processor with the relevant services diff --git a/source/java/org/alfresco/repo/processor/BaseProcessorExtension.java b/source/java/org/alfresco/repo/processor/BaseProcessorExtension.java index 31f78254d8..e49265eec8 100644 --- a/source/java/org/alfresco/repo/processor/BaseProcessorExtension.java +++ b/source/java/org/alfresco/repo/processor/BaseProcessorExtension.java @@ -24,8 +24,8 @@ */ package org.alfresco.repo.processor; -import org.alfresco.service.cmr.repository.Processor; -import org.alfresco.service.cmr.repository.ProcessorExtension; +import org.alfresco.processor.Processor; +import org.alfresco.processor.ProcessorExtension; /** * Abstract base class for a processor extension @@ -69,7 +69,7 @@ public abstract class BaseProcessorExtension implements ProcessorExtension } /** - * @see org.alfresco.service.cmr.repository.ProcessorExtension#getExtensionName() + * @see org.alfresco.processor.ProcessorExtension#getExtensionName() */ public String getExtensionName() { diff --git a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java index daa8e61d62..f150b2166a 100644 --- a/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java +++ b/source/java/org/alfresco/repo/template/FreeMarkerProcessor.java @@ -32,9 +32,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.alfresco.processor.ProcessorExtension; import org.alfresco.repo.processor.BaseProcessor; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.service.cmr.repository.ProcessorExtension; import org.alfresco.service.cmr.repository.TemplateException; import org.alfresco.service.cmr.repository.TemplateImageResolver; import org.alfresco.service.cmr.repository.TemplateProcessor; diff --git a/source/java/org/alfresco/service/cmr/repository/Processor.java b/source/java/org/alfresco/service/cmr/repository/Processor.java deleted file mode 100644 index 029f3c35c3..0000000000 --- a/source/java/org/alfresco/service/cmr/repository/Processor.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2005-2007 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 - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * 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 - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.service.cmr.repository; - - -/** - * Processor interface. - * - * @author Roy Wetherall - */ -public interface Processor -{ - /** - * Get the name of the processor - * - * @return the name of the processor - */ - public String getName(); - - /** - * The file extension that the processor is associated with, null if none. - * - * @return the extension - */ - public String getExtension(); - - /** - * Registers a processor extension with the processor - * - * @param processorExtension the process extension - */ - public void registerProcessorExtension(ProcessorExtension processorExtension); -} diff --git a/source/java/org/alfresco/service/cmr/repository/ProcessorExtension.java b/source/java/org/alfresco/service/cmr/repository/ProcessorExtension.java deleted file mode 100644 index 599cf61544..0000000000 --- a/source/java/org/alfresco/service/cmr/repository/ProcessorExtension.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2005-2007 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 - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - * 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 - * the FLOSS exception, and it is also available here: - * http://www.alfresco.com/legal/licensing" - */ -package org.alfresco.service.cmr.repository; - -/** - * Interface to represent a server side script implementation - * - * @author Roy Wetherall - */ -public interface ProcessorExtension -{ - /** - * Returns the name of the extension - * - * @return the name of the extension - */ - String getExtensionName(); -} diff --git a/source/java/org/alfresco/service/cmr/repository/ScriptProcessor.java b/source/java/org/alfresco/service/cmr/repository/ScriptProcessor.java index 13571ff580..de327a0758 100644 --- a/source/java/org/alfresco/service/cmr/repository/ScriptProcessor.java +++ b/source/java/org/alfresco/service/cmr/repository/ScriptProcessor.java @@ -26,6 +26,7 @@ package org.alfresco.service.cmr.repository; import java.util.Map; +import org.alfresco.processor.Processor; import org.alfresco.service.namespace.QName; /** diff --git a/source/java/org/alfresco/service/cmr/repository/TemplateProcessor.java b/source/java/org/alfresco/service/cmr/repository/TemplateProcessor.java index 5ad3536175..1c825942d8 100644 --- a/source/java/org/alfresco/service/cmr/repository/TemplateProcessor.java +++ b/source/java/org/alfresco/service/cmr/repository/TemplateProcessor.java @@ -26,6 +26,8 @@ package org.alfresco.service.cmr.repository; import java.io.Writer; +import org.alfresco.processor.Processor; + /** * Interface to be implemented by template engine wrapper classes. The developer is responsible * for interfacing to an appropriate template engine, using the supplied data model as input to diff --git a/source/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java b/source/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java index aca697130b..862d094888 100644 --- a/source/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java +++ b/source/java/org/alfresco/service/cmr/repository/TemplateProcessorExtension.java @@ -24,6 +24,8 @@ */ package org.alfresco.service.cmr.repository; +import org.alfresco.processor.ProcessorExtension; + /** * Interface to represent a server side template extension implementation *