Author: chamikara
Date: Fri Jul 6 02:23:47 2007
New Revision: 553808
URL: http://svn.apache.org/viewvc?view=rev&rev=553808
Log:
Corrections to Getter Setter methods. SandeshaPolicyBean was changed to have
set a ConstantsPropertyBean as the parent by default.
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/InvokerBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMDBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/SenderBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
Fri Jul 6 02:23:47 2007
@@ -80,13 +80,13 @@
// continueUncompletedSequences (storageManager,configCtx);
- SandeshaPolicyBean constantPropertyBean =
PropertyManager.loadPropertiesFromDefaultValues();
+ SandeshaPolicyBean constantPropertyBean = new SandeshaPolicyBean ();
SandeshaPolicyBean propertyBean =
PropertyManager.loadPropertiesFromModuleDescPolicy(module,constantPropertyBean);
if (propertyBean==null) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotLoadModulePolicies);
log.error (message);
- propertyBean =
PropertyManager.loadPropertiesFromDefaultValues();
+ propertyBean = new SandeshaPolicyBean ();
} else {
if (log.isDebugEnabled()) {
String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.modulePoliciesLoaded);
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/policy/SandeshaPolicyBean.java
Fri Jul 6 02:23:47 2007
@@ -30,6 +30,7 @@
import org.apache.sandesha2.SandeshaException;
import org.apache.sandesha2.i18n.SandeshaMessageHelper;
import org.apache.sandesha2.i18n.SandeshaMessageKeys;
+import org.apache.sandesha2.util.PropertyManager;
/**
* Used to hold peoperties loaded from sandesha2.properties file or
@@ -92,7 +93,14 @@
private boolean enforceRM;
private boolean enforceRMSet = false;
+ public SandeshaPolicyBean () {
+ //we always set a PolicyBean from Constants as the default parent.
+ PropertyManager.loadPropertiesFromDefaultValues(this);
+
+ }
+
public void setInactiveTimeoutInterval(long value, String measure) {
+
long timeOut = -1;
if (measure == null) {
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/InvokerBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/InvokerBean.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/InvokerBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/InvokerBean.java
Fri Jul 6 02:23:47 2007
@@ -124,6 +124,14 @@
public void setContext(Serializable context) {
this.context = context;
}
+
+ public int getFlags() {
+ return flags;
+ }
+
+ public void setFlags(int flags) {
+ this.flags = flags;
+ }
public String toString() {
StringBuffer result = new StringBuffer();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMDBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMDBean.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMDBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMDBean.java
Fri Jul 6 02:23:47 2007
@@ -188,6 +188,13 @@
this.outboundInternalSequence = outboundSequence;
}
+ public int getRmdFlags() {
+ return rmdFlags;
+ }
+
+ public void setRmdFlags(int rmdFlags) {
+ this.rmdFlags = rmdFlags;
+ }
public String toString() {
StringBuffer result = new StringBuffer();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
Fri Jul 6 02:23:47 2007
@@ -27,6 +27,7 @@
public class RMSBean extends RMSequenceBean {
+
private static final long serialVersionUID = 7051201094510208784L;
/**
@@ -394,6 +395,15 @@
this.soapVersion = soapVersion;
}
+ public int getRmsFlags() {
+ return rmsFlags;
+ }
+
+ public void setRmsFlags(int rmsFlags) {
+ this.rmsFlags = rmsFlags;
+ }
+
+
public String toString() {
StringBuffer result = new StringBuffer();
result.append(this.getClass().getName());
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSequenceBean.java
Fri Jul 6 02:23:47 2007
@@ -37,7 +37,7 @@
private String acksToEPR;
- private String rMVersion;
+ private String RMVersion;
/**
* Comment for <code>securityTokenData</code>
@@ -91,7 +91,7 @@
lastActivatedTime = beanToCopy.getLastActivatedTime();
pollingMode = beanToCopy.isPollingMode();
replyToEPR = beanToCopy.getReplyToEPR();
- rMVersion = beanToCopy.getRMVersion();
+ RMVersion = beanToCopy.getRMVersion();
securityTokenData = beanToCopy.getSecurityTokenData();
sequenceID = beanToCopy.getSequenceID();
terminated = beanToCopy.isTerminated();
@@ -174,17 +174,17 @@
}
public void setLastActivatedTime(long lastActivatedTime) {
- this.lastActivatedTime = lastActivatedTime;
- this.flags |= LAST_ACTIVATED_TIME_FLAG;
- }
-
+ this.lastActivatedTime = lastActivatedTime;
+ this.flags |= LAST_ACTIVATED_TIME_FLAG;
+ }
+
public String getRMVersion() {
- return rMVersion;
- }
+ return RMVersion;
+ }
- public void setRMVersion(String rmVersion) {
- this.rMVersion = rmVersion;
- }
+ public void setRMVersion(String version) {
+ RMVersion = version;
+ }
public String getSecurityTokenData() {
return securityTokenData;
@@ -202,6 +202,14 @@
this.serviceName = serviceName;
}
+ public int getFlags() {
+ return flags;
+ }
+
+ public void setFlags(int flags) {
+ this.flags = flags;
+ }
+
public String toString() {
StringBuffer result = new StringBuffer();
result.append("\nSequence Id : "); result.append(sequenceID);
@@ -212,7 +220,7 @@
result.append("\nClosed : "); result.append(closed);
result.append("\nTerminated : ");
result.append(terminated);
result.append("\nLastActivatedTime: ");
result.append(lastActivatedTime);
- result.append("\nRMVersion : ");
result.append(rMVersion);
+ result.append("\nRMVersion : ");
result.append(RMVersion);
result.append("\nServiceName : ");
result.append(serviceName);
result.append("\nHas SecurityToken: ");
result.append(securityTokenData != null && securityTokenData.length() > 0);
return result.toString();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/SenderBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/SenderBean.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/SenderBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/SenderBean.java
Fri Jul 6 02:23:47 2007
@@ -62,7 +62,7 @@
* If this sender bean is handling a response message, then we record
the sequence id
* of the inbound message that generated this response.
*/
- private String inboundSequence;
+ private String inboundSequenceId;
/**
* Comment for <code>send</code>
@@ -264,11 +264,11 @@
}
public String getInboundSequenceId() {
- return inboundSequence;
+ return inboundSequenceId;
}
- public void setInboundSequenceId(String inboundSequence) {
- this.inboundSequence = inboundSequence;
+ public void setInboundSequenceId(String inboundSequenceId) {
+ this.inboundSequenceId = inboundSequenceId;
}
public boolean isTransportAvailable() {
@@ -278,6 +278,14 @@
public void setTransportAvailable(boolean transportAvailable) {
this.transportAvailable = transportAvailable;
this.flags |= TRANSPORT_FLAG;
+ }
+
+ public int getFlags() {
+ return flags;
+ }
+
+ public void setFlags(int flags) {
+ this.flags = flags;
}
public String toString() {
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/PropertyManager.java
Fri Jul 6 02:23:47 2007
@@ -42,8 +42,7 @@
public class PropertyManager {
- public static SandeshaPolicyBean loadPropertiesFromDefaultValues()
throws SandeshaException {
- SandeshaPolicyBean propertyBean = new SandeshaPolicyBean();
+ public static void loadPropertiesFromDefaultValues(SandeshaPolicyBean
propertyBean) {
propertyBean.setAcknowledgementInterval(Sandesha2Constants.Properties.DefaultValues.AcknowledgementInterval);
propertyBean.setExponentialBackoff(Sandesha2Constants.Properties.DefaultValues.ExponentialBackoff);
propertyBean.setInactiveTimeoutInterval(Sandesha2Constants.Properties.DefaultValues.InactivityTimeout,
@@ -72,7 +71,6 @@
propertyBean.setUseMessageSerialization(Sandesha2Constants.Properties.DefaultValues.UseMessageSerialization);
propertyBean.setEnforceRM(Sandesha2Constants.Properties.DefaultValues.enforceRM);
- return propertyBean;
}
public static SandeshaPolicyBean
loadPropertiesFromPropertyFile(InputStream in) throws SandeshaException {
@@ -476,27 +474,22 @@
}
}
- private static void loadMessageTypesToDrop(String messageTypesToDrop,
SandeshaPolicyBean propertyBean)
- throws SandeshaException {
+ private static void loadMessageTypesToDrop(String messageTypesToDrop,
SandeshaPolicyBean propertyBean) {
- try {
- if (messageTypesToDrop != null &&
!Sandesha2Constants.VALUE_NONE.equals(messageTypesToDrop)) {
- messageTypesToDrop = messageTypesToDrop.trim();
- messageTypesToDrop = "[" + messageTypesToDrop +
"]";
- ArrayList messageTypesLst =
SandeshaUtil.getArrayListFromString(messageTypesToDrop);
-
- Iterator itr = messageTypesLst.iterator();
- while (itr.hasNext()) {
- String typeStr = (String) itr.next();
- Integer typeNo = new Integer(typeStr);
- propertyBean.addMsgTypeToDrop(typeNo);
- }
+ if (messageTypesToDrop != null
+ &&
!Sandesha2Constants.VALUE_NONE.equals(messageTypesToDrop)) {
+ messageTypesToDrop = messageTypesToDrop.trim();
+ messageTypesToDrop = "[" + messageTypesToDrop + "]";
+ ArrayList messageTypesLst =
SandeshaUtil.getArrayListFromString(messageTypesToDrop);
+
+ Iterator itr = messageTypesLst.iterator();
+ while (itr.hasNext()) {
+ String typeStr = (String) itr.next();
+ Integer typeNo = new Integer(typeStr);
+ propertyBean.addMsgTypeToDrop(typeNo);
}
- } catch (NumberFormatException e) {
- String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.propertyInvalidValue,
-
Sandesha2Constants.Properties.MessageTypesToDrop);
- throw new SandeshaException(message, e);
}
+
}
/**
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/SandeshaUtil.java
Fri Jul 6 02:23:47 2007
@@ -519,7 +519,7 @@
}
//TODO change this method.
- public static ArrayList getArrayListFromString(String str) throws
SandeshaException {
+ public static ArrayList getArrayListFromString(String str) {
if (str == null || "".equals(str))
return new ArrayList();
@@ -529,7 +529,7 @@
SandeshaMessageKeys.invalidStringArray,
str);
log.debug(message);
- throw new SandeshaException(message);
+ throw new IllegalArgumentException (message);
}
int length = str.length();
@@ -538,7 +538,7 @@
String message = SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.invalidStringArray,
str);
log.debug(message);
- throw new SandeshaException(message);
+ throw new IllegalArgumentException(message);
}
ArrayList retArr = new ArrayList();
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/InvokerBeanMgrTest.java
Fri Jul 6 02:23:47 2007
@@ -40,7 +40,7 @@
public void setUp() throws Exception {
AxisConfiguration axisConfig = new AxisConfiguration();
- SandeshaPolicyBean propertyBean =
PropertyManager.loadPropertiesFromDefaultValues();
+ SandeshaPolicyBean propertyBean = new SandeshaPolicyBean ();
Parameter parameter = new Parameter ();
parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
parameter.setValue(propertyBean);
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMDBeanMgrTest.java
Fri Jul 6 02:23:47 2007
@@ -40,7 +40,7 @@
public void setUp() throws Exception {
AxisConfiguration axisConfig = new AxisConfiguration();
- SandeshaPolicyBean propertyBean =
PropertyManager.loadPropertiesFromDefaultValues();
+ SandeshaPolicyBean propertyBean = new SandeshaPolicyBean ();
Parameter parameter = new Parameter ();
parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
parameter.setValue(propertyBean);
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/RMSBeanMgrTest.java
Fri Jul 6 02:23:47 2007
@@ -41,7 +41,7 @@
public void setUp() throws Exception {
AxisConfiguration axisConfig = new AxisConfiguration();
- SandeshaPolicyBean propertyBean =
PropertyManager.loadPropertiesFromDefaultValues();
+ SandeshaPolicyBean propertyBean = new SandeshaPolicyBean ();
Parameter parameter = new Parameter ();
parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
parameter.setValue(propertyBean);
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java?view=diff&rev=553808&r1=553807&r2=553808
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/storage/SenderBeanMgrTest.java
Fri Jul 6 02:23:47 2007
@@ -42,7 +42,7 @@
public void setUp() throws Exception {
AxisConfiguration axisConfig = new AxisConfiguration();
- SandeshaPolicyBean propertyBean =
PropertyManager.loadPropertiesFromDefaultValues();
+ SandeshaPolicyBean propertyBean = new SandeshaPolicyBean ();
Parameter parameter = new Parameter ();
parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);
parameter.setValue(propertyBean);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
