You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by me...@apache.org on 2007/02/01 01:13:49 UTC
svn commit: r502057 - in
/incubator/tuscany/java/sca/runtime/services/discovery/jxta/src:
main/java/org/apache/tuscany/service/discovery/jxta/
main/java/org/apache/tuscany/service/discovery/jxta/prp/
main/java/org/apache/tuscany/service/discovery/jxta/...
Author: meerajk
Date: Wed Jan 31 16:13:48 2007
New Revision: 502057
URL: http://svn.apache.org/viewvc?view=rev&rev=502057
Log:
Removed StaxHelper.
Removed:
incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/stax/
incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/stax/
Modified:
incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/prp/TuscanyQueryHandler.java
incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTestCase.java
Modified: incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java?view=diff&rev=502057&r1=502056&r2=502057
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryService.java Wed Jan 31 16:13:48 2007
@@ -24,6 +24,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import javax.security.cert.CertificateException;
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import net.jxta.credential.AuthenticationCredential;
@@ -44,11 +45,11 @@
import org.apache.tuscany.service.discovery.jxta.pdp.PeerListener;
import org.apache.tuscany.service.discovery.jxta.prp.TuscanyQueryHandler;
-import org.apache.tuscany.service.discovery.jxta.stax.StaxHelper;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.services.discovery.AbstractDiscoveryService;
import org.apache.tuscany.spi.services.discovery.DiscoveryException;
import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.util.stax.StaxUtil;
import org.omg.CORBA.Any;
import org.osoa.sca.annotations.Property;
@@ -180,7 +181,13 @@
}
}
- final String message = StaxHelper.serialize(content);
+ String message = null;
+ try {
+ StaxUtil.serialize(content);
+ } catch(XMLStreamException ex) {
+ throw new DiscoveryException(ex);
+ }
+
int messageId = messageIdGenerator.incrementAndGet();
ResolverQuery query = new ResolverQuery();
Modified: incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/prp/TuscanyQueryHandler.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/prp/TuscanyQueryHandler.java?view=diff&rev=502057&r1=502056&r2=502057
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/prp/TuscanyQueryHandler.java (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/main/java/org/apache/tuscany/service/discovery/jxta/prp/TuscanyQueryHandler.java Wed Jan 31 16:13:48 2007
@@ -19,6 +19,7 @@
package org.apache.tuscany.service.discovery.jxta.prp;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import net.jxta.impl.protocol.ResolverResponse;
@@ -28,9 +29,10 @@
import net.jxta.resolver.ResolverService;
import org.apache.tuscany.service.discovery.jxta.JxtaDiscoveryService;
-import org.apache.tuscany.service.discovery.jxta.stax.StaxHelper;
+import org.apache.tuscany.service.discovery.jxta.JxtaException;
import org.apache.tuscany.spi.services.discovery.RequestListener;
import org.apache.tuscany.spi.services.discovery.ResponseListener;
+import org.apache.tuscany.spi.util.stax.StaxUtil;
/**
* Generic quety handler for tuscany PRP (Peer Resolver Protocol) messages. The
@@ -63,28 +65,34 @@
*/
public int processQuery(ResolverQueryMsg queryMessage) {
- final String message = queryMessage.getQuery();
- final int queryId = queryMessage.getQueryId();
- final String source = queryMessage.getSrc();
- final String handler = queryMessage.getHandlerName();
-
- final QName messageType = StaxHelper.getDocumentElementQName(message);
- RequestListener messageListener = discoveryService.getRequestListener(messageType);
- if(messageListener != null) {
-
- XMLStreamReader requestReader = StaxHelper.createReader(message);
- XMLStreamReader responseReader = messageListener.onRequest(requestReader);
- String response = StaxHelper.serialize(responseReader);
-
- ResolverResponse responseMessage = new ResolverResponse();
- responseMessage.setResponse(response);
- responseMessage.setHandlerName(handler);
- responseMessage.setQueryId(queryId);
-
- resolverService.sendResponse(source, responseMessage);
+ try {
+
+ final String message = queryMessage.getQuery();
+ final int queryId = queryMessage.getQueryId();
+ final String source = queryMessage.getSrc();
+ final String handler = queryMessage.getHandlerName();
+
+ final QName messageType = StaxUtil.getDocumentElementQName(message);
+ RequestListener messageListener = discoveryService.getRequestListener(messageType);
+ if(messageListener != null) {
+
+ XMLStreamReader requestReader = StaxUtil.createReader(message);
+ XMLStreamReader responseReader = messageListener.onRequest(requestReader);
+ String response = StaxUtil.serialize(responseReader);
+
+ ResolverResponse responseMessage = new ResolverResponse();
+ responseMessage.setResponse(response);
+ responseMessage.setHandlerName(handler);
+ responseMessage.setQueryId(queryId);
+
+ resolverService.sendResponse(source, responseMessage);
+
+ }
+ return ResolverService.OK;
+ } catch(XMLStreamException ex) {
+ throw new JxtaException(ex);
}
- return ResolverService.OK;
}
@@ -93,14 +101,20 @@
*/
public void processResponse(ResolverResponseMsg responseMessage) {
- final String message = responseMessage.getResponse();
- final int queryId = responseMessage.getQueryId();
-
- final QName messageType = StaxHelper.getDocumentElementQName(message);
- ResponseListener messageListener = discoveryService.getResponseListener(messageType);
- if(messageListener != null) {
- XMLStreamReader responseReader = StaxHelper.createReader(message);
- messageListener.onResponse(responseReader, queryId);
+ try {
+
+ final String message = responseMessage.getResponse();
+ final int queryId = responseMessage.getQueryId();
+
+ final QName messageType = StaxUtil.getDocumentElementQName(message);
+ ResponseListener messageListener = discoveryService.getResponseListener(messageType);
+ if(messageListener != null) {
+ XMLStreamReader responseReader = StaxUtil.createReader(message);
+ messageListener.onResponse(responseReader, queryId);
+ }
+
+ } catch(XMLStreamException ex) {
+ throw new JxtaException(ex);
}
}
Modified: incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTestCase.java?view=diff&rev=502057&r1=502056&r2=502057
==============================================================================
--- incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/services/discovery/jxta/src/test/java/org/apache/tuscany/service/discovery/jxta/JxtaDiscoveryServiceTestCase.java Wed Jan 31 16:13:48 2007
@@ -24,16 +24,17 @@
import java.net.URL;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import net.jxta.platform.NetworkConfigurator;
import org.apache.tuscany.host.RuntimeInfo;
-import org.apache.tuscany.service.discovery.jxta.stax.StaxHelper;
import org.apache.tuscany.spi.services.discovery.RequestListener;
import org.apache.tuscany.spi.services.discovery.ResponseListener;
import org.apache.tuscany.spi.services.work.NotificationListener;
import org.apache.tuscany.spi.services.work.WorkScheduler;
+import org.apache.tuscany.spi.util.stax.StaxUtil;
import junit.framework.TestCase;
@@ -63,14 +64,16 @@
RequestListener requestListener = new RequestListener() {
public XMLStreamReader onRequest(XMLStreamReader content) {
- System.err.println("Request received:" + StaxHelper.serialize(content));
- return StaxHelper.createReader("<response/>");
+ try {
+ return StaxUtil.createReader("<response/>");
+ } catch(XMLStreamException ex) {
+ throw new JxtaException(ex);
+ }
}
};
ResponseListener responseListener = new ResponseListener() {
public void onResponse(XMLStreamReader content, int messageId) {
- System.err.println("Response received:" + StaxHelper.serialize(content));
}
};
@@ -78,7 +81,7 @@
discoveryService.registerRequestListener(new QName("request"), requestListener);
discoveryService.registerResponseListener(new QName("response"), responseListener);
- XMLStreamReader reader = StaxHelper.createReader("<request/>");
+ XMLStreamReader reader = StaxUtil.createReader("<request/>");
discoveryService.sendMessage(null, reader);
reader.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org