Merge branch 'maint-rel-1.6' into develop

utilities/ISF-transition/obsoleteUris/directory_walker.rb

@@ -10,6 +10,8 @@ class DirectoryWalker
       if FileTest.directory?(path)
         if File.basename(path).start_with?(".")
           Find.prune       # Don't look any further into this directory.
+        elsif @known_exceptions.skip?(path)
+          Find.prune
         else
           next
         end
@@ -33,13 +35,13 @@ class DirectoryWalker
   
   def scan_line(path, line_number, line)
     @obsolete_uris.uris.each do |uri|
-      next if @known_exceptions.skip?(path, line_number, uri)
+#     next if @known_exceptions.skip?(path, line_number, uri)
       @report.add_event(Event.new(path, line_number, line, uri)) if line =~ Regexp.new("\\b#{Regexp.quote(uri)}\\b") 
     end
     if @complete
       @obsolete_uris.localnames.each do |localname|
         term = ":#{localname}"
-        next if @known_exceptions.skip?(path, line_number, term)
+#       next if @known_exceptions.skip?(path, line_number, term)
         @report.add_event(Event.new(path, line_number, line, term)) if line =~ Regexp.new("#{Regexp.quote(term)}\\b") 
       end
     end

utilities/ISF-transition/obsoleteUris/doit

@@ -1,7 +1,7 @@
 ruby obsoleteUriChecker.rb /Users/jeb228/git/VIVO  \
    ../../../productMods/WEB-INF/ontologies/update/diff.tab.txt \
-   vivo_known_exceptions_2.txt complete > scan_VIVO_maint_branch
+   vivo_known_exceptions.txt complete > scan_VIVO_maint_branch
 ruby obsoleteUriChecker.rb /Users/jeb228/git/Vitro  \
    ../../../productMods/WEB-INF/ontologies/update/diff.tab.txt \
-   vivo_known_exceptions_2.txt complete > scan_Vitro_maint_branch
+   vivo_known_exceptions.txt complete > scan_Vitro_maint_branch
 

utilities/ISF-transition/obsoleteUris/doit_old

@@ -0,0 +1,2 @@
+ruby obsoleteUriChecker.rb /Users/jeb228/Documents/Releases/VIVO\ 1.6/vivo-rel-1.6-rc1  ../../../productMods/WEB-INF/ontologies/update/diff.tab.txt vivo_known_exceptions.txt complete
+

utilities/ISF-transition/obsoleteUris/vivo_known_exceptions.txt

@@ -1,17 +1,23 @@
-.GIF
-.as
-.class
-.fla
-.gif
-.gz
-.ico
-.jar
-.jpg
-.psd
-.png
-.swf
-.war
-.zip
+
+bin
+utilities/ISF-transition/obsoleteUris
+
+*.GIF
+*.as
+*.class
+*.fla
+*.gif
+*.gz
+*.ico
+*.jar
+*.jpg
+*.psd
+*.png
+*.swf
+*.war
+*.zip
+
+**/.*
 
 #
 # first_pass: no excluded files. everything was duplicated in the .bin directory, and
@@ -39,3 +45,25 @@ productMods/WEB-INF/ontologies/update/oldVersion/vivo-bibo-1.5.owl
 productMods/WEB-INF/ontologies/update/oldVersion/scires-1.5.owl 
 productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcterms-1.5.owl
 productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcelements-1.5.owl
+
+#
+# Exclude old performance tests
+#
+utilities/LoadTesting/distros/release1.4/deploy.properties.template
+
+#
+# Exclude the migration code itself
+#
+productMods/WEB-INF/ontologies/update/**/*
+
+#
+# This is commented out.
+#
+src/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java 
+
+#
+# The URI is obsolete, but it has been replaced by another URI with the same localname.
+# http://purl.org/dc/terms/publisher	http://vivoweb.org/ontology/core#publisher
+# How to catch this?
+#
+

utilities/ISF-transition/obsoleteUris/vivo_known_exceptions_old.txt

@@ -1,22 +1,17 @@
-.*
-bin
-
-*.GIF
-*.as
-*.class
-*.fla
-*.gif
-*.gz
-*.ico
-*.jar
-*.jpg
-*.psd
-*.png
-*.swf
-*.war
-*.zip
-
-**/.*
+.GIF
+.as
+.class
+.fla
+.gif
+.gz
+.ico
+.jar
+.jpg
+.psd
+.png
+.swf
+.war
+.zip
 
 #
 # first_pass: no excluded files. everything was duplicated in the .bin directory, and

utilities/acceptance-tests/suites/ShortViews/shortview_config.n3

@@ -52,9 +52,10 @@ mydomain:facultyDepartmentDG
 	display:query """
 PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
 PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 SELECT ?deptName
 WHERE {
-?individualUri vivo:hasMemberRole ?membership .
+?individualUri obo:RO_0000053 ?membership .
 ?membership vivo:roleContributesTo ?deptUri .
 ?deptUri 
 	a vivo:AcademicDepartment ;
@@ -98,11 +99,11 @@ mydomain:departmentLocationDG
 	display:saveToVar "locations" ;
 	display:query """
 PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
-PREFIX vivo: <http://vivoweb.org/ontology/core#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 SELECT ?label
 WHERE
 {
-?location vivo:geographicLocationOf ?individualUri ;
+?location obo:RO_0001015 ?individualUri ;
           rdfs:label ?label .
 }
 LIMIT 20
@@ -113,12 +114,13 @@ mydomain:departmentHeadDG
 	display:saveToVar "deptHead" ;
 	display:query """
 PREFIX rdfs:  <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX obo: <http://purl.obolibrary.org/obo/>
 PREFIX vivo: <http://vivoweb.org/ontology/core#>
 SELECT ?label
 WHERE
 {
 ?individualUri vivo:contributingRole ?role .
-?role vivo:leaderRoleOf ?head .
+?role obo:RO_0000052 ?head .
 ?head rdfs:label ?label .
 }
 LIMIT 1

utilities/languageSupport/i18nChecker/check

@@ -0,0 +1,2 @@
+ruby i18nChecker.rb '/Library/Tomcat/webapps/vivo/i18n/*.properties' complete
+ruby i18nChecker.rb '/Library/Tomcat/webapps/vivo/themes/wilma/i18n/*.properties' complete