Changeset 7548


Ignore:
Timestamp:
Dec 10, 2018, 12:53:32 PM (4 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #2134: Deprecate secondary storage

Code and documentatation has been updated.

Location:
trunk
Files:
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/config/dist/base.config

    r7521 r7548  
    125125# Secondary storage section
    126126# =========================
     127#
     128# DEPRECTAED SINC BASE 3.14. IT WILL BE REMOVED IN A NEAR FUTURE.
     129#
    127130# The classname of the driver; leave empty to disable secondary storage
    128131# secondary.storage.driver   = net.sf.basedb.core.InternalStorageController
  • trunk/doc/src/docbook/admin/installation.xml

    r7547 r7548  
    112112      </para>
    113113     
     114      <bridgehead>Secondary storage</bridgehead>
     115      <para>
     116        The <guilabel>Secondary storage</guilabel> feature has been deprecated
     117        and will be removed in a future release. The recommendation is to replace
     118        this feature with an external files solution instead.
     119      </para>
     120     
    114121    </important>
    115122   
  • trunk/doc/src/docbook/appendix/base.config.xml

    r7521 r7548  
    443443    <title>Secondary storage controller</title>
    444444   
     445    <note>
     446      This feature has been deprecated in BASE 3.14 and will be removed in a
     447      future release. The recommendation is to replace this with an
     448      external files solution instead.
     449    </note>
     450   
    445451    <para>
    446452      This section contains settings for the secondary storage controller. See
  • trunk/doc/src/docbook/developer/extensions.xml

    r7543 r7548  
    19901990       
    19911991        The BASE plug-ins site has an connection manager that support
    1992         the Hadoop distributed file system (HDFS): <ulink
    1993         url="http://baseplugins.thep.lu.se/wiki/net.sf.basedb.hdfs">
    1994         http://baseplugins.thep.lu.se/wiki/net.sf.basedb.hdfs</ulink>
     1992        external files via FTP and SFTP: <ulink
     1993        url="http://baseplugins.thep.lu.se/wiki/net.sf.basedb.xfiles">
     1994        http://baseplugins.thep.lu.se/wiki/net.sf.basedb.xfiles</ulink>
    19951995      </para>
    19961996     
  • trunk/doc/src/docbook/developer/plugins.xml

    r6863 r7548  
    34813481    <sect2 id="plugin_developer.other.secondary">
    34823482      <title>Secondary file storage plugins</title>
     3483     
     3484      <note>
     3485        This feature has been deprecated in BASE 3.14 and will be removed in a
     3486        future release. The recommendation is to replace this with an
     3487        external files solution instead. See <xref linkend="extensions_developer.connection_manager" />
     3488        for more information.
     3489      </note>
    34833490     
    34843491      <sect3 id="plugin_developer.other.secondary.vsprimary">
  • trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

    r7516 r7548  
    17231723    @since 2.5
    17241724  */
     1725  @SuppressWarnings("deprecation")
    17251726  public static String getFileLinks(String ID, File file, String root)
    17261727  {
  • trunk/src/core/net/sf/basedb/core/Application.java

    r7540 r7548  
    447447      secondaryStorageDriver = Config.getString("secondary.storage.driver");
    448448      log.info("secondary.storage.driver = " + secondaryStorageDriver);
     449      if (secondaryStorageDriver != null)
     450      {
     451        log.warn("The secondary storage feature has been deprecated in BASE 3.14 and will be removed in a future release.");
     452      }
    449453     
    450454      sessionCacheTimeout = Config.getInt("cache.timeout", 20); // minutes
     
    764768    @return TRUE if a secondary storage is available, FALSE otherwise
    765769    @see File#setLocation(Location)
    766   */
     770    @deprecated In 3.14, no replacement
     771  */
     772  @Deprecated
    767773  public static boolean hasSecondaryStorage()
    768774  {
     
    777783    @throws BaseException If the controller class could not be loaded
    778784    @see #hasSecondaryStorage()
    779   */
     785    @deprecated In 3.14, no replacement
     786  */
     787  @Deprecated
    780788  static SecondaryStorageController getSecondaryStorageController()
    781789  {
     
    12481256  }
    12491257
    1250  
     1258  @Deprecated
    12511259  private static class SecondaryStorageControllerTask
    12521260    extends TimerTask
  • trunk/src/core/net/sf/basedb/core/DbControl.java

    r7513 r7548  
    572572    @throws BaseException If there is another error
    573573  */
     574  @SuppressWarnings("deprecation")
    574575  private void updateDiskUsage(BasicItem item)
    575576    throws QuotaException, BaseException
  • trunk/src/core/net/sf/basedb/core/File.java

    r7511 r7548  
    769769    Get the {@link File.Action} of this file.
    770770    @return the action
    771   */
     771    @deprecated In 3.14, no replacement
     772  */
     773  @Deprecated
    772774  public File.Action getAction()
    773775  {
     
    782784      write permission
    783785    @throws InvalidUseOfNullException If action is null
    784   */
     786    @deprecated In 3.14, no replacement
     787  */
     788  @Deprecated
    785789  public void setAction(File.Action action)
    786790    throws PermissionDeniedException, InvalidUseOfNullException
     
    10101014    @throws PermissionDeniedException If the logged in user doesn't have write permission
    10111015  */
     1016  @SuppressWarnings("deprecation")
    10121017  public void setUrl(String url, boolean loadMetadata)
    10131018  {
     
    10601065    @throws PermissionDeniedException If the logged in user doesn't have write permission
    10611066  */
     1067  @SuppressWarnings("deprecation")
    10621068  public void setUrl(String url, UriMetadata metadata)
    10631069  {
     
    16881694   
    16891695    @author enell
    1690   */
     1696    @deprecated In 3.14, no replacement
     1697  */
     1698  @Deprecated
    16911699  public enum Action
    16921700  {
  • trunk/src/core/net/sf/basedb/core/Install.java

    r7536 r7548  
    11501150    Create a {@link QuotaType}.
    11511151  */
     1152  @SuppressWarnings("deprecation")
    11521153  private static QuotaTypeData createQuotaType(String systemId, String name, String description, boolean secondaryLocation)
    11531154    throws BaseException
  • trunk/src/core/net/sf/basedb/core/InternalStorageController.java

    r6881 r7548  
    8080  @version 2.0
    8181  @base.modified $Date$
     82  @deprecated In 3.14, no replacement
    8283*/
     84@Deprecated
    8385final class InternalStorageController
    8486  implements SecondaryStorageController
  • trunk/src/core/net/sf/basedb/core/Location.java

    r6127 r7548  
    4747    The item is stored in secondary storage. Note! This type
    4848    of storage may not be available on all servers.
     49    @deprecated In 3.14, no replacement
    4950  */
     51  @Deprecated
    5052  SECONDARY(2, "Secondary", false, true),
    5153  /**
  • trunk/src/core/net/sf/basedb/core/Quota.java

    r7381 r7548  
    379379    @throws PermissionDeniedException If the user has no write permissions.
    380380  */
     381  @SuppressWarnings("deprecation")
    381382  public void setQuotaValue(QuotaType quotaType, Location location, long bytes)
    382383    throws InvalidDataException, PermissionDeniedException
  • trunk/src/core/net/sf/basedb/core/QuotaType.java

    r7308 r7548  
    223223    in the secondary location or not.
    224224    @return <code>true</code> if the secondary location can be used, <code>false</code> otherwise
    225   */
     225    @deprecated In 3.14, no replacement
     226  */
     227  @Deprecated
    226228  public boolean hasSecondaryLocation()
    227229  {
  • trunk/src/core/net/sf/basedb/core/SecondaryStorageController.java

    r6898 r7548  
    4747  @version 2.0
    4848  @base.modified $Date$
     49  @deprecated In 3.14, no replacement
    4950*/
     51@Deprecated
    5052public interface SecondaryStorageController
    5153{
  • trunk/src/core/net/sf/basedb/core/data/FileData.java

    r6468 r7548  
    123123    object.
    124124    @hibernate.property column="`action`" type="int" not-null="true"
    125   */
     125    @deprecated In 3.14, no replacement
     126  */
     127  @Deprecated
    126128  public int getAction()
    127129  {
    128130    return action;
    129131  }
     132  @Deprecated
    130133  public void setAction(int action)
    131134  {
  • trunk/src/core/net/sf/basedb/core/data/QuotaTypeData.java

    r6127 r7548  
    107107   
    108108    @hibernate.property column="`secondary_location`" type="boolean" not-null="true" update="false"
     109    @deprecated In 3.14, no replacement
    109110  */
     111  @Deprecated
    110112  public boolean getSecondaryLocation()
    111113  {
    112114    return secondaryLocation;
    113115  }
     116  @Deprecated
    114117  public void setSecondaryLocation(boolean secondaryLocation)
    115118  {
  • trunk/src/test/TestFile.java

    r6576 r7548  
    343343    if (!TestUtil.getSilent())
    344344    {
    345       write("   \tID \tName      \tDescription\tFiletype\tUsed\tLocation\tAction\tSize    \tCompressed size\tMime type\tCharacter set\tPath");
    346       write("-- \t-- \t--------- \t-----------\t--------\t----\t--------\t------\t--------\t---------------\t---------\t-------------\t----");
     345      write("   \tID \tName      \tDescription\tFiletype\tUsed\tLocation\tSize    \tCompressed size\tMime type\tCharacter set\tPath");
     346      write("-- \t-- \t--------- \t-----------\t--------\t----\t--------\t--------\t---------------\t---------\t-------------\t----");
    347347    }
    348348  }
     
    351351  {
    352352    if (!TestUtil.getSilent()) System.out.println(i+":\t"+fi.getId()+"\t"+fi.getName()+"\t"+fi.getDescription()+"\t"+
    353       fi.getItemSubtype()+"\t"+fi.isUsed()+"\t"+fi.getLocation()+"\t"+fi.getAction()+"\t"+
     353      fi.getItemSubtype()+"\t"+fi.isUsed()+"\t"+fi.getLocation()+"\t"+
    354354      fi.getSize()+"\t" + fi.getCompressedSize() + "\t"+fi.getMimeType()+"\t"+
    355355      fi.getCharacterSet()+"\t"+fi.getPath());
Note: See TracChangeset for help on using the changeset viewer.