From 12bc82710ba1b9eb399f1b5240dfc3aa77527a21 Mon Sep 17 00:00:00 2001
From: stubbfel <stubbfel@gmail.com>
Date: Mon, 20 May 2013 14:46:49 +0200
Subject: [PATCH] update api

---
 geoapi/api/api.php                                  | 10 ++++++++++
 geoapi/config/config.db.php                         |  7 +++++++
 geoapi/config/config.php                            |  7 +++++++
 geoapi/database/mysql.php                           |  7 +++++++
 geoapi/global.inc.php                               |  7 +++++++
 geoapi/index.php                                    | 12 +-----------
 geoapi/nbproject/project.properties                 |  4 +++-
 geoapi/nbproject/project.xml                        |  2 +-
 geoapi/service/helloservice/index.php               | 13 +++++++++++++
 geoapi/{ => thirdparty}/Slim/Environment.php        |  0
 geoapi/{ => thirdparty}/Slim/Exception/Pass.php     |  0
 geoapi/{ => thirdparty}/Slim/Exception/Stop.php     |  0
 geoapi/{ => thirdparty}/Slim/Http/Headers.php       |  0
 geoapi/{ => thirdparty}/Slim/Http/Request.php       |  0
 geoapi/{ => thirdparty}/Slim/Http/Response.php      |  0
 geoapi/{ => thirdparty}/Slim/Http/Util.php          |  0
 geoapi/{ => thirdparty}/Slim/Log.php                |  0
 geoapi/{ => thirdparty}/Slim/LogWriter.php          |  0
 geoapi/{ => thirdparty}/Slim/Middleware.php         |  0
 .../Slim/Middleware/ContentTypes.php                |  0
 geoapi/{ => thirdparty}/Slim/Middleware/Flash.php   |  0
 .../Slim/Middleware/MethodOverride.php              |  0
 .../Slim/Middleware/PrettyExceptions.php            |  0
 .../Slim/Middleware/SessionCookie.php               |  0
 geoapi/{ => thirdparty}/Slim/Route.php              |  0
 geoapi/{ => thirdparty}/Slim/Router.php             |  0
 geoapi/{ => thirdparty}/Slim/Slim.php               |  0
 geoapi/{ => thirdparty}/Slim/View.php               |  0
 28 files changed, 56 insertions(+), 13 deletions(-)
 create mode 100644 geoapi/api/api.php
 create mode 100644 geoapi/config/config.db.php
 create mode 100644 geoapi/config/config.php
 create mode 100644 geoapi/database/mysql.php
 create mode 100644 geoapi/global.inc.php
 create mode 100644 geoapi/service/helloservice/index.php
 rename geoapi/{ => thirdparty}/Slim/Environment.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Exception/Pass.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Exception/Stop.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Http/Headers.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Http/Request.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Http/Response.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Http/Util.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Log.php (100%)
 rename geoapi/{ => thirdparty}/Slim/LogWriter.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Middleware.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Middleware/ContentTypes.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Middleware/Flash.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Middleware/MethodOverride.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Middleware/PrettyExceptions.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Middleware/SessionCookie.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Route.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Router.php (100%)
 rename geoapi/{ => thirdparty}/Slim/Slim.php (100%)
 rename geoapi/{ => thirdparty}/Slim/View.php (100%)

diff --git a/geoapi/api/api.php b/geoapi/api/api.php
new file mode 100644
index 0000000..408e5d6
--- /dev/null
+++ b/geoapi/api/api.php
@@ -0,0 +1,10 @@
+<?php
+include_once "../../global.inc.php"; 
+require_once PATH_3PARTY."/Slim/Slim.php";
+\Slim\Slim::registerAutoloader();
+
+class api extends \Slim\Slim {
+    //put your code here
+}
+
+?>
diff --git a/geoapi/config/config.db.php b/geoapi/config/config.db.php
new file mode 100644
index 0000000..3e558ca
--- /dev/null
+++ b/geoapi/config/config.db.php
@@ -0,0 +1,7 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+?>
diff --git a/geoapi/config/config.php b/geoapi/config/config.php
new file mode 100644
index 0000000..3e558ca
--- /dev/null
+++ b/geoapi/config/config.php
@@ -0,0 +1,7 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+?>
diff --git a/geoapi/database/mysql.php b/geoapi/database/mysql.php
new file mode 100644
index 0000000..3e558ca
--- /dev/null
+++ b/geoapi/database/mysql.php
@@ -0,0 +1,7 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+?>
diff --git a/geoapi/global.inc.php b/geoapi/global.inc.php
new file mode 100644
index 0000000..16ce1c5
--- /dev/null
+++ b/geoapi/global.inc.php
@@ -0,0 +1,7 @@
+<?php
+define("PATH_ROOT", dirname(__FILE__));
+define("PATH_SERVICES", PATH_ROOT. "/service"); 
+define("PATH_3PARTY", PATH_ROOT . "/thirdparty");
+define("PATH_API", PATH_ROOT . "/api");
+define("PATH_DATABASE", PATH_ROOT. "/datebase");
+?>
diff --git a/geoapi/index.php b/geoapi/index.php
index 25022eb..349f774 100644
--- a/geoapi/index.php
+++ b/geoapi/index.php
@@ -1,14 +1,4 @@
 
 <?php
-require 'Slim/Slim.php';
-\Slim\Slim::registerAutoloader();
-
-
-$app = new \Slim\Slim();
-
-$app->get('/hello/:name', function ($name) {
-    echo "Hello, $name";
-});
-
-$app->run();
+    echo "Welcome to GeoApi";
 ?>
diff --git a/geoapi/nbproject/project.properties b/geoapi/nbproject/project.properties
index 67f3fcd..9e1ed20 100644
--- a/geoapi/nbproject/project.properties
+++ b/geoapi/nbproject/project.properties
@@ -1,4 +1,6 @@
-include.path=${php.global.include.path}
+ignore.path=
+include.path=\
+    ${php.global.include.path}
 php.version=PHP_54
 source.encoding=UTF-8
 src.dir=.
diff --git a/geoapi/nbproject/project.xml b/geoapi/nbproject/project.xml
index 60d3060..07c45ed 100644
--- a/geoapi/nbproject/project.xml
+++ b/geoapi/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.php.project</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>PhpProject1</name>
+            <name>GeoApi</name>
         </data>
     </configuration>
 </project>
diff --git a/geoapi/service/helloservice/index.php b/geoapi/service/helloservice/index.php
new file mode 100644
index 0000000..42aaa2d
--- /dev/null
+++ b/geoapi/service/helloservice/index.php
@@ -0,0 +1,13 @@
+
+<?php
+include_once "../../global.inc.php"; 
+require_once PATH_API."/api.php";
+
+$app = new api();
+
+$app->get('/hello/:name', function ($name) {
+    echo "Hello, $name";
+});
+
+$app->run();
+?>
diff --git a/geoapi/Slim/Environment.php b/geoapi/thirdparty/Slim/Environment.php
similarity index 100%
rename from geoapi/Slim/Environment.php
rename to geoapi/thirdparty/Slim/Environment.php
diff --git a/geoapi/Slim/Exception/Pass.php b/geoapi/thirdparty/Slim/Exception/Pass.php
similarity index 100%
rename from geoapi/Slim/Exception/Pass.php
rename to geoapi/thirdparty/Slim/Exception/Pass.php
diff --git a/geoapi/Slim/Exception/Stop.php b/geoapi/thirdparty/Slim/Exception/Stop.php
similarity index 100%
rename from geoapi/Slim/Exception/Stop.php
rename to geoapi/thirdparty/Slim/Exception/Stop.php
diff --git a/geoapi/Slim/Http/Headers.php b/geoapi/thirdparty/Slim/Http/Headers.php
similarity index 100%
rename from geoapi/Slim/Http/Headers.php
rename to geoapi/thirdparty/Slim/Http/Headers.php
diff --git a/geoapi/Slim/Http/Request.php b/geoapi/thirdparty/Slim/Http/Request.php
similarity index 100%
rename from geoapi/Slim/Http/Request.php
rename to geoapi/thirdparty/Slim/Http/Request.php
diff --git a/geoapi/Slim/Http/Response.php b/geoapi/thirdparty/Slim/Http/Response.php
similarity index 100%
rename from geoapi/Slim/Http/Response.php
rename to geoapi/thirdparty/Slim/Http/Response.php
diff --git a/geoapi/Slim/Http/Util.php b/geoapi/thirdparty/Slim/Http/Util.php
similarity index 100%
rename from geoapi/Slim/Http/Util.php
rename to geoapi/thirdparty/Slim/Http/Util.php
diff --git a/geoapi/Slim/Log.php b/geoapi/thirdparty/Slim/Log.php
similarity index 100%
rename from geoapi/Slim/Log.php
rename to geoapi/thirdparty/Slim/Log.php
diff --git a/geoapi/Slim/LogWriter.php b/geoapi/thirdparty/Slim/LogWriter.php
similarity index 100%
rename from geoapi/Slim/LogWriter.php
rename to geoapi/thirdparty/Slim/LogWriter.php
diff --git a/geoapi/Slim/Middleware.php b/geoapi/thirdparty/Slim/Middleware.php
similarity index 100%
rename from geoapi/Slim/Middleware.php
rename to geoapi/thirdparty/Slim/Middleware.php
diff --git a/geoapi/Slim/Middleware/ContentTypes.php b/geoapi/thirdparty/Slim/Middleware/ContentTypes.php
similarity index 100%
rename from geoapi/Slim/Middleware/ContentTypes.php
rename to geoapi/thirdparty/Slim/Middleware/ContentTypes.php
diff --git a/geoapi/Slim/Middleware/Flash.php b/geoapi/thirdparty/Slim/Middleware/Flash.php
similarity index 100%
rename from geoapi/Slim/Middleware/Flash.php
rename to geoapi/thirdparty/Slim/Middleware/Flash.php
diff --git a/geoapi/Slim/Middleware/MethodOverride.php b/geoapi/thirdparty/Slim/Middleware/MethodOverride.php
similarity index 100%
rename from geoapi/Slim/Middleware/MethodOverride.php
rename to geoapi/thirdparty/Slim/Middleware/MethodOverride.php
diff --git a/geoapi/Slim/Middleware/PrettyExceptions.php b/geoapi/thirdparty/Slim/Middleware/PrettyExceptions.php
similarity index 100%
rename from geoapi/Slim/Middleware/PrettyExceptions.php
rename to geoapi/thirdparty/Slim/Middleware/PrettyExceptions.php
diff --git a/geoapi/Slim/Middleware/SessionCookie.php b/geoapi/thirdparty/Slim/Middleware/SessionCookie.php
similarity index 100%
rename from geoapi/Slim/Middleware/SessionCookie.php
rename to geoapi/thirdparty/Slim/Middleware/SessionCookie.php
diff --git a/geoapi/Slim/Route.php b/geoapi/thirdparty/Slim/Route.php
similarity index 100%
rename from geoapi/Slim/Route.php
rename to geoapi/thirdparty/Slim/Route.php
diff --git a/geoapi/Slim/Router.php b/geoapi/thirdparty/Slim/Router.php
similarity index 100%
rename from geoapi/Slim/Router.php
rename to geoapi/thirdparty/Slim/Router.php
diff --git a/geoapi/Slim/Slim.php b/geoapi/thirdparty/Slim/Slim.php
similarity index 100%
rename from geoapi/Slim/Slim.php
rename to geoapi/thirdparty/Slim/Slim.php
diff --git a/geoapi/Slim/View.php b/geoapi/thirdparty/Slim/View.php
similarity index 100%
rename from geoapi/Slim/View.php
rename to geoapi/thirdparty/Slim/View.php