Merge pull request #20 from fbergkemper/master

Fixes vendor library loading Vendor library Bareos no longer autoloaded by composer, instead by module/Application/Module.php. composer.phar and composer.json.dev added for development purposes and some clean-up.
bareos · Aug 6, 2014 · 7b24d41 · 7b24d41
2 parents e0a9cc1 + 44ef319
commit 7b24d41
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1 @@
 composer.lock
-composer.phar
diff --git a/composer.json b/composer.json
@@ -9,10 +9,6 @@
     "homepage": "http://bareos.github.io/bareos-webui",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "2.2.*",
-        "zendframework/zend-developer-tools": "dev-master"
-    },
-    "autoload": {
-        "psr-0": {"Bareos\\": "vendor/Bareos/library/"}
+        "zendframework/zendframework": "2.2.*"
     }
 }
diff --git a/composer.json.dev b/composer.json.dev
@@ -0,0 +1,18 @@
+{
+    "name": "bareos-webui",
+    "description": "A Web-Frontend to manage Bareos",
+    "license": "AGPL3",
+    "keywords": [
+        "bareos",
+        "webinterface"
+    ],
+    "homepage": "http://bareos.github.io/bareos-webui",
+    "require": {
+        "php": ">=5.3.3",
+        "zendframework/zendframework": "2.2.*",
+        "zendframework/zend-developer-tools": "dev-master"
+    },
+    "autoload": {
+        "psr-0": {"Bareos\\": "vendor/Bareos/library/"}
+    }
+}
diff --git a/composer.phar b/composer.phar
diff --git a/module/Application/Module.php b/module/Application/Module.php
@@ -35,6 +35,7 @@ public function getAutoloaderConfig()
             'Zend\Loader\StandardAutoloader' => array(
                 'namespaces' => array(
                     __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
+		    'Bareos' => __DIR__ .'/../../vendor/Bareos/library/Bareos',
                 ),
             ),
         );

diff --git a/vendor/.gitignore b/vendor/.gitignore
@@ -1,4 +1,5 @@
 !.gitignore
+bin
 .composer
 composer
 zendframework

diff --git a/vendor/bin/classmap_generator.php b/vendor/bin/classmap_generator.php
diff --git a/vendor/bin/pluginmap_generator.php b/vendor/bin/pluginmap_generator.php
diff --git a/vendor/bin/templatemap_generator.php b/vendor/bin/templatemap_generator.php