magicmap-commits — SVN commits

[Magicmap-commits] magicmapclient/src/localhost/magicmap/services/SessionFacade SessionFacadeServiceLocator.java,1.1,1.2 SessionFacadeSoapBindingStub.java,1.1,1.2 SessionFacadeService.java,1.1,1.2 SessionFacade.java,1.1,1.2

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/SessionFacade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/localhost/magicmap/services/SessionFacade

Modified Files:
	SessionFacadeServiceLocator.java 
	SessionFacadeSoapBindingStub.java SessionFacadeService.java 
	SessionFacade.java 
Log Message:
+ Client is usable without server

Index: SessionFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/SessionFacade/SessionFacade.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionFacade.java	12 Feb 2005 16:00:27 -0000	1.1
--- SessionFacade.java	11 May 2005 10:51:29 -0000	1.2
***************
*** 9,13 ****
  
  public interface SessionFacade extends java.rmi.Remote {
!     public long connect(java.lang.String name, java.lang.String mac, java.lang.String passwd, java.lang.String version) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException;
!     public void disconnect(java.lang.String name, java.lang.String mac, java.lang.String passwd, long sessionId) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException;
! }
--- 9,17 ----
  
  public interface SessionFacade extends java.rmi.Remote {
! 
!   public long connect(java.lang.String name, java.lang.String mac, java.lang.String passwd, java.lang.String version)
!       throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException;
! 
!   public void disconnect(java.lang.String name, java.lang.String mac, java.lang.String passwd, long sessionId)
!       throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException;
! }
\ No newline at end of file

Index: SessionFacadeService.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/SessionFacade/SessionFacadeService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionFacadeService.java	12 Feb 2005 16:00:27 -0000	1.1
--- SessionFacadeService.java	11 May 2005 10:51:29 -0000	1.2
***************
*** 9,16 ****
  
  public interface SessionFacadeService extends javax.xml.rpc.Service {
-     public java.lang.String getSessionFacadeAddress();
  
!     public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade() throws javax.xml.rpc.ServiceException;
  
!     public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
! }
--- 9,19 ----
  
  public interface SessionFacadeService extends javax.xml.rpc.Service {
  
!   public java.lang.String getSessionFacadeAddress();
  
!   public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade()
!       throws javax.xml.rpc.ServiceException;
! 
!   public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade(java.net.URL portAddress)
!       throws javax.xml.rpc.ServiceException;
! }
\ No newline at end of file

Index: SessionFacadeServiceLocator.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/SessionFacade/SessionFacadeServiceLocator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionFacadeServiceLocator.java	12 Feb 2005 16:00:27 -0000	1.1
--- SessionFacadeServiceLocator.java	11 May 2005 10:51:29 -0000	1.2
***************
*** 8,136 ****
  package localhost.magicmap.services.SessionFacade;
  
! public class SessionFacadeServiceLocator extends org.apache.axis.client.Service implements localhost.magicmap.services.SessionFacade.SessionFacadeService {
  
!     public SessionFacadeServiceLocator() {
!     }
  
  
!     public SessionFacadeServiceLocator(org.apache.axis.EngineConfiguration config) {
!         super(config);
!     }
  
!     // Use to get a proxy class for SessionFacade
!     private java.lang.String SessionFacade_address = "http://localhost:8080/magicmap/services/SessionFacade";
  
!     public java.lang.String getSessionFacadeAddress() {
!         return SessionFacade_address;
!     }
  
!     // The WSDD service name defaults to the port name.
!     private java.lang.String SessionFacadeWSDDServiceName = "SessionFacade";
  
!     public java.lang.String getSessionFacadeWSDDServiceName() {
!         return SessionFacadeWSDDServiceName;
!     }
  
!     public void setSessionFacadeWSDDServiceName(java.lang.String name) {
!         SessionFacadeWSDDServiceName = name;
      }
  
!     public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade() throws javax.xml.rpc.ServiceException {
!        java.net.URL endpoint;
!         try {
!             endpoint = new java.net.URL(SessionFacade_address);
!         }
!         catch (java.net.MalformedURLException e) {
!             throw new javax.xml.rpc.ServiceException(e);
!         }
!         return getSessionFacade(endpoint);
      }
  
!     public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade(java.net.URL portAddress) throws javax.xml.rpc.ServiceException {
!         try {
!             localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub _stub = new localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub(portAddress, this);
!             _stub.setPortName(getSessionFacadeWSDDServiceName());
!             return _stub;
!         }
!         catch (org.apache.axis.AxisFault e) {
!             return null;
!         }
!     }
  
!     public void setSessionFacadeEndpointAddress(java.lang.String address) {
!         SessionFacade_address = address;
      }
  
!     /**
!      * For the given interface, get the stub implementation.
!      * If this service has no port for the given interface,
!      * then ServiceException is thrown.
!      */
!     public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
!         try {
!             if (localhost.magicmap.services.SessionFacade.SessionFacade.class.isAssignableFrom(serviceEndpointInterface)) {
!                 localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub _stub = new localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub(new java.net.URL(SessionFacade_address), this);
!                 _stub.setPortName(getSessionFacadeWSDDServiceName());
!                 return _stub;
!             }
!         }
!         catch (java.lang.Throwable t) {
!             throw new javax.xml.rpc.ServiceException(t);
!         }
!         throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface:  " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
      }
! 
!     /**
!      * For the given interface, get the stub implementation.
!      * If this service has no port for the given interface,
!      * then ServiceException is thrown.
!      */
!     public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException {
!         if (portName == null) {
!             return getPort(serviceEndpointInterface);
!         }
!         java.lang.String inputPortName = portName.getLocalPart();
!         if ("SessionFacade".equals(inputPortName)) {
!             return getSessionFacade();
!         }
!         else  {
!             java.rmi.Remote _stub = getPort(serviceEndpointInterface);
!             ((org.apache.axis.client.Stub) _stub).setPortName(portName);
!             return _stub;
!         }
      }
  
!     public javax.xml.namespace.QName getServiceName() {
!         return new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/SessionFacade", "SessionFacadeService");
!     }
  
!     private java.util.HashSet ports = null;
  
!     public java.util.Iterator getPorts() {
!         if (ports == null) {
!             ports = new java.util.HashSet();
!             ports.add(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/SessionFacade", "SessionFacade"));
!         }
!         return ports.iterator();
      }
  
!     /**
!     * Set the endpoint address for the specified port name.
!     */
!     public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
!         if ("SessionFacade".equals(portName)) {
!             setSessionFacadeEndpointAddress(address);
!         }
!         else { // Unknown Port Name
!             throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
!         }
      }
  
!     /**
!     * Set the endpoint address for the specified port name.
!     */
!     public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException {
!         setEndpointAddress(portName.getLocalPart(), address);
!     }
  
! }
--- 8,141 ----
  package localhost.magicmap.services.SessionFacade;
  
! public class SessionFacadeServiceLocator extends org.apache.axis.client.Service
!     implements
!       localhost.magicmap.services.SessionFacade.SessionFacadeService {
  
!   public SessionFacadeServiceLocator() {}
  
+   public SessionFacadeServiceLocator(org.apache.axis.EngineConfiguration config) {
+     super(config);
+   }
  
!   // Use to get a proxy class for SessionFacade
!   private java.lang.String SessionFacade_address = "http://localhost:8080/magicmap/services/SessionFacade";
  
!   public java.lang.String getSessionFacadeAddress(){
!     return SessionFacade_address;
!   }
  
!   // The WSDD service name defaults to the port name.
!   private java.lang.String SessionFacadeWSDDServiceName = "SessionFacade";
  
!   public java.lang.String getSessionFacadeWSDDServiceName(){
!     return SessionFacadeWSDDServiceName;
!   }
  
!   public void setSessionFacadeWSDDServiceName(java.lang.String name){
!     SessionFacadeWSDDServiceName = name;
!   }
  
!   public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade()
!       throws javax.xml.rpc.ServiceException{
!     java.net.URL endpoint;
!     try{
!       endpoint = new java.net.URL(SessionFacade_address);
!     } catch (java.net.MalformedURLException e){
!       throw new javax.xml.rpc.ServiceException(e);
      }
+     return getSessionFacade(endpoint);
+   }
  
!   public localhost.magicmap.services.SessionFacade.SessionFacade getSessionFacade(java.net.URL portAddress)
!       throws javax.xml.rpc.ServiceException{
!     try{
!       localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub _stub = new localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub(
!           portAddress, this);
!       _stub.setPortName(getSessionFacadeWSDDServiceName());
!       return _stub;
!     } catch (org.apache.axis.AxisFault e){
!       return null;
      }
+   }
  
!   public void setSessionFacadeEndpointAddress(java.lang.String address){
!     SessionFacade_address = address;
!   }
  
!   /**
!    * For the given interface, get the stub implementation.
!    * If this service has no port for the given interface,
!    * then ServiceException is thrown.
!    */
!   public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException{
!     try{
!       if (localhost.magicmap.services.SessionFacade.SessionFacade.class.isAssignableFrom(serviceEndpointInterface)){
!         localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub _stub = new localhost.magicmap.services.SessionFacade.SessionFacadeSoapBindingStub(
!             new java.net.URL(SessionFacade_address), this);
!         _stub.setPortName(getSessionFacadeWSDDServiceName());
!         return _stub;
!       }
!     } catch (java.lang.Throwable t){
!       throw new javax.xml.rpc.ServiceException(t);
      }
+     throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface:  "
+         + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName()));
+   }
  
!   /**
!    * For the given interface, get the stub implementation.
!    * If this service has no port for the given interface,
!    * then ServiceException is thrown.
!    */
!   public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface)
!       throws javax.xml.rpc.ServiceException{
!     if (portName == null){
!       return getPort(serviceEndpointInterface);
      }
!     java.lang.String inputPortName = portName.getLocalPart();
!     if ("SessionFacade".equals(inputPortName)){
!       return getSessionFacade();
!     } else{
!       java.rmi.Remote _stub = getPort(serviceEndpointInterface);
!       ((org.apache.axis.client.Stub) _stub).setPortName(portName);
!       return _stub;
      }
+   }
  
!   public javax.xml.namespace.QName getServiceName(){
!     return new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/SessionFacade",
!         "SessionFacadeService");
!   }
  
!   private java.util.HashSet ports = null;
  
!   public java.util.Iterator getPorts(){
!     if (ports == null){
!       ports = new java.util.HashSet();
!       ports
!           .add(new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/SessionFacade", "SessionFacade"));
      }
+     return ports.iterator();
+   }
  
!   /**
!    * Set the endpoint address for the specified port name.
!    */
!   public void setEndpointAddress(java.lang.String portName, java.lang.String address)
!       throws javax.xml.rpc.ServiceException{
!     if ("SessionFacade".equals(portName)){
!       setSessionFacadeEndpointAddress(address);
!     } else{ // Unknown Port Name
!       throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName);
      }
+   }
  
!   /**
!    * Set the endpoint address for the specified port name.
!    */
!   public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address)
!       throws javax.xml.rpc.ServiceException{
!     setEndpointAddress(portName.getLocalPart(), address);
!   }
  
! }
\ No newline at end of file

Index: SessionFacadeSoapBindingStub.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/SessionFacade/SessionFacadeSoapBindingStub.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SessionFacadeSoapBindingStub.java	12 Feb 2005 16:00:27 -0000	1.1
--- SessionFacadeSoapBindingStub.java	11 May 2005 10:51:29 -0000	1.2
***************
*** 8,204 ****
  package localhost.magicmap.services.SessionFacade;
  
! public class SessionFacadeSoapBindingStub extends org.apache.axis.client.Stub implements localhost.magicmap.services.SessionFacade.SessionFacade {
!     private java.util.Vector cachedSerClasses = new java.util.Vector();
!     private java.util.Vector cachedSerQNames = new java.util.Vector();
!     private java.util.Vector cachedSerFactories = new java.util.Vector();
!     private java.util.Vector cachedDeserFactories = new java.util.Vector();
  
!     static org.apache.axis.description.OperationDesc [] _operations;
  
!     static {
!         _operations = new org.apache.axis.description.OperationDesc[2];
!         _initOperationDesc1();
!     }
  
!     private static void _initOperationDesc1(){
!         org.apache.axis.description.OperationDesc oper;
!         oper = new org.apache.axis.description.OperationDesc();
!         oper.setName("connect");
!         oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.addParameter(new javax.xml.namespace.QName("", "mac"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.addParameter(new javax.xml.namespace.QName("", "passwd"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.addParameter(new javax.xml.namespace.QName("", "version"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"));
!         oper.setReturnClass(long.class);
!         oper.setReturnQName(new javax.xml.namespace.QName("", "connectReturn"));
!         oper.setStyle(org.apache.axis.constants.Style.RPC);
!         oper.setUse(org.apache.axis.constants.Use.ENCODED);
!         oper.addFault(new org.apache.axis.description.FaultDesc(
!                       new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/SessionFacade", "fault"),
!                       "net.sf.magicmap.server.exception.AuthenticationException",
!                       new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "AuthenticationException"), 
!                       true
!                      ));
!         _operations[0] = oper;
  
!         oper = new org.apache.axis.description.OperationDesc();
!         oper.setName("disconnect");
!         oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.addParameter(new javax.xml.namespace.QName("", "mac"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.addParameter(new javax.xml.namespace.QName("", "passwd"), new javax.xml.namespace.QName("http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false, false);
!         oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID);
!         oper.setStyle(org.apache.axis.constants.Style.RPC);
!         oper.setUse(org.apache.axis.constants.Use.ENCODED);
!         oper.addFault(new org.apache.axis.description.FaultDesc(
!                       new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/SessionFacade", "fault"),
!                       "net.sf.magicmap.server.exception.AuthenticationException",
!                       new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "AuthenticationException"), 
!                       true
!                      ));
!         _operations[1] = oper;
  
!     }
  
!     public SessionFacadeSoapBindingStub() throws org.apache.axis.AxisFault {
!          this(null);
!     }
  
!     public SessionFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
!          this(service);
!          super.cachedEndpoint = endpointURL;
!     }
  
!     public SessionFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
!         if (service == null) {
!             super.service = new org.apache.axis.client.Service();
!         } else {
!             super.service = service;
!         }
!             java.lang.Class cls;
!             javax.xml.namespace.QName qName;
!             java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
!             java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
!             java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
!             java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
!             java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
!             java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
!             java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
!             java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
!             java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
!             java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
!             qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "AuthenticationException");
!             cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.exception.AuthenticationException.class;
!             cachedSerClasses.add(cls);
!             cachedSerFactories.add(beansf);
!             cachedDeserFactories.add(beandf);
  
      }
  
!     protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException {
!         try {
!             org.apache.axis.client.Call _call =
!                     (org.apache.axis.client.Call) super.service.createCall();
!             if (super.maintainSessionSet) {
!                 _call.setMaintainSession(super.maintainSession);
!             }
!             if (super.cachedUsername != null) {
!                 _call.setUsername(super.cachedUsername);
!             }
!             if (super.cachedPassword != null) {
!                 _call.setPassword(super.cachedPassword);
!             }
!             if (super.cachedEndpoint != null) {
!                 _call.setTargetEndpointAddress(super.cachedEndpoint);
!             }
!             if (super.cachedTimeout != null) {
!                 _call.setTimeout(super.cachedTimeout);
!             }
!             if (super.cachedPortName != null) {
!                 _call.setPortName(super.cachedPortName);
!             }
!             java.util.Enumeration keys = super.cachedProperties.keys();
!             while (keys.hasMoreElements()) {
!                 java.lang.String key = (java.lang.String) keys.nextElement();
!                 _call.setProperty(key, super.cachedProperties.get(key));
!             }
!             // All the type mapping information is registered
!             // when the first call is made.
!             // The type mapping information is actually registered in
!             // the TypeMappingRegistry of the service, which
!             // is the reason why registration is only needed for the first call.
!             synchronized (this) {
!                 if (firstCall()) {
!                     // must set encoding style before registering serializers
!                     _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
!                     _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC);
!                     for (int i = 0; i < cachedSerFactories.size(); ++i) {
!                         java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
!                         javax.xml.namespace.QName qName =
!                                 (javax.xml.namespace.QName) cachedSerQNames.get(i);
!                         java.lang.Class sf = (java.lang.Class)
!                                  cachedSerFactories.get(i);
!                         java.lang.Class df = (java.lang.Class)
!                                  cachedDeserFactories.get(i);
!                         _call.registerTypeMapping(cls, qName, sf, df, false);
!                     }
!                 }
!             }
!             return _call;
!         }
!         catch (java.lang.Throwable _t) {
!             throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
          }
      }
  
!     public long connect(java.lang.String name, java.lang.String mac, java.lang.String passwd, java.lang.String version) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException {
!         if (super.cachedEndpoint == null) {
!             throw new org.apache.axis.NoEndPointException();
!         }
!         org.apache.axis.client.Call _call = createCall();
!         _call.setOperation(_operations[0]);
!         _call.setUseSOAPAction(true);
!         _call.setSOAPActionURI("");
!         _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
!         _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "connect"));
  
!         setRequestHeaders(_call);
!         setAttachments(_call);
!         java.lang.Object _resp = _call.invoke(new java.lang.Object[] {name, mac, passwd, version});
  
!         if (_resp instanceof java.rmi.RemoteException) {
!             throw (java.rmi.RemoteException)_resp;
!         }
!         else {
!             extractAttachments(_call);
!             try {
!                 return ((java.lang.Long) _resp).longValue();
!             } catch (java.lang.Exception _exception) {
!                 return ((java.lang.Long) org.apache.axis.utils.JavaUtils.convert(_resp, long.class)).longValue();
!             }
!         }
      }
  
!     public void disconnect(java.lang.String name, java.lang.String mac, java.lang.String passwd, long sessionId) throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException {
!         if (super.cachedEndpoint == null) {
!             throw new org.apache.axis.NoEndPointException();
!         }
!         org.apache.axis.client.Call _call = createCall();
!         _call.setOperation(_operations[1]);
!         _call.setUseSOAPAction(true);
!         _call.setSOAPActionURI("");
!         _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
!         _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "disconnect"));
  
!         setRequestHeaders(_call);
!         setAttachments(_call);
!         java.lang.Object _resp = _call.invoke(new java.lang.Object[] {name, mac, passwd, new java.lang.Long(sessionId)});
  
!         if (_resp instanceof java.rmi.RemoteException) {
!             throw (java.rmi.RemoteException)_resp;
!         }
!         extractAttachments(_call);
      }
  
! }
--- 8,216 ----
  package localhost.magicmap.services.SessionFacade;
  
! public class SessionFacadeSoapBindingStub extends org.apache.axis.client.Stub
!     implements
!       localhost.magicmap.services.SessionFacade.SessionFacade {
  
!   private java.util.Vector                           cachedSerClasses     = new java.util.Vector();
!   private java.util.Vector                           cachedSerQNames      = new java.util.Vector();
!   private java.util.Vector                           cachedSerFactories   = new java.util.Vector();
!   private java.util.Vector                           cachedDeserFactories = new java.util.Vector();
  
!   static org.apache.axis.description.OperationDesc [] _operations;
  
!   static{
!     _operations = new org.apache.axis.description.OperationDesc[2];
!     _initOperationDesc1();
!   }
  
!   private static void _initOperationDesc1(){
!     org.apache.axis.description.OperationDesc oper;
!     oper = new org.apache.axis.description.OperationDesc();
!     oper.setName("connect");
!     oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.addParameter(new javax.xml.namespace.QName("", "mac"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.addParameter(new javax.xml.namespace.QName("", "passwd"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.addParameter(new javax.xml.namespace.QName("", "version"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "long"));
!     oper.setReturnClass(long.class);
!     oper.setReturnQName(new javax.xml.namespace.QName("", "connectReturn"));
!     oper.setStyle(org.apache.axis.constants.Style.RPC);
!     oper.setUse(org.apache.axis.constants.Use.ENCODED);
!     oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName(
!         "http://localhost:8080/magicmap/services/SessionFacade", "fault"),
!         "net.sf.magicmap.server.exception.AuthenticationException", new javax.xml.namespace.QName(
!             "http://exception.server.magicmap.sf.net", "AuthenticationException"), true));
!     _operations[0] = oper;
  
!     oper = new org.apache.axis.description.OperationDesc();
!     oper.setName("disconnect");
!     oper.addParameter(new javax.xml.namespace.QName("", "name"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.addParameter(new javax.xml.namespace.QName("", "mac"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.addParameter(new javax.xml.namespace.QName("", "passwd"), new javax.xml.namespace.QName(
!         "http://schemas.xmlsoap.org/soap/encoding/", "string"), java.lang.String.class,
!         org.apache.axis.description.ParameterDesc.IN, false, false);
!     oper.addParameter(new javax.xml.namespace.QName("", "sessionId"), new javax.xml.namespace.QName(
!         "http://www.w3.org/2001/XMLSchema", "long"), long.class, org.apache.axis.description.ParameterDesc.IN, false,
!         false);
!     oper.setReturnType(org.apache.axis.encoding.XMLType.AXIS_VOID);
!     oper.setStyle(org.apache.axis.constants.Style.RPC);
!     oper.setUse(org.apache.axis.constants.Use.ENCODED);
!     oper.addFault(new org.apache.axis.description.FaultDesc(new javax.xml.namespace.QName(
!         "http://localhost:8080/magicmap/services/SessionFacade", "fault"),
!         "net.sf.magicmap.server.exception.AuthenticationException", new javax.xml.namespace.QName(
!             "http://exception.server.magicmap.sf.net", "AuthenticationException"), true));
!     _operations[1] = oper;
  
!   }
  
!   public SessionFacadeSoapBindingStub() throws org.apache.axis.AxisFault {
!     this(null);
!   }
  
!   public SessionFacadeSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service)
!       throws org.apache.axis.AxisFault {
!     this(service);
!     super.cachedEndpoint = endpointURL;
!   }
  
+   public SessionFacadeSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault {
+     if (service == null){
+       super.service = new org.apache.axis.client.Service();
+     } else{
+       super.service = service;
      }
+     java.lang.Class cls;
+     javax.xml.namespace.QName qName;
+     java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class;
+     java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class;
+     java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class;
+     java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class;
+     java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class;
+     java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class;
+     java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class;
+     java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class;
+     java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
+     java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
+     qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "AuthenticationException");
+     cachedSerQNames.add(qName);
+     cls = net.sf.magicmap.server.exception.AuthenticationException.class;
+     cachedSerClasses.add(cls);
+     cachedSerFactories.add(beansf);
+     cachedDeserFactories.add(beandf);
  
!   }
! 
!   protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException{
!     try{
!       org.apache.axis.client.Call _call = (org.apache.axis.client.Call) super.service.createCall();
!       if (super.maintainSessionSet){
!         _call.setMaintainSession(super.maintainSession);
!       }
!       if (super.cachedUsername != null){
!         _call.setUsername(super.cachedUsername);
!       }
!       if (super.cachedPassword != null){
!         _call.setPassword(super.cachedPassword);
!       }
!       if (super.cachedEndpoint != null){
!         _call.setTargetEndpointAddress(super.cachedEndpoint);
!       }
!       if (super.cachedTimeout != null){
!         _call.setTimeout(super.cachedTimeout);
!       }
!       if (super.cachedPortName != null){
!         _call.setPortName(super.cachedPortName);
!       }
!       java.util.Enumeration keys = super.cachedProperties.keys();
!       while (keys.hasMoreElements()){
!         java.lang.String key = (java.lang.String) keys.nextElement();
!         _call.setProperty(key, super.cachedProperties.get(key));
!       }
!       // All the type mapping information is registered
!       // when the first call is made.
!       // The type mapping information is actually registered in
!       // the TypeMappingRegistry of the service, which
!       // is the reason why registration is only needed for the first call.
!       synchronized (this){
!         if (firstCall()){
!           // must set encoding style before registering serializers
!           _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
!           _call.setEncodingStyle(org.apache.axis.Constants.URI_SOAP11_ENC);
!           for (int i = 0; i < cachedSerFactories.size(); ++i){
!             java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i);
!             javax.xml.namespace.QName qName = (javax.xml.namespace.QName) cachedSerQNames.get(i);
!             java.lang.Class sf = (java.lang.Class) cachedSerFactories.get(i);
!             java.lang.Class df = (java.lang.Class) cachedDeserFactories.get(i);
!             _call.registerTypeMapping(cls, qName, sf, df, false);
!           }
          }
+       }
+       return _call;
+     } catch (java.lang.Throwable _t){
+       throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t);
      }
+   }
  
!   public long connect(java.lang.String name, java.lang.String mac, java.lang.String passwd, java.lang.String version)
!       throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException{
!     if (super.cachedEndpoint == null){
!       throw new org.apache.axis.NoEndPointException();
!     }
!     org.apache.axis.client.Call _call = createCall();
!     _call.setOperation(_operations[0]);
!     _call.setUseSOAPAction(true);
!     _call.setSOAPActionURI("");
!     _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
!     _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "connect"));
  
!     setRequestHeaders(_call);
!     setAttachments(_call);
!     java.lang.Object _resp = _call.invoke(new java.lang.Object[]{name, mac, passwd, version});
  
!     if (_resp instanceof java.rmi.RemoteException){
!       throw (java.rmi.RemoteException) _resp;
!     } else{
!       extractAttachments(_call);
!       try{
!         return ((java.lang.Long) _resp).longValue();
!       } catch (java.lang.Exception _exception){
!         return ((java.lang.Long) org.apache.axis.utils.JavaUtils.convert(_resp, long.class)).longValue();
!       }
      }
+   }
  
!   public void disconnect(java.lang.String name, java.lang.String mac, java.lang.String passwd, long sessionId)
!       throws java.rmi.RemoteException, net.sf.magicmap.server.exception.AuthenticationException{
!     if (super.cachedEndpoint == null){
!       throw new org.apache.axis.NoEndPointException();
!     }
!     org.apache.axis.client.Call _call = createCall();
!     _call.setOperation(_operations[1]);
!     _call.setUseSOAPAction(true);
!     _call.setSOAPActionURI("");
!     _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS);
!     _call.setOperationName(new javax.xml.namespace.QName("http://facade.server.magicmap.sf.net", "disconnect"));
  
!     setRequestHeaders(_call);
!     setAttachments(_call);
!     java.lang.Object _resp = _call.invoke(new java.lang.Object[]{name, mac, passwd, new java.lang.Long(sessionId)});
  
!     if (_resp instanceof java.rmi.RemoteException){
!       throw (java.rmi.RemoteException) _resp;
      }
+     extractAttachments(_call);
+   }
  
! }
\ No newline at end of file

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui/dialogs ConnectServerDialog.java,1.2,1.3

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/gui/dialogs

Modified Files:
	ConnectServerDialog.java 
Log Message:
+ Client is usable without server

Index: ConnectServerDialog.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/dialogs/ConnectServerDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConnectServerDialog.java	13 Feb 2005 21:36:40 -0000	1.2
--- ConnectServerDialog.java	11 May 2005 10:51:30 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  
  import javax.swing.JButton;
+ import javax.swing.JCheckBox;
  import javax.swing.JComboBox;
  import javax.swing.JDialog;
***************
*** 37,40 ****
--- 38,42 ----
    private JTextField           port;
    private JPasswordField       password;
+   private JCheckBox            useNoServer;
  
    public static ServerConnectionInfo showDialog(Frame owner, ServerConnectionInfo info){
***************
*** 114,117 ****
--- 116,126 ----
      builder.setLeftRightDistance("password", "portlabel,hostlabel,clientlabel,passwordlabel", 5);
  
+     // CheckBox für "lokale Verbindung"
+     useNoServer = builder.addCheckBox(GUIUtils.i18n("nonserverconnect"), "nonserver", serverConnectionInfo.useNoServer);
+     builder.setLeftLeftDistance("nonserver", "portedit", 0);
+     builder.setTopBottomDistance("nonserver", "portlabel,portedit", 5);
+     useNoServer.setActionCommand("USENOSERVER");
+     useNoServer.addActionListener(this);
+ 
      // Kopf
      builder.addDialogHeader("<html><b>" + GUIUtils.i18n("createconnectiontopacwserver") + "</b><br>"
***************
*** 142,145 ****
--- 151,155 ----
        serverConnectionInfo.password = new String(this.password.getPassword());
        serverConnectionInfo.name = this.clientname.getText();
+       serverConnectionInfo.useNoServer = this.useNoServer.isSelected();
        try{
          serverConnectionInfo.port = Integer.parseInt(this.port.getText());
***************
*** 152,155 ****
--- 162,170 ----
        serverConnectionInfo = null;
        this.setVisible(false);
+     } else if ("USENOSERVER".equals(e.getActionCommand())){
+       // CheckBox angeklickt
+       boolean b = !useNoServer.isSelected();
+       this.hostname.setEnabled(b);
+       this.port.setEnabled(b);
      }
  

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/delegate/interfaces SessionFacadeInterface.java,1.2,1.3 Closeable.java,1.1,1.2

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12081/src/net/sf/magicmap/client/delegate/interfaces

Modified Files:
	SessionFacadeInterface.java Closeable.java 
Log Message:
+ Client is usable without server

Index: SessionFacadeInterface.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/SessionFacadeInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SessionFacadeInterface.java	12 Feb 2005 16:00:28 -0000	1.2
--- SessionFacadeInterface.java	11 May 2005 10:51:29 -0000	1.3
***************
*** 9,13 ****
  import net.sf.magicmap.server.exception.AuthenticationException;
  
- 
  /**
   * @author Martin
--- 9,12 ----

Index: Closeable.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/Closeable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Closeable.java	21 Apr 2005 10:53:26 -0000	1.1
--- Closeable.java	11 May 2005 10:51:30 -0000	1.2
***************
*** 5,8 ****
--- 5,9 ----
   * Window - Preferences - Java - Code Style - Code Templates
   */
+ 
  package net.sf.magicmap.client.delegate.interfaces;
  
***************
*** 14,18 ****
   */
  public interface Closeable {
- 	public void close() throws IOException;
  
! }
--- 15,20 ----
   */
  public interface Closeable {
  
!   public void close() throws IOException;
! 
! }
\ No newline at end of file

[Magicmap-commits] magicmapclient/res screentext.properties,1.1,1.2 screentext_de_DE.properties,1.1,1.2

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/res
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11920/res

Modified Files:
	screentext.properties screentext_de_DE.properties 
Log Message:
+ Client is usable without server

Index: screentext_de_DE.properties
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/res/screentext_de_DE.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** screentext_de_DE.properties	14 Feb 2005 12:51:15 -0000	1.1
--- screentext_de_DE.properties	11 May 2005 10:50:58 -0000	1.2
***************
*** 90,92 ****
  setanhttpproxyhint=Geben Sie bitte die Daten ihres Proxy-Servers an
  setproxytooltip=Proxy-Server einstellen
! 
--- 90,92 ----
  setanhttpproxyhint=Geben Sie bitte die Daten ihres Proxy-Servers an
  setproxytooltip=Proxy-Server einstellen
! nonserverconnect=Kein Server (Standalone)

Index: screentext.properties
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/res/screentext.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** screentext.properties	14 Feb 2005 12:51:15 -0000	1.1
--- screentext.properties	11 May 2005 10:50:58 -0000	1.2
***************
*** 90,94 ****
  setanhttpproxyhint=Please enter name and port of your proxy server
  setproxytooltip=Set Proxy-server
! 
  
  
--- 90,94 ----
  setanhttpproxyhint=Please enter name and port of your proxy server
  setproxytooltip=Set Proxy-server
! nonserverconnect=Use local connection only
  
  

[Magicmap-commits] magicmapclient/lib jpox-20041204.032009.jar,NONE,1.1 log4j-1.2.8.jar,NONE,1.1 derby.jar,NONE,1.1

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10742/lib

Added Files:
	jpox-20041204.032009.jar log4j-1.2.8.jar derby.jar 
Log Message:
+ Client is usable without server

--- NEW FILE: log4j-1.2.8.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: derby.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jpox-20041204.032009.jar ---
(This appears to be a binary file; contents omitted.)

[Magicmap-commits] magicmapserver/dblayer build.xml,1.2,1.3

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver/dblayer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10440/dblayer

Modified Files:
	build.xml 
Log Message:
+ Client is usable without server

Index: build.xml
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/dblayer/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	14 Feb 2005 15:10:32 -0000	1.2
--- build.xml	11 May 2005 10:47:46 -0000	1.3
***************
*** 92,96 ****
     	   </jar>
         <copy file="${dist}/${jar.name}" toDir="../web/WEB-INF/lib"/>		
- 
      </target>
  	
--- 92,95 ----

[Magicmap-commits] magicmapserver build.xml,1.2,1.3

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10440

Modified Files:
	build.xml 
Log Message:
+ Client is usable without server

Index: build.xml
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** build.xml	14 Feb 2005 15:10:33 -0000	1.2
--- build.xml	11 May 2005 10:47:45 -0000	1.3
***************
*** 1,8 ****
  <?xml version="1.0" encoding="ISO-8859-1" ?>
! <project name="magicmapserver" default="compile" basedir=".">
  
    <property name="build"   value="web/WEB-INF/classes"/>
    <property name="src"   value="src"/>
   
    <path id="build.classpath">
    	<fileset dir="web/WEB-INF/lib">
--- 1,11 ----
  <?xml version="1.0" encoding="ISO-8859-1" ?>
! <project name="magicmapserver" default="jar" basedir=".">
  
    <property name="build"   value="web/WEB-INF/classes"/>
+   <property name="dist"   value="dist"/>	
    <property name="src"   value="src"/>
   
+   <property name="jar.name" value="magicmap-server.jar"/>
+ 
    <path id="build.classpath">
    	<fileset dir="web/WEB-INF/lib">
***************
*** 17,20 ****
--- 20,24 ----
    <target name="prepare" depends="clean">
      <mkdir dir="${build}" />
+     <mkdir dir="${dist}" />
    	<!-- Call ant task in dblayer, in order to run the jdo enhancer-->
    	<ant dir="dblayer" inheritAll="false"/>
***************
*** 23,26 ****
--- 27,31 ----
   <target name="clean">
      <delete dir="${build}" />
+     <delete dir="${dist}" />
    	<ant dir="dblayer" inheritAll="false" target="clean"/>
   </target>
***************
*** 38,40 ****
--- 43,54 ----
    </target>
  	
+    	<target name="jar" depends="compile">
+        <jar destfile="${dist}/${jar.name}">
+    	    <fileset dir="${build}"/>
+    	    <fileset dir="dblayer/build"/>
+    	   </jar>
+     </target>
+ 	
+ 	
+ 	
  </project>

[Magicmap-commits] magicmapserver/dist .cvsignore,NONE,1.1

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver/dist
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9975/dist

Added Files:
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
magicmap-server.jar

[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/dto SimpleScanResultDTO.java,1.2,1.3 PositionDTO.java,1.1,1.2 SignalCharacterDTO.java,1.2,1.3 ClientDTO.java,1.1,1.2 ProbabilityDensity.java,1.1,1.2 ClientSignalCharacter.java,1.1,1.2 MapDTO.java,1.1,1.2 AccessPointDTO.java,1.1,1.2 ClientProbabilityDensity.java,1.1,1.2

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9267/src/net/sf/magicmap/server/dto

Modified Files:
	SimpleScanResultDTO.java PositionDTO.java 
	SignalCharacterDTO.java ClientDTO.java ProbabilityDensity.java 
	ClientSignalCharacter.java MapDTO.java AccessPointDTO.java 
	ClientProbabilityDensity.java 
Log Message:
+ Client is usable without server

Index: ProbabilityDensity.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ProbabilityDensity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ProbabilityDensity.java	12 Feb 2005 15:19:28 -0000	1.1
--- ProbabilityDensity.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 23,36 ****
     * DO NOT USE
     */
!   public ProbabilityDensity() {
!     System.out.println("DO NOT USE!");
!   }
! 
!   public ProbabilityDensity(String locationName, double probability, int positionX, int positionY) {
!     this.locationName = locationName;
!     this.probabilty = probability;
!     this.positionX = positionX;
!     this.positionY = positionY;
!   }
  
    /**
--- 23,27 ----
     * DO NOT USE
     */
!   public ProbabilityDensity() {}
  
    /**

Index: ClientDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ClientDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientDTO.java	12 Feb 2005 15:19:28 -0000	1.1
--- ClientDTO.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 19,25 ****
    private String mac;
  
!   public ClientDTO() {
!   // do not use
!   }
  
    /**
--- 19,23 ----
    private String mac;
  
!   public ClientDTO() {}
  
    /**
***************
*** 65,68 ****
    }
  
- 
  }
\ No newline at end of file
--- 63,65 ----

Index: PositionDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/PositionDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PositionDTO.java	12 Feb 2005 15:19:28 -0000	1.1
--- PositionDTO.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 31,35 ****
    }
  
!    /**
     * @return Returns the id.
     */
--- 31,35 ----
    }
  
!   /**
     * @return Returns the id.
     */

Index: AccessPointDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/AccessPointDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AccessPointDTO.java	12 Feb 2005 15:19:28 -0000	1.1
--- AccessPointDTO.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 13,21 ****
   * (at your option) any later version.
   */
! public class AccessPointDTO{
  
!   public AccessPointDTO() {
!   // do not use
!   }
  
    private Long   id;
--- 13,19 ----
   * (at your option) any later version.
   */
! public class AccessPointDTO {
  
!   public AccessPointDTO() {}
  
    private Long   id;

Index: ClientProbabilityDensity.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ClientProbabilityDensity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientProbabilityDensity.java	12 Feb 2005 15:19:28 -0000	1.1
--- ClientProbabilityDensity.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 27,44 ****
  
    /**
-    * @param locationName
-    * @param probability
-    * @param positionX
-    * @param positionY
-    */
-   public ClientProbabilityDensity(String locationName, double probability, int positionX, int positionY,
-       String clientName, String clientMac, String mapName) {
-     super(locationName, probability, positionX, positionY);
-     this.clientMac = clientMac;
-     this.clientName = clientName;
-     this.mapName = mapName;
-   }
- 
-   /**
     * @return Returns the clientMac.
     */
--- 27,30 ----

Index: ClientSignalCharacter.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/ClientSignalCharacter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ClientSignalCharacter.java	12 Feb 2005 15:19:28 -0000	1.1
--- ClientSignalCharacter.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 21,32 ****
     * DO NOT USE
     */
!   public ClientSignalCharacter() {
!     System.out.println("DO NOT USE!");
!   }
! 
!   public ClientSignalCharacter(String clientName, String clientMac) {
!     this.clientName = clientName;
!     this.clientMac = clientMac;
!   }
  
    /**
--- 21,25 ----
     * DO NOT USE
     */
!   public ClientSignalCharacter() {}
  
    /**

Index: SimpleScanResultDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/SimpleScanResultDTO.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleScanResultDTO.java	13 Feb 2005 22:27:28 -0000	1.2
--- SimpleScanResultDTO.java	11 May 2005 10:45:05 -0000	1.3
***************
*** 17,27 ****
  public class SimpleScanResultDTO {
  
!   protected String    ssid;       // WLAN-Name (optional)
!   protected String    macAP;      // MAC-Adresse AccessPoint
!   protected Double    signalLevel; // Signallevel in dB (negativer Wert)
!   protected Double    noise;      // Signal-Rausch-Abstand (optional)  
!   protected Date lastSeen;   // (optional)
! 
! 
  
    public SimpleScanResultDTO() {
--- 17,25 ----
  public class SimpleScanResultDTO {
  
!   protected String ssid;       // WLAN-Name (optional)
!   protected String macAP;      // MAC-Adresse AccessPoint
!   protected Double signalLevel; // Signallevel in dB (negativer Wert)
!   protected Double noise;      // Signal-Rausch-Abstand (optional)  
!   protected Date   lastSeen;   // (optional)
  
    public SimpleScanResultDTO() {
***************
*** 29,42 ****
    }
  
-   public SimpleScanResultDTO(String ssidAccessPoint, String macAccessPoint, Double signalLevel, Double noise,
-       Date lastSeen) {
-     this.ssid = ssidAccessPoint;
-     this.lastSeen = lastSeen;
-     this.macAP = macAccessPoint;
-     this.signalLevel = signalLevel;
-     this.noise = noise;
-   }
- 
- 
    /**
     * @return Returns the lastSeen.
--- 27,30 ----

Index: MapDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/MapDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MapDTO.java	12 Feb 2005 15:19:28 -0000	1.1
--- MapDTO.java	11 May 2005 10:45:05 -0000	1.2
***************
*** 21,36 ****
    private Integer imageWidth;
  
!   public MapDTO() {
!   // do not use
!   }
! 
! 
!   public MapDTO(Long id, String imageURL, String name, Integer imageHeight, Integer imageWidth) {
!     this.id = id;
!     this.name = name;
!     this.imageURL = imageURL;
!     this.imageHeight = imageHeight;
!     this.imageWidth = imageWidth;
!   }
  
    public Long getId(){
--- 21,25 ----
    private Integer imageWidth;
  
!   public MapDTO() {}
  
    public Long getId(){

Index: SignalCharacterDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/SignalCharacterDTO.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SignalCharacterDTO.java	16 Feb 2005 08:58:27 -0000	1.2
--- SignalCharacterDTO.java	11 May 2005 10:45:05 -0000	1.3
***************
*** 2,7 ****
  package net.sf.magicmap.server.dto;
  
- import java.util.ArrayList;
- 
  /**
   * author        schweige
--- 2,5 ----
***************
*** 23,29 ****
    }
  
-   public SignalCharacterDTO(SimpleScanResultDTO[] simpleScanResults) {
-     this.simpleScanResults = simpleScanResults;}
- 
    public SimpleScanResultDTO[] getSimpleScanResults(){
      return this.simpleScanResults;
--- 21,24 ----

[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/facade MapFacade.java,1.3,1.4 PositionFacade.java,1.5,1.6 SessionFacade.java,1.4,1.5

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9267/src/net/sf/magicmap/server/facade

Modified Files:
	MapFacade.java PositionFacade.java SessionFacade.java 
Log Message:
+ Client is usable without server

Index: MapFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/MapFacade.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MapFacade.java	12 Feb 2005 15:19:27 -0000	1.3
--- MapFacade.java	11 May 2005 10:45:05 -0000	1.4
***************
*** 110,115 ****
        Map map = new Map(name, URL, new Integer(10), new Integer(10), new Integer(width), new Integer(height));
        pm.makePersistent(map);
!       result = new MapDTO(new Long(map.getId()), map.getImageURL(), map.getName(), map.getImageHeight(), map
!           .getImageWidth());
        JDOUtil.commit(tx);
      } finally{
--- 110,120 ----
        Map map = new Map(name, URL, new Integer(10), new Integer(10), new Integer(width), new Integer(height));
        pm.makePersistent(map);
!       result = new MapDTO();
! 
!       result.setId(new Long(map.getId()));
!       result.setName(map.getName());
!       result.setImageHeight(map.getImageHeight());
!       result.setImageWidth(map.getImageWidth());
!       result.setImageURL(map.getImageURL());
        JDOUtil.commit(tx);
      } finally{
***************
*** 140,145 ****
        }
        Map map = (Map) results.iterator().next();
!       result = new MapDTO(new Long(map.getId()), map.getImageURL(), map.getName(), map.getImageHeight(), map
!           .getImageWidth());
        JDOUtil.commit(tx);
      } finally{
--- 145,156 ----
        }
        Map map = (Map) results.iterator().next();
! 
!       result = new MapDTO();
! 
!       result.setId(new Long(map.getId()));
!       result.setName(map.getName());
!       result.setImageHeight(map.getImageHeight());
!       result.setImageWidth(map.getImageWidth());
!       result.setImageURL(map.getImageURL());
        JDOUtil.commit(tx);
      } finally{

Index: SessionFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/SessionFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SessionFacade.java	13 Feb 2005 21:34:43 -0000	1.4
--- SessionFacade.java	11 May 2005 10:45:05 -0000	1.5
***************
*** 41,45 ****
      // check Version
      if (!Version.PROTOCOL_VERSION.equals(version)){
!       throw new AuthenticationException("Client-Server-Versionen passen nicht: " + Version.PROTOCOL_VERSION + " <> " + version);
      }
  
--- 41,46 ----
      // check Version
      if (!Version.PROTOCOL_VERSION.equals(version)){
!       throw new AuthenticationException("Client-Server-Versionen passen nicht: " + Version.PROTOCOL_VERSION + " <> "
!           + version);
      }
  

Index: PositionFacade.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/facade/PositionFacade.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PositionFacade.java	16 Feb 2005 08:58:26 -0000	1.5
--- PositionFacade.java	11 May 2005 10:45:05 -0000	1.6
***************
*** 160,168 ****
          AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm);
          //@TODO think about? ap.setSsid(dtos[i].getSsid());
!         Timestamp lastSeen = null;
!         if (dtos[i].getLastSeen() != null){
!           lastSeen = new Timestamp(dtos[i].getLastSeen().getTime());
!         }
!         ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), lastSeen);
          pm.makePersistent(sr);
          sr.setPosition(pos);
--- 160,165 ----
          AccessPoint ap = findOrCreateAccessPoint(dtos[i].getMacAP(), pm);
          //@TODO think about? ap.setSsid(dtos[i].getSsid());
!         ScanResult sr = new ScanResult(client, ap, dtos[i].getSignalLevel(), dtos[i].getNoise(), new Timestamp(System
!             .currentTimeMillis())); //@TODO use lastSeen
          pm.makePersistent(sr);
          sr.setPosition(pos);
***************
*** 648,659 ****
                }
  
!               SimpleScanResultDTO ssr = new SimpleScanResultDTO(sr.getAccessPoint().getSsid(), sr.getAccessPoint()
!                   .getMac(), sr.getSignalLevel(), sr.getNoiseLevel(), lastSeen);
!               
                ArrayList list;
                if (dto.getCharacter().getSimpleScanResults() == null){
                  list = new ArrayList();
!               } else {
!                 list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults())); 
                }
  
--- 645,661 ----
                }
  
!               SimpleScanResultDTO ssr = new SimpleScanResultDTO();
! 
!               //ssr.setLastSeen(lastSeen); //TODO: last seen benutzen
!               ssr.setMacAP(sr.getAccessPoint().getMac());
!               ssr.setNoise(sr.getNoiseLevel());
!               ssr.setSignalLevel(sr.getSignalLevel());
!               ssr.setSsid(sr.getAccessPoint().getSsid());
! 
                ArrayList list;
                if (dto.getCharacter().getSimpleScanResults() == null){
                  list = new ArrayList();
!               } else{
!                 list = new ArrayList(Arrays.asList(dto.getCharacter().getSimpleScanResults()));
                }
  

[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server Init.java,NONE,1.1 ApplicationWatch.java,1.2,1.3

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9267/src/net/sf/magicmap/server

Modified Files:
	ApplicationWatch.java 
Added Files:
	Init.java 
Log Message:
+ Client is usable without server

--- NEW FILE: Init.java ---
/*
 * Created on 10.05.2005
 *
 */

package net.sf.magicmap.server;

import java.util.Collection;
import java.util.Properties;

import javax.jdo.Extent;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.Query;

import net.sf.magicmap.db.Client;
import net.sf.magicmap.server.utils.JDOUtil;

/**
 * @author thuebner
 *
 */
public class Init {

  /**
   * 
   */
  public static void initJDO(String dbDriver, String dbURL, String user, String password){
    Properties properties = new Properties();

    properties.setProperty("javax.jdo.PersistenceManagerFactoryClass", "org.jpox.PersistenceManagerFactoryImpl");
    properties.setProperty("javax.jdo.option.ConnectionDriverName", dbDriver);
    properties.setProperty("javax.jdo.option.ConnectionURL", dbURL);
    if (user != null){
      properties.setProperty("javax.jdo.option.ConnectionUserName", user);
    }
    if (password != null){
      properties.setProperty("javax.jdo.option.ConnectionPassword", password);
    }
    properties.setProperty("org.jpox.autoCreateSchema", "true");
    properties.setProperty("org.jpox.autoCreateTables", "true");
    properties.setProperty("org.jpox.autoCreateColumns", "true");
    properties.setProperty("org.jpox.autoCreateConstraints", "true");

    properties.setProperty("org.jpox.validateTables", "true");
    properties.setProperty("org.jpox.validateConstraints", "true");
    //properties.setProperty("javax.jdo.option.NontransactionalRead", "true");
    properties.setProperty("javax.jdo.option.Optimistic", "false");
    properties.setProperty("javax.jdo.option.RestoreValues", "true");

    properties.setProperty("org.jpox.cache.level2", "true");
    properties.setProperty("org.jpox.poid.generatorClass", "org.jpox.poid.SequenceTablePoidGenerator");

    JDOUtil.pmfactory = JDOHelper.getPersistenceManagerFactory(properties);
    PersistenceManager pm = JDOUtil.pmfactory.getPersistenceManager();
    pm.currentTransaction().begin();
    Extent e = pm.getExtent(Client.class, true);
    Query query = pm.newQuery(e);
    Collection c = (Collection) query.execute();
    try{
      Client client = new Client("dummy", "client", "dumm");
      pm.makePersistent(client);
      pm.currentTransaction().commit();
      pm.currentTransaction().begin();
      pm.deletePersistent(client);
    } catch (Exception ex){
      System.out.println("Fatal: " + ex.getMessage());
      pm.currentTransaction().begin();
    }
    pm.currentTransaction().commit();
    pm.close();
  }

}
Index: ApplicationWatch.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/ApplicationWatch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ApplicationWatch.java	23 Jan 2005 18:11:00 -0000	1.2
--- ApplicationWatch.java	11 May 2005 10:45:05 -0000	1.3
***************
*** 7,21 ****
  import java.io.IOException;
  import java.sql.Timestamp;
- import java.util.Collection;
- import java.util.Properties;
  
- import javax.jdo.Extent;
- import javax.jdo.JDOHelper;
- import javax.jdo.PersistenceManager;
- import javax.jdo.Query;
  import javax.servlet.ServletContextEvent;
  import javax.servlet.ServletContextListener;
  
- import net.sf.magicmap.db.Client;
  import net.sf.magicmap.server.utils.JDOUtil;
  
--- 7,14 ----
***************
*** 67,108 ****
  
      startUp = System.currentTimeMillis();
!     Properties properties = new Properties();
! 
!     properties.setProperty("javax.jdo.PersistenceManagerFactoryClass", "org.jpox.PersistenceManagerFactoryImpl");
!     properties.setProperty("javax.jdo.option.ConnectionDriverName", "org.jpox.driver.JPOXDriver");
!     properties.setProperty("javax.jdo.option.ConnectionURL", "jpox:java:comp/env/jdbc/magicmap");
!     properties.setProperty("org.jpox.autoCreateSchema", "true");
!     properties.setProperty("org.jpox.autoCreateTables", "true");
!     properties.setProperty("org.jpox.autoCreateColumns", "true");
!     properties.setProperty("org.jpox.autoCreateConstraints", "true");
! 
!     properties.setProperty("org.jpox.validateTables", "true");
!     properties.setProperty("org.jpox.validateConstraints", "true");
!     //properties.setProperty("javax.jdo.option.NontransactionalRead", "true");
!     properties.setProperty("javax.jdo.option.Optimistic", "false");
!     properties.setProperty("javax.jdo.option.RestoreValues", "true");
! 
!     properties.setProperty("org.jpox.cache.level2", "true");
!     properties.setProperty("org.jpox.poid.generatorClass", "org.jpox.poid.SequenceTablePoidGenerator");
! 
!     JDOUtil.pmfactory = JDOHelper.getPersistenceManagerFactory(properties);
!     PersistenceManager pm = JDOUtil.pmfactory.getPersistenceManager();
!     pm.currentTransaction().begin();
!     Extent e = pm.getExtent(Client.class, true);
!     Query query = pm.newQuery(e);
!     Collection c = (Collection) query.execute();
!     logger.debug("Anzahl der gespeicherten Clients: " + c.size());
!     try{
!       Client client = new Client("dummy", "client", "dumm");
!       pm.makePersistent(client);
!       pm.currentTransaction().commit();
!       pm.currentTransaction().begin();
!       pm.deletePersistent(client);
!     } catch (Exception ex){
!       logger.fatal("Fehler beim Anlegen des \"dumm\" Clients", ex);
!       pm.currentTransaction().begin();
!     }
!     pm.currentTransaction().commit();
!     pm.close();
      logger.info("Init MagicMap - done (took " + (System.currentTimeMillis() - startUp) + " ms)");
    }
--- 60,64 ----
  
      startUp = System.currentTimeMillis();
!     Init.initJDO("org.jpox.driver.JPOXDriver", "jpox:java:comp/env/jdbc/magicmap", null, null);
      logger.info("Init MagicMap - done (took " + (System.currentTimeMillis() - startUp) + " ms)");
    }

[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/interpolation/delaunay Int.java,1.3,1.4

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interpolation/delaunay
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9267/src/net/sf/magicmap/server/interpolation/delaunay

Modified Files:
	Int.java 
Log Message:
+ Client is usable without server

Index: Int.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/interpolation/delaunay/Int.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Int.java	13 Feb 2005 21:34:39 -0000	1.3
--- Int.java	11 May 2005 10:45:05 -0000	1.4
***************
*** 12,20 ****
    int i;
  
!   public Int(){
      i = 0;
    }
  
!   public Int(int i){
      this.i = i;
    }
--- 12,20 ----
    int i;
  
!   public Int() {
      i = 0;
    }
  
!   public Int(int i) {
      this.i = i;
    }

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui MapPanel.java,1.2,1.3

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25542/src/net/sf/magicmap/client/gui

Modified Files:
	MapPanel.java 
Log Message:
+ JDK1.4 support

Index: MapPanel.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MapPanel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MapPanel.java	13 Feb 2005 21:36:38 -0000	1.2
--- MapPanel.java	21 Apr 2005 10:53:27 -0000	1.3
***************
*** 108,112 ****
  
        public void actionPerformed(ActionEvent e){
!         assert (selectedNode != null);
          deleteNode();
        }
--- 108,112 ----
  
        public void actionPerformed(ActionEvent e){
!         //assert (selectedNode != null);
          deleteNode();
        }
***************
*** 202,206 ****
    /**
     * Referenzpunkt mit aktuell gemessenen Werten anlegen. Dies
!    * geschieht über den Controller, so dass dieser am Server
     * gespeichert werden kann.
     *  
--- 202,206 ----
    /**
     * Referenzpunkt mit aktuell gemessenen Werten anlegen. Dies
!    * geschieht �ber den Controller, so dass dieser am Server
     * gespeichert werden kann.
     *  
***************
*** 226,235 ****
  
    /**
!    * Löscht einen Knoten anhand des Graphen. Hierzu wird der Controller
     * aufgerufen
     */
    protected void deleteNode(){
      if (selectedNode.getType() == NodeModel.NODETYPE_LOCATION){
!       // Referenzpunkt löschen
        Controller.getInstance().deletePosition(selectedNode.getName(), this);
        return;
--- 226,235 ----
  
    /**
!    * L�scht einen Knoten anhand des Graphen. Hierzu wird der Controller
     * aufgerufen
     */
    protected void deleteNode(){
      if (selectedNode.getType() == NodeModel.NODETYPE_LOCATION){
!       // Referenzpunkt l�schen
        Controller.getInstance().deletePosition(selectedNode.getName(), this);
        return;
***************
*** 252,257 ****
  
    /**
!    * Fixiert oder unfixiert einen Knoten, so wie der User es wünscht und teilt
!    * dies dem Server mit. Das lokale Modell aktualisiert sich dann erst über
     * den Poller.
     * @param b
--- 252,257 ----
  
    /**
!    * Fixiert oder unfixiert einen Knoten, so wie der User es w�nscht und teilt
!    * dies dem Server mit. Das lokale Modell aktualisiert sich dann erst �ber
     * den Poller.
     * @param b
***************
*** 303,307 ****
  
    /**
!    * Liefert die in diesem Panel gesetzte MapView zurück
     * @return
     */
--- 303,307 ----
  
    /**
!    * Liefert die in diesem Panel gesetzte MapView zur�ck
     * @return
     */
***************
*** 359,363 ****
    public void positionDeleteError(Exception e){
      e.printStackTrace();
!     GUIUtils.showErrorDialog("Etwas ging schief beim Löschen der Position.");
    }
  
--- 359,363 ----
    public void positionDeleteError(Exception e){
      e.printStackTrace();
!     GUIUtils.showErrorDialog("Etwas ging schief beim L�schen der Position.");
    }
  

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/delegate/interfaces Closeable.java,NONE,1.1 PositionFacadeInterface.java,1.2,1.3

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25542/src/net/sf/magicmap/client/delegate/interfaces

Modified Files:
	PositionFacadeInterface.java 
Added Files:
	Closeable.java 
Log Message:
+ JDK1.4 support

--- NEW FILE: Closeable.java ---
/*
 * Created on 21.04.2005
 *
 * TODO To change the template for this generated file go to
 * Window - Preferences - Java - Code Style - Code Templates
 */
package net.sf.magicmap.client.delegate.interfaces;

import java.io.IOException;

/**
 * @author radetzki
 *
 */
public interface Closeable {
	public void close() throws IOException;

}

Index: PositionFacadeInterface.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/delegate/interfaces/PositionFacadeInterface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PositionFacadeInterface.java	12 Feb 2005 16:00:28 -0000	1.2
--- PositionFacadeInterface.java	21 Apr 2005 10:53:26 -0000	1.3
***************
*** 6,10 ****
  package net.sf.magicmap.client.delegate.interfaces;
  
- import java.io.Closeable;
  import java.rmi.RemoteException;
  
--- 6,9 ----
***************
*** 23,27 ****
     * legt eine neue Position an
     * 
!    * @param sessionId gültige sessionId
     * @param mapName Name der Karte
     * @param positionX x-Position im Image 
--- 22,26 ----
     * legt eine neue Position an
     * 
!    * @param sessionId g�ltige sessionId
     * @param mapName Name der Karte
     * @param positionX x-Position im Image 
***************
*** 29,33 ****
     * @param character Signalcharacteristik an dieser Position
     * @param Name der Position (Ort an dieser Position)
!    * @throws SessionException ungültige session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
--- 28,32 ----
     * @param character Signalcharacteristik an dieser Position
     * @param Name der Position (Ort an dieser Position)
!    * @throws SessionException ung�ltige session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
***************
*** 37,43 ****
  
    /**
!    * Legt eine Position für einen Client fest oder korrigiert diese
     * 
!    * @param sessionId gültige sessionId
     * @param mapName Name der Karte
     * @param positionX x-Position im Image 
--- 36,42 ----
  
    /**
!    * Legt eine Position f�r einen Client fest oder korrigiert diese
     * 
!    * @param sessionId g�ltige sessionId
     * @param mapName Name der Karte
     * @param positionX x-Position im Image 
***************
*** 45,49 ****
     * @param character Signalcharacteristik an dieser Position
     * @param clientMac Macc Adresse, des zu positionierenden Clients
!    * @throws SessionException ungültige session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
--- 44,48 ----
     * @param character Signalcharacteristik an dieser Position
     * @param clientMac Macc Adresse, des zu positionierenden Clients
!    * @throws SessionException ung�ltige session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
***************
*** 53,59 ****
  
    /**
!    * Legt eine Position für einen AccessPoint fest oder korrigiert diese
     * 
!    * @param sessionId gültige sessionId
     * @param mapName Name der Karte
     * @param positionX x-Position im Image 
--- 52,58 ----
  
    /**
!    * Legt eine Position f�r einen AccessPoint fest oder korrigiert diese
     * 
!    * @param sessionId g�ltige sessionId
     * @param mapName Name der Karte
     * @param positionX x-Position im Image 
***************
*** 61,65 ****
     * @param character Signalcharacteristik an dieser Position
     * @param accessPointMac Macc Adresse, des zu positionierenden Clients
!    * @throws SessionException ungültige session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
--- 60,64 ----
     * @param character Signalcharacteristik an dieser Position
     * @param accessPointMac Macc Adresse, des zu positionierenden Clients
!    * @throws SessionException ung�ltige session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
***************
*** 70,79 ****
     * Verschiebt eine beliebige Position auf der Karte
     * 
!    * @param sessionId gültige session id
     * @param mapName Name der Karte
!    * @param positionId Eindeutige id für diese Position
     * @param newPositionX neue x-Position
     * @param newPositionY neue y-Position
!    * @throws SessionException ungültige Session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
--- 69,78 ----
     * Verschiebt eine beliebige Position auf der Karte
     * 
!    * @param sessionId g�ltige session id
     * @param mapName Name der Karte
!    * @param positionId Eindeutige id f�r diese Position
     * @param newPositionX neue x-Position
     * @param newPositionY neue y-Position
!    * @throws SessionException ung�ltige Session
     * @throws MapException Fehlende Karte, inkosistente Positionsangaben
     */
***************
*** 82,91 ****
  
    /**
!    * löscht eine Position
!    * Löschen bedeutet dabei, das das "deleted"-Flag auf true gesetzt wird
     * 
!    * @param sessionId gültige Session
!    * @param positionId Eindeutige id für diese Position
!    * @throws SessionException ungültige Session
     * @throws MapException Fehlende Karte
     */
--- 81,90 ----
  
    /**
!    * l�scht eine Position
!    * L�schen bedeutet dabei, das das "deleted"-Flag auf true gesetzt wird
     * 
!    * @param sessionId g�ltige Session
!    * @param positionId Eindeutige id f�r diese Position
!    * @throws SessionException ung�ltige Session
     * @throws MapException Fehlende Karte
     */
***************
*** 94,103 ****
  
    /**
!    * Liefert alle geänderte Positionen, seit dem übermittelten Zeitstempel
!    * Zeitstempel -1 liefert alle aktuellen/nicht gelöschten Positionen 
     * 
!    * @param sessionId gültige SessionId
     * @param mapName   Name der Map
!    * @param timeStamp Zeitstempel, ab dem geänderte Positionen geliefert werden sollen, bei -1 werden alle gültigen Positionen geliefert
     * @return Liste aller Positionen der Karte
     * @throws MapException Fehlende Karte
--- 93,102 ----
  
    /**
!    * Liefert alle ge�nderte Positionen, seit dem �bermittelten Zeitstempel
!    * Zeitstempel -1 liefert alle aktuellen/nicht gel�schten Positionen 
     * 
!    * @param sessionId g�ltige SessionId
     * @param mapName   Name der Map
!    * @param timeStamp Zeitstempel, ab dem ge�nderte Positionen geliefert werden sollen, bei -1 werden alle g�ltigen Positionen geliefert
     * @return Liste aller Positionen der Karte
     * @throws MapException Fehlende Karte

[Magicmap-commits] magicmapserver .classpath,1.3,1.4

[Vladimir S. <vst...@us...>]

Update of /cvsroot/magicmap/magicmapserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16325

Modified Files:
	.classpath 
Log Message:
JDK_TOOLS entfernt

Index: .classpath
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/.classpath,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .classpath	14 Feb 2005 12:05:56 -0000	1.3
--- .classpath	14 Apr 2005 10:46:57 -0000	1.4
***************
*** 4,8 ****
  	<classpathentry output="dblayer/bin" kind="src" path="dblayer/src"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- 	<classpathentry kind="var" path="JDK_TOOLS"/>
  	<classpathentry kind="lib" path="web/WEB-INF/lib/log4j-1.2.8.jar"/>
  	<classpathentry kind="lib" path="web/WEB-INF/lib/jpox-20041204.032009.jar"/>
--- 4,7 ----

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/measurement AbstractScanner.java,1.1,1.2 UDPScanner.java,1.1,1.2

[Vladimir S. <vst...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/measurement
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5600/src/net/sf/magicmap/client/measurement

Modified Files:
	AbstractScanner.java UDPScanner.java 
Log Message:
+ catch DateParseException - use current time (workaround)  

Index: UDPScanner.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/measurement/UDPScanner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UDPScanner.java	16 Jan 2005 16:01:31 -0000	1.1
--- UDPScanner.java	14 Apr 2005 10:24:59 -0000	1.2
***************
*** 91,94 ****
--- 91,96 ----
        StringTokenizer st = new StringTokenizer(recievedStr, "|");
  
+       //System.out.println("Paket empfangen: " + recievedStr);
+       
        String ssid;
        String bssid;
***************
*** 117,121 ****
          clientMac = trim(st.nextToken());
          clientAddress = packet.getAddress().toString();
!         Date lastSeenDate = ScanResult.df.parse(lastSeen);
          double signalLevel = 0.0;
          double noised = 0.0;
--- 119,130 ----
          clientMac = trim(st.nextToken());
          clientAddress = packet.getAddress().toString();
!         
!         Date lastSeenDate = new Date(System.currentTimeMillis());
!         //@TODO Auch englische Dsatumsformate parsen
!         try {
!           lastSeenDate = ScanResult.df.parse(lastSeen);
!         } catch (Exception e){
!           //@TODO handle exception
!         }
          double signalLevel = 0.0;
          double noised = 0.0;
***************
*** 144,148 ****
  
      } catch (Exception e){
! 
      }
    }
--- 153,157 ----
  
      } catch (Exception e){
!       e.printStackTrace();
      }
    }

Index: AbstractScanner.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/measurement/AbstractScanner.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractScanner.java	16 Jan 2005 16:01:31 -0000	1.1
--- AbstractScanner.java	14 Apr 2005 10:24:59 -0000	1.2
***************
*** 42,46 ****
     */
    protected synchronized void notifyScan(ScanResult result){
!     Iterator it = listeners.iterator();
      while (it.hasNext()){
        ScannerListener l = (ScannerListener) it.next();
--- 42,47 ----
     */
    protected synchronized void notifyScan(ScanResult result){
!     //System.out.println("Scan: " +result);
!   	Iterator it = listeners.iterator();
      while (it.hasNext()){
        ScannerListener l = (ScannerListener) it.next();
***************
*** 54,57 ****
--- 55,59 ----
     */
    protected synchronized void notifyRoundComplete(){
+     //System.out.println("Runde komplett");
      Iterator it = listeners.iterator();
      while (it.hasNext()){

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/views MapView.java,1.3,1.4

[Tobias H. <thu...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21240/src/net/sf/magicmap/client/views

Modified Files:
	MapView.java 
Log Message:


Index: MapView.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MapView.java	16 Feb 2005 18:38:49 -0000	1.3
--- MapView.java	18 Feb 2005 09:23:46 -0000	1.4
***************
*** 1075,1082 ****
      }
      Node node = findNode(v);
!     if (node != null && (node.getType() == NodeModel.NODETYPE_LOCATION || node.getType() == NodeModel.NODETYPE_CLIENT)
!         && node != Controller.getInstance().getClient()){
!       Controller.getInstance().setMeasurementViewLocal(false);
!       Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node);
      } else{
        Controller.getInstance().setMeasurementViewLocal(true);
--- 1075,1086 ----
      }
      Node node = findNode(v);
!     if (node != null && (node.getType() == NodeModel.NODETYPE_LOCATION || node.getType() == NodeModel.NODETYPE_CLIENT)) {
!       if (node != Controller.getInstance().getClient()) {
!         Controller.getInstance().setMeasurementViewLocal(false);
!         Controller.getInstance().buildOtherMeasurement((AccessPointSeerNode) node);
!       }  
!       Controller.getInstance().getMeasurementView().setTitle(GUIUtils.i18n("measurementfor") + " " + node.getDisplayName());
!       
!       
      } else{
        Controller.getInstance().setMeasurementViewLocal(true);

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/utils Version.java,1.4,1.5

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4641/src/net/sf/magicmap/client/utils

Modified Files:
	Version.java 
Log Message:
+version 0.4 released => new version is 0.5

Index: Version.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Version.java	16 Feb 2005 09:02:03 -0000	1.4
--- Version.java	16 Feb 2005 20:37:23 -0000	1.5
***************
*** 14,18 ****
    public static final String PROTOCOL_VERSION = "0.3";
    public static final int VERSION_MAJOR = 0;
!   public static final int VERSION_MINOR = 4;
    public static final String VERSION_FLAVOR = "alpha";
      
--- 14,18 ----
    public static final String PROTOCOL_VERSION = "0.3";
    public static final int VERSION_MAJOR = 0;
!   public static final int VERSION_MINOR = 5;
    public static final String VERSION_FLAVOR = "alpha";
      

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/views MapView.java,1.2,1.3

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5504/src/net/sf/magicmap/client/views

Modified Files:
	MapView.java 
Log Message:
+Fix text color bug

Index: MapView.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/views/MapView.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MapView.java	13 Feb 2005 21:36:39 -0000	1.2
--- MapView.java	16 Feb 2005 18:38:49 -0000	1.3
***************
*** 173,176 ****
--- 173,199 ----
    }
    
+   public Color getFgColorForNode(Node node){
+     if (node == null) return null;
+     switch (node.getType()) {
+       case NodeModel.NODETYPE_CLIENT :
+         if (!showClients) {
+           return null;
+         }
+         return Color.BLACK;
+       case NodeModel.NODETYPE_ACCESSPOINT :
+         if (!showAccessPoints) {
+           return null;
+         }
+         return Color.BLACK;
+       case NodeModel.NODETYPE_LOCATION :
+         if (!showLocations) {
+           return null;
+         }
+         return Color.BLACK;
+       default :
+         return Color.BLACK;
+     }
+   }
+   
    public Color getBgColorForNode(Node node){
      if (node == null) return null;
***************
*** 389,393 ****
  
        public Color getForeColor(Vertex v){
!         return null;
        }
  
--- 412,417 ----
  
        public Color getForeColor(Vertex v){
!         Node node = findNode(v);
!         return getFgColorForNode(node);
        }
  

[Magicmap-commits] magicmapclient/src/localhost/magicmap/services/PositionFacade PositionFacadeSoapBindingStub.java,1.2,1.3

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/PositionFacade
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26841/src/localhost/magicmap/services/PositionFacade

Modified Files:
	PositionFacadeSoapBindingStub.java 
Log Message:
+Bug in webservice interface fixed, magicmap 0.3 was broken...

Index: PositionFacadeSoapBindingStub.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/localhost/magicmap/services/PositionFacade/PositionFacadeSoapBindingStub.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PositionFacadeSoapBindingStub.java	13 Feb 2005 22:27:53 -0000	1.2
--- PositionFacadeSoapBindingStub.java	16 Feb 2005 09:02:19 -0000	1.3
***************
*** 198,207 ****
              java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
              java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
!             qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.exception.SessionException.class;
              cachedSerClasses.add(cls);
!             cachedSerFactories.add(beansf);
!             cachedDeserFactories.add(beandf);
  
              qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException");
--- 198,207 ----
              java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class;
              java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class;
!             qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_PositionDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.PositionDTO[].class;
              cachedSerClasses.add(cls);
!             cachedSerFactories.add(arraysf);
!             cachedDeserFactories.add(arraydf);
  
              qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "MapException");
***************
*** 212,229 ****
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SimpleScanResultDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.SimpleScanResultDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.SignalCharacterDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
              qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO");
              cachedSerQNames.add(qName);
--- 212,236 ----
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("http://exception.server.magicmap.sf.net", "SessionException");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.exception.SessionException.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.ClientDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
+             qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_SimpleScanResultDTO");
+             cachedSerQNames.add(qName);
+             cls = net.sf.magicmap.server.dto.SimpleScanResultDTO[].class;
+             cachedSerClasses.add(cls);
+             cachedSerFactories.add(arraysf);
+             cachedDeserFactories.add(arraydf);
+ 
              qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "PositionDTO");
              cachedSerQNames.add(qName);
***************
*** 233,263 ****
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.AccessPointDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "ClientDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.ClientDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_SimpleScanResultDTO");
!             cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.SimpleScanResultDTO[].class;
!             cachedSerClasses.add(cls);
!             cachedSerFactories.add(arraysf);
!             cachedDeserFactories.add(arraydf);
! 
!             qName = new javax.xml.namespace.QName("http://localhost:8080/magicmap/services/PositionFacade", "ArrayOf_tns2_PositionDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.PositionDTO[].class;
              cachedSerClasses.add(cls);
!             cachedSerFactories.add(arraysf);
!             cachedDeserFactories.add(arraydf);
  
      }
--- 240,263 ----
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SimpleScanResultDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.SimpleScanResultDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "SignalCharacterDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.SignalCharacterDTO.class;
              cachedSerClasses.add(cls);
              cachedSerFactories.add(beansf);
              cachedDeserFactories.add(beandf);
  
!             qName = new javax.xml.namespace.QName("urn:dto.server.magicmap.sf.net", "AccessPointDTO");
              cachedSerQNames.add(qName);
!             cls = net.sf.magicmap.server.dto.AccessPointDTO.class;
              cachedSerClasses.add(cls);
!             cachedSerFactories.add(beansf);
!             cachedDeserFactories.add(beandf);
  
      }

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/server/exception MapException.java,1.2,1.3

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26841/src/net/sf/magicmap/server/exception

Modified Files:
	MapException.java 
Log Message:
+Bug in webservice interface fixed, magicmap 0.3 was broken...

Index: MapException.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/server/exception/MapException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MapException.java	13 Feb 2005 22:27:53 -0000	1.2
--- MapException.java	16 Feb 2005 09:02:31 -0000	1.3
***************
*** 18,22 ****
      public MapException(String message) {
        super(message);
!     }
  
      private java.lang.Object __equalsCalc = null;
--- 18,22 ----
      public MapException(String message) {
        super(message);
!       }
  
      private java.lang.Object __equalsCalc = null;

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/controller ServerManager.java,1.4,1.5

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26841/src/net/sf/magicmap/client/controller

Modified Files:
	ServerManager.java 
Log Message:
+Bug in webservice interface fixed, magicmap 0.3 was broken...

Index: ServerManager.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/controller/ServerManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ServerManager.java	13 Feb 2005 22:27:52 -0000	1.4
--- ServerManager.java	16 Feb 2005 09:02:31 -0000	1.5
***************
*** 5,14 ****
  package net.sf.magicmap.client.controller;
  
- import java.sql.Timestamp;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.Calendar;
  import java.util.Collection;
- import java.util.Date;
  import java.util.GregorianCalendar;
  import java.util.Iterator;
--- 5,12 ----
***************
*** 229,234 ****
        //       zunächst nicht wichtig)
  
!       ArrayList list = new ArrayList(Arrays.asList(signalCharacter.getSimpleScanResults()));
! 
        Calendar c = new GregorianCalendar();
        c.setTimeInMillis(System.currentTimeMillis());
--- 227,236 ----
        //       zunächst nicht wichtig)
  
!       ArrayList list;
!       if (signalCharacter.getSimpleScanResults() == null){
!         list = new ArrayList();
!       } else {
!         list = new ArrayList(Arrays.asList(signalCharacter.getSimpleScanResults())); 
!       }
        Calendar c = new GregorianCalendar();
        c.setTimeInMillis(System.currentTimeMillis());
***************
*** 256,259 ****
--- 258,263 ----
      if (isConnected()){
        final SignalCharacterDTO signalCharacter = currentSignalCharacter();
+       System.out.println("signalCharacter.getSimpleScanResults() " + signalCharacter.getSimpleScanResults());
+       
        Thread createPositionThread = new Thread() {
  

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/utils Version.java,1.3,1.4 Settings.java,1.3,1.4

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26785/src/net/sf/magicmap/client/utils

Modified Files:
	Version.java Settings.java 
Log Message:
+ show version information

Index: Settings.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Settings.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Settings.java	15 Feb 2005 15:06:39 -0000	1.3
--- Settings.java	16 Feb 2005 09:02:03 -0000	1.4
***************
*** 20,23 ****
--- 20,25 ----
    public static String         clientPassword      = "test";
  
+   public static String         NIGHTLY = "";
+   
    public static String         hostname            = "phl.informatik.hu-berlin.de";
    public static int            port                = 80;
***************
*** 76,79 ****
--- 78,85 ----
            WEBSERVICE_PATH = args[i];
          }
+         if (arg.equals("--nightly")){
+           i++;
+           NIGHTLY = args[i];
+         }
        }
      }

Index: Version.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/utils/Version.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Version.java	13 Feb 2005 21:36:38 -0000	1.3
--- Version.java	16 Feb 2005 09:02:03 -0000	1.4
***************
*** 10,14 ****
   *
   */
! public interface Version {
  
    public static final String PROTOCOL_VERSION = "0.3";
--- 10,14 ----
   *
   */
! public abstract class Version {
  
    public static final String PROTOCOL_VERSION = "0.3";
***************
*** 16,21 ****
    public static final int VERSION_MINOR = 4;
    public static final String VERSION_FLAVOR = "alpha";
!   
!   public static final String VERSION  = VERSION_MAJOR + "." + VERSION_MINOR  + VERSION_FLAVOR;
    
  }
\ No newline at end of file
--- 16,23 ----
    public static final int VERSION_MINOR = 4;
    public static final String VERSION_FLAVOR = "alpha";
!     
!   public static String getVersion(){
!     return VERSION_MAJOR + "." + VERSION_MINOR  + VERSION_FLAVOR + " " + Settings.NIGHTLY;
!   }
    
  }
\ No newline at end of file

[Magicmap-commits] magicmapclient/src/net/sf/magicmap/client/gui MainGUI.java,1.3,1.4

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26785/src/net/sf/magicmap/client/gui

Modified Files:
	MainGUI.java 
Log Message:
+ show version information

Index: MainGUI.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapclient/src/net/sf/magicmap/client/gui/MainGUI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MainGUI.java	15 Feb 2005 15:06:38 -0000	1.3
--- MainGUI.java	16 Feb 2005 09:02:02 -0000	1.4
***************
*** 112,116 ****
      // Hauptfenstereigenschaften setzen
      this.setSize(new Dimension(1024, 768));
!     this.setTitle("MagicMap - Version " + Version.VERSION);
      this.setIconImage(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMapLogo.gif")).getImage());
      // Menu erstellen
--- 112,116 ----
      // Hauptfenstereigenschaften setzen
      this.setSize(new Dimension(1024, 768));
!     this.setTitle("MagicMap - Version " + Version.getVersion());
      this.setIconImage(new ImageIcon(this.getClass().getClassLoader().getResource("MagicMapLogo.gif")).getImage());
      // Menu erstellen
***************
*** 210,214 ****
      aboutAction = new MagicAction("about") {
        public void actionPerformed(ActionEvent e){
!         JOptionPane.showMessageDialog(MainGUI.this, "MagicMap - Version " + Version.VERSION +"\n\nHumboldt-Universität zu Berlin\nInstitut für Informatik, Peter Ibach, Tobias Hübner, Martin Schweigert",GUIUtils.i18n("about",false),JOptionPane.PLAIN_MESSAGE);
        }};
        
--- 210,214 ----
      aboutAction = new MagicAction("about") {
        public void actionPerformed(ActionEvent e){
!         JOptionPane.showMessageDialog(MainGUI.this, "MagicMap - Version " + Version.getVersion() +"\n\nHumboldt-Universität zu Berlin\nInstitut für Informatik, Peter Ibach, Tobias Hübner, Martin Schweigert",GUIUtils.i18n("about",false),JOptionPane.PLAIN_MESSAGE);
        }};
        

[Magicmap-commits] magicmapserver/src/net/sf/magicmap/server/dto SignalCharacterDTO.java,1.1,1.2

[Martin S. <sch...@us...>]

Update of /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26024/src/net/sf/magicmap/server/dto

Modified Files:
	SignalCharacterDTO.java 
Log Message:
+Bug in webservice interface fixed, magicmap 0.3 was broken...

Index: SignalCharacterDTO.java
===================================================================
RCS file: /cvsroot/magicmap/magicmapserver/src/net/sf/magicmap/server/dto/SignalCharacterDTO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SignalCharacterDTO.java	12 Feb 2005 15:19:28 -0000	1.1
--- SignalCharacterDTO.java	16 Feb 2005 08:58:27 -0000	1.2
***************
*** 15,38 ****
   * (at your option) any later version.
   */
! public class SignalCharacterDTO{
  
!   private ArrayList simpleScanResults = new ArrayList();
  
-   /**
-    */
    public SignalCharacterDTO() {
!   //
    }
  
! 
  
    public SimpleScanResultDTO[] getSimpleScanResults(){
!     return (SimpleScanResultDTO[]) this.simpleScanResults.toArray(new SimpleScanResultDTO[0]);
    }
  
!   public void addSimpleScan(SimpleScanResultDTO ssr){
!     this.simpleScanResults.add(ssr);
    }
  
- 
  }
\ No newline at end of file
--- 15,36 ----
   * (at your option) any later version.
   */
! public class SignalCharacterDTO {
  
!   private SimpleScanResultDTO[] simpleScanResults;
  
    public SignalCharacterDTO() {
!   //  
    }
  
!   public SignalCharacterDTO(SimpleScanResultDTO[] simpleScanResults) {
!     this.simpleScanResults = simpleScanResults;}
  
    public SimpleScanResultDTO[] getSimpleScanResults(){
!     return this.simpleScanResults;
    }
  
!   public void setSimpleScanResults(SimpleScanResultDTO[] ssr){
!     this.simpleScanResults = ssr;
    }
  
  }
\ No newline at end of file