[jboss-cvs] JBossCache/src/org/jboss/cache/marshall ...

[Manik Surtani]

  User: msurtani
  Date: 07/01/29 12:40:35

  Modified:    src/org/jboss/cache/marshall 
                        ObjectSerializationFactory.java
  Log:
  Doc improvements
  
  Revision  Changes    Path
  1.20      +11 -2     JBossCache/src/org/jboss/cache/marshall/ObjectSerializationFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ObjectSerializationFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/ObjectSerializationFactory.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ObjectSerializationFactory.java	12 Jan 2007 17:02:02 -0000	1.19
  +++ ObjectSerializationFactory.java	29 Jan 2007 17:40:35 -0000	1.20
  @@ -30,8 +30,17 @@
   
      static
      {
  -      String useJBossSerializationStr = System.getProperty("serialization.jboss", "true");
  -      useJBossSerialization = Boolean.valueOf(useJBossSerializationStr);
  +      // start with the NEW property
  +      String propString = System.getProperty("jboss.serialization");
  +      if (propString == null)
  +      {
  +         // and now check legacy
  +         propString = System.getProperty("serialization.jboss");
  +         if (propString != null)
  +            log.info("The system property 'serialization.jboss' is deprecated and may be removed from future releases.  Please use 'jboss.serialization' instead.");
  +      }      
  +      useJBossSerialization = true; // default.
  +      if (propString != null) useJBossSerialization = Boolean.valueOf(propString);
   
         try
         {