Merge branch 'develop' into writePerformance

Conflicts:
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/ABoxJenaChangeListener.java
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaChangeListener.java
	api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/jena/ListeningGraph.java

.gitignore

@@ -12,5 +12,8 @@ utilities/solrtester/.work
 utilities/rdbmigration/.work
 utilities/sdb_to_tdb/.work
 
+**/.idea
 **/*.iml
+**/target
 
+**/overlays

README.md

@@ -6,6 +6,7 @@ Vitro is an integrated ontology editor and semantic web application.
 Vitro is a Java web application that runs in a Tomcat servlet container.
 
 With Vitro, you can:
+
 * Create or load ontologies in OWL format
 * Edit instances and relationships
 * Build a public web site to display your data
@@ -14,5 +15,5 @@ With Vitro, you can:
 Vitro was originally developed at Cornell University, and is used as the core of the popular
 research and scholarship portal, [VIVO](http://vivoweb.org) .
 
-For more information, contact the [VIVO community](http://vivoweb.org/contact).
+For more information, contact the [VIVO community](http://www.vivoweb.org/support/user-feedback).
 

api/pom.xml

@@ -0,0 +1,78 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.vivoweb</groupId>
+    <artifactId>vitro-api</artifactId>
+    <version>1.9.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>org.vivoweb</groupId>
+        <artifactId>vitro-project</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <name>Vitro API</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vivoweb</groupId>
+            <artifactId>vitro-dependencies</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jsp-api</artifactId>
+            <version>2.0</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.11</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>