[Smartfrog-checkins] core/components/deployapi/src/org/smartfrog/services/deployapi/alpineclient/model PortalSession.java, 1.6, 1.7 SystemSession.java, 1.10, 1.11 WsrfSession.java, 1.7, 1.8

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/alpineclient/model
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10847/deployapi/src/org/smartfrog/services/deployapi/alpineclient/model

Modified Files:
	PortalSession.java SystemSession.java WsrfSession.java 
Log Message:
actions are URIs too

Index: WsrfSession.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/alpineclient/model/WsrfSession.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WsrfSession.java	6 Jun 2006 16:14:47 -0000	1.7
--- WsrfSession.java	7 Jun 2006 15:52:20 -0000	1.8
***************
*** 40,43 ****
--- 40,44 ----
  import javax.xml.namespace.QName;
  import java.util.List;
+ import java.net.URI;
  
  
***************
*** 104,114 ****
      }
  
      /**
!      * Bind to an address; forces us to use the
!      * {@link Constants.WS_ADDRESSING_NAMESPACE} namespace for WSA, and
!      * mark the headers as MustUnderstand.
!      *
!      * @param endpoint
!      */
      public void bind(AlpineEPR endpoint) {
          super.bind(endpoint);
--- 105,116 ----
      }
  
+ 
      /**
!     * Bind to an address; forces us to use the
!     * {@link Constants.WS_ADDRESSING_NAMESPACE} namespace for WSA, and
!     * mark the headers as MustUnderstand.
!     *
!     * @param endpoint
!     */
      public void bind(AlpineEPR endpoint) {
          super.bind(endpoint);
***************
*** 159,163 ****
          //and the value
          request.appendChild(prefix + ":" + property.getLocalPart());
!         return queue(CddlmConstants.WSRF_OPERATION_GETRESOURCEPROPERTY, request);
      }
  
--- 161,165 ----
          //and the value
          request.appendChild(prefix + ":" + property.getLocalPart());
!         return queue(getSoapAction(request), request);
      }
  
***************
*** 194,197 ****
--- 196,200 ----
          if(fault!=null) {
              tx.addMessagesToFault(fault);
+             getLog().error(fault.toString(),fault);
              throw fault;
          }
***************
*** 241,245 ****
              request.appendChild(child);
          }
!         return queue(CddlmConstants.WSRF_OPERATION_GETRESOURCEPROPERTY, request);
      }
  
--- 244,248 ----
              request.appendChild(child);
          }
!         return queue(getSoapAction(request), request);
      }
  
***************
*** 268,272 ****
          SoapElement request;
          request = new SoapElement(QNAME_WSRF_RL_DESTROY_REQUEST);
!         return queue(CddlmConstants.WSRF_OPERATION_DESTROY, request);
      }
  
--- 271,275 ----
          SoapElement request;
          request = new SoapElement(QNAME_WSRF_RL_DESTROY_REQUEST);
!         return queue(request);
      }
  

Index: PortalSession.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/alpineclient/model/PortalSession.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PortalSession.java	27 Apr 2006 15:27:00 -0000	1.6
--- PortalSession.java	7 Jun 2006 15:52:20 -0000	1.7
***************
*** 24,27 ****
--- 24,28 ----
  import org.ggf.cddlm.generated.api.CddlmConstants;
  import org.smartfrog.projects.alpine.om.soap11.MessageDocument;
+ import org.smartfrog.projects.alpine.om.base.SoapElement;
  import org.smartfrog.projects.alpine.transport.Transmission;
  import org.smartfrog.projects.alpine.transport.TransmitQueue;
***************
*** 57,64 ****
  
      public Transmission beginLookupSystem(String id) {
!         Element resid = XomHelper.apiElement("ResourceId", id);
!         Element request;
          request = XomHelper.apiElement(API_ELEMENT_LOOKUPSYSTEM_REQUEST, resid);
!         return queue(Constants.API_PORTAL_OPERATION_LOOKUPSYSTEM, request);
      }
  
--- 58,66 ----
  
      public Transmission beginLookupSystem(String id) {
!         SoapElement resid = XomHelper.apiElement("ResourceId", id);
!         SoapElement request;
          request = XomHelper.apiElement(API_ELEMENT_LOOKUPSYSTEM_REQUEST, resid);
!         //return queue(Constants.API_PORTAL_OPERATION_LOOKUPSYSTEM, request);
!         return queue(request);
      }
  
***************
*** 101,105 ****
       */
      public Transmission beginCreate(String hostname) {
!         Element request;
          request = XomHelper.apiElement(Constants.API_ELEMENT_CREATE_REQUEST);
          if (hostname != null) {
--- 103,107 ----
       */
      public Transmission beginCreate(String hostname) {
!         SoapElement request;
          request = XomHelper.apiElement(Constants.API_ELEMENT_CREATE_REQUEST);
          if (hostname != null) {
***************
*** 107,111 ****
              request.appendChild(child);
          }
!         return queue(Constants.API_PORTAL_OPERATION_CREATE, request);
      }
  
--- 109,113 ----
              request.appendChild(child);
          }
!         return queue(request);
      }
  

Index: SystemSession.java
===================================================================
RCS file: /cvsroot/smartfrog/core/components/deployapi/src/org/smartfrog/services/deployapi/alpineclient/model/SystemSession.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SystemSession.java	19 May 2006 13:00:03 -0000	1.10
--- SystemSession.java	7 Jun 2006 15:52:20 -0000	1.11
***************
*** 76,80 ****
          SoapElement request;
          request = XomHelper.apiElement(API_ELEMENT_PING_REQUEST);
!         return queue(API_SYSTEM_OPERATION_PING, request);
      }
  
--- 76,81 ----
          SoapElement request;
          request = XomHelper.apiElement(API_ELEMENT_PING_REQUEST);
!         //return queue(API_SYSTEM_OPERATION_PING, request);
!         return queue(request);
      }
  
***************
*** 101,105 ****
      }
  
!     protected MessageDocument invokeBlocking(String operation,Element request) {
          Transmission transmission = queue(operation, request);
          return transmission.blockForResult(getTimeout());
--- 102,106 ----
      }
  
!     protected MessageDocument invokeBlocking(String operation,SoapElement request) {
          Transmission transmission = queue(operation, request);
          return transmission.blockForResult(getTimeout());
***************
*** 113,117 ****
       */
      public MessageDocument run()  {
!         Element request;
          request = apiElement(API_ELEMENT_RUN_REQUEST);
          MessageDocument document = invokeBlocking(API_SYSTEM_OPERATION_RUN,
--- 114,118 ----
       */
      public MessageDocument run()  {
!         SoapElement request;
          request = apiElement(API_ELEMENT_RUN_REQUEST);
          MessageDocument document = invokeBlocking(API_SYSTEM_OPERATION_RUN,
***************
*** 143,147 ****
       * @return the response
       */
!     public MessageDocument initialize(Element request)  {
          return invokeBlocking(API_SYSTEM_OPERATION_INITIALIZE,
                  request);
--- 144,148 ----
       * @return the response
       */
!     public MessageDocument initialize(SoapElement request)  {
          return invokeBlocking(API_SYSTEM_OPERATION_INITIALIZE,
                  request);
***************
*** 166,171 ****
       * @return the list of URIs
       */
!     public UriListType addFile(Element request) {
!         return endAddFile(queue(API_SYSTEM_OPERATION_ADDFILE,request));
      }
  
--- 167,174 ----
       * @return the list of URIs
       */
!     public UriListType addFile(SoapElement request) {
!         //Transmission transmission = queue(API_SYSTEM_OPERATION_ADDFILE, request);
!         Transmission transmission = queue(request);
!         return endAddFile(transmission);
      }