From d6fb302e2bff6aaa9f527643cabdc1f0efe06375 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 29 Oct 2013 11:46:39 -0400 Subject: [PATCH 1/2] VIVO-444 clarify how the RDF files have moved. --- doc/upgrade-1.6.html | 146 ++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 92 deletions(-) diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html index 42bc64d5..6fdd5356 100644 --- a/doc/upgrade-1.6.html +++ b/doc/upgrade-1.6.html @@ -243,97 +243,59 @@ the new locations accordingly.

-
Old locations of RDF files
-
/WEB-INF/ontologies/app/application.owl
-/WEB-INF/ontologies/app/aboutPage.n3
-/WEB-INF/ontologies/app/menu.n3
-/WEB-INF/ontologies/app/profilePageType.n3
-/WEB-INF/ontologies/app/loadedAtStartup/displayModelListViews.rdf
-/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3
-/WEB-INF/ontologies/app/loadedAtStartup/localeSelectionGUI.n3
-/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
-/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3
-/WEB-INF/ontologies/app/loadedAtStartup/vivoSearchProhibited.n3
-/WEB-INF/ontologies/app/menuload/displayTBOX.n3
-/WEB-INF/ontologies/app/menuload/displayDisplay.n3
-/WEB-INF/init-data/initialSiteConfig.rdf
-/WEB-INF/ontologies/user/abox/geopolitical.ver1.1-11-18-11-individual-labels.rdf
-/WEB-INF/ontologies/user/abox/vocabularySource-labels.n3
-/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf
-/WEB-INF/ontologies/user/tbox/geopolitical-ver1.1-11-18-11-annotations.rdf
-/WEB-INF/ontologies/user/tbox/scires-1.5-annotations.rdf
-/WEB-INF/ontologies/user/tbox/vivo-core-1.5-annotations.rdf
-/WEB-INF/ontologies/user/tbox/isDefinedBy-1.5-annotations.rdf
-/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf
-/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf
-/WEB-INF/filegraph/abox/us-states.rdf
-/WEB-INF/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl
-/WEB-INF/filegraph/abox/academicDegree.rdf
-/WEB-INF/filegraph/abox/documentStatus.owl
-/WEB-INF/filegraph/abox/continents.n3
-/WEB-INF/filegraph/abox/vocabularySource.n3
-/WEB-INF/filegraph/abox/dateTimeValuePrecision.owl
-/WEB-INF/filegraph/tbox/vitroPublic.owl
-/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl
-/WEB-INF/filegraph/tbox/scires-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-core-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl
-/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl
-/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-event-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl
-/WEB-INF/filegraph/tbox/vitro-0.7.owl
-/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl
-/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl
-/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Old locations of RDF files
under [Vitro]/webapp/web or [VIVO]/productMods		New locations of RDF files
under [Vitro]/webapp/rdf or [VIVO]/rdf		Comments
WEB-INF/ontologies/app/rdf/display/firsttime/
WEB-INF/ontologies/app/loadedAtStartup/rdf/display/everytime/
WEB-INF/ontologies/app/menuload/displayTBOX.n3rdf/displayTbox/everytime/Was one file, now a directory
/WEB-INF/ontologies/app/menuload/displayDisplay.n3rdf/displayDisplay/everytime/Was one file, now a directory
WEB-INF/ontologies/user/applicationMetadata/
WEB-INF/init-data/		rdf/applicationMetadata/firsttime/Merged directories
WEB-INF/ontologies/user/abox/rdf/abox/firsttime/
WEB-INF/filegraph/abox/rdf/abox/filegraph/
WEB-INF/ontologies/user/tbox/rdf/tbox/firsttime/
WEB-INF/filegraph/tbox/rdf/tbox/filegraph/
-
New locations of RDF files
-
rdf/display/firsttime/aboutPage.n3
-rdf/display/firsttime/application.owl
-rdf/display/firsttime/menu.n3
-rdf/display/firsttime/profilePageType.n3
-rdf/display/everytime/displayModelListViews.rdf
-rdf/display/everytime/homePageDataGetters.n3
-rdf/display/everytime/localeSelectionGUI.n3
-rdf/display/everytime/vivoListViewConfig.rdf
-rdf/display/everytime/vivoOrganizationDataGetters.n3
-rdf/display/everytime/vivoSearchProhibited.n3
-rdf/displayTbox/everytime/displayTBOX.n3
-rdf/displayDisplay/everytime/displayDisplay.n3
-rdf/applicationMetadata/firsttime/classgroups.rdf
-rdf/applicationMetadata/firsttime/initialSiteConfig.rdf
-rdf/applicationMetadata/firsttime/propertygroups.rdf
-rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf
-rdf/abox/firsttime/vocabularySource-labels.n3
-rdf/abox/filegraph/abox/academicDegree.rdf
-rdf/abox/filegraph/abox/continents.n3
-rdf/abox/filegraph/abox/dateTimeValuePrecision.owl
-rdf/abox/filegraph/abox/documentStatus.owl
-rdf/abox/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl
-rdf/abox/filegraph/abox/us-states.rdf
-rdf/abox/filegraph/abox/vocabularySource.n3
-rdf/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf
-rdf/tbox/firsttime/isDefinedBy-1.5-annotations.rdf
-rdf/tbox/firsttime/scires-1.5-annotations.rdf
-rdf/tbox/firsttime/vitro-0.7-annotations.rdf
-rdf/tbox/firsttime/vivo-core-1.5-annotations.rdf
-rdf/tbox/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl
-rdf/tbox/filegraph/tbox/isDefinedBy-1.5.owl
-rdf/tbox/filegraph/tbox/scires-1.5.owl
-rdf/tbox/filegraph/tbox/vitro-0.7.owl
-rdf/tbox/filegraph/tbox/vitroPublic.owl
-rdf/tbox/filegraph/tbox/vivo-bibo-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-c4o-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-core-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-dcelements-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-dcterms-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-event-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-fabio-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-foaf-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-pws-1.5.owl
-rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl

If you are using a three-tier build process, you will need to add two lines to the build script to accomodate the RDF files, and the language support (see below) @@ -353,8 +315,8 @@ rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl 

<patternset id="appbase.patterns">
 <include name="src/**/*" />
 <include name="lib/**/*" />
-<include name="rdf/**/*" />
-<include name="languages/**/*" />
+<include name="rdf/**/*" />
+<include name="languages/**/*" />
 <include name="test/**/*" />
 <include name="themes/**/*" />
 <include name="config/*.properties" />

From a8908964f22a82e661d2b07b66b9bf4996a68983 Mon Sep 17 00:00:00 2001
From: j2blake 
Date: Tue, 29 Oct 2013 11:47:12 -0400
Subject: [PATCH 2/2] Refine the load-testing scripts

---
 .../LoadTesting/scripts/_captureTomcatLogs    | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/utilities/LoadTesting/scripts/_captureTomcatLogs b/utilities/LoadTesting/scripts/_captureTomcatLogs
index e5ddbbaf..55bcd656 100755
--- a/utilities/LoadTesting/scripts/_captureTomcatLogs
+++ b/utilities/LoadTesting/scripts/_captureTomcatLogs
@@ -10,6 +10,7 @@ directory, for possible inspection later.
 --------------------------------------------------------------------------------
 =end
 
+require File.expand_path('subscripts/common', File.dirname(__FILE__))
 require 'date'
 require "#{File.dirname(__FILE__)}/subscripts/loadParms"
 
@@ -17,19 +18,27 @@ def figure_time_stamp()
   return DateTime.now.strftime("%Y-%m-%d_%H-%M-%S")
 end
 
-Dir.chdir("/home/jeb228/LoadTesting/versions/#{@version_name}") do |path|
-  @tomcat_logs_dir = "#{path}/tomcatLogs"
-  if (! File.directory?(@tomcat_logs_dir))
-    Dir.mkdir(@tomcat_logs_dir)
+def add_read_me() 
+  puts "Add a comment for the README.txt file"
+  comment = STDIN.gets.strip
+  return if comment.empty?
+
+  File.open('README.txt', "w") do |file|
+    file.puts comment
   end
 end
 
+@tomcat_logs_dir = version_file('tomcatLogs')
+if (! File.directory?(@tomcat_logs_dir))
+  Dir.mkdir(@tomcat_logs_dir)
+end
+
 Dir.chdir(@tomcat_logs_dir) do |path|
   @this_logs_dir = "#{path}/#{figure_time_stamp()}"
   Dir.mkdir(@this_logs_dir)
 end
 
 Dir.chdir(@this_logs_dir) do |path|
-  system('cp ~/LoadTesting/tomcat/logs/* .')
+  system("cp #{@home}/tomcat/logs/* .")
+  add_read_me()
 end
-