Author: chamikara
Date: Thu Nov 23 14:27:55 2006
New Revision: 478688
URL: http://svn.apache.org/viewvc?view=rev&rev=478688
Log:
A correction to use the correct operation name for the CreateSequence.
Several minor fixes.
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/SandeshaModule.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/resource.properties
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/SandeshaModule.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/SandeshaModule.java?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/SandeshaModule.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/SandeshaModule.java
Thu Nov 23 14:27:55 2006
@@ -63,6 +63,16 @@
SandeshaPolicyBean propertyBean =
PropertyManager.loadPropertiesFromModuleDescPolicy(module,constantPropertyBean);
if (propertyBean==null) {
+ String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.couldNotLoadModulePolicies);
+ log.error (message);
+ } else {
+ if (log.isDebugEnabled()) {
+ String message =
SandeshaMessageHelper.getMessage(SandeshaMessageKeys.modulePoliciesLoaded);
+ log.info (message);
+ }
+ }
+
+ if (propertyBean==null) {
String message = SandeshaMessageHelper.getMessage(
SandeshaMessageKeys.cannotFindModulePolicies);
log.debug(message);
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/client/SandeshaClient.java
Thu Nov 23 14:27:55 2006
@@ -384,6 +384,14 @@
return newSequenceKey;
}
+ /**
+ * This could be used to create sequences with a given sequence key.
+ *
+ * @param serviceClient - A configured ServiceClient to be used to
invoke RM messages. This need to have Sandesha2 engaged.
+ * @param offer - Weather a sequence should be offered for obtaining
response messages.
+ * @param sequenceKey The sequenceKey of the newly generated sequence.
+ * @throws SandeshaException
+ */
public static void createSequence(ServiceClient serviceClient, boolean
offer, String sequenceKey)
throws SandeshaException {
@@ -400,15 +408,6 @@
options.setProperty(SandeshaClientConstants.SEQUENCE_KEY,
oldSequenceKey);
}
- /**
- * User can terminate the sequence defined by the passed serviceClient.
- *
- * @deprecated
- */
- public static void createSequnce(ServiceClient serviceClient, boolean
offer, String sequenceKey)
- throws SandeshaException {
- createSequence(serviceClient,offer,sequenceKey);
- }
/**
* User can terminate the sequence defined by the passed serviceClient.
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/SandeshaMessageKeys.java
Thu Nov 23 14:27:55 2006
@@ -253,4 +253,7 @@
public final static String invalidOfferNoResponseEndpoint =
"invalidOfferNoResponseEndpoint";
public final static String invalidElementFoundWithinElement =
"invalidElementFoundWithinElement";
+ public final static String couldNotLoadModulePolicies =
"couldNotLoadModulePolicies";
+ public final static String modulePoliciesLoaded = "modulePoliciesLoaded";
+
}
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/resource.properties
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/resource.properties?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/resource.properties
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/i18n/resource.properties
Thu Nov 23 14:27:55 2006
@@ -279,4 +279,7 @@
proofOfPossessionNotVerified = Proof of possession not verified
noSecurityResults = No Security results
noSecConvTokenInPolicy = No SecureConversationToken in policy
-noServicePolicy=Service policy missing
\ No newline at end of file
+noServicePolicy=Service policy missing
+
+couldNotLoadModulePolicies=Could not load module policies. Using default
valies.
+modulePoliciesLoaded=Module policies were successfully loaded
\ No newline at end of file
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/msgprocessors/ApplicationMsgProcessor.java
Thu Nov 23 14:27:55 2006
@@ -540,9 +540,11 @@
internalSequenceId =
SandeshaUtil.getOutgoingSideInternalSequenceID(incomingSeqId);
+
// deciding weather the last message.
String requestLastMsgNoStr =
SandeshaUtil.getSequenceProperty(incomingSeqId,
Sandesha2Constants.SequenceProperties.LAST_IN_MESSAGE_NO, storageManager);
+
if (requestLastMsgNoStr != null) {
long requestLastMsgNo =
Long.parseLong(requestLastMsgNoStr);
if (requestLastMsgNo == requestMsgNo)
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/util/RMMsgCreator.java
Thu Nov 23 14:27:55 2006
@@ -239,7 +239,7 @@
AxisOperation createSeqOperation =
createSeqmsgContext.getAxisOperation();
- createSeqOperation.setName(new
QName("CreateSequenceOperation"));
+ createSeqOperation.setName(new
QName(Sandesha2Constants.RM_IN_OUT_OPERATION_NAME));
if (appMsgOperationDesc != null) {
createSeqOperation.setPhasesOutFlow(appMsgOperationDesc.getPhasesOutFlow());
createSeqOperation.setPhasesOutFaultFlow(appMsgOperationDesc.getPhasesOutFaultFlow());
Modified:
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java?view=diff&rev=478688&r1=478687&r2=478688
==============================================================================
---
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
(original)
+++
webservices/sandesha/branches/sandesha2/java/1_1/src/org/apache/sandesha2/workers/SenderWorker.java
Thu Nov 23 14:27:55 2006
@@ -224,16 +224,14 @@
msgCtx.setProperty(Sandesha2Constants.WITHIN_TRANSACTION,
Sandesha2Constants.VALUE_FALSE);
} catch (SandeshaStorageException e) {
+ String message = "Sender got an Storage exception.
Transaction will be rollbacked";
+ log.error(message,e);
+
if (transaction!=null && transaction.isActive())
transaction.rollback();
- } catch (SandeshaException e) {
- e.printStackTrace();
- } catch (MissingResourceException e) {
- e.printStackTrace();
- } catch (AxisFault e) {
- e.printStackTrace();
} catch (Exception e) {
- e.printStackTrace();
+ String message = "Sender got an exception";
+ log.error(message,e);
} finally {
if (transaction!=null && transaction.isActive())
transaction.commit();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
