From 9272bee0c33c28098b986184fc64a368be323974 Mon Sep 17 00:00:00 2001
From: Wayne Graham <wayne.graham@virginia.edu>
Date: Mon, 10 Oct 2011 10:31:40 -0400
Subject: [PATCH] Cosmetic code changes, added Ant file to automate building
 packages and running code reports

---
 .gitignore                      |  1 +
 NeatlineMapsPlugin.php          | 16 ++++++++++--
 README.md                       |  6 ++---
 build.xml                       | 44 +++++++++++++++++++++++++++++++++
 controllers/IndexController.php |  2 --
 controllers/MapsController.php  |  2 --
 plugin.php                      | 16 +++++++++---
 7 files changed, 74 insertions(+), 13 deletions(-)
 create mode 100644 build.xml

diff --git a/.gitignore b/.gitignore
index 99d7fc7..0fe32cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .*.sw*$
 *~$
 build/
+dist/
 TAGS
 .settings
 .hgignore
diff --git a/NeatlineMapsPlugin.php b/NeatlineMapsPlugin.php
index e03ad81..999c845 100644
--- a/NeatlineMapsPlugin.php
+++ b/NeatlineMapsPlugin.php
@@ -22,7 +22,6 @@
  * @author      David McClure <david.mcclure@virginia.edu>
  * @copyright   2010 The Board and Visitors of the University of Virginia
  * @license     http://www.apache.org/licenses/LICENSE-2.0.html Apache 2 License
- * @version     $Id$
  */
 ?>
 
@@ -78,6 +77,7 @@ public function addHooksAndFilters()
 
     }
 
+    // {{{ hookcallbacks
     /**
      * Hook callbacks:
      */
@@ -199,7 +199,9 @@ public function publicAppendToItemsShow()
         }
 
     }
+    // }}}
 
+    // {{{ filtercallbacks
 
     /**
      * Filter callbacks:
@@ -248,8 +250,18 @@ public function adminItemsFormTabs($tabs)
     public function exhibitBuilderExhibitDisplayItem()
     {
 
-
+      return;
 
     }
 
+  //}}}
+
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
diff --git a/README.md b/README.md
index 1b335c4..7c6f29e 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ in a “slippy” interface.
 
 # Installation and Configuration
 [![](http://github.com/scholarslab/NeatlineMaps/tarball/master)][1]
-1. Download the most current version of NeatlineMaps
-2. Install the plugin
-3. Tell the plugin where to look for [GeoServer] by adding a new server. 
+* Download the most current version of NeatlineMaps
+* Install the plugin
+* Tell the plugin where to look for [GeoServer] by adding a new server. 
 
 ## Feedback
 We rely on the [Github issues tracker][issues] for feedback on issues
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..c3bdad7
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<project name="NeatlineMaps">
+  <property name="project.name" value="NeatlineMaps" />
+  <property name="build.dir" value="${basedir}/build" />
+  <property name="test.dir" value="${basedir}/tests" />
+  <property name="dist.dir" value="${basedir}/dist" />
+
+  <tstamp />
+  <property name="now" value="${DSTAMP}-${TSTAMP}" />
+  <property name="tar" value="${project.name}-${now}.tar" />
+  <property name="gzip" value="${tar}.gz" />
+
+  <target name="clean" description="Clean up the build directory">
+    <delete dir="${build.dir}" />
+    <delete dir="${dist.dir}" />
+  </target>
+
+  <target name="setup" description="Create the directory structure for various reports">
+    <mkdir dir="${build.dir}/api" />
+    <mkdir dir="${build.dir}/code-browser" />
+    <mkdir dir="${build.dir}/coverage" />
+    <mkdir dir="${build.dir}/phpmd" />
+    <mkdir dir="${build.dir}/logs" />
+  </target>
+
+  <target name="package" description="Create a gzipped package of the current branch for distribution">
+    <mkdir dir="${dist.dir}" />
+
+    <tar destfile="${dist.dir}/${project.name}-${now}.tar"
+      basedir="${basedir}"
+      excludes="${build.dir}/**, ${dist.dir}/**, ${test.dir}/**" />
+    <gzip zipfile="${dist.dir}/${gzip}" src="${dist.dir}/${tar}" />
+
+    <delete file="${dist.dir}/${tar}" />
+  </target>
+
+  <target name="phpunit" depends="setup" description="Run PHPUnit tests and generate code coverage report">
+    <exec executable="phpunit" failonerror="false" />
+  </target>
+
+  <target name="build" depends="clean,setup">
+  
+  </target>
+</project>
diff --git a/controllers/IndexController.php b/controllers/IndexController.php
index 56de055..cebbd10 100644
--- a/controllers/IndexController.php
+++ b/controllers/IndexController.php
@@ -22,7 +22,6 @@
  * @author      David McClure <david.mcclure@virginia.edu>
  * @copyright   2010 The Board and Visitors of the University of Virginia
  * @license     http://www.apache.org/licenses/LICENSE-2.0.html Apache 2 License
- * @version     $Id$
  */
 ?>
 
@@ -53,4 +52,3 @@ public function indexAction()
  * End:
  */
 
-?>
diff --git a/controllers/MapsController.php b/controllers/MapsController.php
index cf6d1b7..1a717d9 100644
--- a/controllers/MapsController.php
+++ b/controllers/MapsController.php
@@ -22,7 +22,6 @@
  * @author      David McClure <david.mcclure@virginia.edu>
  * @copyright   2010 The Board and Visitors of the University of Virginia
  * @license     http://www.apache.org/licenses/LICENSE-2.0.html Apache 2 License
- * @version     $Id$
  */
 ?>
 
@@ -489,4 +488,3 @@ protected function _doServerForm($item_id)
  * End:
  */
 
-?>
diff --git a/plugin.php b/plugin.php
index 42ee8cf..0cb1889 100644
--- a/plugin.php
+++ b/plugin.php
@@ -14,15 +14,14 @@
  * OF ANY KIND, either express or implied. See the License for the specific
  * language governing permissions and limitations under the License.
  *
- * @package     omeka
- * @subpackage  neatlinemaps
+ * @package     Omeka
+ * @subpackage  NeatlineMaps
  * @author      Scholars' Lab <>
- * @author      Bethany Nowviskie <bethany@virginia.edu>
  * @author      Adam Soroka <ajs6f@virginia.edu>
  * @author      David McClure <david.mcclure@virginia.edu>
  * @copyright   2010 The Board and Visitors of the University of Virginia
  * @license     http://www.apache.org/licenses/LICENSE-2.0.html Apache 2 License
- * @version     $Id$
+ * @category    plugins
  */
 ?>
 
@@ -42,3 +41,12 @@
 require_once NEATLINE_MAPS_PLUGIN_DIR . '/libraries/GeoserverMap/GeoserverMap_Abstract.php';
 
 new NeatlineMapsPlugin;
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+