Author: charith
Date: Wed May 4 16:39:07 2011
New Revision: 1099511
URL: http://svn.apache.org/viewvc?rev=1099511&view=rev
Log:
adding message processor deployer
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/MessageProcessorDeployer.java
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/MessageProcessor.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ScheduledMessageForwardingProcessor.java
synapse/trunk/java/repository/conf/axis2.xml
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java?rev=1099511&r1=1099510&r2=1099511&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
Wed May 4 16:39:07 2011
@@ -30,6 +30,7 @@ import org.apache.synapse.SynapseConstan
import org.apache.synapse.endpoints.Template;
import org.apache.synapse.mediators.template.TemplateMediator;
import org.apache.synapse.SynapseException;
+import org.apache.synapse.message.processors.MessageProcessor;
import org.apache.synapse.message.store.MessageStore;
import org.apache.synapse.commons.executors.PriorityExecutor;
import org.apache.synapse.config.Entry;
@@ -84,6 +85,7 @@ public class MultiXMLConfigurationBuilde
public static final String EVENTS_DIR = "event-sources";
public static final String EXECUTORS_DIR = "priority-executors";
public static final String MESSAGE_STORE_DIR = "message-stores";
+ public static final String MESSAGE_PROCESSOR_DIR = "message-processors";
public static final String REGISTRY_FILE = "registry.xml";
@@ -126,6 +128,7 @@ public class MultiXMLConfigurationBuilde
createEventSources(synapseConfig, root, properties);
createExecutors(synapseConfig, root, properties);
createMessageStores(synapseConfig, root, properties);
+ createMessageProcessors(synapseConfig,root,properties);
return synapseConfig;
}
@@ -411,6 +414,32 @@ public class MultiXMLConfigurationBuilde
}
}
+
+ private static void createMessageProcessors(SynapseConfiguration
synapseConfig,
+ String rootDirPath, Properties
properties) {
+
+ File messageProcessorDir = new File(rootDirPath,
MESSAGE_PROCESSOR_DIR);
+ if (messageProcessorDir.exists()) {
+ if (log.isDebugEnabled()) {
+ log.debug("Loading Message Processors from :" +
messageProcessorDir.getPath());
+ }
+
+ Iterator messageProcessors =
FileUtils.iterateFiles(messageProcessorDir, extensions, false);
+ while (messageProcessors.hasNext()) {
+ File file = (File) messageProcessors.next();
+ OMElement document = getOMElement(file);
+ MessageProcessor messageProcessor =
SynapseXMLConfigurationFactory.defineMessageProcessor(
+ synapseConfig, document, properties);
+ if (messageProcessor != null) {
+ messageProcessor.setFileName(file.getName());
+
synapseConfig.getArtifactDeploymentStore().addArtifact(file.getAbsolutePath(),
+ messageProcessor.getName());
+ }
+ }
+ }
+ }
+
+
private static OMElement getOMElement(File file) {
FileInputStream is;
OMElement document = null;
Added:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/MessageProcessorDeployer.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/MessageProcessorDeployer.java?rev=1099511&view=auto
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/MessageProcessorDeployer.java
(added)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/deployers/MessageProcessorDeployer.java
Wed May 4 16:39:07 2011
@@ -0,0 +1,184 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.synapse.deployers;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axis2.deployment.DeploymentException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.synapse.config.xml.MessageProcessorFactory;
+import org.apache.synapse.config.xml.MessageStoreSerializer;
+import org.apache.synapse.config.xml.MultiXMLConfigurationBuilder;
+import org.apache.synapse.message.processors.MessageProcessor;
+import org.apache.synapse.message.store.MessageStore;
+
+import java.io.File;
+import java.util.Properties;
+
+public class MessageProcessorDeployer extends AbstractSynapseArtifactDeployer {
+
+ private static Log log = LogFactory.getLog(MessageProcessorDeployer.class);
+
+ @Override
+ public String deploySynapseArtifact(OMElement artifactConfig, String
fileName, Properties properties) {
+ if (log.isDebugEnabled()) {
+ log.debug("Message Processor Deployment from file : " + fileName +
" : Started");
+ }
+
+ try{
+
+ MessageProcessor mp =
MessageProcessorFactory.createMessageProcessor(artifactConfig);
+ if(mp != null) {
+ mp.setFileName((new File(fileName)).getName());
+ if (log.isDebugEnabled()) {
+ log.debug("Message Processor named '" + mp.getName()
+ + "' has been built from the file " + fileName);
+ }
+ mp.init(getSynapseEnvironment());
+ if (log.isDebugEnabled()) {
+ log.debug("Initialized the Message Processor : " +
mp.getName());
+ }
+ getSynapseConfiguration().addMessageProcessor(mp.getName(),
mp);
+ if (log.isDebugEnabled()) {
+ log.debug("Message Processor Deployment from file : " +
fileName +
+ " : Completed");
+ }
+ log.info("Message Processor named '" + mp.getName()
+ + "' has been deployed from file : " + fileName);
+ return mp.getName();
+ } else {
+ handleSynapseArtifactDeploymentError("Message Processor
Deployment from the file : "
+ + fileName + " : Failed. The artifact " +
+ "described in the file is not a Message Processor");
+ }
+
+ } catch (Exception e) {
+ handleSynapseArtifactDeploymentError("Message Processor Deployment
from the file : "
+ + fileName + " : Failed.", e);
+ }
+
+ return null;
+ }
+
+ @Override
+ public String updateSynapseArtifact(OMElement artifactConfig, String
fileName,
+ String existingArtifactName,
Properties properties) {
+ if (log.isDebugEnabled()) {
+ log.debug("Message Processor update from file : " + fileName + "
has started");
+ }
+
+ try {
+ MessageProcessor mp =
MessageProcessorFactory.createMessageProcessor(artifactConfig);
+ if (mp == null) {
+ handleSynapseArtifactDeploymentError("Message Processor update
failed. The artifact " +
+ "defined in the file: " + fileName + " is not valid");
+ return null;
+ }
+ mp.setFileName(new File(fileName).getName());
+
+ if (log.isDebugEnabled()) {
+ log.debug("MessageProcessor: " + mp.getName() + " has been
built from the file: "
+ + fileName);
+ }
+
+ mp.init(getSynapseEnvironment());
+ MessageStore existingMs =
getSynapseConfiguration().getMessageStore(existingArtifactName);
+
+ // We should add the updated MessageProcessor as a new
MessageProcessor
+ // and remove the old one
+ getSynapseConfiguration().addMessageProcessor(mp.getName(), mp);
+ getSynapseConfiguration().removeMessageStore(existingArtifactName);
+ log.info("MessageProcessor: " + existingArtifactName + " has been
undeployed");
+
+
+ log.info("MessageProcessor: " + mp.getName() + " has been updated
from the file: " + fileName);
+
+ waitForCompletion();
+ existingMs.destroy();
+ return mp.getName();
+
+ } catch (DeploymentException e) {
+ handleSynapseArtifactDeploymentError("Error while updating the
MessageProcessor from the " +
+ "file: " + fileName);
+ }
+
+ return null;
+ }
+
+ @Override
+ public void undeploySynapseArtifact(String artifactName) {
+ if (log.isDebugEnabled()) {
+ log.debug("MessageProcessor Undeployment of the MessageProcessor
named : "
+ + artifactName + " : Started");
+ }
+
+ try {
+ MessageProcessor mp =
+
getSynapseConfiguration().getMessageProcessors().get(artifactName);
+ if (mp != null) {
+ getSynapseConfiguration().removeMessageStore(artifactName);
+ if (log.isDebugEnabled()) {
+ log.debug("Destroying the MessageProcessor named : " +
artifactName);
+ }
+ mp.destroy();
+ if (log.isDebugEnabled()) {
+ log.debug("MessageProcessor Undeployment of the endpoint
named : "
+ + artifactName + " : Completed");
+ }
+ log.info("MessageProcessor named '" + mp.getName() + "' has
been undeployed");
+ } else if (log.isDebugEnabled()) {
+ log.debug("MessageProcessor " + artifactName + " has already
been undeployed");
+ }
+ } catch (Exception e) {
+ handleSynapseArtifactDeploymentError(
+ "MessageProcessor Undeployement of MessageProcessor named
: "
+ + artifactName + " : Failed", e);
+ }
+ }
+
+ @Override
+ public void restoreSynapseArtifact(String artifactName) {
+ if (log.isDebugEnabled()) {
+ log.debug("Restoring the MessageProcessor with name : " +
artifactName + " : Started");
+ }
+
+ try {
+ MessageStore ms
+ = getSynapseConfiguration().getMessageStore(artifactName);
+ OMElement msElem =
MessageStoreSerializer.serializeMessageStore(null, ms);
+ if (ms.getFileName() != null) {
+ String fileName =
getServerConfigurationInformation().getSynapseXMLLocation()
+ + File.separator +
MultiXMLConfigurationBuilder.MESSAGE_PROCESSOR_DIR
+ + File.separator + ms.getFileName();
+ writeToFile(msElem, fileName);
+ if (log.isDebugEnabled()) {
+ log.debug("Restoring the MessageProcessor with name : "
+ + artifactName + " : Completed");
+ }
+ log.info("MessageProcessor named '" + artifactName + "' has
been restored");
+ } else {
+ handleSynapseArtifactDeploymentError("Couldn't restore the
MessageProcessor named '"
+ + artifactName + "', filename cannot be found");
+ }
+ } catch (Exception e) {
+ handleSynapseArtifactDeploymentError(
+ "Restoring of the MessageProcessor named '" + artifactName
+ "' has failed", e);
+ }
+ }
+}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java?rev=1099511&r1=1099510&r2=1099511&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/AbstractMessageProcessor.java
Wed May 4 16:39:07 2011
@@ -45,6 +45,8 @@ public abstract class AbstractMessagePro
protected String name;
+ protected String fileName;
+
protected SynapseConfiguration configuration;
protected enum State {
@@ -107,4 +109,12 @@ public abstract class AbstractMessagePro
public String getDescription() {
return description;
}
+
+ public void setFileName(String filename) {
+ this.fileName = filename;
+ }
+
+ public String getFileName() {
+ return fileName;
+ }
}
\ No newline at end of file
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/MessageProcessor.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/MessageProcessor.java?rev=1099511&r1=1099510&r2=1099511&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/MessageProcessor.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/MessageProcessor.java
Wed May 4 16:39:07 2011
@@ -71,4 +71,18 @@ public interface MessageProcessor extend
* @return
*/
public boolean isStarted();
+
+ /**
+ * Set the name of the file that the Message Processor is configured
+ *
+ * @param filename Name of the file where this artifact is defined
+ */
+ public void setFileName(String filename);
+
+ /**
+ * get the file name that the message processor is configured
+ *
+ * @return Name of the file where this artifact is defined
+ */
+ public String getFileName();
}
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ScheduledMessageForwardingProcessor.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ScheduledMessageForwardingProcessor.java?rev=1099511&r1=1099510&r2=1099511&view=diff
==============================================================================
---
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ScheduledMessageForwardingProcessor.java
(original)
+++
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/message/processors/forward/ScheduledMessageForwardingProcessor.java
Wed May 4 16:39:07 2011
@@ -138,5 +138,14 @@ public class ScheduledMessageForwardingP
}
state = State.DESTROY;
}
+
+
+ /**
+ * Return the JMS view of Message Processor
+ * @return
+ */
+ public MessageForwardingProcessorView getView() {
+ return view;
+ }
}
Modified: synapse/trunk/java/repository/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/axis2.xml?rev=1099511&r1=1099510&r2=1099511&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/axis2.xml (original)
+++ synapse/trunk/java/repository/conf/axis2.xml Wed May 4 16:39:07 2011
@@ -91,6 +91,7 @@
<deployer extension="xml"
directory="conf/synapse-config/priority-executors"
class="org.apache.synapse.deployers.PriorityExecutorDeployer"/>
<deployer extension="xml" directory="conf/synapse-config/templates"
class="org.apache.synapse.deployers.TemplateDeployer"/>
<deployer extension="xml" directory="conf/synapse-config/message-stores"
class="org.apache.synapse.deployers.MessageStoreDeployer"/>
+ <deployer extension="xml"
directory="conf/synapse-config/message-processors"
class="org.apache.synapse.deployers.MessageProcessorDeployer"/>
<!-- Following parameter will set the host name for the epr-->
<!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
