Revision 07516903 src/main/scala/gr/grnet/aquarium/ResourceLocator.scala

b/src/main/scala/gr/grnet/aquarium/ResourceLocator.scala
60 60
   */
61 61
  final val AQUARIUM_HOME = SysEnv("AQUARIUM_HOME")
62 62

  
63
  lazy val AQUARIUM_HOME_FOLDER: File = {
63
  final lazy val AQUARIUM_HOME_FOLDER: File = {
64 64
    AQUARIUM_HOME.value match {
65 65
      case Just(home) ⇒
66 66
        val file = new File(home)
......
73 73
    }
74 74
  }
75 75

  
76
  final lazy val AQUARIUM_HOME_CONF_FOLDER = new File(AQUARIUM_HOME_FOLDER, "conf")
77

  
76 78
  /**
77 79
   * This exists in order to have a feeling of where we are.
78 80
   */
79 81
  final lazy val HERE = justForSure(getResource(".")).get.url.toExternalForm
80 82

  
81 83
  /**
82
   * Current directory resource context.
83
   */
84
  private[this] final lazy val AppBaseResourceContext = new FileStreamResourceContext(".")
85

  
86
  /**
87
   * Default config context for Aquarium distributions
84
   * AQUARIUM_HOME/conf resource context.
88 85
   */
89
  private[this] final lazy val LocalConfigResourceContext = new FileStreamResourceContext("conf")
86
  private[this] final lazy val HomeConfResourceContext = new FileStreamResourceContext(AQUARIUM_HOME_CONF_FOLDER)
90 87

  
91 88
  /**
92 89
   * The venerable /etc resource context. Applicable in Unix environments
......
110 107
  private[this] final lazy val BasicResourceContext = new CompositeStreamResourceContext(
111 108
    NoVal,
112 109
    SlashEtcResourceContext,
113
    LocalConfigResourceContext,
114
    AppBaseResourceContext,
110
    HomeConfResourceContext,
115 111
    ClasspathBaseResourceContext)
116 112

  
117 113
  /**
......
125 121
      case NoVal ⇒
126 122
        BasicResourceContext
127 123
      case Failed(e, m) ⇒
128
        throw new RuntimeException(m , e)
124
        throw new AquariumException(m , e)
129 125
    }
130 126
  }
131 127

  

Also available in: Unified diff