Changeset 23

Timestamp:

08/10/10 17:31:35 (13 years ago)

Author:

bowman

Message:

Prepared for 0.9.0 release.

Location:

trunk

Files:

• README.0.9.0.txt (modified) (1 diff)
• README.Compiling.txt (modified) (3 diffs)
• src/com/bowman/cardserv/CardServProxy.java (modified) (1 diff)
• src/com/bowman/cardserv/cws/CwsServiceMapper.java (modified) (3 diffs)
• src/com/bowman/cardserv/session/EcmTransaction.java (modified) (1 diff)
• src/com/bowman/cardserv/web/FileFetcher.java (modified) (1 diff)

trunk/README.0.9.0.txt

@@ -7 +7 @@
 
 - Don't attempt to use an existing config. Start from scratch (with no proxy.xml) and use the generated config template.
-  Allow the default plugins to remain unless you find good reason to do otherwise.
+  Allow the default plugins to remain unless you find good reason to do otherwise. The generated config is the only
+  example template included in 0.9.0.
 
 - Since the max connections limit is now per profile and not global:

trunk/README.Compiling.txt

@@ -5 +5 @@
 
 You'll need the following:
-- The Java SE sdk and compiler (j2sdk) 1.6 or later: http://developers.sun.com/downloads/new.jsp
+- The Java SE sdk and compiler (jdk) 1.6 or later: http://java.sun.com/javase/downloads/widget/jdk6.jsp
 NOTE: As of 0.8.10 java 1.6 is required to compile everything, but 1.4 is still enough to run the proxy.
 Sun only provides downloads for linux/win/solaris, osx users look to apple: http://developer.apple.com/java/download/
@@ -13 +13 @@
 http://java.sun.com/docs/books/tutorial/
 
-The proxy comes with project files for Intellij IDEA 7, but you don't need this to compile (its a commercial product):
+The proxy comes with project files for Intellij IDEA 9, but you don't need this to compile (its a commercial product):
 http://www.jetbrains.com/idea/index.html
 NOTE: There is now a open source community version as well, which works perfectly with the csp project files.
@@ -23 +23 @@
 following procedure:
 
-$ tar xvzf cardservproxy-0.8.13-src.tar.gz
+$ tar xvzf cardservproxy-0.9.0-src.tar.gz
 $ cd cardservproxy-src
 $ ant

trunk/src/com/bowman/cardserv/CardServProxy.java

@@ -579 +579 @@
       if(!userManager.isMapExcluded(session.getUser())) {
         session.setFlag(msg, 'P');
+        // hack to track the origin user of the probe later (conn name is normally only used for reply messages)
+        msg.setConnectorName(session.toString());
+
         broadcastMessage(msg, connectors.getUnknown(), true);
       }

trunk/src/com/bowman/cardserv/cws/CwsServiceMapper.java

@@ -542 +542 @@
     if(!connectors.contains(conn.getName())) {
       connectors.add(conn.getName());
-      logger.info("Discovered service [" + config.getServiceName(msg) + "] on CWS: " + conn);      
+      String source = (session==null?msg.getConnectorName():session.toString()); // conn name contains origin-session in case of probes
+      logger.info("Discovered service [" + config.getServiceName(msg) + "] on CWS: " + conn +
+          (source==null?"":" - Ecm source was: " + source));
       if(session != null) session.setFlag(msg, '+');
       cacheUpdated = true;
@@ -568 +570 @@
           connectors.remove(conn.getName());
           setLastFailed(id, conn.getName(), false, -1);
-          String s = "Service [" + config.getServiceName(msg) + "] no longer available on CWS: " + conn.getName() +
-              " Ecm source was: " + session;
-          if(resetServices.contains(id)) logger.info(s);
-          else logger.warning(s);
+          if(session != null) {
+            String s = "Service [" + config.getServiceName(msg) + "] no longer available on CWS: " + conn.getName() +
+                " Ecm source was: " + session;
+            if(resetServices.contains(id)) logger.info(s);
+            else logger.warning(s);
+          }
           resetSingle(new ServiceMapping(id.serviceId, -1), conn.getName());
           if(session != null) session.setFlag(msg, '-');
@@ -581 +585 @@
         } else {
           if(overrideCanDecodeMap.containsKey(id)) {
-            logger.info("Service [" + config.getServiceName(msg) + "] failed to decode on CWS: " + conn.getName() +
-                " (according to the manual can-decode list it should always decode). Ecm source was: " + session);
+            if(session != null)
+              logger.info("Service [" + config.getServiceName(msg) + "] failed to decode on CWS: " + conn.getName() +
+                  " (according to the manual can-decode list it should always decode). Ecm source was: " + session);
             return;
           } else {
-            String s = "Service [" + config.getServiceName(msg) + "] failed to decode on CWS: "  + conn.getName() +
-                " (two consecutive failures removes mapping). Ecm source was: " + session;
-            if(resetServices.contains(id)) logger.info(s);
-            else logger.warning(s);
+            if(session != null) {
+              String s = "Service [" + config.getServiceName(msg) + "] failed to decode on CWS: "  + conn.getName() +
+                  " (two consecutive failures removes mapping). Ecm source was: " + session;
+              if(resetServices.contains(id)) logger.info(s);
+              else logger.warning(s);
+            }
             setLastFailed(id, conn.getName(), true, session==null?-1:session.getId());
             return;

trunk/src/com/bowman/cardserv/session/EcmTransaction.java

@@ -106 +106 @@
   public String getConnectorName() {
     if(reply != null && reply.getConnectorName() != null) return reply.getConnectorName();
-    else if(request != null && request.getConnectorName() != null) return request.getConnectorName();
     else return null;
   }

trunk/src/com/bowman/cardserv/web/FileFetcher.java

@@ -86 +86 @@
     }
     addConnection(conn);
-    if(lastModified != -1 && conn.getLastModified() != 0) {
+    if(lastModified > 0 && conn.getLastModified() > 0) {
       if(conn.getLastModified() <= lastModified) return null;
     }