[jboss-svn-commits] JBL Code SVN: r12084 - in labs/jbossesb/trunk/product: core/listeners/src/org/jboss/soa/esb/actions/converters and 16 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue May 22 09:58:58 EDT 2007
Author: beve
Date: 2007-05-22 09:58:58 -0400 (Tue, 22 May 2007)
New Revision: 12084
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedFilter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/AbstractFileNamingStrategy.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/ChangeSuffixNamingStrategy.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/FileNamingStrategy.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/GroovyNamingStrategy.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/Email.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/properties/MessagePropertyFacade.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/urigen/MessageURIGenerator.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystem.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java
labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java
labs/jbossesb/trunk/product/lib/ext/xbean.jar
Log:
Work for JIRA:http://jira.jboss.com/jira/browse/JBESB-573 "Tidy up javadocs warnings in build"
Patched xbean.jar to aviod generated javadoc warnings
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedFilter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedFilter.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedFilter.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -56,7 +56,7 @@
* to which destinations it is going to be routed too.
*
* @param message
- * @return
+ * @return Message
* @throws MalformedEPRException
* @throws RegistryException
* @throws CourierException
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/ContentBasedRouter.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -64,7 +64,7 @@
* to which destinations it is going to be routed too.
*
* @param message
- * @return
+ * @return Message
* @throws MalformedEPRException
* @throws RegistryException
* @throws CourierException
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/AbstractObjectXStream.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -61,7 +61,7 @@
* Gets the alias to use with classes.
*
* @param obj
- * @return
+ * @return String
*/
protected String getAlias(Object obj) {
if(classAlias == null) {
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/ObjectInvoke.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -148,7 +148,7 @@
* Classes can extend this to provide the object in the way they want.
*
*
- * @return
+ * @return Object
* @throws ActionProcessingException
*/
protected Object getObjectToInvoke() throws ActionProcessingException {
@@ -168,7 +168,7 @@
* Gets the method to invoke on object.
*
* @param obj
- * @return
+ * @return Method
*/
protected Method setUpMethod(Object obj) {
if(method != null)
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/XStreamToObject.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -1,6 +1,9 @@
package org.jboss.soa.esb.actions.converters;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.log4j.Logger;
import org.jboss.soa.esb.ConfigurationException;
@@ -26,6 +29,11 @@
* <property name="class-alias" value="Customer" /> <!-- Optional. Class alias used in call to <a href="http://xstream.codehaus.org/javadoc/com/thoughtworks/xstream/XStream.html">XStream.alias(String, Class)</a> prior to deserialisation. -->
* <property name="incoming-type" value="CustomerProcessor" /> <!-- Required. Class for incoming type used to process the message after deserialisation. -->
* <property name="exclude-package" value="false" /> <!-- Optional. Default "true". Not applicable if a "class-alias" is specified. -->
+ * <aliases> <!-- Optional list of extra aliases to add to XStream -->
+ * <alias name="aliasName" class="className" />
+ * <alias name="aliasName" class="className" />
+ * ...
+ * </aliases>
* </Action>
* </pre>
* <p/>
@@ -35,6 +43,7 @@
* This can be used with ObjectToXStream
*
* @author danielmarchant
+ * @author Daniel Bevenius
* @since Version 4.0
*/
public class XStreamToObject extends AbstractObjectXStream {
@@ -45,6 +54,7 @@
private Class incomingType;
// action related variables
+ private Map<String,String> aliases;
/**
* Public constructor.
@@ -53,6 +63,7 @@
*/
public XStreamToObject(ConfigTree properties) {
this(properties.getName(), properties.attributesAsList());
+ aliases = getAliases( properties );
}
/**
@@ -83,6 +94,7 @@
XStream xstream = new XStream(new DomDriver());
xstream.alias(getAlias(incomingType), incomingType);
+ addAliases( aliases, xstream );
Object arg;
try {
@@ -90,13 +102,61 @@
arg = xstream.fromXML(xml, arg);
ActionUtils.setTaskObject(message,arg);
} catch (InstantiationException e) {
+ e.printStackTrace();
throw new ActionProcessingException("Could not invoke for Arg: " + getName(),e );
} catch (IllegalAccessException e) {
+ e.printStackTrace();
throw new ActionProcessingException("Could not access for Arg: " + getName(),e );
}
return message;
}
+
+ /**
+ * Will extract the alias elements from the passed-in conifgTree
+ *
+ * @param configTree the configuration for this class
+ *
+ * @return Map<String,String> either an empty map or a map containing the alias name
+ * as its key and the corresponding value is the class to map
+ * it to.
+ */
+ protected Map<String,String> getAliases( ConfigTree configTree )
+ {
+ Map<String,String> aliases = new HashMap<String,String>();
+
+ ConfigTree[] children = configTree.getChildren( "alias" );
+
+ if ( children != null ) {
+ for ( ConfigTree alias : children )
+ aliases.put( alias.getAttribute( "name" ), alias.getAttribute( "class" ) );
+ }
+ return aliases;
+ }
+ /**
+ * Added the aliases contained in the passed-in map to the
+ * passed-in XStream object
+ *
+ * @param aliases Map of aliases.
+ * @throws ActionProcessingException
+ */
+ protected void addAliases( Map<String, String> aliases, XStream xstream) throws ActionProcessingException
+ {
+ if ( aliases == null )
+ return;
+
+ Set<Map.Entry<String,String>> set = aliases.entrySet();
+ for (Map.Entry me : set ) {
+ String className = (String) me.getValue();
+ try {
+ Class clazz = ClassUtil.forName( className, getClass() );
+ xstream.alias((String)me.getKey(), clazz );
+ } catch (ClassNotFoundException e) {
+ logger.error(e);
+ throw new ActionProcessingException("Could not add alias : " + (String)me.getKey() + ", class : " + className ,e );
+ }
+ }
+ }
}
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/FileNameGeneratorAction.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -111,7 +111,7 @@
* Create a strategy instance given a DOM node.
*
* @param strategyNode
- * @return
+ * @return FileNamingStrategy
*/
protected FileNamingStrategy createStrategy(Node strategyNode) {
Node classNode = strategyNode.getAttributes().getNamedItem(ATTR_CLASS);
@@ -146,7 +146,7 @@
/**
* Get the property that holds the initial file name.
*
- * @return
+ * @return String
*/
public String getFileNameProperty() {
return fileNameProperty;
@@ -164,7 +164,7 @@
/**
* Get the property that holds the processed file name.
*
- * @return
+ * @return String
*/
public String getResultProperty() {
return resultProperty;
@@ -183,7 +183,7 @@
/**
* Set the string containing XML for strategies.
*
- * @return
+ * @return String
*/
public String getStrategies() {
return strategies;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/AbstractFileNamingStrategy.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/AbstractFileNamingStrategy.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/AbstractFileNamingStrategy.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -43,7 +43,7 @@
* Gets the filename without the suffix.
*
* @param filename
- * @return
+ * @return String
*/
public String getFilenameWithoutSuffix(String filename) {
int lastDot = filename.lastIndexOf('.');
@@ -58,7 +58,7 @@
* Gets the filename without the suffix.
*
* @param filename
- * @return
+ * @return String
*/
public String getSuffix(String filename) {
int lastDot = filename.lastIndexOf('.');
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/ChangeSuffixNamingStrategy.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/ChangeSuffixNamingStrategy.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/ChangeSuffixNamingStrategy.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -75,7 +75,7 @@
/**
* Get the new suffix to use.
*
- * @return
+ * @return String
*/
public String getNewSuffix() {
return newSuffix;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/FileNamingStrategy.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/FileNamingStrategy.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/FileNamingStrategy.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -44,7 +44,7 @@
*
* @param filename
* @param message
- * @return
+ * @return String
*/
public String process(String filename, Message message);
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/GroovyNamingStrategy.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/GroovyNamingStrategy.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/naming/strategy/GroovyNamingStrategy.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -102,7 +102,7 @@
/**
* Get the path to the script.
*
- * @return
+ * @return String
*/
public String getScriptPath() {
return scriptPath;
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/persistence/StoreMessage.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -72,7 +72,7 @@
/**
* Attempts to load the URI for the message store type from the config tree.
*
- * @return
+ * @return URI
* @throws ActionProcessingException
*/
protected URI getMessageStoreTypeURI() throws ActionProcessingException {
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/templating/StringTemplateProcessor.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -14,7 +14,7 @@
* <p/>
* Code supplied by the <a href="http://milyn.codehaus.org/Smooks">Milyn Smooks</a> project.
*
- * @author
+ * @author John Doe
*/
public class StringTemplateProcessor extends AbstractActionPipelineProcessor {
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/config/ServicePublisher.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -34,7 +34,7 @@
*
* @param name Service name.
* @param category Service category.
- * @paaram contractPublisher Contract publisher implementation.
+ * @param contractPublisher Contract publisher implementation.
*/
protected ServicePublisher(String name, String category, ContractPublisher contractPublisher) {
AssertArgument.isNotNullAndNotEmpty(name, "name");
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/message/Invoker.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -81,7 +81,7 @@
* @param category String - Service category name for Registry inquiry
* @param name String - Service name for Registry inquiry
* @param maxWaitMillis int - Maximum time to wait for a response
- * @return
+ * @return Message
* @throws RegistryException
* @throws MalformedEPRException
* @throws CourierException
@@ -106,7 +106,7 @@
*
* @param outgoing Message - should contain at least the toEPR
* @param maxWaitMillis int - Maximum time to wait for a response
- * @return
+ * @return Message
* @throws CourierException
* @throws MalformedEPRException
* @throws CourierTimeoutException - If response was not received in specified time
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/JMSEpr.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -154,11 +154,8 @@
* name of the queue/topic.
* @param connection
* reference to the connection factory.
- * @param jndiType
- * reference to the type of jndi to obtain the JMS objects from
- * @param jndiUrl
- * reference to the location of the jndi to obtain the JMS
- * objects from
+ * @param environment
+ * reference to the jndi properties
* @param messageSelector
* reference to the connection factory.
*/
@@ -181,11 +178,8 @@
* name of the queue/topic.
* @param connection
* reference to the connection factory.
- * @param jndiType
- * reference to the type of jndi to obtain the JMS objects from
- * @param jndiUrl
- * reference to the location of the jndi to obtain the JMS
- * objects from
+ * @param environment
+ * reference to the jndi properties
* @param messageSelector
* reference to the connection factory.
*/
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/eprs/SFTPEpr.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -104,7 +104,7 @@
/**
* Set the Certificate URL for this endpoint.
*
- * @param url
+ * @param cert
* the address.
* @throws URISyntaxException
* thrown if this EPR is malformed.
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierFactory.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -96,7 +96,7 @@
* Obtain a courier which can perform deliveries only and prime it with the "to address" (toEPR).
*
* @param toEPR - the 'to address', the address on where to deliverAsync a Message.
- * @return
+ * @return Courier
* @throws CourierException if the specific courier implementation cannot be created.
*/
public static Courier getCourier(EPR toEPR) throws CourierException, MalformedEPRException
@@ -107,8 +107,8 @@
* Obtain a courier which can perform pickups only and prime it with the "to address" (toEPR)
* and the "replyTo address" (replyToEPR).
*
- * @parem replyToEPR - the 'replyTo address', the address where to deliverAsync the Message we pickup.
- * @return
+ * @param replyToEPR - the 'replyTo address', the address where to deliverAsync the Message we pickup.
+ * @return TwoWayCourier
* @throws CourierException if the specific courier implementation cannot be created.
*/
public static TwoWayCourier getPickupCourier(EPR replyToEPR) throws CourierException, MalformedEPRException
@@ -120,8 +120,8 @@
* the "to address" (toEPR) and the "replyTo address" (replyToEPR).
*
* @param toEPR - the 'to address', the address on where to deliverAsync a Message.
- * @parem replyToEPR - the 'replyTo address', the address where to deliverAsync the Message we pickup.
- * @return
+ * @param replyToEPR - the 'replyTo address', the address where to deliverAsync the Message we pickup.
+ * @return TwoWayCourier
* @throws CourierException if the specific courier implementation cannot be created.
*/
public static TwoWayCourier getCourier(EPR toEPR, EPR replyToEPR) throws CourierException, MalformedEPRException
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/couriers/CourierUtil.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -107,8 +107,8 @@
/**
* Obtain properties and values used in a JMS message selector
- * @param selector: A valid JMS message selector
- * @return: A Properties object containing the keys and values in the message selector
+ * @param selector A valid JMS message selector
+ * @return Properties A Properties object containing the keys and values in the message selector
* @throws ConfigurationException
*/
public static Properties propertiesFromSelector(String selector)
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/Email.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/Email.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/Email.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -67,7 +67,7 @@
* parameters (attachments) are added as child ConfigTrees of the supplied
* ConfigTree.
*
- * @author: Heuristica - Buenos Aires - Argentina
+ * @author Heuristica - Buenos Aires - Argentina
*/
public class Email {
@@ -159,8 +159,6 @@
* The message is sent via a subsequent call to the {@link #sendMessage()}
* method.
*
- * @param p_oMessageParms
- * A ConfigTree object containing the elements mentioned above
* @throws MessagingException
* @throws AddressException
* @see ConfigTree
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/helpers/NamingContext.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -80,7 +80,7 @@
/**
* Refreshing the cached JNDI context, return the new context.
* @param properties
- * @return
+ * @return Context
*/
public static Context getFreshServerContext(Properties properties)
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/properties/MessagePropertyFacade.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/properties/MessagePropertyFacade.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/properties/MessagePropertyFacade.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -59,7 +59,7 @@
/**
* Get the message id.
*
- * @return
+ * @return String
*/
public String getMessageId() {
return (String) message.getProperties().getProperty(MESSAGE_ID);
@@ -77,7 +77,7 @@
/**
* Get the message category.
*
- * @return
+ * @return String
*/
public String getMessageCategory() {
return (String) message.getProperties().getProperty(MESSAGE_CATEGORY);
@@ -95,7 +95,7 @@
/**
* Get the message created date.
*
- * @return
+ * @return Calendar
*/
public Calendar getCreatedDate() {
return (Calendar) message.getProperties().getProperty(MESSAGE_CREATED_DATE);
@@ -113,7 +113,7 @@
/**
* Indicates whether the message was delivered.
*
- * @return
+ * @return Boolean
*/
public Boolean wasDelivered() {
return (Boolean) message.getProperties().getProperty(MESSAGE_DELIVERED);
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/urigen/MessageURIGenerator.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/urigen/MessageURIGenerator.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/urigen/MessageURIGenerator.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -36,7 +36,7 @@
* Generate a unique URI for a message.
*
* @param message
- * @return
+ * @return URI
*/
public URI generateMessageURI(Message message) throws URIGenerationException;
}
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationList.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -98,7 +98,7 @@
* method iterates along it's NotificationTarget child nodes and invokes the
* sendNotification() method with the same object to all of them
*
- * @param p_o
+ * @param message
* Object - The event to notify to all targets
* @throws NotificationException -
* use Exception.getMessage() at runtime
@@ -128,7 +128,7 @@
* <li>A NotificationList can be both OK and Error if no "type"
* attribute was specified at constructor time in the ConfigTree
* argument</li>
- * @see ConfigTree#getAttr(String)
+ * @see ConfigTree#getAttribute(String)
*/
public boolean isOK ()
{
@@ -143,7 +143,7 @@
* <li>A NotificationList can be both OK and Error if no "type"
* attribute was specified at constructor time in the ConfigTree
* argument</li>
- * @see ConfigTree#getAttr(String)
+ * @see ConfigTree#getAttribute(String)
*/
public boolean isErr ()
{
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotificationTarget.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -47,7 +47,7 @@
* Derived classes must implement this method to do what has to be done to
* trigger that specific type of notification event
*
- * @param p_o
+ * @param message
* Object - The toString() method of this object will be the
* actual notification content
* @throws NotificationException -
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyEmail.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -56,7 +56,7 @@
* Email() constructor - The MESSAGE attribute will be filled in
* at sendNotification(Serializable) time
* @throws ConfigurationException
- * @see NotifyEmail#sendNotification(Serializable)
+ * @see NotifyEmail#sendNotification(Message)
*/
public NotifyEmail (ConfigTree p_oP) throws ConfigurationException
{
@@ -85,7 +85,7 @@
* Send an Email using Email() using p_o.toString() to fill in the message
* text
*
- * @param p_o
+ * @param message
* Object - This object's toString() method will supply contents
* of mail message
*/
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFTP.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -83,7 +83,7 @@
/**
* Get the ConfigTree for the 'ftp' element.
*
- * @return
+ * @return ConfigTree
*/
protected ConfigTree getFtpConfig() throws NotificationException {
ConfigTree[] ftps = config.getChildren(CHILD_FTP);
@@ -96,7 +96,7 @@
/**
* Lazy loads filename from config tree.
*
- * @return
+ * @return String
*/
protected String getFileName(Message message) throws NotificationException {
if (fileName == null) {
@@ -116,7 +116,7 @@
*
* @param value
* @param message
- * @return
+ * @return String
*/
protected String replaceArguments(String value, Message message) {
String current = value;
@@ -134,7 +134,7 @@
*
* @param value
* @param message
- * @return
+ * @return String
*/
protected String replaceArgument(String value, Message message) {
int startIndex = value.indexOf('{');
@@ -156,8 +156,7 @@
/**
* Builds an FTP EPR from the configutation data.
*
- * @param config
- * @return
+ * @return FTPEpr
*/
protected FTPEpr getFtpEpr() throws NotificationException {
if (epr == null) {
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyFiles.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -93,7 +93,7 @@
* @param p_oaP
* ConfigTree[] - Each entry must have a "URI" attribute, and can
* have an optional "append" attribute
- * @see ConfigTree#getAttr(String)
+ * @see ConfigTree#getAttribute(String)
*/
protected void setFiles (ConfigTree[] p_oaP)
{
@@ -136,7 +136,7 @@
* Writes the result of p_o into each one of the File objects contained in
* the m_oaOutF array
*
- * @param p_o
+ * @param message
* Object - This object's toString() results will be written to
* (appended to) each one of the files in m_oaOutF
* @see NotifyFiles#setFiles(ConfigTree[])
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -164,7 +164,7 @@
* Send a JMS message using p_o to fill in the message content and the list
* of message properties that will be added to the JMS message header fields
*
- * @param p_o
+ * @param message
* Object - This object or thie object's toString() method will
* supply contents of JMS message
* @see NotifyJMS#CHILD_MSG_PROP
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/services/persistence/MessageStore.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -69,7 +69,7 @@
/**
* Get a map of undelivered messages.
- * @return
+ * @return Map<URI, Message>
* @throws MessageStoreException
*/
public Map<URI, Message> getUndeliveredMessages(String classification) throws MessageStoreException;
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -330,7 +330,7 @@
* Uploads specified file from local directory (localDirURI) to remote
* directory (remoteDirURI)
*
- * @param p_sFile
+ * @param p_oFile
* String : filename to upload
* @throws RemoteFileSystemException :
* if ftp connection cannot be established, or file cannot be
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystem.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystem.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystem.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -131,7 +131,7 @@
* Uploads specified file from local directory (localDirURI) to remote
* directory (remoteDirURI)
*
- * @param p_sFile
+ * @param p_oFile
* String : filename to upload
* @throws RemoteFileSystemException :
* if ftp connection cannot be established, or file cannot be
Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/util/RemoteFileSystemFactory.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -47,7 +47,7 @@
* Refactoring related to JIRA Tasks: JBESB-127 and JBESB-197
* @param p_oEpr
* @param p_bConnect
- * @return
+ * @return RemoteFileSystem
* @throws RemoteFileSystemException
*/
public static RemoteFileSystem getRemoteFileSystem(FTPEpr p_oEpr,
Modified: labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java 2007-05-22 13:35:43 UTC (rev 12083)
+++ labs/jbossesb/trunk/product/core/services/src/org/jboss/soa/esb/services/routing/MessageRouter.java 2007-05-22 13:58:58 UTC (rev 12084)
@@ -69,12 +69,12 @@
* Sends the message on to the service with the name(s) we just obtained
* from the routing.
*
- * @param destinationServices -
- * Collection with the name of the destination services.
+ * @param serviceCategory -
+ * the service category
+ * @param serviceName -
+ * the service name
* @param message -
* the message that needs routing and delivery
- * @param boolean - isSpitter, if true will Tag the messages for
- * aggregation purposes.
*/
@SuppressWarnings("unchecked")
public synchronized static void deliverMessage(
@@ -152,12 +152,10 @@
* Sends the message on to the service with the name(s) we just obtained
* from the routing.
*
- * @param destinationServices -
+ * @param destinations -
* Collection with the name of the destination services.
* @param message -
* the message that needs routing and delivery
- * @param boolean - isSpitter, if true will Tag the messages for
- * aggregation purposes.
*/
@SuppressWarnings("unchecked")
public synchronized static void deliverMessages(
Modified: labs/jbossesb/trunk/product/lib/ext/xbean.jar
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list