[dna-commits] DNA SVN: r270 - in trunk: dna-repository and 11 other directories.

dna-commits at lists.jboss.org dna-commits at lists.jboss.org
Wed Jun 11 12:27:26 EDT 2008


Author: maeste
Date: 2008-06-11 12:27:26 -0400 (Wed, 11 Jun 2008)
New Revision: 270

Added:
   trunk/sequencers/dna-sequencer-esbMessage/
   trunk/sequencers/dna-sequencer-esbMessage/.classpath
   trunk/sequencers/dna-sequencer-esbMessage/.project
   trunk/sequencers/dna-sequencer-esbMessage/pom.xml
   trunk/sequencers/dna-sequencer-esbMessage/src/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java
   trunk/sequencers/dna-sequencer-esbMessage/src/main/resources/
   trunk/sequencers/dna-sequencer-esbMessage/src/test/
   trunk/sequencers/dna-sequencer-esbMessage/src/test/java/
   trunk/sequencers/dna-sequencer-esbMessage/src/test/resources/
Removed:
   trunk/sequencers/dna-sequencer-esbMessage/.classpath
   trunk/sequencers/dna-sequencer-esbMessage/.project
   trunk/sequencers/dna-sequencer-esbMessage/pom.xml
   trunk/sequencers/dna-sequencer-esbMessage/src/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java
   trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java
   trunk/sequencers/dna-sequencer-esbMessage/src/main/resources/
   trunk/sequencers/dna-sequencer-esbMessage/src/test/
   trunk/sequencers/dna-sequencer-esbMessage/src/test/java/
   trunk/sequencers/dna-sequencer-esbMessage/src/test/resources/
Modified:
   trunk/dna-repository/pom.xml
   trunk/pom.xml
Log:
merged on trunk [DNA-78]

Modified: trunk/dna-repository/pom.xml
===================================================================
--- trunk/dna-repository/pom.xml	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/dna-repository/pom.xml	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jboss.dna</groupId>
@@ -70,6 +71,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>
     <!-- 

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/pom.xml	2008-06-11 16:27:26 UTC (rev 270)
@@ -61,6 +61,7 @@
 		<module>dna-maven-classloader</module>
 		<module>sequencers/dna-sequencer-images</module>
 		<module>sequencers/dna-sequencer-mp3</module>
+		<module>sequencers/dna-sequencer-esbMessage</module>
 		<module>connectors/dna-connector-jbosscache</module>
     	<module>dna-integration-tests</module>
 	</modules>

Copied: trunk/sequencers/dna-sequencer-esbMessage (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage)

Deleted: trunk/sequencers/dna-sequencer-esbMessage/.classpath
===================================================================
--- branches/maeste/sequencers/dna-sequencer-esbMessage/.classpath	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/sequencers/dna-sequencer-esbMessage/.classpath	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

Copied: trunk/sequencers/dna-sequencer-esbMessage/.classpath (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/.classpath)
===================================================================
--- trunk/sequencers/dna-sequencer-esbMessage/.classpath	                        (rev 0)
+++ trunk/sequencers/dna-sequencer-esbMessage/.classpath	2008-06-11 16:27:26 UTC (rev 270)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Deleted: trunk/sequencers/dna-sequencer-esbMessage/.project
===================================================================
--- branches/maeste/sequencers/dna-sequencer-esbMessage/.project	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/sequencers/dna-sequencer-esbMessage/.project	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>dna-sequencer-mp3</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-	</natures>
-</projectDescription>

Copied: trunk/sequencers/dna-sequencer-esbMessage/.project (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/.project)
===================================================================
--- trunk/sequencers/dna-sequencer-esbMessage/.project	                        (rev 0)
+++ trunk/sequencers/dna-sequencer-esbMessage/.project	2008-06-11 16:27:26 UTC (rev 270)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>dna-sequencer-mp3</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

Deleted: trunk/sequencers/dna-sequencer-esbMessage/pom.xml
===================================================================
--- branches/maeste/sequencers/dna-sequencer-esbMessage/pom.xml	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/sequencers/dna-sequencer-esbMessage/pom.xml	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,35 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>dna</artifactId>
-    <groupId>org.jboss.dna</groupId>
-    <version>0.2-SNAPSHOT</version>
-    <relativePath>../..</relativePath>
-  </parent>
-  <!-- The groupId and version values are inherited from parent -->
-  <artifactId>dna-sequencer-esbMessage</artifactId>
-  <packaging>jar</packaging>
-  <name>JBoss DNA ESB Message Sequencer</name>
-  <description>JBoss DNA Sequencer that processes ESB Message</description>
-  <url>http://labs.jboss.org/dna</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.jboss.dna</groupId>
-      <artifactId>dna-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.dna</groupId>
-      <artifactId>dna-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>4.4</version>
-    </dependency>
-    <dependency>
-      <groupId>jbossesb-rosetta.jar</groupId>
-      <artifactId>jbossesb-rosetta-dep</artifactId>
-      <version>4.3</version>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file

Copied: trunk/sequencers/dna-sequencer-esbMessage/pom.xml (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/pom.xml)
===================================================================
--- trunk/sequencers/dna-sequencer-esbMessage/pom.xml	                        (rev 0)
+++ trunk/sequencers/dna-sequencer-esbMessage/pom.xml	2008-06-11 16:27:26 UTC (rev 270)
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>dna</artifactId>
+    <groupId>org.jboss.dna</groupId>
+    <version>0.2-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  <!-- The groupId and version values are inherited from parent -->
+  <artifactId>dna-sequencer-esbMessage</artifactId>
+  <packaging>jar</packaging>
+  <name>JBoss DNA ESB Message Sequencer</name>
+  <description>JBoss DNA Sequencer that processes ESB Message</description>
+  <url>http://labs.jboss.org/dna</url>
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.dna</groupId>
+      <artifactId>dna-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.dna</groupId>
+      <artifactId>dna-spi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit-dep</artifactId>
+      <version>4.4</version>
+    </dependency>
+    <dependency>
+      <groupId>jbossesb-rosetta.jar</groupId>
+      <artifactId>jbossesb-rosetta-dep</artifactId>
+      <version>4.3</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Copied: trunk/sequencers/dna-sequencer-esbMessage/src (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage)

Deleted: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java
===================================================================
--- branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,192 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.dna.sequencer.esbMessage;
-
-import java.io.InputStream;
-import java.io.Serializable;
-import java.net.URI;
-import java.util.HashMap;
-import java.util.Map;
-import org.jboss.dna.common.monitor.ProgressMonitor;
-import org.jboss.dna.common.util.StringUtil;
-import org.jboss.internal.soa.esb.util.Encoding;
-import org.jboss.soa.esb.addressing.EPR;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.util.Util;
-
-/**
- * Utility for extracting metadata from MP3 files.
- * 
- * @author Stefano Maestri
- */
-public class ESBMessageMetaData {
-
-    private URI messageType;
-    private EPR to = null;
-    private EPR from = null;
-    private EPR faultTo = null;
-    private EPR replyTo = null;
-    private URI relatesTo = null;
-    private URI action = null;
-    private URI messageID = null;
-    private Map<String, Object> bodyMap = null;
-    private Map<String, Object> propertiesMap = null;
-    private Map<String, Object> attachmentsMap = null;
-    private URI faultCode = null;
-    private String faultReason;
-    private Throwable faultCause;
-
-    private ESBMessageMetaData() {
-
-    }
-
-    public static ESBMessageMetaData instance( InputStream stream,
-                                               ProgressMonitor progressMonitor ) {
-
-        ESBMessageMetaData me = null;
-        Message message = null;
-        progressMonitor.beginTask(10, ESBMessageSequencerI18n.sequencerTaskName);
-        try {
-            me = new ESBMessageMetaData();
-            message = Util.deserialize((Serializable)Encoding.decodeToObject(StringUtil.read(stream)));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-        progressMonitor.worked(2);
-        if (progressMonitor.isCancelled()) return null;
-
-        me.messageType = message.getType();
-        // Context not yet implemented in JBossESB
-        // message.getContext();
-
-        me.to = message.getHeader().getCall().getTo();
-        me.from = message.getHeader().getCall().getFrom();
-        me.faultTo = message.getHeader().getCall().getFaultTo();
-        me.replyTo = message.getHeader().getCall().getReplyTo();
-        me.relatesTo = message.getHeader().getCall().getRelatesTo();
-        me.action = message.getHeader().getCall().getAction();
-        me.messageID = message.getHeader().getCall().getMessageID();
-        progressMonitor.worked(1);
-        if (progressMonitor.isCancelled()) return null;
-
-        if (message.getBody().getNames().length != 0) {
-            me.bodyMap = new HashMap<String, Object>();
-            ProgressMonitor subtask = progressMonitor.createSubtask(2);
-            subtask.beginTask(message.getBody().getNames().length, ESBMessageSequencerI18n.sequencerTaskName);
-            for (String name : message.getBody().getNames()) {
-                me.bodyMap.put(name, message.getBody().get(name));
-                subtask.worked(1);
-                if (progressMonitor.isCancelled()) return null;
-            }
-            subtask.done();
-        }
-
-        if (message.getProperties().getNames().length != 0) {
-            me.propertiesMap = new HashMap<String, Object>();
-            ProgressMonitor subtask = progressMonitor.createSubtask(2);
-            subtask.beginTask(message.getProperties().getNames().length, ESBMessageSequencerI18n.sequencerTaskName);
-            for (String name : message.getProperties().getNames()) {
-                me.propertiesMap.put(name, message.getProperties().getProperty(name));
-                subtask.worked(1);
-                if (progressMonitor.isCancelled()) return null;
-            }
-            subtask.done();
-        }
-
-        if (message.getAttachment().getNames().length != 0) {
-            me.attachmentsMap = new HashMap<String, Object>();
-            ProgressMonitor subtask = progressMonitor.createSubtask(2);
-            subtask.beginTask(message.getAttachment().getNames().length, ESBMessageSequencerI18n.sequencerTaskName);
-            for (String name : message.getAttachment().getNames()) {
-                me.attachmentsMap.put(name, message.getAttachment().get(name));
-                subtask.worked(1);
-                if (progressMonitor.isCancelled()) return null;
-            }
-            subtask.done();
-        }
-
-        me.faultCause = message.getFault().getCause();
-        me.faultCode = message.getFault().getCode();
-        me.faultReason = message.getFault().getReason();
-        // do last unit of work implicit in done
-        progressMonitor.done();
-        return me;
-
-    }
-
-    public URI getMessageType() {
-        return messageType;
-    }
-
-    public EPR getTo() {
-        return to;
-    }
-
-    public EPR getFrom() {
-        return from;
-    }
-
-    public EPR getFaultTo() {
-        return faultTo;
-    }
-
-    public EPR getReplyTo() {
-        return replyTo;
-    }
-
-    public URI getRelatesTo() {
-        return relatesTo;
-    }
-
-    public URI getAction() {
-        return action;
-    }
-
-    public URI getMessageID() {
-        return messageID;
-    }
-
-    public Map<String, Object> getBodyMap() {
-        return bodyMap;
-    }
-
-    public Map<String, Object> getPropertiesMap() {
-        return propertiesMap;
-    }
-
-    public Map<String, Object> getAttachmentsMap() {
-        return attachmentsMap;
-    }
-
-    public URI getFaultCode() {
-        return faultCode;
-    }
-
-    public String getFaultReason() {
-        return faultReason;
-    }
-
-    public Throwable getFaultCause() {
-        return faultCause;
-    }
-}

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java)
===================================================================
--- trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java	                        (rev 0)
+++ trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageMetaData.java	2008-06-11 16:27:26 UTC (rev 270)
@@ -0,0 +1,192 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors. 
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.sequencer.esbMessage;
+
+import java.io.InputStream;
+import java.io.Serializable;
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+import org.jboss.dna.common.monitor.ProgressMonitor;
+import org.jboss.dna.common.util.StringUtil;
+import org.jboss.internal.soa.esb.util.Encoding;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.util.Util;
+
+/**
+ * Utility for extracting metadata from MP3 files.
+ * 
+ * @author Stefano Maestri
+ */
+public class ESBMessageMetaData {
+
+    private URI messageType;
+    private EPR to = null;
+    private EPR from = null;
+    private EPR faultTo = null;
+    private EPR replyTo = null;
+    private URI relatesTo = null;
+    private URI action = null;
+    private URI messageID = null;
+    private Map<String, Object> bodyMap = null;
+    private Map<String, Object> propertiesMap = null;
+    private Map<String, Object> attachmentsMap = null;
+    private URI faultCode = null;
+    private String faultReason;
+    private Throwable faultCause;
+
+    private ESBMessageMetaData() {
+
+    }
+
+    public static ESBMessageMetaData instance( InputStream stream,
+                                               ProgressMonitor progressMonitor ) {
+
+        ESBMessageMetaData me = null;
+        Message message = null;
+        progressMonitor.beginTask(10, ESBMessageSequencerI18n.sequencerTaskName);
+        try {
+            me = new ESBMessageMetaData();
+            message = Util.deserialize((Serializable)Encoding.decodeToObject(StringUtil.read(stream)));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+        progressMonitor.worked(2);
+        if (progressMonitor.isCancelled()) return null;
+
+        me.messageType = message.getType();
+        // Context not yet implemented in JBossESB
+        // message.getContext();
+
+        me.to = message.getHeader().getCall().getTo();
+        me.from = message.getHeader().getCall().getFrom();
+        me.faultTo = message.getHeader().getCall().getFaultTo();
+        me.replyTo = message.getHeader().getCall().getReplyTo();
+        me.relatesTo = message.getHeader().getCall().getRelatesTo();
+        me.action = message.getHeader().getCall().getAction();
+        me.messageID = message.getHeader().getCall().getMessageID();
+        progressMonitor.worked(1);
+        if (progressMonitor.isCancelled()) return null;
+
+        if (message.getBody().getNames().length != 0) {
+            me.bodyMap = new HashMap<String, Object>();
+            ProgressMonitor subtask = progressMonitor.createSubtask(2);
+            subtask.beginTask(message.getBody().getNames().length, ESBMessageSequencerI18n.sequencerTaskName);
+            for (String name : message.getBody().getNames()) {
+                me.bodyMap.put(name, message.getBody().get(name));
+                subtask.worked(1);
+                if (progressMonitor.isCancelled()) return null;
+            }
+            subtask.done();
+        }
+
+        if (message.getProperties().getNames().length != 0) {
+            me.propertiesMap = new HashMap<String, Object>();
+            ProgressMonitor subtask = progressMonitor.createSubtask(2);
+            subtask.beginTask(message.getProperties().getNames().length, ESBMessageSequencerI18n.sequencerTaskName);
+            for (String name : message.getProperties().getNames()) {
+                me.propertiesMap.put(name, message.getProperties().getProperty(name));
+                subtask.worked(1);
+                if (progressMonitor.isCancelled()) return null;
+            }
+            subtask.done();
+        }
+
+        if (message.getAttachment().getNames().length != 0) {
+            me.attachmentsMap = new HashMap<String, Object>();
+            ProgressMonitor subtask = progressMonitor.createSubtask(2);
+            subtask.beginTask(message.getAttachment().getNames().length, ESBMessageSequencerI18n.sequencerTaskName);
+            for (String name : message.getAttachment().getNames()) {
+                me.attachmentsMap.put(name, message.getAttachment().get(name));
+                subtask.worked(1);
+                if (progressMonitor.isCancelled()) return null;
+            }
+            subtask.done();
+        }
+
+        me.faultCause = message.getFault().getCause();
+        me.faultCode = message.getFault().getCode();
+        me.faultReason = message.getFault().getReason();
+        // do last unit of work implicit in done
+        progressMonitor.done();
+        return me;
+
+    }
+
+    public URI getMessageType() {
+        return messageType;
+    }
+
+    public EPR getTo() {
+        return to;
+    }
+
+    public EPR getFrom() {
+        return from;
+    }
+
+    public EPR getFaultTo() {
+        return faultTo;
+    }
+
+    public EPR getReplyTo() {
+        return replyTo;
+    }
+
+    public URI getRelatesTo() {
+        return relatesTo;
+    }
+
+    public URI getAction() {
+        return action;
+    }
+
+    public URI getMessageID() {
+        return messageID;
+    }
+
+    public Map<String, Object> getBodyMap() {
+        return bodyMap;
+    }
+
+    public Map<String, Object> getPropertiesMap() {
+        return propertiesMap;
+    }
+
+    public Map<String, Object> getAttachmentsMap() {
+        return attachmentsMap;
+    }
+
+    public URI getFaultCode() {
+        return faultCode;
+    }
+
+    public String getFaultReason() {
+        return faultReason;
+    }
+
+    public Throwable getFaultCause() {
+        return faultCause;
+    }
+}

Deleted: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java
===================================================================
--- branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,148 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.dna.sequencer.esbMessage;
-
-import java.io.InputStream;
-import java.util.Map.Entry;
-import org.jboss.dna.common.monitor.ProgressMonitor;
-import org.jboss.dna.spi.graph.NameFactory;
-import org.jboss.dna.spi.graph.Path;
-import org.jboss.dna.spi.graph.PathFactory;
-import org.jboss.dna.spi.sequencers.SequencerOutput;
-import org.jboss.dna.spi.sequencers.StreamSequencer;
-
-/**
- * A sequencer that processes the binary content of an ESB Message, extracts the metadata for the message, and then writes this
- * metadata to the repository.
- * <p>
- * This sequencer produces data that corresponds to the following structure:
- * <ul>
- * <li><strong>esbMessage:metadata</strong> node of type <code>esbMessage:metadata</code>
- * <ul>
- * <li><strong>esbMessage:to</strong> - optional property for the destination EPR of the message</li>
- * <li><strong>esbMessage:from</strong> - optional property for the source EPR of the message</li>
- * <li><strong>esbMessage:replyTo</strong> - optional property for the reply destination EPR</li>
- * <li><strong>esbMessage:relatesTo</strong> - optional property for the relatesTo URI</li>
- * <li><strong>esbMessage:action</strong> - optional property specifying the action URI</li>
- * <li><strong>esbMessage:messageID</strong> - optional property specifying the messageID URI</li>
- * <li><strong>esbMessage:body</strong> - optional node specifying the message body. It contains a set of properties
- * representing Object contained in body. Properties names reflect object names used in message body</li>
- * <li><strong>esbMessage:properties</strong> - optional node specifying the message properties. It contains a set of properties
- * representing Object contained in message properties. Properties names reflect object names used in message properties</li>
- * <li><strong>esbMessage:attachments</strong> - optional node specifying the message attachments. It contains a set of
- * properties representing Object contained in message attachments. Properties names reflect object names used in message
- * attachments</li>
- * <li><strong>esbMessage:faultCode</strong> - optional property specifying the message fault code. As defined in ESB message
- * it's an URI</li>
- * <li><strong>esbMessage:faultReason</strong> - optional property containing a String describing the fault in a human readable
- * form</li>
- * <li><strong>esbMessage:faultCause</strong> - optional property specifying the Throwable Cause of the fault.</li>
- * </ul>
- * </li>
- * </ul>
- * </p>
- * 
- * @author Stefano Maestri
- */
-public class ESBMessageSequencer implements StreamSequencer {
-
-    public static final String METADATA_NODE = "esbMessage:metadata";
-    public static final String ESB_MESSAGE_PRIMARY_TYPE = "jcr:primaryType";
-    public static final String ESB_MESSAGE_TO = "esbMessage:to";
-    public static final String ESB_MESSAGE_FROM = "esbMessage:from";
-    public static final String ESB_MESSAGE_REPLY_TO = "esbMessage:replyTo";
-    public static final String ESB_MESSAGE_RELATES_TO = "esbMessage:relatesTo";
-    public static final String ESB_MESSAGE_ACTION = "esbMessage:action";
-    public static final String ESB_MESSAGE_MESSAGE_ID = "esbMessage:messageID";
-    public static final String ESB_MESSAGE_MESSAGE_TYPE = "esbMessage:messageType";
-    public static final String ESB_MESSAGE_BODY = "esbMessage:metadata/esbMessage:body";
-    public static final String ESB_MESSAGE_PROPERTIES = "esbMessage:metadata/esbMessage:properties";
-    public static final String ESB_MESSAGE_ATTACHMENTS = "esbMessage:metadata/esbMessage:attachments";
-    public static final String ESB_MESSAGE_FAULT_CODE = "esbMessage:faultCode";
-    public static final String ESB_MESSAGE_FAULT_REASON = "esbMessage:faultReason";
-    public static final String ESB_MESSAGE_FAULT_CAUSE = "esbMessage:faultCause";
-
-    public static final String ESB_MESSAGE_NAMESPACE = "esbMessage";
-
-    public void sequence( InputStream stream,
-                          SequencerOutput output,
-                          ProgressMonitor progressMonitor ) {
-
-        progressMonitor.beginTask(20, ESBMessageSequencerI18n.sequencerTaskName);
-        ESBMessageMetaData metadata = ESBMessageMetaData.instance(stream, progressMonitor.createSubtask(10));
-        if (progressMonitor.isCancelled()) return;
-
-        if (metadata != null) {
-            NameFactory nameFactory = output.getFactories().getNameFactory();
-            PathFactory pathFactory = output.getFactories().getPathFactory();
-            Path metadataNode = pathFactory.create(METADATA_NODE);
-
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_PRIMARY_TYPE), "esbMessage:metadata");
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_TO), metadata.getTo());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FROM), metadata.getFrom());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_REPLY_TO), metadata.getReplyTo());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_RELATES_TO), metadata.getRelatesTo());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_ACTION), metadata.getAction());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_MESSAGE_ID), metadata.getMessageID());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_MESSAGE_TYPE), metadata.getMessageType());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FAULT_CODE), metadata.getFaultCode());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FAULT_REASON), metadata.getFaultReason());
-            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FAULT_CAUSE), metadata.getFaultCause());
-            progressMonitor.worked(1);
-            if (progressMonitor.isCancelled()) return;
-
-            ProgressMonitor subtask = progressMonitor.createSubtask(3);
-            subtask.beginTask(metadata.getBodyMap().entrySet().size(), ESBMessageSequencerI18n.sequencerTaskName);
-            Path bodyNode = pathFactory.create(metadataNode, nameFactory.create(ESB_MESSAGE_BODY));
-            for (Entry<String, Object> entry : metadata.getBodyMap().entrySet()) {
-                output.setProperty(bodyNode, nameFactory.create(ESB_MESSAGE_NAMESPACE, entry.getKey()), entry.getValue());
-                subtask.worked(1);
-                if (progressMonitor.isCancelled()) return;
-            }
-            subtask.done();
-
-            subtask = progressMonitor.createSubtask(3);
-            subtask.beginTask(metadata.getPropertiesMap().entrySet().size(), ESBMessageSequencerI18n.sequencerTaskName);
-            Path propertiesNode = pathFactory.create(metadataNode, nameFactory.create(ESB_MESSAGE_PROPERTIES));
-            for (Entry<String, Object> entry : metadata.getPropertiesMap().entrySet()) {
-                output.setProperty(propertiesNode, nameFactory.create(ESB_MESSAGE_NAMESPACE, entry.getKey()), entry.getValue());
-                subtask.worked(1);
-                if (progressMonitor.isCancelled()) return;
-            }
-            subtask.done();
-
-            subtask = progressMonitor.createSubtask(3);
-            subtask.beginTask(metadata.getAttachmentsMap().entrySet().size(), ESBMessageSequencerI18n.sequencerTaskName);
-            Path attachmentsNode = pathFactory.create(metadataNode, nameFactory.create(ESB_MESSAGE_ATTACHMENTS));
-            for (Entry<String, Object> entry : metadata.getAttachmentsMap().entrySet()) {
-                output.setProperty(attachmentsNode, nameFactory.create(ESB_MESSAGE_NAMESPACE, entry.getKey()), entry.getValue());
-                subtask.worked(1);
-                if (progressMonitor.isCancelled()) return;
-            }
-            subtask.done();
-
-            progressMonitor.done();
-
-        }
-    }
-
-}

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java)
===================================================================
--- trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java	                        (rev 0)
+++ trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencer.java	2008-06-11 16:27:26 UTC (rev 270)
@@ -0,0 +1,148 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors. 
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.sequencer.esbMessage;
+
+import java.io.InputStream;
+import java.util.Map.Entry;
+import org.jboss.dna.common.monitor.ProgressMonitor;
+import org.jboss.dna.spi.graph.NameFactory;
+import org.jboss.dna.spi.graph.Path;
+import org.jboss.dna.spi.graph.PathFactory;
+import org.jboss.dna.spi.sequencers.SequencerOutput;
+import org.jboss.dna.spi.sequencers.StreamSequencer;
+
+/**
+ * A sequencer that processes the binary content of an ESB Message, extracts the metadata for the message, and then writes this
+ * metadata to the repository.
+ * <p>
+ * This sequencer produces data that corresponds to the following structure:
+ * <ul>
+ * <li><strong>esbMessage:metadata</strong> node of type <code>esbMessage:metadata</code>
+ * <ul>
+ * <li><strong>esbMessage:to</strong> - optional property for the destination EPR of the message</li>
+ * <li><strong>esbMessage:from</strong> - optional property for the source EPR of the message</li>
+ * <li><strong>esbMessage:replyTo</strong> - optional property for the reply destination EPR</li>
+ * <li><strong>esbMessage:relatesTo</strong> - optional property for the relatesTo URI</li>
+ * <li><strong>esbMessage:action</strong> - optional property specifying the action URI</li>
+ * <li><strong>esbMessage:messageID</strong> - optional property specifying the messageID URI</li>
+ * <li><strong>esbMessage:body</strong> - optional node specifying the message body. It contains a set of properties
+ * representing Object contained in body. Properties names reflect object names used in message body</li>
+ * <li><strong>esbMessage:properties</strong> - optional node specifying the message properties. It contains a set of properties
+ * representing Object contained in message properties. Properties names reflect object names used in message properties</li>
+ * <li><strong>esbMessage:attachments</strong> - optional node specifying the message attachments. It contains a set of
+ * properties representing Object contained in message attachments. Properties names reflect object names used in message
+ * attachments</li>
+ * <li><strong>esbMessage:faultCode</strong> - optional property specifying the message fault code. As defined in ESB message
+ * it's an URI</li>
+ * <li><strong>esbMessage:faultReason</strong> - optional property containing a String describing the fault in a human readable
+ * form</li>
+ * <li><strong>esbMessage:faultCause</strong> - optional property specifying the Throwable Cause of the fault.</li>
+ * </ul>
+ * </li>
+ * </ul>
+ * </p>
+ * 
+ * @author Stefano Maestri
+ */
+public class ESBMessageSequencer implements StreamSequencer {
+
+    public static final String METADATA_NODE = "esbMessage:metadata";
+    public static final String ESB_MESSAGE_PRIMARY_TYPE = "jcr:primaryType";
+    public static final String ESB_MESSAGE_TO = "esbMessage:to";
+    public static final String ESB_MESSAGE_FROM = "esbMessage:from";
+    public static final String ESB_MESSAGE_REPLY_TO = "esbMessage:replyTo";
+    public static final String ESB_MESSAGE_RELATES_TO = "esbMessage:relatesTo";
+    public static final String ESB_MESSAGE_ACTION = "esbMessage:action";
+    public static final String ESB_MESSAGE_MESSAGE_ID = "esbMessage:messageID";
+    public static final String ESB_MESSAGE_MESSAGE_TYPE = "esbMessage:messageType";
+    public static final String ESB_MESSAGE_BODY = "esbMessage:metadata/esbMessage:body";
+    public static final String ESB_MESSAGE_PROPERTIES = "esbMessage:metadata/esbMessage:properties";
+    public static final String ESB_MESSAGE_ATTACHMENTS = "esbMessage:metadata/esbMessage:attachments";
+    public static final String ESB_MESSAGE_FAULT_CODE = "esbMessage:faultCode";
+    public static final String ESB_MESSAGE_FAULT_REASON = "esbMessage:faultReason";
+    public static final String ESB_MESSAGE_FAULT_CAUSE = "esbMessage:faultCause";
+
+    public static final String ESB_MESSAGE_NAMESPACE = "esbMessage";
+
+    public void sequence( InputStream stream,
+                          SequencerOutput output,
+                          ProgressMonitor progressMonitor ) {
+
+        progressMonitor.beginTask(20, ESBMessageSequencerI18n.sequencerTaskName);
+        ESBMessageMetaData metadata = ESBMessageMetaData.instance(stream, progressMonitor.createSubtask(10));
+        if (progressMonitor.isCancelled()) return;
+
+        if (metadata != null) {
+            NameFactory nameFactory = output.getFactories().getNameFactory();
+            PathFactory pathFactory = output.getFactories().getPathFactory();
+            Path metadataNode = pathFactory.create(METADATA_NODE);
+
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_PRIMARY_TYPE), "esbMessage:metadata");
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_TO), metadata.getTo());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FROM), metadata.getFrom());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_REPLY_TO), metadata.getReplyTo());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_RELATES_TO), metadata.getRelatesTo());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_ACTION), metadata.getAction());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_MESSAGE_ID), metadata.getMessageID());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_MESSAGE_TYPE), metadata.getMessageType());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FAULT_CODE), metadata.getFaultCode());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FAULT_REASON), metadata.getFaultReason());
+            output.setProperty(metadataNode, nameFactory.create(ESB_MESSAGE_FAULT_CAUSE), metadata.getFaultCause());
+            progressMonitor.worked(1);
+            if (progressMonitor.isCancelled()) return;
+
+            ProgressMonitor subtask = progressMonitor.createSubtask(3);
+            subtask.beginTask(metadata.getBodyMap().entrySet().size(), ESBMessageSequencerI18n.sequencerTaskName);
+            Path bodyNode = pathFactory.create(metadataNode, nameFactory.create(ESB_MESSAGE_BODY));
+            for (Entry<String, Object> entry : metadata.getBodyMap().entrySet()) {
+                output.setProperty(bodyNode, nameFactory.create(ESB_MESSAGE_NAMESPACE, entry.getKey()), entry.getValue());
+                subtask.worked(1);
+                if (progressMonitor.isCancelled()) return;
+            }
+            subtask.done();
+
+            subtask = progressMonitor.createSubtask(3);
+            subtask.beginTask(metadata.getPropertiesMap().entrySet().size(), ESBMessageSequencerI18n.sequencerTaskName);
+            Path propertiesNode = pathFactory.create(metadataNode, nameFactory.create(ESB_MESSAGE_PROPERTIES));
+            for (Entry<String, Object> entry : metadata.getPropertiesMap().entrySet()) {
+                output.setProperty(propertiesNode, nameFactory.create(ESB_MESSAGE_NAMESPACE, entry.getKey()), entry.getValue());
+                subtask.worked(1);
+                if (progressMonitor.isCancelled()) return;
+            }
+            subtask.done();
+
+            subtask = progressMonitor.createSubtask(3);
+            subtask.beginTask(metadata.getAttachmentsMap().entrySet().size(), ESBMessageSequencerI18n.sequencerTaskName);
+            Path attachmentsNode = pathFactory.create(metadataNode, nameFactory.create(ESB_MESSAGE_ATTACHMENTS));
+            for (Entry<String, Object> entry : metadata.getAttachmentsMap().entrySet()) {
+                output.setProperty(attachmentsNode, nameFactory.create(ESB_MESSAGE_NAMESPACE, entry.getKey()), entry.getValue());
+                subtask.worked(1);
+                if (progressMonitor.isCancelled()) return;
+            }
+            subtask.done();
+
+            progressMonitor.done();
+
+        }
+    }
+
+}

Deleted: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java
===================================================================
--- branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java	2008-06-11 16:13:44 UTC (rev 269)
+++ trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java	2008-06-11 16:27:26 UTC (rev 270)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.dna.sequencer.esbMessage;
-
-import java.util.Locale;
-import java.util.Set;
-import org.jboss.dna.common.i18n.I18n;
-
-/**
- * @author Stefano Maestri
- */
-public final class ESBMessageSequencerI18n {
-
-    public static I18n sequencerTaskName;
-
-    static {
-        try {
-            I18n.initialize(ESBMessageSequencerI18n.class);
-        } catch (final Exception err) {
-            System.err.println(err);
-        }
-    }
-
-    public static Set<Locale> getLocalizationProblemLocales() {
-        return I18n.getLocalizationProblemLocales(ESBMessageSequencerI18n.class);
-    }
-
-    public static Set<String> getLocalizationProblems() {
-        return I18n.getLocalizationProblems(ESBMessageSequencerI18n.class);
-    }
-
-    public static Set<String> getLocalizationProblems( Locale locale ) {
-        return I18n.getLocalizationProblems(ESBMessageSequencerI18n.class, locale);
-    }
-}

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java)
===================================================================
--- trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java	                        (rev 0)
+++ trunk/sequencers/dna-sequencer-esbMessage/src/main/java/org/jboss/dna/sequencer/esbMessage/ESBMessageSequencerI18n.java	2008-06-11 16:27:26 UTC (rev 270)
@@ -0,0 +1,54 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.dna.sequencer.esbMessage;
+
+import java.util.Locale;
+import java.util.Set;
+import org.jboss.dna.common.i18n.I18n;
+
+/**
+ * @author Stefano Maestri
+ */
+public final class ESBMessageSequencerI18n {
+
+    public static I18n sequencerTaskName;
+
+    static {
+        try {
+            I18n.initialize(ESBMessageSequencerI18n.class);
+        } catch (final Exception err) {
+            System.err.println(err);
+        }
+    }
+
+    public static Set<Locale> getLocalizationProblemLocales() {
+        return I18n.getLocalizationProblemLocales(ESBMessageSequencerI18n.class);
+    }
+
+    public static Set<String> getLocalizationProblems() {
+        return I18n.getLocalizationProblems(ESBMessageSequencerI18n.class);
+    }
+
+    public static Set<String> getLocalizationProblems( Locale locale ) {
+        return I18n.getLocalizationProblems(ESBMessageSequencerI18n.class, locale);
+    }
+}

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/main/resources (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/main/resources)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/test (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/test)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/test/java (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/test/java)

Copied: trunk/sequencers/dna-sequencer-esbMessage/src/test/resources (from rev 269, branches/maeste/sequencers/dna-sequencer-esbMessage/src/test/resources)




More information about the dna-commits mailing list