[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/serialization ...

[Anil Saldhana]

  User: asaldhana
  Date: 06/08/25 17:12:05

  Modified:    src/main/org/jboss/remoting/serialization 
                        SerializationStreamFactory.java
  Log:
  JBREM-419: Serialization Managers for Java/JBoss encryption
  
  Revision  Changes    Path
  1.24      +23 -2     JBossRemoting/src/main/org/jboss/remoting/serialization/SerializationStreamFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SerializationStreamFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/serialization/SerializationStreamFactory.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- SerializationStreamFactory.java	18 Aug 2006 17:48:44 -0000	1.23
  +++ SerializationStreamFactory.java	25 Aug 2006 21:12:05 -0000	1.24
  @@ -23,7 +23,9 @@
   package org.jboss.remoting.serialization;
   
   import org.jboss.logging.Logger;
  +import org.jboss.remoting.serialization.impl.java.JavaEncryptionSerializationManager;
   import org.jboss.remoting.serialization.impl.java.JavaSerializationManager;
  +import org.jboss.remoting.serialization.impl.jboss.JBossEncryptionSerializationManager;
   
   import java.io.IOException;
   import java.util.HashMap;
  @@ -46,6 +48,8 @@
      public static final String DEFAULT = "default";
      public static final String JAVA = "java";
      public static final String JBOSS = "jboss";
  +   public static final String JAVA_ENCRYPT = "javaencrypt";
  +   public static final String JBOSS_ENCRYPT = "jbossencrypt";
   
   
      static
  @@ -76,7 +80,24 @@
            log.debug("Could not load JBoss Serialization.  Use Java Serialization default.");
            log.trace(e);
         }
  -
  +      try
  +      {
  +         setManagerClassName(JAVA_ENCRYPT, JavaEncryptionSerializationManager.class.getName());
  +      }
  +      catch(Throwable e) // catching throwable as if jboss serialization not on classpath, will throw NoClassDefFoundError
  +      {
  +         log.debug("Could not load Java Encrypted Serialization.  Use Java Serialization default.");
  +         log.trace(e);
  +      }
  +      try
  +      {
  +         setManagerClassName(JBOSS_ENCRYPT, JBossEncryptionSerializationManager.class.getName());
  +      }
  +      catch(Throwable e) // catching throwable as if jboss serialization not on classpath, will throw NoClassDefFoundError
  +      {
  +         log.debug("Could not load JBoss Encrypted Serialization.  Use Java Serialization default.");
  +         log.trace(e);
  +      }
      }
   
      /**