litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' into develop

Browse source 
Conflicts:
	utilities/LoadTesting/scripts/_captureTomcatLogs
This commit is contained in:
j2blake 2013-10-29 11:49:37 -04:00
commit 05ba1d0f03
2 changed files with 66 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

146
doc/upgrade-1.6.html
View file

@ -243,97 +243,59 @@
the new locations accordingly. the new locations accordingly.
</p> </p>
<h5>Old locations of RDF files</h5> <table>
<pre>/WEB-INF/ontologies/app/application.owl <tr>
/WEB-INF/ontologies/app/aboutPage.n3 <th>Old locations of RDF files<br/>under [Vitro]/webapp/web or [VIVO]/productMods</th>
/WEB-INF/ontologies/app/menu.n3 <th>New locations of RDF files<br/>under [Vitro]/webapp/rdf or [VIVO]/rdf</th>
/WEB-INF/ontologies/app/profilePageType.n3 <th>Comments</th>
/WEB-INF/ontologies/app/loadedAtStartup/displayModelListViews.rdf </tr>
/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3 <tr>
/WEB-INF/ontologies/app/loadedAtStartup/localeSelectionGUI.n3 <td>WEB-INF/ontologies/app/</td>
/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf <td>rdf/display/firsttime/</td>
/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3 <td></td>
/WEB-INF/ontologies/app/loadedAtStartup/vivoSearchProhibited.n3 </tr>
/WEB-INF/ontologies/app/menuload/displayTBOX.n3 <tr>
/WEB-INF/ontologies/app/menuload/displayDisplay.n3 <td>WEB-INF/ontologies/app/loadedAtStartup/</td>
/WEB-INF/init-data/initialSiteConfig.rdf <td>rdf/display/everytime/</td>
/WEB-INF/ontologies/user/abox/geopolitical.ver1.1-11-18-11-individual-labels.rdf <td></td>
/WEB-INF/ontologies/user/abox/vocabularySource-labels.n3 </tr>
/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf <tr>
/WEB-INF/ontologies/user/tbox/geopolitical-ver1.1-11-18-11-annotations.rdf <td>WEB-INF/ontologies/app/menuload/displayTBOX.n3</td>
/WEB-INF/ontologies/user/tbox/scires-1.5-annotations.rdf <td>rdf/displayTbox/everytime/</td>
/WEB-INF/ontologies/user/tbox/vivo-core-1.5-annotations.rdf <td>Was one file, now a directory</td>
/WEB-INF/ontologies/user/tbox/isDefinedBy-1.5-annotations.rdf </tr>
/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf <tr>
/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf <td>/WEB-INF/ontologies/app/menuload/displayDisplay.n3</td>
/WEB-INF/filegraph/abox/us-states.rdf <td>rdf/displayDisplay/everytime/</td>
/WEB-INF/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl <td>Was one file, now a directory</td>
/WEB-INF/filegraph/abox/academicDegree.rdf </tr>
/WEB-INF/filegraph/abox/documentStatus.owl <tr>
/WEB-INF/filegraph/abox/continents.n3 <td>WEB-INF/ontologies/user/applicationMetadata/<br/>WEB-INF/init-data/</td>
/WEB-INF/filegraph/abox/vocabularySource.n3 <td>rdf/applicationMetadata/firsttime/</td>
/WEB-INF/filegraph/abox/dateTimeValuePrecision.owl <td>Merged directories</td>
/WEB-INF/filegraph/tbox/vitroPublic.owl </tr>
/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl <tr>
/WEB-INF/filegraph/tbox/scires-1.5.owl <td>WEB-INF/ontologies/user/abox/</td>
/WEB-INF/filegraph/tbox/vivo-core-1.5.owl <td>rdf/abox/firsttime/</td>
/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl <td></td>
/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl </tr>
/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl <tr>
/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl <td>WEB-INF/filegraph/abox/</td>
/WEB-INF/filegraph/tbox/vivo-event-1.5.owl <td>rdf/abox/filegraph/</td>
/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl <td></td>
/WEB-INF/filegraph/tbox/vitro-0.7.owl </tr>
/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl <tr>
/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl <td>WEB-INF/ontologies/user/tbox/</td>
/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl <td>rdf/tbox/firsttime/</td>
/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl</pre> <td></td>
</tr>
<tr>
<td>WEB-INF/filegraph/tbox/</td>
<td>rdf/tbox/filegraph/</td>
<td></td>
</tr>
</table>
<h5>New locations of RDF files</h5>
<pre>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</pre>
<p> <p>
If you are using a three-tier build process, you will need to add two lines 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) 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</pre>
<pre>&lt;patternset id="appbase.patterns"&gt; <pre>&lt;patternset id="appbase.patterns"&gt;
&lt;include name="src/**/*" /&gt; &lt;include name="src/**/*" /&gt;
&lt;include name="lib/**/*" /&gt; &lt;include name="lib/**/*" /&gt;
&lt;include name="rdf/**/*" /&gt; <b>&lt;include name="rdf/**/*" /&gt;
&lt;include name="languages/**/*" /&gt; &lt;include name="languages/**/*" /&gt;</b>
&lt;include name="test/**/*" /&gt; &lt;include name="test/**/*" /&gt;
&lt;include name="themes/**/*" /&gt; &lt;include name="themes/**/*" /&gt;
&lt;include name="config/*.properties" /&gt; &lt;include name="config/*.properties" /&gt;

13
utilities/LoadTesting/scripts/_captureTomcatLogs
View file

@ -12,11 +12,22 @@ directory, for possible inspection later.
require File.expand_path('subscripts/common', File.dirname(__FILE__)) require File.expand_path('subscripts/common', File.dirname(__FILE__))
require 'date' require 'date'
require "#{File.dirname(__FILE__)}/subscripts/loadParms"
def figure_time_stamp() def figure_time_stamp()
return DateTime.now.strftime("%Y-%m-%d_%H-%M-%S") return DateTime.now.strftime("%Y-%m-%d_%H-%M-%S")
end end
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') @tomcat_logs_dir = version_file('tomcatLogs')
if (! File.directory?(@tomcat_logs_dir)) if (! File.directory?(@tomcat_logs_dir))
Dir.mkdir(@tomcat_logs_dir) Dir.mkdir(@tomcat_logs_dir)
@ -29,5 +40,5 @@ end
Dir.chdir(@this_logs_dir) do |path| Dir.chdir(@this_logs_dir) do |path|
system("cp #{@home}/tomcat/logs/* .") system("cp #{@home}/tomcat/logs/* .")
add_read_me()
end end