diff options
author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-02 04:29:04 +0000 |
---|---|---|
committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2009-09-02 04:29:04 +0000 |
commit | 36ff4f08abdcf2ccf0fc816ff7bbc54eec2f11c1 (patch) | |
tree | 688c11526a0a8ce0a66a2ba73cd174b6689fece6 /branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany | |
parent | 60b0359c6b93e39dbfcdab2e62b3b0fb602e02c6 (diff) |
Conversion to JUnit 4.5 + Cleaning up System.out
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@810356 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany')
3 files changed, 27 insertions, 28 deletions
diff --git a/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java b/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java index 9575b2ebd0..dd748fec85 100644 --- a/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java +++ b/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingInvoker.java @@ -140,7 +140,7 @@ class GdataBindingInvoker implements Invoker, DataExchangeSemantics { @Override public Message invoke(Message msg) { - System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- invoke method reached"); + //System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- invoke method reached"); // Post an entry Object[] args = (Object[])msg.getBody(); com.google.gdata.data.Entry feedEntry = null; @@ -149,10 +149,10 @@ class GdataBindingInvoker implements Invoker, DataExchangeSemantics { // Expect an GData entry - System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- supportsFeedEntries: " + provider.supportsFeedEntries()); + //System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- supportsFeedEntries: " + provider.supportsFeedEntries()); feedEntry = (com.google.gdata.data.Entry)args[0]; - System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- feedEntry title: " + feedEntry.getTitle().getPlainText()); + //System.out.println("[Debug Info]GdataBindingInvoker.PostInvoker --- feedEntry title: " + feedEntry.getTitle().getPlainText()); } else { // Expect a key and data item @@ -222,7 +222,7 @@ class GdataBindingInvoker implements Invoker, DataExchangeSemantics { com.google.gdata.data.Entry toUpdateEntry = googleService.getEntry(entryURL, com.google.gdata.data.Entry.class); - System.out.println("EditHtml:" + toUpdateEntry.getEditLink().getHref()); + //System.out.println("EditHtml:" + toUpdateEntry.getEditLink().getHref()); URL editURL = new URL(toUpdateEntry.getEditLink().getHref()); @@ -269,7 +269,7 @@ class GdataBindingInvoker implements Invoker, DataExchangeSemantics { com.google.gdata.data.Entry toUpdateEntry = googleService.getEntry(entryURL, com.google.gdata.data.Entry.class); - System.out.println("EditHtml:" + toUpdateEntry.getEditLink().getHref()); + //System.out.println("EditHtml:" + toUpdateEntry.getEditLink().getHref()); URL editURL = new URL(toUpdateEntry.getEditLink().getHref()); @@ -309,7 +309,7 @@ class GdataBindingInvoker implements Invoker, DataExchangeSemantics { GetMethod getMethod = new GetMethod(uri); getMethod.setRequestHeader("Authorization", authorizationHeader); - System.out.println("[Debug Info] GdataBindingInvoker.GetAllInvoker.invoke---feedURL: " + uri); + //System.out.println("[Debug Info] GdataBindingInvoker.GetAllInvoker.invoke---feedURL: " + uri); try { @@ -354,7 +354,7 @@ class GdataBindingInvoker implements Invoker, DataExchangeSemantics { Object[] args = (Object[])msg.getBody(); Query myQuery = (Query)args[0]; - System.out.println("[Debug Info] GdataBindingInvoker.QueryInvoker.invoke---feedURL: " + uri); + //System.out.println("[Debug Info] GdataBindingInvoker.QueryInvoker.invoke---feedURL: " + uri); try { diff --git a/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java b/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java index a615b2067e..34d6ca85dc 100644 --- a/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java +++ b/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataBindingListenerServlet.java @@ -158,7 +158,7 @@ class GdataBindingListenerServlet extends HttpServlet { qname = new QName(qname.getNamespaceURI(), itemClass.getSimpleName()); itemClassType = new DataTypeImpl<XMLType>("java:complexType", itemClass, new XMLType(qname, null)); - System.out.println("[Debug Info]GdataBindingListenerServlet --- initilized!"); + //System.out.println("[Debug Info]GdataBindingListenerServlet --- initilized!"); } @@ -166,14 +166,13 @@ class GdataBindingListenerServlet extends HttpServlet { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { // No authentication required for a get request - System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- I am good here 00"); + //System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- I am good here 00"); // Get the request path String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8"); - System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- request.getRequestURI(): " + request - .getRequestURI()); - System.out.println("[Debug Info]GdataBindingListenerServlet doGet()--- path: " + path); + //System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- request.getRequestURI(): " + request.getRequestURI()); + //System.out.println("[Debug Info]GdataBindingListenerServlet doGet()--- path: " + path); // FIXME: Log this get http request, commented out for testing logger.fine("get " + request.getRequestURI()); @@ -218,25 +217,25 @@ class GdataBindingListenerServlet extends HttpServlet { // get HTTP request asking for a feed - System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- I am good here brach 02"); + //System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- I am good here brach 02"); // Return a feed containing the entries in the collection com.google.gdata.data.Feed feed = null; if (supportsFeedEntries) { - System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- supportsFeedEntries: " + supportsFeedEntries); + //System.out.println("[Debug Info]GdataBindingListenerServlet doGet() --- supportsFeedEntries: " + supportsFeedEntries); // The service implementation supports feed entries, invoke its // getFeed operation Message requestMessage = messageFactory.createMessage(); Message responseMessage; if (request.getQueryString() != null) { - System.out.println("getQueryString != null"); + //System.out.println("getQueryString != null"); requestMessage.setBody(new Object[] {request.getQueryString()}); responseMessage = queryInvoker.invoke(requestMessage); } else { - System.out.println("getQueryString == null"); + //System.out.println("getQueryString == null"); responseMessage = getFeedInvoker.invoke(requestMessage); } if (responseMessage.isFault()) { @@ -247,11 +246,11 @@ class GdataBindingListenerServlet extends HttpServlet { feed = (com.google.gdata.data.Feed)responseMessage.getBody(); - System.out.println("feed title: " + feed.getTitle().getPlainText()); + //System.out.println("feed title: " + feed.getTitle().getPlainText()); } else { - System.out.println("GdataBindingListenerServlet doGet(): do not supportsFeedEntries"); + //System.out.println("GdataBindingListenerServlet doGet(): do not supportsFeedEntries"); // The service implementation does not support feed entries, // invoke its getAll operation to get the data item collection, @@ -317,7 +316,7 @@ class GdataBindingListenerServlet extends HttpServlet { out.println(stringWriter.toString()); out.close(); - System.out.println("Feed content in plain text:" + stringWriter.toString()); + //System.out.println("Feed content in plain text:" + stringWriter.toString()); } else { response.sendError(HttpServletResponse.SC_NOT_FOUND); } @@ -342,7 +341,7 @@ class GdataBindingListenerServlet extends HttpServlet { // The service implementation returns a feed entry feedEntry = (com.google.gdata.data.Entry)responseMessage.getBody(); - System.out.println("entry title: " + feedEntry.getTitle().getPlainText()); + //System.out.println("entry title: " + feedEntry.getTitle().getPlainText()); } else { // The service implementation only returns a data item, create @@ -387,7 +386,7 @@ class GdataBindingListenerServlet extends HttpServlet { protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - System.out.println("[Debug Info]GdataBindingListenerServlet doPost() --- reached"); + //System.out.println("[Debug Info]GdataBindingListenerServlet doPost() --- reached"); // Authenticate the user String user = processAuthorizationHeader(request); @@ -399,7 +398,7 @@ class GdataBindingListenerServlet extends HttpServlet { // Get the request path String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8"); - System.out.println("[Debug Info]GdataBindingListenerServlet path --- " + path); + //System.out.println("[Debug Info]GdataBindingListenerServlet path --- " + path); if (path == null || path.length() == 0 || path.equals("/")) { // Create a new Gdata entry @@ -534,7 +533,7 @@ class GdataBindingListenerServlet extends HttpServlet { // Get the request path String path = request.getRequestURI().substring(request.getServletPath().length()); - System.out.println("[Debug Info] localServlet doPut --- path: " + path); + //System.out.println("[Debug Info] localServlet doPut --- path: " + path); if (path != null && path.startsWith("/")) { String id = path.substring(1); @@ -549,7 +548,7 @@ class GdataBindingListenerServlet extends HttpServlet { ParseSource source = new ParseSource(request.getReader()); feedEntry = com.google.gdata.data.Entry.readEntry(source, com.google.gdata.data.Entry.class, null); - System.out.println("[Debug Info] localServlet doPut --- feedEntry title: " + feedEntry.getTitle().getPlainText()); + //System.out.println("[Debug Info] localServlet doPut --- feedEntry title: " + feedEntry.getTitle().getPlainText()); } catch (ParseException pe) { throw new ServletException(pe); } catch (com.google.gdata.util.ParseException e) { @@ -565,7 +564,7 @@ class GdataBindingListenerServlet extends HttpServlet { // Let the component implementation create it if (supportsFeedEntries) { - System.out.println("[Debug Info] localServlet doPut --- supportsFeedEntries: " + supportsFeedEntries); + //System.out.println("[Debug Info] localServlet doPut --- supportsFeedEntries: " + supportsFeedEntries); // The service implementation supports feed entries, pass // the entry to it diff --git a/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java b/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java index 7656754bca..ac8c298d1a 100644 --- a/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java +++ b/branches/sca-java-1.x/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GdataReferenceBindingProvider.java @@ -88,9 +88,9 @@ class GdataReferenceBindingProvider implements ReferenceBindingProvider { String usernane = binding.getUsername(); String password = binding.getPassword(); - System.out.println("[Debug Info] binding.getServiceType()" + serviceType); - System.out.println("[Debug Info] binding.getName()" +usernane); - System.out.println("[Debug Info] binding.getPassword()" + password); + //System.out.println("[Debug Info] binding.getServiceType()" + serviceType); + //System.out.println("[Debug Info] binding.getName()" +usernane); + //System.out.println("[Debug Info] binding.getPassword()" + password); googleService = new GoogleService(serviceType, ""); if(binding.getUsername().equals("admin") == false && binding.getPassword().equals("admin")==false){ |