From 6a13e272e75a78587a2d438a678bfb051ccee0d8 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 23 Feb 2010 18:50:21 +0000
Subject: [PATCH] NIHVIVO-119 Remove the ontologies/auth directory, remove
 vitroUsers.owl, remove the build step that modifies vitroUsers.own (both
 build.xml and product-build.xml).

---
 webapp/build.xml                              | 10 ----------
 webapp/ontologies/auth/example.vitroUsers.owl | 15 ---------------
 webapp/product-build.xml                      | 10 ----------
 3 files changed, 35 deletions(-)
 delete mode 100644 webapp/ontologies/auth/example.vitroUsers.owl

diff --git a/webapp/build.xml b/webapp/build.xml
index a692782c0..9c341abca 100644
--- a/webapp/build.xml
+++ b/webapp/build.xml
@@ -213,16 +213,6 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 			</filterchain>
 		</copy>
 
-		<!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
-		<copy file="${vitroCore.basedir}/ontologies/auth/example.vitroUsers.owl"
-		      tofile="${build.dir}/war/WEB-INF/ontologies/auth/vitroUsers.owl"
-		      filtering="true">
-			<filterchain>
-				<expandproperties />
-			</filterchain>
-		</copy>
-		<!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
-
 		<copy todir="${build.dir}/war/WEB-INF/classes">
 			<fileset file="${deploy.properties.file}" />
 		</copy>
diff --git a/webapp/ontologies/auth/example.vitroUsers.owl b/webapp/ontologies/auth/example.vitroUsers.owl
deleted file mode 100644
index a6911c6a0..000000000
--- a/webapp/ontologies/auth/example.vitroUsers.owl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:owl="http://www.w3.org/2002/07/owl#"
-         xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-         xmlns="http://vitro.mannlib.cornell.edu/ns/vitro/default#"
-         xml:base="http://vitro.mannlib.cornell.edu/ns/vitro/default">
-
-<vitro:User rdf:about="#defaultAdminUser">
-    <vitro:username rdf:datatype="http://www.w3.org/2001/XMLSchema#string">${initialAdminUser}</vitro:username>
-    <vitro:md5password rdf:datatype="http://www.w3.org/2001/XMLSchema#string">22BA075EC8951A70960A0A95C0BC2294</vitro:md5password>
-    <vitro:roleURI rdf:datatype="http://www.w3.org/2001/XMLSchema#string">role:/50</vitro:roleURI>    
-</vitro:User>
-
-</rdf:RDF>
diff --git a/webapp/product-build.xml b/webapp/product-build.xml
index 32804acec..f89080586 100644
--- a/webapp/product-build.xml
+++ b/webapp/product-build.xml
@@ -122,16 +122,6 @@ deploy   - Deploy the application directly into the Tomcat webapps directory.
 			<fileset dir="${product.themes.dir}" />
 		</copy>
 
-		<!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
-		<copy file="config/vitroUsers.owl.template"
-		      tofile="${build.dir}/war/WEB-INF/ontologies/auth/vitroUsers.owl"
-		      filtering="true" overwrite="true">
-			<filterchain>
-				<expandproperties />
-			</filterchain>
-		</copy>
-		<!-- TODO: Have the Jena code read the userId directly from the deploy.properties -->
-
 		<copy todir="${build.dir}/war" overwrite="true">
 			<fileset dir="${product.modifications.dir}" />
 		</copy>