Overlord SVN: r534 - in cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb: stateless and 1 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-03 00:26:38 -0500 (Tue, 03 Mar 2009)
New Revision: 534
Added:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Decision.java
Removed:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java
Log:
* update the Decision class package.
Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Decision.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Decision.java (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/Decision.java 2009-03-03 05:26:38 UTC (rev 534)
@@ -0,0 +1,41 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.jbossesb;
+
+import org.jboss.soa.esb.message.Message;
+
+/**
+ * This is the interface for {@link IfAction} decision-class attribute.
+ * That class has to implement this interface.
+ *
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public interface Decision {
+
+ /**
+ * Execute the decision business logic.
+ *
+ * @param message Message that is on the ESB pipeline.
+ * @return
+ */
+ boolean executeDecision(Message message);
+
+}
Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java 2009-03-02 16:46:50 UTC (rev 533)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java 2009-03-03 05:26:38 UTC (rev 534)
@@ -1,41 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package org.jboss.soa.overlord.jbossesb.stateless;
-
-import org.jboss.soa.esb.message.Message;
-
-/**
- * This is the interface for {@link IfAction} decision-class attribute.
- * That class has to implement this interface.
- *
- * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
- *
- */
-public interface Decision {
-
- /**
- * Execute the decision business logic.
- *
- * @param message Message that is on the ESB pipeline.
- * @return
- */
- boolean executeDecision(Message message);
-
-}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java 2009-03-02 16:46:50 UTC (rev 533)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java 2009-03-03 05:26:38 UTC (rev 534)
@@ -28,8 +28,8 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.jbossesb.ClassLoaderUtil;
+import org.jboss.soa.overlord.jbossesb.Decision;
import org.jboss.soa.overlord.jbossesb.StringUtils;
-import org.jboss.soa.overlord.jbossesb.stateless.Decision;
/**
17 years, 4 months
Overlord SVN: r533 - in cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb: pi4soa and 1 other directory.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2009-03-02 11:46:50 -0500 (Mon, 02 Mar 2009)
New Revision: 533
Modified:
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java
cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java
Log:
Moved to log4j, and changed most info messages to debug.
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ESBUtil.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,7 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
/**
* This class provides utility functions for processing
@@ -47,8 +47,8 @@
Object mesg=message.getBody().get(message.getBody().getNames()[0]);
- if (logger.isLoggable(java.util.logging.Level.FINEST)) {
- logger.finest("MESSAGE("+
+ if (logger.isDebugEnabled()) {
+ logger.debug("MESSAGE("+
message.getBody().getNames()[0]+")="+mesg);
}
@@ -78,5 +78,5 @@
return(ret);
}
- private static Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static Logger logger = Logger.getLogger(ESBUtil.class);
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorFactory.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -18,8 +18,7 @@
package org.jboss.soa.overlord.validator.jbossesb;
import java.lang.reflect.Constructor;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
/**
* This class provides a factory for Service Validators.
@@ -50,15 +49,15 @@
ret = (ServiceValidator)con.newInstance(new Object[]{name});
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Returning service validator for "+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Returning service validator for "+
name+": "+ret);
}
return(ret);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ServiceValidatorFactory.class);
private static java.util.Map<String,Class<?>> m_validatorClasses=
new java.util.HashMap<String,Class<?>>();
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ServiceValidatorManager.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,8 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.helpers.ConfigTree;
@@ -96,8 +95,8 @@
ret = m_replyToManager.getInputServiceValidators(endpoint);
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Return input validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return input validators '"+endpoint+"': "+ret);
}
return(ret);
@@ -113,8 +112,8 @@
public boolean isInputDynamicReplyTo(Endpoint endpoint) {
boolean ret=m_inputDynaReplyTos.contains(endpoint);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Is input endpoint '"+endpoint+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Is input endpoint '"+endpoint+
"' a dynamic reply-to: "+ret);
}
@@ -137,8 +136,8 @@
ret = m_replyToManager.getOutputServiceValidators(endpoint);
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Return output validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return output validators '"+endpoint+"': "+ret);
}
return(ret);
@@ -154,8 +153,8 @@
public boolean isOutputDynamicReplyTo(Endpoint endpoint) {
boolean ret=m_outputDynaReplyTos.contains(endpoint);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Is output endpoint '"+endpoint+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Is output endpoint '"+endpoint+
"' a dynamic reply-to: "+ret);
}
@@ -172,8 +171,8 @@
public void registerInputReplyToValidators(Endpoint endpoint,
java.util.List<ServiceValidator> validators) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Register input reply-to '"+endpoint+"': "+validators);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Register input reply-to '"+endpoint+"': "+validators);
}
m_replyToManager.registerInputDynamicReplyTo(endpoint, validators);
@@ -188,8 +187,8 @@
*/
public void registerOutputReplyToValidators(Endpoint endpoint,
java.util.List<ServiceValidator> validators) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Register output reply-to '"+endpoint+"': "+validators);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Register output reply-to '"+endpoint+"': "+validators);
}
m_replyToManager.registerOutputDynamicReplyTo(endpoint, validators);
@@ -223,8 +222,8 @@
}
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Created Service Validator '"+name+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Created Service Validator '"+name+"': "+ret);
}
return(ret);
@@ -256,7 +255,7 @@
list.remove(validator);
if (list.size() == 0) {
- logger.severe("Input validator list, associated with endpoint '"+
+ logger.error("Input validator list, associated with endpoint '"+
ep+"' contains no entries after removal of validator '"+
name+"' - this Endpoint should have previously been removed");
}
@@ -274,7 +273,7 @@
list.remove(validator);
if (list.size() == 0) {
- logger.severe("Output validator list, associated with endpoint '"+
+ logger.error("Output validator list, associated with endpoint '"+
ep+"' contains no entries after removal of validator '"+
name+"' - this Endpoint should have previously been removed");
}
@@ -324,8 +323,8 @@
java.io.InputStream is=ValidatorFilter.class.getClassLoader().
getResourceAsStream(CONFIG_FILE);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("ValidationFilter: config="+CONFIG_FILE+" is="+is);
+ if (logger.isDebugEnabled()) {
+ logger.debug("ValidationFilter: config="+CONFIG_FILE+" is="+is);
}
try {
@@ -347,15 +346,15 @@
} else if (mode.equals("monitor")) {
m_managedMode = false; // will override active=true
} else {
- logger.severe("Unknown mode '"+mode+"' - setting to 'monitor'");
+ logger.error("Unknown mode '"+mode+"' - setting to 'monitor'");
m_managedMode = false;
}
}
if (m_managedMode) {
- logger.info("Setting validators in 'manage' mode");
+ logger.debug("Setting validators in 'manage' mode");
} else {
- logger.info("Setting validators in 'monitor' mode");
+ logger.debug("Setting validators in 'monitor' mode");
}
// Check for dynamic replyTo endpoint timeout
@@ -367,8 +366,7 @@
m_replyToManager.setReplyToTimeout(tv);
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Unable to set 'reply to' timeout", e);
+ logger.error("Unable to set 'reply to' timeout", e);
}
}
}
@@ -399,13 +397,12 @@
existingInputDynaReplyTos,
existingOutputDynaReplyTos);
} else {
- logger.severe("Failed to obtain configuration for model '"+
+ logger.error("Failed to obtain configuration for model '"+
files[i].getName()+"'");
}
}
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to update configuration for model '"+
+ logger.error("Failed to update configuration for model '"+
files[i].getName()+"'", e);
}
}
@@ -450,16 +447,15 @@
ValidatorName svkey=sviter.next();
try {
- logger.info("Removing service validator: "+svkey);
+ logger.debug("Removing service validator: "+svkey);
removeServiceValidator(svkey);
} catch(Exception e) {
- logger.log(Level.SEVERE,
+ logger.error(
"Failed to remove service validator: "+svkey, e);
}
}
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to update configuration from input stream", e);
+ logger.error("Failed to update configuration from input stream", e);
}
}
@@ -482,7 +478,7 @@
java.util.Set<Endpoint> existingOutputEndpoints,
java.util.Set<Endpoint> existingInputDynaReplyTos,
java.util.Set<Endpoint> existingOutputDynaReplyTos) {
- logger.info("Update Service Validator Configuration");
+ logger.debug("Update Service Validator Configuration");
if (config != null) {
try {
@@ -491,18 +487,18 @@
if (active != null && active.equalsIgnoreCase("true")) {
- logger.info("Setting validator into active mode");
+ logger.debug("Setting validator into active mode");
m_managedMode = true;
}
}
ConfigTree[] services=config.getChildren(SERVICE_NODE);
- if (logger.isLoggable(Level.FINEST)) {
+ if (logger.isDebugEnabled()) {
if (services != null) {
- logger.finest("ValidationFilter: services="+services.length);
+ logger.debug("ValidationFilter: services="+services.length);
} else {
- logger.finest("ValidationFilter: services null");
+ logger.debug("ValidationFilter: services null");
}
}
@@ -536,8 +532,8 @@
}
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Initialize service validator for: model="+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Initialize service validator for: model="+
modelName+" role="+role+" validate="+validate);
}
@@ -558,22 +554,23 @@
// Obtain the service container
sm = createServiceValidator(name);
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Service validator for '"+modelName+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Service validator for '"+modelName+
"' and role '"+role+"' = "+sm);
}
// Remove validator name from list
existingValidatorNames.remove(sm.getValidatorName());
} catch(Exception e) {
- logger.log(Level.SEVERE, "Failed to create service validator '"+
+ logger.error(
+ "Failed to create service validator '"+
name+"'", e);
}
} else {
- logger.severe("Model name must be specified in validation mode");
+ logger.error("Model name must be specified in validation mode");
}
} else {
- logger.severe("Role must be specified");
+ logger.error("Role must be specified");
}
if (sm != null) {
@@ -586,8 +583,8 @@
if (epr != null) {
Endpoint endpoint=new Endpoint(epr);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Storing input endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Storing input endpoint '"+
endpoint+"' against validator: "+sm);
}
@@ -610,8 +607,8 @@
if (inputs[j].getAttribute(DYNAMIC_REPLY_TO_ATTR,
"false").equalsIgnoreCase("true")) {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Input endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Input endpoint '"+
endpoint+"' has dynamic replyTo destination");
}
@@ -631,8 +628,8 @@
if (epr != null) {
Endpoint endpoint=new Endpoint(epr);
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Storing output endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Storing output endpoint '"+
endpoint+"' against validator: "+sm);
}
@@ -655,8 +652,8 @@
if (outputs[j].getAttribute(DYNAMIC_REPLY_TO_ATTR,
"false").equalsIgnoreCase("true")) {
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Output endpoint '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Output endpoint '"+
endpoint+"' has dynamic replyTo destination");
}
@@ -669,8 +666,7 @@
}
}
} catch(Exception e) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to load validator config", e);
+ logger.error("Failed to load validator config", e);
}
}
}
@@ -686,7 +682,7 @@
return(m_managedMode);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ServiceValidatorManager.class);
private static final String EPR_ATTR = "epr";
private static final String DYNAMIC_REPLY_TO_ATTR = "dynamicReplyTo";
@@ -749,7 +745,7 @@
}
protected void checkForUpdates() {
- logger.info("Checking for config updates");
+ logger.debug("Checking for config updates");
// Get last update time
long lastUpdate=getLastUpdate();
@@ -814,20 +810,20 @@
wait(m_replyToTimeout);
}
} catch(Exception e) {
- logger.severe("Failed to wait");
+ logger.error("Failed to wait");
}
// Shift main entries to an emptied 'pending delete'
// map
synchronized(m_inputs) {
- if (logger.isLoggable(Level.FINEST)) {
+ if (logger.isDebugEnabled()) {
java.util.Iterator<Endpoint> iter=
m_inputsPendingDelete.keySet().iterator();
while (iter.hasNext()) {
Endpoint endpoint=iter.next();
java.util.List<ServiceValidator> validators=
m_inputsPendingDelete.get(endpoint);
- logger.finest("Deleting input (reply-to) validators '"+
+ logger.debug("Deleting input (reply-to) validators '"+
endpoint+"': "+validators);
}
}
@@ -838,14 +834,14 @@
}
synchronized(m_outputs) {
- if (logger.isLoggable(Level.FINEST)) {
+ if (logger.isDebugEnabled()) {
java.util.Iterator<Endpoint> iter=
m_outputsPendingDelete.keySet().iterator();
while (iter.hasNext()) {
Endpoint endpoint=iter.next();
java.util.List<ServiceValidator> validators=
m_outputsPendingDelete.get(endpoint);
- logger.finest("Deleting output (reply-to) validators '"+
+ logger.debug("Deleting output (reply-to) validators '"+
endpoint+"': "+validators);
}
}
@@ -876,8 +872,8 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Return input (reply-to) validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return input (reply-to) validators '"+endpoint+"': "+ret);
}
return(ret);
@@ -902,8 +898,8 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Return output (reply-to) validators '"+endpoint+"': "+ret);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Return output (reply-to) validators '"+endpoint+"': "+ret);
}
return(ret);
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorConfigFactory.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,8 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
/**
* This class provides a factory for ValidatorConfig objects
@@ -61,8 +60,8 @@
}
}
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Returning validator config for "+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Returning validator config for "+
file.getName()+": "+ret);
}
@@ -87,7 +86,7 @@
return(ret);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ValidatorConfigFactory.class);
private static java.util.List<ValidatorConfigLoader> m_loaders=
new java.util.Vector<ValidatorConfigLoader>();
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/ValidatorFilter.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,8 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.message.*;
import org.jboss.soa.esb.couriers.*;
@@ -74,11 +73,22 @@
// Only raise exception if none of the service
// validators were able to validate the message
if (validated == false) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to handle sent message", ex);
+ String vnames="";
+
+ for (int i=0; validators != null &&
+ i < validators.size(); i++) {
+ if (vnames.length() > 0) {
+ vnames += ", ";
+ }
+ vnames += validators.get(i).getValidatorName();
+ }
+
+ logger.error("Failed to handle sent message on endpoint '"+
+ endpoint+"' validated against: "+vnames);
if (ServiceValidatorManager.instance().isManagedMode()) {
- throw new CourierException("Failed to handle sent message", ex);
+ throw new CourierException("Failed to handle sent message on endpoint '"+
+ endpoint+"' validated against: "+vnames, ex);
}
} else {
@@ -92,7 +102,7 @@
ServiceValidatorManager.instance().registerInputReplyToValidators(replyTo,
validators);
} else {
- logger.severe("Unable to get 'reply-to' endpoint for message: "+msg);
+ logger.error("Unable to get 'reply-to' endpoint for message: "+msg);
}
}
}
@@ -137,11 +147,22 @@
// Only raise exception if none of the service
// validators were able to validate the message
if (validated == false) {
- logger.log(java.util.logging.Level.SEVERE,
- "Failed to handle received message", ex);
+ String vnames="";
+
+ for (int i=0; validators != null &&
+ i < validators.size(); i++) {
+ if (vnames.length() > 0) {
+ vnames += ", ";
+ }
+ vnames += validators.get(i).getValidatorName();
+ }
+
+ logger.error("Failed to handle received message on endpoint '"+
+ endpoint+"' validated against: "+vnames);
if (ServiceValidatorManager.instance().isManagedMode()) {
- throw new CourierException("Failed to handle received message", ex);
+ throw new CourierException("Failed to handle received message on endpoint '"+
+ endpoint+"' validated against: "+vnames, ex);
}
} else {
@@ -155,7 +176,7 @@
ServiceValidatorManager.instance().registerOutputReplyToValidators(replyTo,
validators);
} else {
- logger.severe("Unable to get 'reply-to' endpoint for message: "+msg);
+ logger.error("Unable to get 'reply-to' endpoint for message: "+msg);
}
}
}
@@ -190,9 +211,7 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Destination for message '"+msg+"' is: "+ret);
- }
+ logger.debug("Destination for message '"+msg+"' is: "+ret);
return(ret);
}
@@ -222,12 +241,10 @@
}
}
- if (logger.isLoggable(Level.FINEST)) {
- logger.finest("Reply-To Destination for message '"+msg+"' is: "+ret);
- }
-
+ logger.debug("Reply-To Destination for message '"+msg+"' is: "+ret);
+
return(ret);
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb");
+ private static final Logger logger = Logger.getLogger(ValidatorFilter.class);
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceRecorder.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,7 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb.pi4soa;
-import java.util.logging.*;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.validator.jbossesb.*;
@@ -66,10 +66,10 @@
m_monitor.getConfiguration().getServiceRepository().
addServiceDescription(sdesc);
- logger.info("Created monitor for service description "+sdesc.getFullyQualifiedName());
+ logger.debug("Created monitor for service description "+sdesc.getFullyQualifiedName());
} catch(Exception e) {
- logger.severe("Failed to initialize service monitor: "+e);
+ logger.error("Failed to initialize service monitor: "+e);
}
}
@@ -149,7 +149,7 @@
m_monitor.close();
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb.pi4soa");
+ private static final Logger logger = Logger.getLogger(Pi4SOAServiceRecorder.class);
private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null;
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/Pi4SOAServiceValidator.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -17,7 +17,7 @@
*/
package org.jboss.soa.overlord.validator.jbossesb.pi4soa;
-import java.util.logging.*;
+import org.apache.log4j.Logger;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.validator.jbossesb.*;
@@ -66,8 +66,8 @@
*/
public void update() throws Exception {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Update: "+getValidatorName());
+ if (logger.isDebugEnabled()) {
+ logger.debug("Update: "+getValidatorName());
}
java.io.InputStream is=getModel();
@@ -80,7 +80,7 @@
try {
is.close();
} catch(Exception e) {
- logger.log(Level.SEVERE, "Failed to close model '"+
+ logger.error("Failed to close model '"+
getValidatorName()+"' input stream", e);
}
@@ -88,8 +88,8 @@
if (m_monitor == null) {
- if (logger.isLoggable(Level.FINE)) {
- logger.fine("Service monitor for '"+
+ if (logger.isDebugEnabled()) {
+ logger.debug("Service monitor for '"+
sdesc.getFullyQualifiedName()+
"' being created");
}
@@ -109,10 +109,10 @@
m_monitor.getConfiguration().getServiceRepository().
addServiceDescription(sdesc);
- logger.info("Created monitor for service description "+sdesc.getFullyQualifiedName());
+ logger.debug("Created monitor for service description "+sdesc.getFullyQualifiedName());
} catch(Exception e) {
- logger.severe("Failed to initialize service monitor: "+e);
+ logger.error("Failed to initialize service monitor: "+e);
}
} else {
@@ -129,21 +129,21 @@
removeServiceDescription(sdescs[i]);
}
- logger.info("Updating service description for "+sdesc.getFullyQualifiedName());
+ logger.debug("Updating service description for "+sdesc.getFullyQualifiedName());
m_monitor.getConfiguration().getServiceRepository().addServiceDescription(sdesc);
} catch(Exception e) {
- logger.log(Level.SEVERE, "Failed to update service description '"+
+ logger.error("Failed to update service description '"+
sdesc.getFullyQualifiedName()+"'", e);
}
}
}
} else {
- logger.severe("Unable to obtain service description for validator '"+
+ logger.error("Unable to obtain service description for validator '"+
getValidatorName()+"'");
}
} else {
- logger.severe("Unable to obtain model for validator '"+
+ logger.error("Unable to obtain model for validator '"+
getValidatorName()+"'");
throw new java.io.IOException("Failed to locate model '"+
@@ -210,7 +210,7 @@
m_monitor.close();
}
- private static final Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb.pi4soa");
+ private static final Logger logger = Logger.getLogger(Pi4SOAServiceValidator.class);
private org.pi4soa.service.monitor.ServiceMonitor m_monitor=null;
}
Modified: cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java
===================================================================
--- cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java 2009-03-02 15:41:38 UTC (rev 532)
+++ cdl/trunk/validator/jbossesb/src/main/java/org/jboss/soa/overlord/validator/jbossesb/pi4soa/ValidatorConfigGenerator.java 2009-03-02 16:46:50 UTC (rev 533)
@@ -18,8 +18,7 @@
package org.jboss.soa.overlord.validator.jbossesb.pi4soa;
import java.util.Collections;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.apache.log4j.Logger;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -119,7 +118,7 @@
}
}
- private static Logger logger = Logger.getLogger("org.jboss.soa.overlord.validator.jbossesb.pi4soa");
+ private static Logger logger = Logger.getLogger(ValidatorConfigGenerator.class);
public class InputOutputAnalyser extends DefaultCDLVisitor {
@@ -200,16 +199,15 @@
if (nl.getLength() == 1) {
dest = (org.w3c.dom.Element)nl.item(0);
} else if (nl.getLength() > 1) {
- logger.severe("Too many destination elements ("+
+ logger.error("Too many destination elements ("+
nl.getLength()+") found");
} else {
- logger.severe("No destinations found");
+ logger.error("No destinations found");
}
}
} catch(Exception e) {
- logger.log(Level.SEVERE,
- "Failed to load jbossesb annotation", e);
+ logger.error("Failed to load jbossesb annotation", e);
}
}
17 years, 4 months
Overlord SVN: r532 - in cdl/trunk: runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful and 5 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-02 10:41:38 -0500 (Mon, 02 Mar 2009)
New Revision: 532
Added:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/LogicalCourier.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/StringUtils.java
Removed:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/LogicalCourier.java
Modified:
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java
cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SwitchAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml
cdl/trunk/samples/pom.xml
Log:
[SOAG-91] Update the sendMessageAction.
Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/LogicalCourier.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/LogicalCourier.java (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/LogicalCourier.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.jbossesb;
+
+import org.jboss.soa.esb.addressing.MalformedEPRException;
+import org.jboss.soa.esb.couriers.CourierException;
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.addressing.eprs.*;
+import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.listeners.message.MessageDeliverException;
+
+/**
+ * This class providers the courier implementation associated
+ * with a LogicalEPR.
+ *
+ * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
+ */
+public class LogicalCourier implements org.jboss.soa.esb.couriers.Courier {
+
+ private ServiceInvoker serviceInvoker=null;
+
+ /**
+ * The constructor, supplied the logical EPR represented
+ * by the courier.
+ *
+ * @param epr The logical EPR
+ * @throws MessageDeliverException
+ */
+ public LogicalCourier(LogicalEPR epr)
+ throws MessageDeliverException {
+ serviceInvoker = epr.getServiceInvoker();
+ }
+
+ /**
+ * This method delivers the supplied message to the EPR
+ * associated with the logical courier.
+ *
+ * @param mesg The message
+ */
+ public boolean deliver(Message mesg) throws CourierException,
+ MalformedEPRException {
+
+ try {
+ serviceInvoker.deliverAsync(mesg);
+ } catch(MessageDeliverException e) {
+ throw new CourierException("Failed to deliver message", e);
+ }
+
+ return(true);
+ }
+
+ /**
+ * This method cleans up after the courier implementation
+ * is no longer required.
+ */
+ public void cleanup() {
+ serviceInvoker = null;
+ }
+
+}
Added: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/StringUtils.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/StringUtils.java (rev 0)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/StringUtils.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * 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,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2008,
+ */
+package org.jboss.soa.overlord.jbossesb;
+
+/**
+ * This utility class for keeping some common used methods to deal with String.
+ *
+ * @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
+ *
+ */
+public class StringUtils {
+
+ public static final boolean isNull(String string) {
+ if (string == null || "".equals(string.trim())) {
+ return true;
+ }
+ return false;
+ }
+
+ public static final boolean isNotNull(String string) {
+ return !isNull(string);
+ }
+
+
+}
Deleted: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/LogicalCourier.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/LogicalCourier.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/LogicalCourier.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * 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,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2008,
- */
-package org.jboss.soa.overlord.jbossesb.stateful;
-
-import org.jboss.soa.esb.addressing.MalformedEPRException;
-import org.jboss.soa.esb.couriers.CourierException;
-import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.addressing.eprs.*;
-import org.jboss.soa.esb.client.ServiceInvoker;
-import org.jboss.soa.esb.listeners.message.MessageDeliverException;
-
-/**
- * This class providers the courier implementation associated
- * with a LogicalEPR.
- *
- * @author <a href="mailto:gary.brown@hattricksoftware.com">Gary Brown</a>
- */
-public class LogicalCourier implements org.jboss.soa.esb.couriers.Courier {
-
- private ServiceInvoker serviceInvoker=null;
-
- /**
- * The constructor, supplied the logical EPR represented
- * by the courier.
- *
- * @param epr The logical EPR
- * @throws MessageDeliverException
- */
- public LogicalCourier(LogicalEPR epr)
- throws MessageDeliverException {
- serviceInvoker = epr.getServiceInvoker();
- }
-
- /**
- * This method delivers the supplied message to the EPR
- * associated with the logical courier.
- *
- * @param mesg The message
- */
- public boolean deliver(Message mesg) throws CourierException,
- MalformedEPRException {
-
- try {
- serviceInvoker.deliverAsync(mesg);
- } catch(MessageDeliverException e) {
- throw new CourierException("Failed to deliver message", e);
- }
-
- return(true);
- }
-
- /**
- * This method cleans up after the courier implementation
- * is no longer required.
- */
- public void cleanup() {
- serviceInvoker = null;
- }
-
-}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateful/actions/SendMessageAction.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -31,8 +31,8 @@
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.overlord.jbossesb.LogicalCourier;
import org.jboss.soa.overlord.jbossesb.stateful.Identity;
-import org.jboss.soa.overlord.jbossesb.stateful.LogicalCourier;
import org.mvel.MVEL;
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/Decision.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -22,11 +22,20 @@
import org.jboss.soa.esb.message.Message;
/**
+ * This is the interface for {@link IfAction} decision-class attribute.
+ * That class has to implement this interface.
+ *
* @author <a href="mailto:cyu@redhat.com">Jeff Yu</a>
*
*/
public interface Decision {
+ /**
+ * Execute the decision business logic.
+ *
+ * @param message Message that is on the ESB pipeline.
+ * @return
+ */
boolean executeDecision(Message message);
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/IfAction.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -28,6 +28,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.jbossesb.ClassLoaderUtil;
+import org.jboss.soa.overlord.jbossesb.StringUtils;
import org.jboss.soa.overlord.jbossesb.stateless.Decision;
@@ -111,7 +112,7 @@
String category = branch.getAttribute(SERVICE_CATEGORY);
String name = branch.getAttribute(SERVICE_NAME);
- if (decisionClzString == null || "".equals(decisionClzString.trim())){
+ if (StringUtils.isNull(decisionClzString)){
throw new Exception("The decision-class attribute can not be null or empty string");
}
Class<?> decisionClz = ClassLoaderUtil.loadClass(decisionClzString);
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/ReceiveMessageAction.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -24,6 +24,7 @@
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.overlord.jbossesb.MessageUtil;
+import org.jboss.soa.overlord.jbossesb.StringUtils;
/**
* The ReceiveMessageAction is used to explicitly define the message type that should be received.
@@ -61,7 +62,7 @@
public Message process(Message message) throws Exception {
String expected = config.getAttribute(MESSAGE_TYPE);
- if (expected == null || "".equals(expected.trim())) {
+ if (StringUtils.isNull(expected)) {
throw new Exception("The messageType is not defined.");
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SendMessageAction.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -20,10 +20,18 @@
package org.jboss.soa.overlord.jbossesb.stateless.actions;
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
+import org.jboss.soa.esb.addressing.EPR;
+import org.jboss.soa.esb.addressing.eprs.LogicalEPR;
import org.jboss.soa.esb.client.ServiceInvoker;
+import org.jboss.soa.esb.couriers.Courier;
+import org.jboss.soa.esb.couriers.CourierFactory;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.overlord.jbossesb.LogicalCourier;
import org.jboss.soa.overlord.jbossesb.MessageUtil;
+import org.jboss.soa.overlord.jbossesb.StringUtils;
/**
* Deliver message to the target service.
@@ -53,7 +61,7 @@
<action class="org.jboss.soa.overlord.jbossesb.stateless.actions.SendMessageAction"
process="process" name="s4-3">
<property name="messageType" value="quoteList" />
- <property name="clientEPR" value="buyer" />
+ <property name="clientRole" value="buyer" />
</action>
* }
* </pre>
@@ -74,7 +82,7 @@
* <h4>Description of configuration properties:</h4>
* <ul>
* <li><i>messageType </i> - Define the message type that is prepared to sent to.</li>
- * <li><i>clientEPR</i> - This is JBossESB EPR Label, represents a JBossESB EPR that can be used to send a message to.</li>
+ * <li><i>clientRole</i> - This is JBossESB EPR Label, represents a JBossESB EPR that can be used to send a message to.</li>
* <li><i>serviceName</i> - Mapped to JBossESB service-name.</li>
* <li><i>serviceCategory</i> - Mapped to JBossESB service-category.</li>
* <li><i>responseServiceName</i> - The service-name of the responded message.</li>
@@ -109,7 +117,7 @@
public Message process(Message message) throws Exception {
String expected = config.getAttribute(MESSAGE_TYPE);
- if (expected == null || "".equals(expected.trim())) {
+ if (StringUtils.isNull(expected)) {
throw new Exception("The messageType is not defined.");
}
@@ -123,15 +131,56 @@
throw new Exception ("Unexpected message type= "+ receivedMessageType + ", but expecting type="+ expected);
}
+ Message deliverMessage = constructDeliverMessage(message);
+
String category = config.getAttribute(SERVICE_CATEGORY);
String serviceName = config.getAttribute(SERVICE_NAME);
+ String clientRole = config.getAttribute(CLIENT_ROLE);
- ServiceInvoker invoker = new ServiceInvoker(category, serviceName);
- invoker.deliverAsync(message);
+ if (StringUtils.isNotNull(category) && StringUtils.isNotNull(serviceName)
+ && StringUtils.isNotNull(clientRole)) {
+ throw new Exception ("[serviceCategory/serviceName] and [clientRole] can NOT co-exist.");
+ }
- //TODO: add logic for dealing with responseServiceCategory and responseServiceName
+ if (StringUtils.isNotNull(category) && StringUtils.isNotNull(serviceName)){
+ ServiceInvoker invoker = new ServiceInvoker(category, serviceName);
+ invoker.deliverAsync(deliverMessage);
+ } else if (StringUtils.isNotNull(clientRole)) {
+ deliverMessageFromEPR(message, deliverMessage);
+ } else {
+ throw new Exception ("Failed to send message, because can't find [serivceCategory/serviceName]," +
+ "nor clientRole.");
+ }
return message;
+
}
+
+ private Message constructDeliverMessage(Message message) {
+ Message deliverMessage = MessageFactory.getInstance().getMessage(MessageType.JBOSS_XML);
+ deliverMessage.getBody().add(message.getBody().get());
+
+ String respCategory = config.getAttribute(RESPONSE_SERVICE_CATEGORY);
+ String respName = config.getAttribute(RESPONSE_SERVICE_NAME);
+
+ if (StringUtils.isNotNull(respCategory) && StringUtils.isNotNull(respName)) {
+ LogicalEPR lepr= new LogicalEPR(respCategory, respName);
+ deliverMessage.getHeader().getCall().setReplyTo(lepr);
+ }
+ return deliverMessage;
+ }
+
+ private void deliverMessageFromEPR(Message message, Message deliverMessage) throws Exception {
+ EPR epr = message.getHeader().getCall().getReplyTo();
+ Courier courier = null;
+ // Workaround, as CourierFactory currently does not support logical EPRs.
+ if (epr instanceof LogicalEPR) {
+ courier = new LogicalCourier((LogicalEPR) epr);
+ } else {
+ courier = CourierFactory.getCourier(epr);
+ }
+ courier.deliver(deliverMessage);
+ }
+
}
Modified: cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SwitchAction.java
===================================================================
--- cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SwitchAction.java 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/runtime/jbossesb/src/main/java/org/jboss/soa/overlord/jbossesb/stateless/actions/SwitchAction.java 2009-03-02 15:41:38 UTC (rev 532)
@@ -70,10 +70,18 @@
public static final String MESSAGE_TYPE = "type";
+ public static final String SERVICE_DESC_NAME = "serviceDescriptionName";
+
+ public static final String CONVERSATION_TYPE = "conversationType";
+
private ConfigTree config;
private List<ConfigTree> caseBranchs = new LinkedList<ConfigTree>();
+ private String serviceDescName;
+
+ private String conversationType;
+
public SwitchAction(ConfigTree config){
this.config = config;
}
@@ -110,6 +118,9 @@
private void parseConfiguration() {
+ serviceDescName = config.getAttribute(SERVICE_DESC_NAME);
+ conversationType = config.getAttribute(CONVERSATION_TYPE);
+
ConfigTree[] children = config.getAllChildren();
for (ConfigTree ct : children) {
if (CASE_STATEMENT.equals(ct.getName())) {
@@ -117,5 +128,13 @@
}
}
}
+
+ public String getServiceDescName() {
+ return serviceDescName;
+ }
+
+ public String getConversationType() {
+ return conversationType;
+ }
}
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml 2009-03-02 15:41:38 UTC (rev 532)
@@ -3,10 +3,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.overlord.cdl.samples</groupId>
- <artifactId>jbossesb-supplier</artifactId>
+ <artifactId>jbossesb-stateful-supplier</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jboss-esb</packaging>
- <name>Overlord::CDL::Samples::Supplier</name>
+ <name>Overlord::CDL::Samples::Stateful::Supplier</name>
<url>http://www.jboss.org/overlord</url>
<parent>
Modified: cdl/trunk/samples/pom.xml
===================================================================
--- cdl/trunk/samples/pom.xml 2009-03-02 14:05:59 UTC (rev 531)
+++ cdl/trunk/samples/pom.xml 2009-03-02 15:41:38 UTC (rev 532)
@@ -21,10 +21,10 @@
<modules>
- <module>jbossesb/purchasing/store</module>
- <module>jbossesb/common/creditAgency</module>
- <module>jbossesb/brokerage/broker</module>
- <module>jbossesb/brokerage/supplier</module>
+ <module>jbossesb/purchasing/store/stateful</module>
+ <module>jbossesb/common/creditAgency/stateful</module>
+ <module>jbossesb/brokerage/broker/stateful</module>
+ <module>jbossesb/brokerage/supplier/stateful</module>
</modules>
<build>
17 years, 4 months
Overlord SVN: r531 - cdl/trunk/docs/docbook/userguide/src/main/module.
by overlord-commits@lists.jboss.org
Author: objectiser
Date: 2009-03-02 09:05:59 -0500 (Mon, 02 Mar 2009)
New Revision: 531
Modified:
cdl/trunk/docs/docbook/userguide/src/main/module/conversation-validation-with-cdl.xml
Log:
Minor fixes to the doc
Modified: cdl/trunk/docs/docbook/userguide/src/main/module/conversation-validation-with-cdl.xml
===================================================================
--- cdl/trunk/docs/docbook/userguide/src/main/module/conversation-validation-with-cdl.xml 2009-03-02 09:33:54 UTC (rev 530)
+++ cdl/trunk/docs/docbook/userguide/src/main/module/conversation-validation-with-cdl.xml 2009-03-02 14:05:59 UTC (rev 531)
@@ -92,7 +92,7 @@
</informalexample>
<para>
-The 'validator' element has an optional boolean attribute called 'mode', with the possible values of 'monitor' or 'manage'. If the
+The 'validator' element has an optional attribute called 'mode', with the possible values of 'monitor' or 'manage'. If the
mode is 'monitor' (which is the default), then any messages that result in validation errors being detected will continue to be received or sent, with the errors only be reported for information purposes. If the mode is 'manage', then any erronous messages detected during validation, that conflict with the behaviour as described in the choreography, will be prevented from being received or sent.
</para>
<note>
@@ -105,7 +105,8 @@
The optional 'replyToTimeout' (defined in milliseconds) is used to determine how long a dynamic reply-to destination should be monitored for validation purposes. In some message exchanges, the response destination will not always be known in advance. Therefore the configuration can identify such situations, and monitor the reply-to destination for the response. However, if a response is not delivered in a particular time period, we need to be able to discontinue the validation of the dynamic endpoint. If this did not occur, then over time too many endpoints would be monitored, which may result in out-of-memory problems. The default timeout period is 10 seconds.
</para>
<para>
-Within the 'validator' element is a list of 'service' elements, one per service being validated. The behaviour of the service being validated is identified by specifying the model (e.g. choreography description file) and the role (e.g. participant type) within the model. Therefore, within the above configuration, the first set of destinations (eprs) are associated with the <emphasis>LoanBrokerParticipant</emphasis> defined within the choreography description model found in the file <filename>models/TrailBlazer.cdm</filename>, which will be located within the <emphasis>overlord-cdl-validator.esb</emphasis> bundle.
+Within the 'validator' element is a list of 'service' elements, one per service being validated. The behaviour of the service being validated is identified by specifying the model (e.g. choreography description file) and the role (e.g. participant type) within the model. Therefore, within the above configuration, the first set of destinations (eprs) are associated with the <emphasis>LoanBrokerParticipant</emphasis> defined within the choreography description model found in the file <filename>TrailBlazer.cdm</filename>, which will be located within the <filename>models</filename> folder contained within the
+<emphasis>overlord-cdl-validator.esb</emphasis> bundle.
</para>
<para>
The elements contained within the 'service' element define the <emphasis>input</emphasis> and <emphasis>output</emphasis> eprs (Endpoint References) that are associated with the service. The <emphasis>input</emphasis> eprs are the destinations on which messages will be received and the <emphasis>output</emphasis> eprs are the destinations on which messages will be sent by the service.
17 years, 4 months
Overlord SVN: r530 - in cdl/trunk/samples/jbossesb/common/creditAgency: stateful and 1 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-02 04:33:54 -0500 (Mon, 02 Mar 2009)
New Revision: 530
Added:
cdl/trunk/samples/jbossesb/common/creditAgency/stateful/
cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src/
Removed:
cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
cdl/trunk/samples/jbossesb/common/creditAgency/src/
Log:
* restructure.
Deleted: cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-03-02 09:12:35 UTC (rev 529)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml 2009-03-02 09:33:54 UTC (rev 530)
@@ -1,60 +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>
- <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
- <artifactId>jbossesb-creditAgency</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jboss-esb</packaging>
- <name>Overlord::CDL::Samples::CreditAgency</name>
- <url>http://www.jboss.org/overlord</url>
-
- <parent>
- <groupId>org.jboss.soa.overlord.cdl</groupId>
- <artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
- <artifactId>cdl-runtime-jbossesb</artifactId>
- <version>${cdl.jbossesb.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>creditAgency</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!--Deploy esb artifact to JBoss AS/ESB -->
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy file="target/creditAgency.esb" todir="${deploy.dir}" overwrite="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
Copied: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml (from rev 524, cdl/trunk/samples/jbossesb/common/creditAgency/pom.xml)
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml 2009-03-02 09:33:54 UTC (rev 530)
@@ -0,0 +1,60 @@
+<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>
+ <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
+ <artifactId>jbossesb-stateful-creditAgency</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jboss-esb</packaging>
+ <name>Overlord::CDL::Samples::Stateful::CreditAgency</name>
+ <url>http://www.jboss.org/overlord</url>
+
+ <parent>
+ <groupId>org.jboss.soa.overlord.cdl</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
+ <artifactId>cdl-runtime-jbossesb</artifactId>
+ <version>${cdl.jbossesb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>creditAgency</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!--Deploy esb artifact to JBoss AS/ESB -->
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/creditAgency.esb" todir="${deploy.dir}" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Property changes on: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src (from rev 529, cdl/trunk/samples/jbossesb/common/creditAgency/src)
Property changes on: cdl/trunk/samples/jbossesb/common/creditAgency/stateful/src
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 4 months
Overlord SVN: r529 - in cdl/trunk/samples/jbossesb/purchasing/store: stateful and 1 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-02 04:12:35 -0500 (Mon, 02 Mar 2009)
New Revision: 529
Added:
cdl/trunk/samples/jbossesb/purchasing/store/stateful/
cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml
cdl/trunk/samples/jbossesb/purchasing/store/stateful/src/
Removed:
cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
cdl/trunk/samples/jbossesb/purchasing/store/src/
Log:
* Refactor the store folder structure.
Deleted: cdl/trunk/samples/jbossesb/purchasing/store/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-03-02 09:05:43 UTC (rev 528)
+++ cdl/trunk/samples/jbossesb/purchasing/store/pom.xml 2009-03-02 09:12:35 UTC (rev 529)
@@ -1,58 +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>
- <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
- <artifactId>jbossesb-purchasing</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jboss-esb</packaging>
- <name>Overlord::CDL::Samples::Purchasing</name>
- <url>http://www.jboss.org/soag</url>
-
- <parent>
- <groupId>org.jboss.soa.overlord.cdl</groupId>
- <artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
- <artifactId>cdl-runtime-jbossesb</artifactId>
- <version>${cdl.jbossesb.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>purchasing</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy file="target/purchasing.esb" todir="${deploy.dir}" overwrite="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
Copied: cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml (from rev 528, cdl/trunk/samples/jbossesb/purchasing/store/pom.xml)
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml 2009-03-02 09:12:35 UTC (rev 529)
@@ -0,0 +1,58 @@
+<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>
+ <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
+ <artifactId>jbossesb-stateful-purchasing</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jboss-esb</packaging>
+ <name>Overlord::CDL::Samples::Stateful::Purchasing</name>
+ <url>http://www.jboss.org/soag</url>
+
+ <parent>
+ <groupId>org.jboss.soa.overlord.cdl</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
+ <artifactId>cdl-runtime-jbossesb</artifactId>
+ <version>${cdl.jbossesb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>purchasing</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/purchasing.esb" todir="${deploy.dir}" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Property changes on: cdl/trunk/samples/jbossesb/purchasing/store/stateful/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/samples/jbossesb/purchasing/store/stateful/src (from rev 528, cdl/trunk/samples/jbossesb/purchasing/store/src)
Property changes on: cdl/trunk/samples/jbossesb/purchasing/store/stateful/src
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 4 months
Overlord SVN: r528 - in cdl/trunk/samples/jbossesb/brokerage/broker: stateful and 1 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-02 04:05:43 -0500 (Mon, 02 Mar 2009)
New Revision: 528
Added:
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml
cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src/
Removed:
cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
cdl/trunk/samples/jbossesb/brokerage/broker/src/
Log:
* Refactor the folder structure.
Deleted: cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-03-02 07:57:29 UTC (rev 527)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml 2009-03-02 09:05:43 UTC (rev 528)
@@ -1,60 +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>
- <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
- <artifactId>jbossesb-broker</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jboss-esb</packaging>
- <name>Overlord::CDL::Samples::Broker</name>
- <url>http://www.jboss.org/overlord</url>
-
- <parent>
- <groupId>org.jboss.soa.overlord.cdl</groupId>
- <artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
- <artifactId>cdl-runtime-jbossesb</artifactId>
- <version>${cdl.jbossesb.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>broker</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!--Deploy esb artifact to JBoss AS/ESB -->
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy file="target/broker.esb" todir="${deploy.dir}" overwrite="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
Copied: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml (from rev 527, cdl/trunk/samples/jbossesb/brokerage/broker/pom.xml)
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml 2009-03-02 09:05:43 UTC (rev 528)
@@ -0,0 +1,60 @@
+<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>
+ <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
+ <artifactId>jbossesb-stateful-broker</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jboss-esb</packaging>
+ <name>Overlord::CDL::Samples::Stateful::Broker</name>
+ <url>http://www.jboss.org/overlord</url>
+
+ <parent>
+ <groupId>org.jboss.soa.overlord.cdl</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
+ <artifactId>cdl-runtime-jbossesb</artifactId>
+ <version>${cdl.jbossesb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>broker</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!--Deploy esb artifact to JBoss AS/ESB -->
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/broker.esb" todir="${deploy.dir}" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Property changes on: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src (from rev 527, cdl/trunk/samples/jbossesb/brokerage/broker/src)
Property changes on: cdl/trunk/samples/jbossesb/brokerage/broker/stateful/src
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 4 months
Overlord SVN: r527 - in cdl/trunk/samples/jbossesb/brokerage/supplier: stateful and 1 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-02 02:57:29 -0500 (Mon, 02 Mar 2009)
New Revision: 527
Added:
cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src/
Removed:
cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
cdl/trunk/samples/jbossesb/brokerage/supplier/src/
Log:
* Move to the stateful folder.
Deleted: cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-03-02 07:56:45 UTC (rev 526)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml 2009-03-02 07:57:29 UTC (rev 527)
@@ -1,60 +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>
- <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
- <artifactId>jbossesb-supplier</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>jboss-esb</packaging>
- <name>Overlord::CDL::Samples::Supplier</name>
- <url>http://www.jboss.org/overlord</url>
-
- <parent>
- <groupId>org.jboss.soa.overlord.cdl</groupId>
- <artifactId>samples</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
-
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
- <artifactId>cdl-runtime-jbossesb</artifactId>
- <version>${cdl.jbossesb.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>supplier</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!--Deploy esb artifact to JBoss AS/ESB -->
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <configuration>
- <tasks>
- <copy file="target/supplier.esb" todir="${deploy.dir}" overwrite="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
Copied: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml (from rev 525, cdl/trunk/samples/jbossesb/brokerage/supplier/pom.xml)
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml (rev 0)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml 2009-03-02 07:57:29 UTC (rev 527)
@@ -0,0 +1,60 @@
+<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>
+ <groupId>org.jboss.soa.overlord.cdl.samples</groupId>
+ <artifactId>jbossesb-supplier</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jboss-esb</packaging>
+ <name>Overlord::CDL::Samples::Supplier</name>
+ <url>http://www.jboss.org/overlord</url>
+
+ <parent>
+ <groupId>org.jboss.soa.overlord.cdl</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.overlord.cdl.runtime</groupId>
+ <artifactId>cdl-runtime-jbossesb</artifactId>
+ <version>${cdl.jbossesb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>supplier</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!--Deploy esb artifact to JBoss AS/ESB -->
+ <execution>
+ <id>deploy</id>
+ <phase>install</phase>
+ <configuration>
+ <tasks>
+ <copy file="target/supplier.esb" todir="${deploy.dir}" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Property changes on: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/pom.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src (from rev 525, cdl/trunk/samples/jbossesb/brokerage/supplier/src)
Property changes on: cdl/trunk/samples/jbossesb/brokerage/supplier/stateful/src
___________________________________________________________________
Name: svn:mergeinfo
+
17 years, 4 months
Overlord SVN: r525 - in cdl/trunk/samples/jbossesb: brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier and 2 other directories.
by overlord-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2009-03-02 01:41:53 -0500 (Mon, 02 Mar 2009)
New Revision: 525
Modified:
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderRejectMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java
cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java
cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java
cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
Log:
Fix the compile error due to package refactoring last time.
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/BrokerMain.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -24,7 +24,7 @@
import java.util.List;
import org.apache.log4j.Logger;
-import org.jboss.soa.overlord.jbossesb.actions.Service;
+import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
@Service(name="{http://www.jboss.org/overlord/loanBroker}Broker", conversationType="overlord.cdl.samples.LoanBroker@Broker", root=true)
public class BrokerMain implements Serializable, QuoteManager{
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/CompleteTransactionMain.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -21,7 +21,7 @@
import java.io.Serializable;
-import org.jboss.soa.overlord.jbossesb.actions.Service;
+import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
@Service(name="{http://www.jboss.org/overlord/loanBroker}CompleteTransaction", conversationType="CompleteTransaction", root=false)
public class CompleteTransactionMain implements Serializable {
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetCreditCheckRequestMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderConfirmRequestAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/**
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderRejectMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderRejectMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetOrderRejectMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/**
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetQuotesListAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -25,7 +25,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/**
Modified: cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/broker/src/main/java/org/jboss/soa/overlord/samples/jbossesb/loan/broker/SetRequestQuoteMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/**
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetOrderConfirmResponseAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -5,7 +5,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/**
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SetQuoteMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -5,7 +5,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/**
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierRFQMain.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -2,8 +2,9 @@
import java.io.Serializable;
-import org.jboss.soa.overlord.jbossesb.actions.Service;
+import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
+
/**
* @author jeffyu
*
Modified: cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java
===================================================================
--- cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/brokerage/supplier/src/main/java/org/jboss/soa/overlord/samples/jbossesb/supplier/SupplierTxnMain.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -2,7 +2,7 @@
import java.io.Serializable;
-import org.jboss.soa.overlord.jbossesb.actions.Service;
+import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
/**
* @author jeffyu
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/CreditAgencyPurchase.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -21,7 +21,7 @@
import java.io.Serializable;
-import org.jboss.soa.overlord.jbossesb.actions.Service;
+import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
@Service(name="{http://www.jboss.org/overlord/purchase}CreditAgency", conversationType="overlord.cdl.samples.Common@CreditAgency",root=true)
public class CreditAgencyPurchase implements Serializable {
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckInvalidMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
public class SetCreditCheckInvalidMessageAction extends AbstractActionLifecycle {
Modified: cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/common/creditAgency/src/main/java/com/acme/services/creditAgency/SetCreditCheckResponseMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
public class SetCreditCheckResponseMessageAction extends AbstractActionLifecycle {
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/PurchaseGoods.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -21,8 +21,9 @@
import java.io.Serializable;
-import org.jboss.soa.overlord.jbossesb.actions.Service;
+import org.jboss.soa.overlord.jbossesb.stateful.actions.Service;
+
@Service(name="{http://www.jboss.org/overlord/purchase}Store", conversationType="overlord.cdl.samples.Purchasing@Store", root=true)
public class PurchaseGoods implements Serializable{
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyFailedMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
/*
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetBuyResponseMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
public class SetBuyResponseMessageAction extends AbstractActionLifecycle {
Modified: cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java
===================================================================
--- cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2009-02-28 10:53:16 UTC (rev 524)
+++ cdl/trunk/samples/jbossesb/purchasing/store/src/main/java/com/acme/services/broker/SetCreditCheckRequestMessageAction.java 2009-03-02 06:41:53 UTC (rev 525)
@@ -23,7 +23,7 @@
import org.jboss.soa.esb.actions.AbstractActionLifecycle;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.overlord.jbossesb.util.XMLUtils;
+import org.jboss.soa.overlord.jbossesb.XMLUtils;
import org.w3c.dom.Node;
public class SetCreditCheckRequestMessageAction extends AbstractActionLifecycle {
17 years, 4 months