Author: tfennelly
Date: 2008-04-10 06:27:40 -0400 (Thu, 10 Apr 2008)
New Revision: 19512
Modified:
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/InVMRegistry.java
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-commons-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-edisax-0.2.1.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-core-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-csv-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-edi-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-misc-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0-SNAPSHOT.jar
labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-templating-1.0-SNAPSHOT.jar
Log:
Last set of updates - before merging back for 4.2.1 FP1
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/InVMRegistry.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/InVMRegistry.java 2008-04-10 09:13:30 UTC (rev 19511)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/InVMRegistry.java 2008-04-10 10:27:40 UTC (rev 19512)
@@ -28,10 +28,7 @@
import org.jboss.soa.esb.services.registry.RegistryException;
import org.jboss.soa.esb.services.registry.ServiceNotFoundException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -137,8 +134,16 @@
}
private synchronized List<RegsitryEntry> getServiceEntries(Service service) {
- List<RegsitryEntry> serviceEntries = regEntries.get(service);
+ List<RegsitryEntry> serviceEntries = null; // = regEntries.get(service);
+ Set<Map.Entry<Service, List<RegsitryEntry>>> entries = regEntries.entrySet();
+ for (Map.Entry<Service, List<RegsitryEntry>> entry : entries) {
+ if(entry.getKey().equals(service)) {
+ serviceEntries = entry.getValue();
+ break;
+ }
+ }
+
if(serviceEntries == null) {
serviceEntries = new ArrayList<RegsitryEntry>();
regEntries.put(service, serviceEntries);
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java 2008-04-10 09:13:30 UTC (rev 19511)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/SystemPrintln.java 2008-04-10 10:27:40 UTC (rev 19512)
@@ -69,9 +69,11 @@
*/
public Message process(Message message) throws ActionProcessingException
{
- Object messageObject = message.getBody().get(BytesBody.BYTES_LOCATION);
+ Object messageObject = message.getBody().get();
if (messageObject == null)
+ messageObject = message.getBody().get(BytesBody.BYTES_LOCATION);
+ if (messageObject == null)
messageObject = message.getBody().get(ActionUtils.POST_ACTION_DATA);
PrintStream stream = (useOutputStream ? System.out : System.err);
Modified: labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2008-04-10 09:13:30 UTC (rev 19511)
+++ labs/jbossesb/workspace/bramley/product/rosetta/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2008-04-10 10:27:40 UTC (rev 19512)
@@ -204,9 +204,11 @@
Message jmsMessage = null;
if ( unwrap ) {
- Object objectFromBody = esbMessage.getBody().get(BytesBody.BYTES_LOCATION);
+ Object objectFromBody = esbMessage.getBody().get();
if (objectFromBody == null)
+ objectFromBody = esbMessage.getBody().get(BytesBody.BYTES_LOCATION);
+ if (objectFromBody == null)
objectFromBody = esbMessage.getBody().get(ActionUtils.POST_ACTION_DATA);
jmsMessage = createJMSMessageWithObjectType( objectFromBody );
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-commons-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-edisax-0.2.1.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-core-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-csv-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-edi-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-javabean-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-misc-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-scripting-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Modified: labs/jbossesb/workspace/bramley/product/services/smooks/lib/ext/milyn-smooks-templating-1.0-SNAPSHOT.jar
===================================================================
(Binary files differ)