diff --git a/config/xml/xml.go b/config/xml/xml.go index 5028cd45..f763d4f0 100644 --- a/config/xml/xml.go +++ b/config/xml/xml.go @@ -14,6 +14,7 @@ import ( "strings" "sync" + "github.com/astaxie/beego/config" "github.com/beego/x2j" ) @@ -24,7 +25,7 @@ type XMLConfig struct { } // Parse returns a ConfigContainer with parsed xml config map. -func (xmls *XMLConfig) Parse(filename string) (ConfigContainer, error) { +func (xmls *XMLConfig) Parse(filename string) (config.ConfigContainer, error) { file, err := os.Open(filename) if err != nil { return nil, err @@ -101,5 +102,5 @@ func (c *XMLConfigContainer) DIY(key string) (v interface{}, err error) { } func init() { - Register("xml", &XMLConfig{}) + config.Register("xml", &XMLConfig{}) } diff --git a/config/xml/xml_test.go b/config/xml/xml_test.go index 49f49ea2..767b02ed 100644 --- a/config/xml/xml_test.go +++ b/config/xml/xml_test.go @@ -9,6 +9,8 @@ package config import ( "os" "testing" + + "github.com/astaxie/beego/config" ) //xml parse should incluce in tags @@ -36,7 +38,7 @@ func TestXML(t *testing.T) { } f.Close() defer os.Remove("testxml.conf") - xmlconf, err := NewConfig("xml", "testxml.conf") + xmlconf, err := config.NewConfig("xml", "testxml.conf") if err != nil { t.Fatal(err) } diff --git a/config/yaml/yaml.go b/config/yaml/yaml.go index 65008565..04a6def3 100644 --- a/config/yaml/yaml.go +++ b/config/yaml/yaml.go @@ -16,6 +16,7 @@ import ( "strings" "sync" + "github.com/astaxie/beego/config" "github.com/beego/goyaml2" ) @@ -24,7 +25,7 @@ type YAMLConfig struct { } // Parse returns a ConfigContainer with parsed yaml config map. -func (yaml *YAMLConfig) Parse(filename string) (ConfigContainer, error) { +func (yaml *YAMLConfig) Parse(filename string) (config.ConfigContainer, error) { y := &YAMLConfigContainer{ data: make(map[string]interface{}), } @@ -146,5 +147,5 @@ func (c *YAMLConfigContainer) DIY(key string) (v interface{}, err error) { } func init() { - Register("yaml", &YAMLConfig{}) + config.Register("yaml", &YAMLConfig{}) } diff --git a/config/yaml/yaml_test.go b/config/yaml/yaml_test.go index bdcc6d42..fbeaf654 100644 --- a/config/yaml/yaml_test.go +++ b/config/yaml/yaml_test.go @@ -9,6 +9,8 @@ package config import ( "os" "testing" + + "github.com/astaxie/beego/config" ) var yamlcontext = ` @@ -33,7 +35,7 @@ func TestYaml(t *testing.T) { } f.Close() defer os.Remove("testyaml.conf") - yamlconf, err := NewConfig("yaml", "testyaml.conf") + yamlconf, err := config.NewConfig("yaml", "testyaml.conf") if err != nil { t.Fatal(err) }