Author: scamp
Date: Tue May 3 11:13:16 2005
New Revision: 167946
URL: http://svn.apache.org/viewcvs?rev=167946&view=rev
Log: (empty)
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/http/HttpEmitterTask.java
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/i18n/Keys.java
incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java?rev=167946&r1=167945&r2=167946&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v2004_6/impl/SubscriptionResource.java
Tue May 3 11:13:16 2005
@@ -85,12 +85,12 @@
// wsrlw:ScheduledResourceTermination props
ResourceProperty prop = m_propSet.get(
ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME );
CurrentTimeDocument currTimeDoc =
CurrentTimeDocument.Factory.newInstance();
- currTimeDoc.setCurrentTime( Calendar.getInstance() );
+ currTimeDoc.setCurrentTime( getCurrentTime() );
prop.add( currTimeDoc );
- prop.setCallback( new CurrentTimeCallback() );
+ //prop.setCallback( new CurrentTimeCallback() );
prop = m_propSet.get(
ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME );
TerminationTimeDocument termTimeDoc =
TerminationTimeDocument.Factory.newInstance();
- termTimeDoc.setNilTerminationTime();
+ termTimeDoc.setTerminationTime(getTerminationTime());
// wsntw:SubscriptionManager props
prop = m_propSet.get(
SubscriptionManagerPortType.PROP_QNAME_CONSUMER_REFERENCE );
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java?rev=167946&r1=167945&r2=167946&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/EmitterTask.java
Tue May 3 11:13:16 2005
@@ -182,7 +182,7 @@
LOG.error( MSG.getMessage( Keys.EMISSION_FAILURE,
this.getClass( ),
m_notification,
- t.getCause( ) ) );
+ t.getMessage() ) );
}
else
{
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/http/HttpEmitterTask.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/http/HttpEmitterTask.java?rev=167946&r1=167945&r2=167946&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/http/HttpEmitterTask.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/pubsub/emitter/http/HttpEmitterTask.java
Tue May 3 11:13:16 2005
@@ -71,8 +71,15 @@
SOAPConnection soapConn = SOAPConnectionFactory.newInstance(
).createConnection( );
SOAPMessage response = soapConn.call( getNotification( ),
getDestinationUrl(
).toString( ) );
- LOG.debug( MSG.getMessage( Keys.RESPONSE_TO_EMIT,
- response.toString( ) ) );
+ if (LOG.isDebugEnabled())
+ {
+ if(response != null)
+ {
+ LOG.debug( MSG.getMessage( Keys.RESPONSE_TO_EMIT,
+ response.toString() ) );
+ }
+
+ }
}
catch ( SOAPException e )
{
Modified: incubator/hermes/trunk/src/java/org/apache/ws/pubsub/i18n/Keys.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/pubsub/i18n/Keys.java?rev=167946&r1=167945&r2=167946&view=diff
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/pubsub/i18n/Keys.java
(original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/pubsub/i18n/Keys.java Tue May
3 11:13:16 2005
@@ -69,7 +69,9 @@
/** EMITTING_NOTIFICATION=Emitting notification: destination=[{0}],
notification=[{1}] */
String EMITTING_NOTIFICATION = "EMITTING_NOTIFICATION";
- /** RESPONSE_TO_EMIT=Notification emission complete, server response
follows: [{0}] */
+ /**
+ * @msg SOAP Response to emitted notification: [{0}]
+ **/
String RESPONSE_TO_EMIT = "RESPONSE_TO_EMIT";
/** EMISSION_FAILURE={0} failed to emit notification [{1}]. Cause: {2} */
Modified: incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml?rev=167946&r1=167945&r2=167946&view=diff
==============================================================================
--- incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml (original)
+++ incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Tue May
3 11:13:16 2005
@@ -34,6 +34,15 @@
</parameter>
</resourceParams>
</resource>
+
+ <resource name="topic/eval/concrete"
type="org.apache.ws.notification.topics.impl.ConcreteTopicExpressionEvaluator">
+ <resourceParams>
+ <parameter>
+ <name>factory</name>
+ <value>org.apache.ws.util.jndi.BeanFactory</value>
+ </parameter>
+ </resourceParams>
+ </resource>
<resource name="topic/ContainerTopicExpressionEngine"
type="org.apache.ws.notification.topics.impl.TopicExpressionEngineImpl">
<resourceParams>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
